/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 breezy/osutils.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-09-11 02:50:43 UTC
  • mfrom: (7067.16.7 fix-c-extensions)
  • Revision ID: breezy.the.bot@gmail.com-20180911025043-c4v82nhbajxniw2y
Fix remaining Cython extensions on Python 3.

Merged from https://code.launchpad.net/~jelmer/brz/fix-c-extensions/+merge/353369

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/osutils.py
1028
1028
    """Turn string into list of parts."""
1029
1029
    # split on either delimiter because people might use either on
1030
1030
    # Windows
1031
 
    ps = re.split(r'[\\/]', p)
 
1031
    if isinstance(p, bytes):
 
1032
        ps = re.split(b'[\\\\/]', p)
 
1033
    else:
 
1034
        ps = re.split(r'[\\/]', p)
1032
1035
 
1033
1036
    rps = []
1034
1037
    for f in ps:
1035
 
        if f == '..':
 
1038
        if f in ('..', b'..'):
1036
1039
            raise errors.BzrError(gettext("sorry, %r not allowed in path") % f)
1037
 
        elif (f == '.') or (f == ''):
 
1040
        elif f in ('.', '', b'.', b''):
1038
1041
            pass
1039
1042
        else:
1040
1043
            rps.append(f)