/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 __init__.py

  • Committer: Aaron Bentley
  • Date: 2007-07-23 19:25:12 UTC
  • Revision ID: abentley@panoramicfeedback.com-20070723192512-ss8x3yayx7kfijoz
Fix test suite

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
15
15
"""Graphical support for Bazaar using GTK.
16
16
 
17
17
This plugin includes:
 
18
commit-notify     Start the graphical notifier of commits.
18
19
gannotate         GTK+ annotate. 
19
20
gbranch           GTK+ branching. 
20
21
gcheckout         GTK+ checkout. 
21
 
gcommit           GTK+ commit dialog.
22
 
gconflicts        GTK+ conflicts. 
 
22
gcommit           GTK+ commit dialog 
 
23
gconflicts        GTK+ push. 
23
24
gdiff             Show differences in working tree in a GTK+ Window. 
24
25
ginit             Initialise a new branch.
25
 
gmerge            GTK+ merge dialog
26
26
gmissing          GTK+ missing revisions dialog. 
27
27
gpreferences      GTK+ preferences dialog. 
28
 
gpush             GTK+ push.
29
 
gsend             GTK+ send merge directive.
30
 
gstatus           GTK+ status dialog.
 
28
gpush             GTK+ push. 
 
29
gstatus           GTK+ status dialog 
31
30
gtags             Manage branch tags.
32
31
visualise         Graphically visualise this branch. 
33
32
"""
34
33
 
35
 
import sys
36
 
 
37
34
import bzrlib
38
35
 
39
 
version_info = (0, 95, 0, 'dev', 1)
40
 
 
41
 
if version_info[3] == 'final':
42
 
    version_string = '%d.%d.%d' % version_info[:3]
43
 
else:
44
 
    version_string = '%d.%d.%d%s%d' % version_info
45
 
__version__ = version_string
46
 
 
47
 
required_bzrlib = (1, 3)
 
36
__version__ = '0.19.0'
 
37
version_info = tuple(int(n) for n in __version__.split('.'))
 
38
 
48
39
 
49
40
def check_bzrlib_version(desired):
50
41
    """Check that bzrlib is compatible.
51
42
 
52
43
    If version is < bzr-gtk version, assume incompatible.
 
44
    If version == bzr-gtk version, assume completely compatible
 
45
    If version == bzr-gtk version + 1, assume compatible, with deprecations
 
46
    Otherwise, assume incompatible.
53
47
    """
 
48
    desired_plus = (desired[0], desired[1]+1)
54
49
    bzrlib_version = bzrlib.version_info[:2]
 
50
    if bzrlib_version == desired or (bzrlib_version == desired_plus and
 
51
                                     bzrlib.version_info[3] == 'dev'):
 
52
        return
55
53
    try:
56
54
        from bzrlib.trace import warning
57
55
    except ImportError:
59
57
        from warnings import warn as warning
60
58
    if bzrlib_version < desired:
61
59
        from bzrlib.errors import BzrError
62
 
        warning('Installed Bazaar version %s is too old to be used with bzr-gtk'
 
60
        warning('Installed bzr version %s is too old to be used with bzr-gtk'
63
61
                ' %s.' % (bzrlib.__version__, __version__))
64
 
        raise BzrError('Version mismatch: %r, %r' % (version_info, bzrlib.version_info) )
65
 
 
66
 
 
67
 
if version_info[2] == "final":
68
 
    check_bzrlib_version(required_bzrlib)
 
62
        raise BzrError('Version mismatch: %r' % version_info)
 
63
    else:
 
64
        warning('bzr-gtk is not up to date with installed bzr version %s.'
 
65
                ' \nThere should be a newer version available, e.g. %i.%i.' 
 
66
                % (bzrlib.__version__, bzrlib_version[0], bzrlib_version[1]))
 
67
 
 
68
 
 
69
check_bzrlib_version(version_info[:2])
69
70
 
70
71
from bzrlib.trace import warning
71
72
if __name__ != 'bzrlib.plugins.gtk':
77
78
    branch,
78
79
    builtins,
79
80
    errors,
80
 
    merge_directive,
81
81
    workingtree,
82
82
    )
