← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/urlutils.py

  • Committer: Robert Collins
  • Date: 2010-06-28 02:41:22 UTC
  • mto: This revision was merged to the branch mainline in revision 5324.
  • Revision ID: robertc@robertcollins.net-20100628024122-g951fzp74f3u6wst
Sanity check that new_trace_file in pop_log_file is valid, and also fix a test that monkey patched get_terminal_encoding.

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'