/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to errors.py

  • Committer: Vincent Ladeuil
  • Date: 2010-02-24 07:47:17 UTC
  • Revision ID: v.ladeuil+lp@free.fr-20100224074717-gac36h7b3wmhp91x
Fix 2.1.0 compatibility issue.

* diff.py:
(MergeDirectiveController.perform_merge): Fix 2.1.0 deprecation
warnings.

Show diffs side-by-side

added added

removed removed

Lines of Context:
errors.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
from bzrlib import errors
18
 
from bzrlib.plugins.gtk.dialog import (
19
 
    error_dialog,
20
 
    info_dialog,
21
 
    )
22
 
from bzrlib.plugins.gtk.i18n import _i18n
 
17
import bzrlib.errors as errors
 
18
from bzrlib.plugins.gtk import _i18n
 
19
from dialog import error_dialog, info_dialog, warning_dialog
23
20
 
24
21
 
25
22
def show_bzr_error(unbound):