/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/urlutils.py

[merge] bzr.dev 2294

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/urlutils.py
212
212
    #       which actually strips trailing space characters.
213
213
    #       The worst part is that under linux ntpath.abspath has different
214
214
    #       semantics, since 'nt' is not an available module.
215
 
    win32_path = osutils._nt_normpath(
216
 
        osutils._win32_abspath(path)).replace('\\', '/')
 
215
    win32_path = osutils._win32_abspath(path)
217
216
    # check for UNC path \\HOST\path
218
217
    if win32_path.startswith('//'):
219
218
        return 'file:' + escape(win32_path)
405
404
    if not url.endswith('/'):
406
405
        # Nothing to do
407
406
        return url
408
 
    if sys.platform == 'win32' and url.startswith('file:///'):
 
407
    if sys.platform == 'win32' and url.startswith('file://'):
409
408
        return _win32_strip_local_trailing_slash(url)
410
409
 
411
410
    scheme_loc, first_path_slash = _find_scheme_and_separator(url)