diff options
author | Gauvain Pocentek <gauvainpocentek@gmail.com> | 2019-02-24 17:37:53 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-24 17:37:53 +0100 |
commit | e58d2a8567545ce14a6e1ee64423fe12f571b2ca (patch) | |
tree | 8d235bd7017d5c35238bff133e1ac143542577c2 | |
parent | 39cb97d0f15b675f308a052f0c4856d467971f14 (diff) | |
parent | b08efcb9d155c20fa938534dd2d912f5191eede6 (diff) | |
download | gitlab-e58d2a8567545ce14a6e1ee64423fe12f571b2ca.tar.gz |
Merge pull request #707 from python-gitlab/fix/python-tests
fix: use python2 compatible syntax for super
-rw-r--r-- | gitlab/base.py | 9 | ||||
-rw-r--r-- | gitlab/tests/test_base.py | 6 |
2 files changed, 12 insertions, 3 deletions
diff --git a/gitlab/base.py b/gitlab/base.py index c3da077..7a88881 100644 --- a/gitlab/base.py +++ b/gitlab/base.py @@ -99,11 +99,16 @@ class RESTObject(object): def __eq__(self, other): if self.get_id() and other.get_id(): return self.get_id() == other.get_id() - return super().__eq__(other) + return super(RESTObject, self) == other + + def __ne__(self, other): + if self.get_id() and other.get_id(): + return self.get_id() != other.get_id() + return super(RESTObject, self) != other def __hash__(self): if not self.get_id(): - return super().__hash__() + return super(RESTObject, self).__hash__() return hash(self.get_id()) def _create_managers(self): diff --git a/gitlab/tests/test_base.py b/gitlab/tests/test_base.py index b29d423..d38c507 100644 --- a/gitlab/tests/test_base.py +++ b/gitlab/tests/test_base.py @@ -131,6 +131,7 @@ class TestRESTObject(unittest.TestCase): _managers = (('fakes', 'FakeManager'), ) obj = ObjectWithManager(self.manager, {'foo': 'bar'}) + obj.id = 42 self.assertIsInstance(obj.fakes, FakeManager) self.assertEqual(obj.fakes.gitlab, self.gitlab) self.assertEqual(obj.fakes._parent, obj) @@ -145,7 +146,10 @@ class TestRESTObject(unittest.TestCase): _id_attr = 'foo' obj1 = OtherFakeObject(self.manager, {'foo': 'bar'}) - obj2 = OtherFakeObject(self.manager, {'foo': 'bar', 'other_attr': 'baz'}) + obj2 = OtherFakeObject( + self.manager, + {'foo': 'bar', 'other_attr': 'baz'} + ) self.assertEqual(obj1, obj2) def test_inequality(self): |