openstack/deb-python-pygit2
Code Issues Proposed changes

Fix create_blob_fromiobase with Python 2.7

Browse Source
This commit is contained in:
J. David Ibáñez
2015-10-25 19:17:05 +01:00
parent f92d38e25f
commit 13f4ddec1d
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/repository.c
View File

@@ -39,8 +39,6 @@
#include "signature.h" #include "signature.h"
#include <git2/odb_backend.h> #include <git2/odb_backend.h>
extern PyTypeObject PyIOBase_Type;
extern PyObject *GitError; extern PyObject *GitError;
extern PyTypeObject IndexType; extern PyTypeObject IndexType;
@@ -874,20 +872,18 @@ int read_chunk(char *content, size_t max_length, void *payload)
} }
PyObject * PyObject *
Repository_create_blob_fromiobase(Repository *self, PyObject *args) Repository_create_blob_fromiobase(Repository *self, PyObject *py_file)
{ {
git_oid oid; git_oid oid;
PyObject *py_is_readable; PyObject *py_is_readable;
int is_readable; int is_readable;
PyObject *py_file;
int err; int err;
if (!PyArg_ParseTuple(args, "O!", &PyIOBase_Type, &py_file))
return NULL;
py_is_readable = PyObject_CallMethod(py_file, "readable", NULL); py_is_readable = PyObject_CallMethod(py_file, "readable", NULL);
if (!py_is_readable) { if (!py_is_readable) {
Py_DECREF(py_file); Py_DECREF(py_file);
if (PyErr_ExceptionMatches(PyExc_AttributeError))
PyErr_SetObject(PyExc_TypeError, py_file);
return NULL; return NULL;
} }
@@ -900,10 +896,7 @@ Repository_create_blob_fromiobase(Repository *self, PyObject *args)
return NULL; return NULL;
} }
err = git_blob_create_fromchunks(&oid, err = git_blob_create_fromchunks(&oid, self->repo, NULL, &read_chunk,
self->repo,
NULL,
&read_chunk,
py_file); py_file);
Py_DECREF(py_file); Py_DECREF(py_file);
@@ -1619,7 +1612,7 @@ PyMethodDef Repository_methods[] = {
METHOD(Repository, create_blob, METH_VARARGS), METHOD(Repository, create_blob, METH_VARARGS),
METHOD(Repository, create_blob_fromworkdir, METH_VARARGS), METHOD(Repository, create_blob_fromworkdir, METH_VARARGS),
METHOD(Repository, create_blob_fromdisk, METH_VARARGS), METHOD(Repository, create_blob_fromdisk, METH_VARARGS),
METHOD(Repository, create_blob_fromiobase, METH_VARARGS), METHOD(Repository, create_blob_fromiobase, METH_O),
METHOD(Repository, create_commit, METH_VARARGS), METHOD(Repository, create_commit, METH_VARARGS),
METHOD(Repository, create_tag, METH_VARARGS), METHOD(Repository, create_tag, METH_VARARGS),
METHOD(Repository, TreeBuilder, METH_VARARGS), METHOD(Repository, TreeBuilder, METH_VARARGS),

2
test/test_blob.py
View File

@@ -114,6 +114,8 @@ class BlobTest(utils.RepoTestCase):
self.assertEqual(pygit2.GIT_OBJ_BLOB, blob.type) self.assertEqual(pygit2.GIT_OBJ_BLOB, blob.type)
def test_create_blob_fromiobase(self): def test_create_blob_fromiobase(self):
self.assertRaises(TypeError, self.repo.create_blob_fromiobase, 'bad type')
f = io.BytesIO(BLOB_CONTENT) f = io.BytesIO(BLOB_CONTENT)
blob_oid = self.repo.create_blob_fromiobase(f) blob_oid = self.repo.create_blob_fromiobase(f)
blob = self.repo[blob_oid] blob = self.repo[blob_oid]