← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/urlutils.py

  • Committer: Vincent Ladeuil
  • Date: 2011-10-06 07:43:13 UTC
  • mfrom: (6015.33.8 2.4)
  • mto: This revision was merged to the branch mainline in revision 6192.
  • Revision ID: v.ladeuil+lp@free.fr-20111006074313-w3f2t8lgzy04pjjb
Merge 2.4 into trunk resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/urlutils.py
22
22
 
23
23
from bzrlib.lazy_import import lazy_import
24
24
lazy_import(globals(), """
25
 
from posixpath import split as _posix_split, normpath as _posix_normpath
 
25
from posixpath import split as _posix_split
26
26
import urllib
27
27
import urlparse
28
28
 
201
201
    """
202
202
    # importing directly from posixpath allows us to test this
203
203
    # on non-posix platforms
204
 
    return 'file://' + escape(_posix_normpath(
205
 
        osutils._posix_abspath(path)))
 
204
    return 'file://' + escape(osutils._posix_abspath(path))
206
205
 
207
206
 
208
207
def _win32_local_path_from_url(url):