← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/urlutils.py

  • Committer: John Arbash Meinel
  • Date: 2006-06-10 14:53:51 UTC
  • mto: (1711.7.2 win32)
  • mto: This revision was merged to the branch mainline in revision 1796.
  • Revision ID: john@arbash-meinel.com-20060610145351-9da0c1f8ba8a57e0
the _posix_* routines should use posixpath not os.path, so tests pass on win32

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/urlutils.py
19
19
"""A collection of function for handling URL operations."""
20
20
 
21
21
import os
22
 
from posixpath import split as _posix_split
 
22
from posixpath import split as _posix_split, normpath as _posix_normpath
23
23
import re
24
24
import sys
25
25
import urllib
160
160
    """
161
161
    # importing directly from posixpath allows us to test this 
162
162
    # on non-posix platforms
163
 
    from posixpath import normpath
164
 
    return 'file://' + escape(normpath(bzrlib.osutils._posix_abspath(path)))
 
163
    return 'file://' + escape(_posix_normpath(
 
164
        bzrlib.osutils._posix_abspath(path)))
165
165
 
166
166
 
167
167
def _win32_local_path_from_url(url):