83
83
""")
104
104
    bzrlib.ui.ui_factory = GtkUIFactory()
105
105
 
106
106
 
107
 
def data_basedirs():
108
 
    return [os.path.dirname(__file__),
109
 
             "/usr/share/bzr-gtk", 
110
 
             "/usr/local/share/bzr-gtk"]
111
 
 
112
 
 
113
 
def data_path(*args):
114
 
    for basedir in data_basedirs():
115
 
        path = os.path.join(basedir, *args)
116
 
        if os.path.exists(path):
117
 
            return path
118
 
    return None
119
 
 
120
 
 
121
 
def icon_path(*args):
122
 
    return data_path(os.path.join('icons', *args))
123
 
 
124
 
 
125
 
def open_display():
126
 
    pygtk = import_pygtk()
127
 
    try:
128
 
        import gtk
129
 
    except RuntimeError, e:
130
 
        if str(e) == "could not open display":
131
 
            raise NoDisplayError
132
 
    set_ui_factory()
133
 
    return gtk
134
 
 
 
107
def data_path():
 
108
    return os.path.dirname(__file__)
 
109
 
135
110
 
136
111
class GTKCommand(Command):
137
112
    """Abstract class providing GTK specific run commands."""
138
113
 
 
114
    def open_display(self):
 
115
        pygtk = import_pygtk()
 
116
        try:
 
117
            import gtk
 
118
        except RuntimeError, e:
 
119
            if str(e) == "could not open display":
 
120
                raise NoDisplayError
 
121
        set_ui_factory()
 
122
        return gtk
 
123
 
139
124
    def run(self):
140
 
        open_display()
 
125
        self.open_display()
141
126
        dialog = self.get_gtk_dialog(os.path.abspath('.'))
142
127
        dialog.run()
143
128
 
171
156
 
172
157
    def run(self, location="."):
173
158
        (br, path) = branch.Branch.open_containing(location)
174
 
        open_display()
 
159
        self.open_display()
175
160
        from push import PushDialog
176
161
        dialog = PushDialog(br.repository, br.last_revision(), br)
177
162
        dialog.run()
196
181
            if revision is not None:
197
182
                if len(revision) == 1:
198
183
                    tree1 = wt
199
 
                    revision_id = revision[0].as_revision_id(tree1.branch)
 
184
                    revision_id = revision[0].in_history(branch).rev_id
200
185
                    tree2 = branch.repository.revision_tree(revision_id)
201
186
                elif len(revision) == 2:
202
 
                    revision_id_0 = revision[0].as_revision_id(branch)
 
187
                    revision_id_0 = revision[0].in_history(branch).rev_id
203
188
                    tree2 = branch.repository.revision_tree(revision_id_0)
204
 
                    revision_id_1 = revision[1].as_revision_id(branch)
 
189
                    revision_id_1 = revision[1].in_history(branch).rev_id
205
190
                    tree1 = branch.repository.revision_tree(revision_id_1)
206
191
            else:
207
192
                tree1 = wt
229
214
            wt.unlock()
230
215
 
231
216
 
232
 
def start_viz_window(branch, revisions, limit=None):
 
217
def start_viz_window(branch, revision, limit=None):
233
218
    """Start viz on branch with revision revision.
234
219
    
235
220
    :return: The viz window object.
