← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/directory_service.py

  • Committer: Jelmer Vernooij
  • Date: 2010-08-28 11:20:04 UTC
  • mto: This revision was merged to the branch mainline in revision 5418.
  • Revision ID: jelmer@samba.org-20100828112004-83vag2ktvihjlt40
Fix some test failures now that bzrlib.controldir.network_format_registry has moved.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/directory_service.py
1
 
# Copyright (C) 2008, 2009, 2011 Canonical Ltd
 
1
# Copyright (C) 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
20
20
to true URLs.  Examples include lp:urls and per-user location aliases.
21
21
"""
22
22
 
23
 
from bzrlib import (
24
 
    errors,
25
 
    registry,
26
 
    )
 
23
from bzrlib import errors, registry
27
24
from bzrlib.lazy_import import lazy_import
28
25
lazy_import(globals(), """
29
 
from bzrlib import (
30
 
    branch as _mod_branch,
31
 
    urlutils,
32
 
    )
 
26
from bzrlib.branch import Branch
 
27
from bzrlib import urlutils
33
28
""")
34
29
 
35
30
 
73
68
    """
74
69
 
75
70
    def look_up(self, name, url):
76
 
        branch = _mod_branch.Branch.open_containing('.')[0]
 
71
        branch = Branch.open_containing('.')[0]
77
72
        lookups = {
78
73
            'parent': branch.get_parent,
79
74
            'submit': branch.get_submit_branch,