← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/directory_service.py

  • Committer: Michael Hudson
  • Date: 2008-08-14 03:13:55 UTC
  • mto: (3714.2.1 bzr.ab.integration2)
  • mto: This revision was merged to the branch mainline in revision 3717.
  • Revision ID: michael.hudson@canonical.com-20080814031355-a0qts3o42dcxrleb
import urlutils and write urlutils.join rather than join

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/directory_service.py
22
22
 
23
23
from bzrlib import errors, registry
24
24
from bzrlib.branch import Branch
25
 
from bzrlib.urlutils import join
 
25
from bzrlib import urlutils
 
26
 
26
27
 
27
28
class DirectoryServiceRegistry(registry.Registry):
28
29
    """This object maintains and uses a list of directory services.
88
89
        if result is None:
89
90
            raise errors.UnsetLocationAlias(url)
90
91
        if extra is not None:
91
 
            result = join(result, extra)
 
92
            result = urlutils.join(result, extra)
92
93
        return result
93
94
 
94
95
directories.register(':', AliasDirectory,