236
221
    """
237
 
    from viz import BranchWindow
238
 
    return BranchWindow(branch, revisions, limit)
 
222
    from viz.branchwin import BranchWindow
 
223
    branch.lock_read()
 
224
    pp = BranchWindow()
 
225
    pp.set_branch(branch, revision, limit)
 
226
    # cleanup locks when the window is closed
 
227
    pp.connect("destroy", lambda w: branch.unlock())
 
228
    return pp
239
229
 
240
230
 
241
231
class cmd_visualise(Command):
251
241
        "revision",
252
242
        Option('limit', "Maximum number of revisions to display.",
253
243
               int, 'count')]
254
 
    takes_args = [ "locations*" ]
 
244
    takes_args = [ "location?" ]
255
245
    aliases = [ "visualize", "vis", "viz" ]
256
246
 
257
 
    def run(self, locations_list, revision=None, limit=None):
 
247
    def run(self, location=".", revision=None, limit=None):
258
248
        set_ui_factory()
259
 
        if locations_list is None:
260
 
            locations_list = ["."]
261
 
        revids = []
262
 
        for location in locations_list:
263
 
            (br, path) = branch.Branch.open_containing(location)
 
249
        (br, path) = branch.Branch.open_containing(location)
 
250
        br.lock_read()
 
251
        try:
264
252
            if revision is None:
265
 
                revids.append(br.last_revision())
 
253
                revid = br.last_revision()
 
254
                if revid is None:
 
255
                    return
266
256
            else:
267
 
                revids.append(revision[0].as_revision_id(br))
268
 
        import gtk
269
 
        pp = start_viz_window(br, revids, limit)
270
 
        pp.connect("destroy", lambda w: gtk.main_quit())
271
 
        pp.show()
272
 
        gtk.main()
 
257
                (revno, revid) = revision[0].in_history(br)
 
258
 
 
259
            import gtk
 
260
            pp = start_viz_window(br, revid, limit)
 
261
            pp.connect("destroy", lambda w: gtk.main_quit())
 
262
            pp.show()
 
263
            gtk.main()
 
264
        finally:
 
265
            br.unlock()
273
266
 
274
267
 
275
268
class cmd_gannotate(GTKCommand):
289
282
    aliases = ["gblame", "gpraise"]
290
283
    
291
284
    def run(self, filename, all=False, plain=False, line='1', revision=None):
292
 
        gtk = open_display()
 
285
        gtk = self.open_display()
293
286
 
294
287
        try:
295
288
            line = int(line)
314
307
        if revision is not None:
315
308
            if len(revision) != 1:
316
309
                raise BzrCommandError("Only 1 revion may be specified.")
317
 
            revision_id = revision[0].as_revision_id(br)
 
310
            revision_id = revision[0].in_history(br).rev_id
318
311
            tree = br.repository.revision_tree(revision_id)
319
312
        else:
320
313
            revision_id = getattr(tree, 'get_revision_id', lambda: None)()
321
314
 
322
 
        window = GAnnotateWindow(all, plain, branch=br)
 
315
        window = GAnnotateWindow(all, plain)
323
316
        window.connect("destroy", lambda w: gtk.main_quit())
 
317
        window.set_title(path + " - gannotate")
324
318
        config = GAnnotateConfig(window)
325
319
        window.show()
326
320
        br.lock_read()
341
335
    """GTK+ commit dialog
342
336
 
343
337
    Graphical user interface for committing revisions"""
344
 
 
 
338
    
345
339
    aliases = [ "gci" ]
346
340
    takes_args = []
347
341
    takes_options = []
348
342
 
349
343
    def run(self, filename=None):
350
344
        import os
351
 
        open_display()
 
345
        self.open_display()
352
346
        from commit import CommitDialog
353
347
        from bzrlib.errors import (BzrCommandError,
354
348
                                   NotBranchError,
360
354
            (wt, path) = workingtree.WorkingTree.open_containing(filename)
361
355
            br = wt.branch
362
356
        except NoWorkingTree, e:
363
 
            from dialog import error_dialog
364
 
            error_dialog(_i18n('Directory does not have a working tree'),
365
 
                         _i18n('Operation aborted.'))
366
 
            return 1 # should this be retval=3?
367
 
 
368
 
        # It is a good habit to keep things locked for the duration, but it
369
 
        # could cause difficulties if someone wants to do things in another
370
 
        # window... We could lock_read() until we actually go to commit
371
 
        # changes... Just a thought.
372
 
        wt.lock_write()
373
 
        try:
374
 
            dlg = CommitDialog(wt)
375
 
            return dlg.run()
376
 
        finally:
377
 
            wt.unlock()
 
357
            path = e.base
 
358
            (br, path) = branch.Branch.open_containing(path)
 
359
 
 
360
        commit = CommitDialog(wt, path, not br)
 
361
        commit.run()
 
362
 
378
363
 
379
364
 
380
365
class cmd_gstatus(GTKCommand):
385
370
    
386
371
    aliases = [ "gst" ]
387
372
    takes_args = ['PATH?']
388
 
    takes_options = ['revision']
 
373
    takes_options = []
389
374
 
390
 
    def run(self, path='.', revision=None):
 
375
    def run(self, path='.'):
391
376
        import os
392
 
        gtk = open_display()
 
377
        gtk = self.open_display()
393
378
        from status import StatusDialog
394
379
        (wt, wt_path) = workingtree.WorkingTree.open_containing(path)
395
 
        
396
 
        if revision is not None:
397
 
            try:
398
 
                revision_id = revision[0].as_revision_id(wt.branch)
399
 
            except:
400
 
                from bzrlib.errors import BzrError
401
 
                raise BzrError('Revision %r doesn\'t exist' % revision[0].user_spec )
402
 
        else:
403
 
            revision_id = None
404
 
 
405
 
        status = StatusDialog(wt, wt_path, revision_id)
 
380
        status = StatusDialog(wt, wt_path)
406
381
        status.connect("destroy", gtk.main_quit)
407
382
        status.run()
408
383
 
409
384
 
410
 
class cmd_gsend(GTKCommand):
411
 
    """GTK+ send merge directive.
