Merge lp:~a1s/brz/3.2-windows-separators into lp:brz/3.2

[Aleksandr Smyshliaev]

Let osutils path functions on Windows accept byte strings as well as unicode strings

As far as I understand, Breezy hasn't decided yet if file paths should be byte strings or Unicode strings. A lot of calls to osutils functions pass byte strings, but the regression tests use mostly Unicode strings.

This change makes osutils accept both bytes and strings, just as posixpath and ntpath from the Standard Library do.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/osutils.py'
--- breezy/osutils.py	2020-07-18 23:14:00 +0000
+++ breezy/osutils.py	2021-11-16 16:14:23 +0000
@@ -335,31 +335,37 @@
     drive, path = ntpath.splitdrive(path)
     return drive.upper() + path
 
+def _win32_fix_separators(path):
+    """Return path with directory separators changed to forward slashes"""
+    if isinstance(path, bytes):
+        return path.replace(b'\\', b'/')
+    else:
+        return path.replace('\\', '/')
 
 def _win32_abspath(path):
     # Real ntpath.abspath doesn't have a problem with a unicode cwd
-    return _win32_fixdrive(ntpath.abspath(path).replace('\\', '/'))
+    return _win32_fixdrive(_win32_fix_separators(ntpath.abspath(path)))
 
 
 def _win32_realpath(path):
     # Real ntpath.realpath doesn't have a problem with a unicode cwd
-    return _win32_fixdrive(ntpath.realpath(path).replace('\\', '/'))
+    return _win32_fixdrive(_win32_fix_separators(ntpath.realpath(path)))
 
 
 def _win32_pathjoin(*args):
-    return ntpath.join(*args).replace('\\', '/')
+    return _win32_fix_separators(ntpath.join(*args))
 
 
 def _win32_normpath(path):
-    return _win32_fixdrive(ntpath.normpath(path).replace('\\', '/'))
+    return _win32_fixdrive(_win32_fix_separators(ntpath.normpath(path)))
 
 
 def _win32_getcwd():
-    return _win32_fixdrive(_getcwd().replace('\\', '/'))
+    return _win32_fixdrive(_win32_fix_separators(_getcwd()))
 
 
 def _win32_mkdtemp(*args, **kwargs):
-    return _win32_fixdrive(tempfile.mkdtemp(*args, **kwargs).replace('\\', '/'))
+    return _win32_fixdrive(_win32_fix_separators(tempfile.mkdtemp(*args, **kwargs)))
 
 
 def _win32_rename(old, new):