From b08efcb9d155c20fa938534dd2d912f5191eede6 Mon Sep 17 00:00:00 2001 From: Max Wittig Date: Fri, 22 Feb 2019 13:51:17 +0100 Subject: [PATCH] fix: use python2 compatible syntax for super --- gitlab/base.py | 9 +++++++-- gitlab/tests/test_base.py | 6 +++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gitlab/base.py b/gitlab/base.py index c3da0775a..7a8888199 100644 --- a/gitlab/base.py +++ b/gitlab/base.py @@ -99,11 +99,16 @@ def __repr__(self): 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 b29d423f4..d38c5075b 100644 --- a/gitlab/tests/test_base.py +++ b/gitlab/tests/test_base.py @@ -131,6 +131,7 @@ class ObjectWithManager(FakeObject): _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 OtherFakeObject(FakeObject): _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):