412
 
 
413
 
    """
414
 
    def run(self):
415
 
        (br, path) = branch.Branch.open_containing(".")
416
 
        gtk = open_display()
417
 
        from bzrlib.plugins.gtk.mergedirective import SendMergeDirectiveDialog
418
 
        from StringIO import StringIO
419
 
        dialog = SendMergeDirectiveDialog(br)
420
 
        if dialog.run() == gtk.RESPONSE_OK:
421
 
            outf = StringIO()
422
 
            outf.writelines(dialog.get_merge_directive().to_lines())
423
 
            mail_client = br.get_config().get_mail_client()
424
 
            mail_client.compose_merge_request(dialog.get_mail_to(), "[MERGE]", 
425
 
                outf.getvalue())
426
 
 
427
 
            
428
 
 
429
385
 
430
386
class cmd_gconflicts(GTKCommand):
431
 
    """GTK+ conflicts.
 
387
    """ GTK+ push.
432
388
    
433
 
    Select files from the list of conflicts and run an external utility to
434
 
    resolve them.
435
389
    """
436
390
    def run(self):
437
391
        (wt, path) = workingtree.WorkingTree.open_containing('.')
438
 
        open_display()
 
392
        self.open_display()
439
393
        from bzrlib.plugins.gtk.conflicts import ConflictsDialog
440
394
        dialog = ConflictsDialog(wt)
441
395
        dialog.run()
442
396
 
443
397
 
 
398
 
444
399
class cmd_gpreferences(GTKCommand):
445
400
    """ GTK+ preferences dialog.
446
401
 
447
402
    """
448
403
    def run(self):
449
 
        open_display()
 
404
        self.open_display()
450
405
        from bzrlib.plugins.gtk.preferences import PreferencesWindow
451
406
        dialog = PreferencesWindow()
452
407
        dialog.run()
453
408
 
454
409
 
455
 
class cmd_gmerge(Command):
456
 
    """ GTK+ merge dialog
457
 
    
458
 
    """
459
 
    takes_args = ["merge_from_path?"]
460
 
    def run(self, merge_from_path=None):
461
 
        from bzrlib import workingtree
462
 
        from bzrlib.plugins.gtk.dialog import error_dialog
463
 
        from bzrlib.plugins.gtk.merge import MergeDialog
464
 
        
465
 
        (wt, path) = workingtree.WorkingTree.open_containing('.')
466
 
        old_tree = wt.branch.repository.revision_tree(wt.branch.last_revision())
467
 
        delta = wt.changes_from(old_tree)
468
 
        if len(delta.added) or len(delta.removed) or len(delta.renamed) or len(delta.modified):
469
 
            error_dialog(_i18n('There are local changes in the branch'),
470
 
                         _i18n('Please commit or revert the changes before merging.'))
471
 
        else:
472
 
            parent_branch_path = wt.branch.get_parent()
473
 
            merge = MergeDialog(wt, path, parent_branch_path)
474
 
            response = merge.run()
475
 
            merge.destroy()
476
 
 
477
410
 
