← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-19 10:58:39 UTC
  • mfrom: (6383 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6386.
  • Revision ID: jelmer@canonical.com-20111219105839-uji05ck4rkm1mj4j
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/__init__.py
35
35
lazy_import(globals(), """
36
36
import errno
37
37
from stat import S_ISDIR
38
 
import urllib
39
38
import urlparse
40
39
 
41
40
from bzrlib import (
1417
1416
 
1418
1417
        :return: The corresponding URL.
1419
1418
        """
1420
 
        netloc = urllib.quote(host)
 
1419
        netloc = urlutils.quote(host)
1421
1420
        if user is not None:
1422
1421
            # Note that we don't put the password back even if we
1423
1422
            # have one so that it doesn't get accidentally
1424
1423
            # exposed.
1425
 
            netloc = '%s@%s' % (urllib.quote(user), netloc)
 
1424
            netloc = '%s@%s' % (urlutils.quote(user), netloc)
1426
1425
        if port is not None:
1427
1426
            netloc = '%s:%d' % (netloc, port)
1428
1427
        path = urlutils.escape(path)