/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: Jelmer Vernooij
  • Date: 2012-03-23 12:56:39 UTC
  • Revision ID: jelmer@samba.org-20120323125639-z3qgalx8qodxr2zw
bzr-handle-patch: Use spaces rather than tabs for indentation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
53
53
 
54
54
import bzrlib
55
55
import bzrlib.api
 
56
from bzrlib import (
 
57
    config,
 
58
    )
56
59
from bzrlib.commands import plugin_cmds
57
60
 
58
61
from bzrlib.plugins.gtk.info import (
141
144
    install_lazy_named_hook("bzrlib.branch", "Branch.hooks",
142
145
        'post_uncommit', save_commit_messages, "Saving commit messages for gcommit")
143
146
 
144
 
try:
145
 
    from bzrlib.registry import register_lazy
146
 
except ImportError:
147
 
    from bzrlib import config
148
 
    option_registry = getattr(config, "option_registry", None)
149
 
    if option_registry is not None:
150
 
        config.option_registry.register_lazy('nautilus_integration',
151
 
                'bzrlib.plugins.gtk.config', 'opt_nautilus_integration')
152
 
else:
153
 
    register_lazy("bzrlib.config", "option_registry",
154
 
        'nautilus_integration', 'bzrlib.plugins.gtk.config',
155
 
        'opt_nautilus_integration')
156
147
 
 
148
option_registry = getattr(config, "option_registry", None)
 
149
if option_registry is not None:
 
150
    config.option_registry.register_lazy('nautilus_integration',
 
151
            'bzrlib.plugins.gtk.config', 'opt_nautilus_integration')
157
152
 
158
153
def load_tests(basic_tests, module, loader):
159
154
    testmod_names = [