← 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: 2010-09-25 20:08:01 UTC
  • mfrom: (5444 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5445.
  • Revision ID: john@arbash-meinel.com-20100925200801-7uf0ux3uwxo9i3x0
Merge bzr.dev 5444 to resolve some small text conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/urlutils.py
224
224
        return '/'
225
225
 
226
226
    # usual local path with drive letter
227
 
    if (len(win32_url) < 6
228
 
        or win32_url[3] not in ('abcdefghijklmnopqrstuvwxyz'
229
 
                                'ABCDEFGHIJKLMNOPQRSTUVWXYZ')
 
227
    if (win32_url[3] not in ('abcdefghijklmnopqrstuvwxyz'
 
228
                             'ABCDEFGHIJKLMNOPQRSTUVWXYZ')
230
229
        or win32_url[4] not in  '|:'
231
230
        or win32_url[5] != '/'):
232
231
        raise errors.InvalidURL(url, 'Win32 file urls start with'