openstack/deb-python-pygit2
Code Issues Proposed changes

Refactor getters to become methods

Browse Source
This commit is contained in:
Jose Plana
2013-11-27 19:26:24 +01:00
parent 41bedc05f0
commit f69eeae108
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/remote.c
View File

@@ -112,11 +112,11 @@ PyObject * get_pylist_from_git_strarray(git_strarray *strarray)
} }
PyDoc_STRVAR(Remote_fetch_refspecs__doc__, "Fetch refspecs"); PyDoc_STRVAR(Remote_get_fetch_refspecs__doc__, "Fetch refspecs");
PyObject * PyObject *
Remote_fetch_refspecs__get__(Remote *self) Remote_get_fetch_refspecs(Remote *self)
{ {
int err; int err;
git_strarray refspecs; git_strarray refspecs;
@@ -136,11 +136,11 @@ Remote_fetch_refspecs__get__(Remote *self)
} }
PyDoc_STRVAR(Remote_push_refspecs__doc__, "Push refspecs"); PyDoc_STRVAR(Remote_get_push_refspecs__doc__, "Push refspecs");
PyObject * PyObject *
Remote_push_refspecs__get__(Remote *self) Remote_get_push_refspecs(Remote *self)
{ {
int err; int err;
git_strarray refspecs; git_strarray refspecs;
@@ -445,7 +445,9 @@ PyMethodDef Remote_methods[] = {
METHOD(Remote, save, METH_NOARGS), METHOD(Remote, save, METH_NOARGS),
METHOD(Remote, get_refspec, METH_O), METHOD(Remote, get_refspec, METH_O),
METHOD(Remote, push, METH_VARARGS), METHOD(Remote, push, METH_VARARGS),
METHOD(Remote, get_fetch_refspecs, METH_O),
METHOD(Remote, set_fetch_refspecs, METH_O), METHOD(Remote, set_fetch_refspecs, METH_O),
METHOD(Remote, get_push_refspecs, METH_O),
METHOD(Remote, set_push_refspecs, METH_O), METHOD(Remote, set_push_refspecs, METH_O),
{NULL} {NULL}
}; };
@@ -454,8 +456,6 @@ PyGetSetDef Remote_getseters[] = {
GETSET(Remote, name), GETSET(Remote, name),
GETSET(Remote, url), GETSET(Remote, url),
GETTER(Remote, refspec_count), GETTER(Remote, refspec_count),
GETTER(Remote, fetch_refspecs),
GETTER(Remote, push_refspecs),
{NULL} {NULL}
}; };

20
test/test_remote.py
View File

@@ -83,26 +83,26 @@ class RepositoryTest(utils.RepoTestCase):
self.assertEqual(refspec[0], REMOTE_FETCHSPEC_SRC) self.assertEqual(refspec[0], REMOTE_FETCHSPEC_SRC)
self.assertEqual(refspec[1], REMOTE_FETCHSPEC_DST) self.assertEqual(refspec[1], REMOTE_FETCHSPEC_DST)
self.assertEqual(list, type(remote.fetch_refspecs)) self.assertEqual(list, type(remote.get_fetch_refspecs()))
self.assertEqual(1, len(remote.fetch_refspecs)) self.assertEqual(1, len(remote.get_fetch_refspecs()))
self.assertEqual('+refs/heads/*:refs/remotes/origin/*', self.assertEqual('+refs/heads/*:refs/remotes/origin/*',
remote.fetch_refspecs[0]) remote.get_fetch_refspecs()[0])
self.assertEqual(list, type(remote.fetch_refspecs)) self.assertEqual(list, type(remote.get_push_refspecs()))
self.assertEqual(0, len(remote.push_refspecs)) self.assertEqual(0, len(remote.get_push_refspecs()))
remote.set_fetch_refspecs(['+refs/*:refs/remotes/*']) remote.set_fetch_refspecs(['+refs/*:refs/remotes/*'])
self.assertEqual('+refs/*:refs/remotes/*', self.assertEqual('+refs/*:refs/remotes/*',
remote.fetch_refspecs[0]) remote.get_fetch_refspecs()[0])
remote.set_fetch_refspecs([ remote.set_fetch_refspecs([
'+refs/*:refs/remotes/*', '+refs/*:refs/remotes/*',
'+refs/test/*:refs/test/remotes/*' '+refs/test/*:refs/test/remotes/*'
]) ])
self.assertEqual('+refs/*:refs/remotes/*', self.assertEqual('+refs/*:refs/remotes/*',
remote.fetch_refspecs[0]) remote.get_fetch_refspecs()[0])
self.assertEqual('+refs/test/*:refs/test/remotes/*', self.assertEqual('+refs/test/*:refs/test/remotes/*',
remote.fetch_refspecs[1]) remote.get_fetch_refspecs()[1])
remote.set_push_refspecs([ remote.set_push_refspecs([
'+refs/*:refs/remotes/*', '+refs/*:refs/remotes/*',
@@ -110,9 +110,9 @@ class RepositoryTest(utils.RepoTestCase):
]) ])
self.assertEqual('+refs/*:refs/remotes/*', self.assertEqual('+refs/*:refs/remotes/*',
remote.push_refspecs[0]) remote.get_push_refspecs()[0])
self.assertEqual('+refs/test/*:refs/test/remotes/*', self.assertEqual('+refs/test/*:refs/test/remotes/*',
remote.push_refspecs[1]) remote.get_push_refspecs()[1])
def test_remote_list(self): def test_remote_list(self):