Merge lp:~jelmer/brz/python3.8-1 into lp:brz

[Jelmer Vernooij]

Support passing bytestring paths to osutils.splitpath.

Support passing bytestring paths to osutils.splitpath.

This fixes some of the tests on Python 3.8.

[Martin Packman (gz)]

Thanks!

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/517/

=== modified file 'breezy/osutils.py'
--- breezy/osutils.py	2019-06-16 15:36:08 +0000
+++ breezy/osutils.py	2019-10-13 17:18:06 +0000
@@ -1026,24 +1026,32 @@
 
 def splitpath(p):
     """Turn string into list of parts."""
+    use_bytes = isinstance(p, bytes)
     if os.path.sep == '\\':
         # split on either delimiter because people might use either on
         # Windows
-        if isinstance(p, bytes):
+        if use_bytes:
             ps = re.split(b'[\\\\/]', p)
         else:
             ps = re.split(r'[\\/]', p)
     else:
-        if isinstance(p, bytes):
+        if use_bytes:
             ps = p.split(b'/')
         else:
             ps = p.split('/')
 
+    if use_bytes:
+        parent_dir = b'..'
+        current_empty_dir = (b'.', b'')
+    else:
+        parent_dir = '..'
+        current_empty_dir = ('.', '')
+
     rps = []
     for f in ps:
-        if f in ('..', b'..'):
+        if f == parent_dir:
             raise errors.BzrError(gettext("sorry, %r not allowed in path") % f)
-        elif f in ('.', '', b'.', b''):
+        elif f in current_empty_dir:
             pass
         else:
             rps.append(f)