openstack/deb-python-pygit2
Code Issues Proposed changes

Fix most unit tests with Python 3

Browse Source
This commit is contained in:
J. David Ibáñez 2011-08-21 00:49:05 +02:00
parent ef9a5f6e55
commit ae1d178d7a
2 changed files with 19 additions and 15 deletions

32
pygit2.c

@ -344,6 +344,9 @@ py_str_to_c_str(PyObject *value)
return NULL; return NULL;
} }
#define c_str_to_py_str(c_str) \
PyUnicode_DecodeUTF8(c_str, strlen(c_str), "strict")
static int static int
Repository_init(Repository *self, PyObject *args, PyObject *kwds) Repository_init(Repository *self, PyObject *args, PyObject *kwds)
{ {
@ -502,7 +505,7 @@ Repository_get_path(Repository *self, void *closure)
const char *c_path; const char *c_path;
c_path = git_repository_path(self->repo, GIT_REPO_PATH); c_path = git_repository_path(self->repo, GIT_REPO_PATH);
return PyString_FromString(c_path); return c_str_to_py_str(c_path);
} }
static PyObject * static PyObject *
@ -514,7 +517,7 @@ Repository_get_workdir(Repository *self, void *closure)
if (c_path == NULL) if (c_path == NULL)
Py_RETURN_NONE; Py_RETURN_NONE;
return PyString_FromString(c_path); return c_str_to_py_str(c_path);
} }
static PyObject * static PyObject *
@ -707,15 +710,16 @@ Repository_listall_references(Repository *self, PyObject *args)
return Error_set(err); return Error_set(err);
/* 3- Create a new PyTuple */ /* 3- Create a new PyTuple */
if ( (py_result = PyTuple_New(c_result.count)) == NULL) { py_result = PyTuple_New(c_result.count);
if (py_result == NULL) {
git_strarray_free(&c_result); git_strarray_free(&c_result);
return NULL; return NULL;
} }
/* 4- Fill it */ /* 4- Fill it */
for (index=0; index < c_result.count; index++) { for (index=0; index < c_result.count; index++) {
if ((py_string = PyString_FromString( (c_result.strings)[index] )) py_string = c_str_to_py_str((c_result.strings)[index]);
== NULL) { if (py_string == NULL) {
Py_XDECREF(py_result); Py_XDECREF(py_result);
git_strarray_free(&c_result); git_strarray_free(&c_result);
return NULL; return NULL;
@ -738,7 +742,7 @@ Repository_lookup_reference(Repository *self, PyObject *py_name)
int err; int err;
/* 1- Get the C name */ /* 1- Get the C name */
c_name = PyString_AsString(py_name); c_name = py_str_to_c_str(py_name);
if (c_name == NULL) if (c_name == NULL)
return NULL; return NULL;
@ -1223,7 +1227,7 @@ TreeEntry_get_attributes(TreeEntry *self)
static PyObject * static PyObject *
TreeEntry_get_name(TreeEntry *self) TreeEntry_get_name(TreeEntry *self)
{ {
return PyString_FromString(git_tree_entry_name(self->entry)); return c_str_to_py_str(git_tree_entry_name(self->entry));
} }
static PyObject * static PyObject *
@ -1600,7 +1604,7 @@ Tag_get_name(Tag *self)
name = git_tag_name(self->tag); name = git_tag_name(self->tag);
if (!name) if (!name)
Py_RETURN_NONE; Py_RETURN_NONE;
return PyString_FromString(name); return c_str_to_py_str(name);
} }
static PyObject * static PyObject *
@ -1619,7 +1623,7 @@ Tag_get_message(Tag *self)
message = git_tag_message(self->tag); message = git_tag_message(self->tag);
if (!message) if (!message)
Py_RETURN_NONE; Py_RETURN_NONE;
return PyString_FromString(message); return c_str_to_py_str(message);
} }
static PyGetSetDef Tag_getseters[] = { static PyGetSetDef Tag_getseters[] = {
@ -2058,7 +2062,7 @@ IndexEntry_get_mode(IndexEntry *self)
static PyObject * static PyObject *
IndexEntry_get_path(IndexEntry *self) IndexEntry_get_path(IndexEntry *self)
{ {
return PyString_FromString(self->entry->path); return c_str_to_py_str(self->entry->path);
} }
static PyObject * static PyObject *
@ -2286,7 +2290,7 @@ Reference_rename(Reference *self, PyObject *py_name)
int err; int err;
/* 1- Get the C name */ /* 1- Get the C name */
c_name = PyString_AsString(py_name); c_name = py_str_to_c_str(py_name);
if (c_name == NULL) if (c_name == NULL)
return NULL; return NULL;
@ -2327,7 +2331,7 @@ Reference_get_target(Reference *self)
} }
/* 2- Make a PyString and return it */ /* 2- Make a PyString and return it */
return PyString_FromString(c_name); return c_str_to_py_str(c_name);
} }
static int static int
@ -2337,7 +2341,7 @@ Reference_set_target(Reference *self, PyObject *py_name)
int err; int err;
/* 1- Get the C name */ /* 1- Get the C name */
c_name = PyString_AsString(py_name); c_name = py_str_to_c_str(py_name);
if (c_name == NULL) if (c_name == NULL)
return -1; return -1;
@ -2358,7 +2362,7 @@ Reference_get_name(Reference *self)
const char *c_name; const char *c_name;
c_name = git_reference_name(self->reference); c_name = git_reference_name(self->reference);
return PyString_FromString(c_name); return c_str_to_py_str(c_name);
} }
static PyObject * static PyObject *

2
test/test_repository.py

@ -79,7 +79,7 @@ class RepositoryTest(utils.BareRepoTestCase):
self.assertRaises(TypeError, lambda: self.repo[123]) self.assertRaises(TypeError, lambda: self.repo[123])
self.assertEqual(self.repo[A_BIN_SHA].sha, A_HEX_SHA) self.assertEqual(self.repo[A_BIN_SHA].sha, A_HEX_SHA)
a = self.repo[A_HEX_SHA] a = self.repo[A_HEX_SHA]
self.assertEqual('a contents\n', a.read_raw()) self.assertEqual(b'a contents\n', a.read_raw())
self.assertEqual(A_HEX_SHA, a.sha) self.assertEqual(A_HEX_SHA, a.sha)
self.assertEqual(GIT_OBJ_BLOB, a.type) self.assertEqual(GIT_OBJ_BLOB, a.type)