Fix test_diff_patch

jdavid · jdavid · commit a3ab5c8a4dbf · 2019-02-24T09:11:07.000+01:00
Now Diff.parse_diff in Python 2 if given a unicode object it will decode
using utf-8 instead of default.
diff --git a/src/diff.c b/src/diff.c
@@ -998,24 +998,24 @@ PyDoc_STRVAR(Diff_parse_diff__doc__,
     "Parses a git unified diff into a diff object without a repository");
 
 static PyObject *
-Diff_parse_diff(PyObject *self, PyObject *args)
+Diff_parse_diff(PyObject *self, PyObject *py_str)
 {
-  /* A wrapper around
-   * git_diff_from_buffer
-  */
-  git_diff *diff;
-  const char *content = NULL;
-  Py_ssize_t content_len;
-  int err;
-
-  if (!PyArg_ParseTuple(args, "s#", &content, &content_len))
-    return NULL;
+    /* A wrapper around git_diff_from_buffer */
+    git_diff *diff;
+    const char *content = NULL;
+    int err;
+    PyObject *tvalue;
 
-  err = git_diff_from_buffer(&diff, content, content_len);
-  if (err < 0)
-    return Error_set(err);
+    content = py_str_borrow_c_str(&tvalue, py_str, NULL);
+    if (content == NULL)
+        return NULL;
+
+    err = git_diff_from_buffer(&diff, content, strlen(content));
+    Py_DECREF(tvalue);
+    if (err < 0)
+        return Error_set(err);
 
-  return wrap_diff(diff, NULL);
+    return wrap_diff(diff, NULL);
 }
 
 static void
@@ -1044,7 +1044,7 @@ static PyMethodDef Diff_methods[] = {
     METHOD(Diff, find_similar, METH_VARARGS | METH_KEYWORDS),
     METHOD(Diff, from_c, METH_STATIC | METH_VARARGS),
     {"parse_diff", (PyCFunction) Diff_parse_diff,
-      METH_VARARGS | METH_STATIC, Diff_parse_diff__doc__},
+      METH_O | METH_STATIC, Diff_parse_diff__doc__},
     {NULL}
 };
 
diff --git a/src/repository.c b/src/repository.c
@@ -1924,10 +1924,7 @@ Repository_apply(Repository *self, PyObject *py_diff)
     git_apply_location_t location = GIT_APPLY_LOCATION_WORKDIR;
     git_apply_options options = GIT_APPLY_OPTIONS_INIT;
 
-    err = git_apply(self->repo,
-                    ((Diff*)py_diff)->diff,
-                    location,
-	                &options);
+    err = git_apply(self->repo, ((Diff*)py_diff)->diff, location, &options);
 
     if (err < 0)
         return Error_set(err);
diff --git a/test/test_repository.py b/test/test_repository.py
@@ -480,19 +480,20 @@ def test_diff_patch(self):
         new_content = 'bye world\nadiós\nau revoir monde\n'
 
         # create the patch
-        with open(os.path.join(self.repo.workdir, 'hello.txt'), 'w') as f:
-            f.write(new_content)
+        with open(os.path.join(self.repo.workdir, 'hello.txt'), 'wb') as f:
+            f.write(new_content.encode('utf-8'))
 
         patch = self.repo.diff().patch
 
         # rollback all changes
         self.repo.checkout('HEAD', strategy=pygit2.GIT_CHECKOUT_FORCE)
 
         # apply the patch and compare
-        self.repo.apply(pygit2.Diff.parse_diff(patch))
+        diff = pygit2.Diff.parse_diff(patch)
+        self.repo.apply(diff)
 
-        with open(os.path.join(self.repo.workdir, 'hello.txt'), 'r') as f:
-            content = f.read()
+        with open(os.path.join(self.repo.workdir, 'hello.txt'), 'rb') as f:
+            content = f.read().decode('utf-8')
 
         self.assertEqual(content, new_content)
 