478
411
class cmd_gmissing(Command):
479
412
    """ GTK+ missing revisions dialog.
513
446
 
514
447
class cmd_ginit(GTKCommand):
515
448
    def run(self):
516
 
        open_display()
 
449
        self.open_display()
517
450
        from initialize import InitDialog
518
451
        dialog = InitDialog(os.path.abspath(os.path.curdir))
519
452
        dialog.run()
523
456
    def run(self):
524
457
        br = branch.Branch.open_containing('.')[0]
525
458
        
526
 
        gtk = open_display()
 
459
        gtk = self.open_display()
527
460
        from tags import TagsWindow
528
461
        window = TagsWindow(br)
529
462
        window.show()
531
464
 
532
465
 
533
466
commands = [
 
467
    cmd_gmissing, 
 
468
    cmd_gpreferences, 
 
469
    cmd_gconflicts, 
 
470
    cmd_gstatus,
 
471
    cmd_gcommit, 
534
472
    cmd_gannotate, 
 
473
    cmd_visualise, 
 
474
    cmd_gdiff,
 
475
    cmd_gpush, 
 
476
    cmd_gcheckout, 
535
477
    cmd_gbranch,
536
 
    cmd_gcheckout, 
537
 
    cmd_gcommit, 
538
 
    cmd_gconflicts, 
539
 
    cmd_gdiff,
540
478
    cmd_ginit,
541
 
    cmd_gmerge,
542
 
    cmd_gmissing, 
543
 
    cmd_gpreferences, 
544
 
    cmd_gpush, 
545
 
    cmd_gsend,
546
 
    cmd_gstatus,
547
 
    cmd_gtags,
548
 
    cmd_visualise
 
479
    cmd_gtags
549
480
    ]
550
481
 
551
482
for cmd in commands:
552
483
    register_command(cmd)
553
484
 
554
485
 
 
486
class cmd_commit_notify(GTKCommand):
 
487
    """Run the bzr commit notifier.
 
488
 
 
489
    This is a background program which will pop up a notification on the users
 
490
    screen when a commit occurs.
 
