test using pygit2 for branch creation instead of subprocess call, but fails because of surrogates not allowed

Author: wschuell

pygit2/utils.py

@@ -34,14 +34,14 @@ def maybe_string(ptr):
     if not ptr:
         return None
 
-    return ffi.string(ptr).decode("utf8", errors="surrogateescape")
+    return ffi.string(ptr).decode('utf8', errors='surrogateescape')
 
 
-def to_bytes(s, encoding="utf-8", errors="strict"):
+def to_bytes(s, encoding='utf-8', errors='strict'):
     if s == ffi.NULL or s is None:
         return ffi.NULL
 
-    if hasattr(s, "__fspath__"):
+    if hasattr(s, '__fspath__'):
         s = os.fspath(s)
 
     if isinstance(s, bytes):
@@ -51,7 +51,7 @@ def to_bytes(s, encoding="utf-8", errors="strict"):
 
 
 def to_str(s):
-    if hasattr(s, "__fspath__"):
+    if hasattr(s, '__fspath__'):
         s = os.fspath(s)
 
     if type(s) is str:
@@ -69,13 +69,13 @@ def ptr_to_bytes(ptr_cdata):
     to a byte buffer containing the address that the pointer refers to.
     """
 
-    pp = ffi.new("void **", ptr_cdata)
+    pp = ffi.new('void **', ptr_cdata)
     return bytes(ffi.buffer(pp)[:])
 
 
 @contextlib.contextmanager
 def new_git_strarray():
-    strarray = ffi.new("git_strarray *")
+    strarray = ffi.new('git_strarray *')
     yield strarray
     C.git_strarray_dispose(strarray)
 
@@ -88,7 +88,7 @@ def strarray_to_strings(arr):
     calling this function.
     """
     try:
-        return [ffi.string(arr.strings[i]).decode("utf-8") for i in range(arr.count)]
+        return [ffi.string(arr.strings[i]).decode('utf-8') for i in range(arr.count)]
     finally:
         C.git_strarray_dispose(arr)
 
@@ -120,19 +120,19 @@ def __init__(self, l):
             return
 
         if not isinstance(l, (list, tuple)):
-            raise TypeError("Value must be a list")
+            raise TypeError('Value must be a list')
 
         strings = [None] * len(l)
         for i in range(len(l)):
             li = l[i]
-            if not isinstance(li, str) and not hasattr(li, "__fspath__"):
-                raise TypeError("Value must be a string or PathLike object")
+            if not isinstance(li, str) and not hasattr(li, '__fspath__'):
+                raise TypeError('Value must be a string or PathLike object')
 
-            strings[i] = ffi.new("char []", to_bytes(li))
+            strings[i] = ffi.new('char []', to_bytes(li))
 
-        self.__arr = ffi.new("char *[]", strings)
+        self.__arr = ffi.new('char *[]', strings)
         self.__strings = strings
-        self.__array = ffi.new("git_strarray *", [self.__arr, len(strings)])
+        self.__array = ffi.new('git_strarray *', [self.__arr, len(strings)])
 
     def __enter__(self):
         return self

test/test_nonunicode.py

@@ -41,8 +41,7 @@ def bstring(request):
 
 
 def test_nonunicode_branchname(testrepo, bstring):
-    cmd = b"git checkout -b " + bstring
-    subprocess.check_output(cmd.split(b" "), cwd=testrepo.workdir)
+    testrepo.branches.local.create(bstring.decode("utf8", errors="surrogateescape"),commit=testrepo.head.target)
     newrepo = pygit2.clone_repository(
         testrepo.workdir,
         os.path.join(os.path.dirname(testrepo.workdir), "test_nonunicode_repo"),