← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/urlutils.py

  • Committer: Andrew Bennetts
  • Date: 2011-03-15 07:54:39 UTC
  • mfrom: (0.38.5 trunk)
  • mto: This revision was merged to the branch mainline in revision 5726.
  • Revision ID: andrew.bennetts@canonical.com-20110315075439-nzm293joz143cx0k
Merge bzr-changelog-merge plugin.

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 (win32_url[3] not in ('abcdefghijklmnopqrstuvwxyz'
228
 
                             'ABCDEFGHIJKLMNOPQRSTUVWXYZ')
 
227
    if (len(win32_url) < 6
 
228
        or win32_url[3] not in ('abcdefghijklmnopqrstuvwxyz'
 
229
                                'ABCDEFGHIJKLMNOPQRSTUVWXYZ')
229
230
        or win32_url[4] not in  '|:'
230
231
        or win32_url[5] != '/'):
231
232
        raise errors.InvalidURL(url, 'Win32 file urls start with'