491
    """
 
492
 
 
493
    def run(self):
 
494
        from notify import NotifyPopupMenu
 
495
        gtk = self.open_display()
 
496
        menu = NotifyPopupMenu()
 
497
        icon = gtk.status_icon_new_from_file(os.path.join(data_path(), "bzr-icon-64.png"))
 
498
        icon.connect('popup-menu', menu.display)
 
499
 
 
500
        import cgi
 
501
        import dbus
 
502
        import dbus.service
 
503
        import pynotify
 
504
        from bzrlib.bzrdir import BzrDir
 
505
        from bzrlib import errors
 
506
        from bzrlib.osutils import format_date
 
507
        from bzrlib.transport import get_transport
 
508
        if getattr(dbus, 'version', (0,0,0)) >= (0,41,0):
 
509
            import dbus.glib
 
510
        from bzrlib.plugins.dbus import activity
 
511
        bus = dbus.SessionBus()
 
512
        # get the object so we can subscribe to callbacks from it.
 
513
        broadcast_service = bus.get_object(
 
514
            activity.Broadcast.DBUS_NAME,
 
515
            activity.Broadcast.DBUS_PATH)
 
516
 
 
517
        def catch_branch(revision_id, urls):
 
518
            # TODO: show all the urls, or perhaps choose the 'best'.
 
519
            url = urls[0]
 
520
            try:
 
521
                if isinstance(revision_id, unicode):
 
522
                    revision_id = revision_id.encode('utf8')
 
523
                transport = get_transport(url)
 
524
                a_dir = BzrDir.open_from_transport(transport)
 
525
                branch = a_dir.open_branch()
 
526
                revno = branch.revision_id_to_revno(revision_id)
 
527
                revision = branch.repository.get_revision(revision_id)
 
528
                summary = 'New revision %d in %s' % (revno, url)
 
529
                body  = 'Committer: %s\n' % revision.committer
 
530
                body += 'Date: %s\n' % format_date(revision.timestamp,
 
531
                    revision.timezone)
 
532
                body += '\n'
 
533
                body += revision.message
 
534
                body = cgi.escape(body)
 
535
                nw = pynotify.Notification(summary, body)
 
536
                def start_viz(notification=None, action=None, data=None):
 
537
                    """Start the viz program."""
 
538
                    pp = start_viz_window(branch, revision_id)
 
539
                    pp.show()
 
540
                def start_branch(notification=None, action=None, data=None):
 
541
                    """Start a Branch dialog"""
 
542
                    from bzrlib.plugins.gtk.branch import BranchDialog
 
543
                    bd = BranchDialog(remote_path=url)
 
544
                    bd.run()
 
545
                nw.add_action("inspect", "Inspect", start_viz, None)
 
546
                nw.add_action("branch", "Branch", start_branch, None)
 
547
                nw.set_timeout(5000)
 
548
                nw.show()
 
549
            except Exception, e:
 
550
                print e
 
551
                raise
 
552
        broadcast_service.connect_to_signal("Revision", catch_branch,
 
553
            dbus_interface=activity.Broadcast.DBUS_INTERFACE)
 
554
        pynotify.init("bzr commit-notify")
 
555
        gtk.main()
 
556
 
 
557
register_command(cmd_commit_notify)
 
558
 
 
559
 
555
560
class cmd_gselftest(GTKCommand):
556
561
    """Version of selftest that displays a notification at the end"""
557
562
 
561
566
 
562
567
    def run(self, *args, **kwargs):
563
568
        import cgi
564
 
        import sys
565
 
        default_encoding = sys.getdefaultencoding()
566
569
        # prevent gtk from blowing up later
567
570
        gtk = import_pygtk()
568
 
        # prevent gtk from messing with default encoding
569
571
        import pynotify
570
 
        if sys.getdefaultencoding() != default_encoding:
571
 
            reload(sys)
572
 
            sys.setdefaultencoding(default_encoding)
573
572
        result = builtins.cmd_selftest().run(*args, **kwargs)
574
573
        if result == 0:
575
574
            summary = 'Success'
586
585
register_command(cmd_gselftest)
587
586
 
588
587
 
589
 
class cmd_test_gtk(GTKCommand):
590
 
    """Version of selftest that just runs the gtk test suite."""
591
 
 
592
 
    takes_options = ['verbose',
593
 
                     Option('one', short_name='1',
594
 
                            help='Stop when one test fails.'),
595
 
                     Option('benchmark', help='Run the benchmarks.'),
596
 
                     Option('lsprof-timed',
597
 
                     help='Generate lsprof output for benchmarked'
598
 
                          ' sections of code.'),
599
 
                     Option('list-only',
600
 
                     help='List the tests instead of running them.'),
601
 
                     Option('randomize', type=str, argname="SEED",
602
 
                     help='Randomize the order of tests using the given'
603
 
                          ' seed or "now" for the current time.'),
604
 
                    ]
605
 
    takes_args = ['testspecs*']
606
 
 
607
 
    def run(self, verbose=None, one=False, benchmark=None,
608
 
            lsprof_timed=None, list_only=False, randomize=None,
609
 
            testspecs_list=None):
610
 
        from bzrlib import __path__ as bzrlib_path
611
 
        from bzrlib.tests import selftest
612
 
 
613
 
        print '%10s: %s' % ('bzrlib', bzrlib_path[0])
614
 
        if benchmark:
615
 
            print 'No benchmarks yet'
616
 
            return 3
617
 
 
618
 
            test_suite_factory = bench_suite
619
 
            if verbose is None:
620
 
                verbose = True
621
 
            # TODO: should possibly lock the history file...
622
 
            benchfile = open(".perf_history", "at", buffering=1)
623
 
        else:
624
 
            test_suite_factory = test_suite
625
 
            if verbose is None:
626
 
                verbose = False
627
 
            benchfile = None
628
 
 
629
 
        if testspecs_list is not None:
630
 
            pattern = '|'.join(testspecs_list)
631
 
        else:
632
 
            pattern = ".*"
633
 
 
634
 
        try:
635
 
            result = selftest(verbose=verbose,
636
 
                              pattern=pattern,
637
 
                              stop_on_failure=one,
638
 
                              test_suite_factory=test_suite_factory,
639
 
                              lsprof_timed=lsprof_timed,
640
 
                              bench_history=benchfile,
641
 
                              list_only=list_only,
642
 
                              random_seed=randomize,
643
 
                             )
644
 
        finally:
645
 
            if benchfile is not None:
646
 
                benchfile.close()
647
 
 
648
 
register_command(cmd_test_gtk)
649
 
 
650
 
 
651
 
 
652
588
import gettext
653
589
gettext.install('olive-gtk')
654
590
 
655
 
# Let's create a specialized alias to protect '_' from being erased by other
656
 
# uses of '_' as an anonymous variable (think pdb for one).
657
 
_i18n = gettext.gettext
658
591
 
659
592
class NoDisplayError(BzrCommandError):
660
593
    """gtk could not find a proper display"""
670
603
    default_encoding = sys.getdefaultencoding()
671
604
    try:
672
605
        result = TestSuite()
673
 
        try:
674
 
            import_pygtk()
675
 
        except errors.BzrCommandError:
676
 
            return result
677
606
        result.addTest(tests.test_suite())
678
607
    finally:
679
608
        if sys.getdefaultencoding() != default_encoding: