8000 Merge pull request #906 from jouve/test-cleanup · python-gitlab/python-gitlab@42a1ba6 · GitHub
[go: up one dir, main page]
Skip to content

Commit 42a1ba6

Browse files
max-wittigmax-wittig
authored
Merge pull request #906 from jouve/test-cleanup
unused unittest2, type -> isinstance
2 parents 67a9c1f + 33b1801 commit 42a1ba6

File tree

7 files changed

+33
-64
lines changed

7 files changed

+33
-64
lines changed

‎gitlab/tests/test_base.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@
1616
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1717

1818
import pickle
19-
20-
try:
21-
import unittest
22-
except ImportError:
23-
import unittest2 as unittest
19+
import unittest
2420

2521
from gitlab import base
2622

‎gitlab/tests/test_cli.py

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@
1616
# You should have received a copy of the GNU Lesser General Public License
1717
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1818

19-
from __future__ import print_function
20-
from __future__ import absolute_import
21-
2219
import argparse
2320
import os
2421
import tempfile
22+
import unittest
2523

2624
try:
2725
from contextlib import redirect_stderr # noqa: H302
@@ -36,11 +34,6 @@ def redirect_stderr(new_target):
3634
sys.stderr = old_target
3735

3836

39-
try:
40-
import unittest
41-
except ImportError:
42-
import unittest2 as unittest
43-
4437
import six
4538

4639
from gitlab import cli
@@ -120,19 +113,19 @@ def test_parse_args(self):
120113

121114
def test_parser(self):
122115
parser = cli._get_parser(gitlab.v4.cli)
123-
subparsers = None
124-
for action in parser._actions:
125-
if type(action) == argparse._SubParsersAction:
126-
subparsers = action
127-
break
116+
subparsers = next(
117+
action
118+
for action in parser._actions
119+
if isinstance(action, argparse._SubParsersAction)
120+
)
128121
self.assertIsNotNone(subparsers)
129122
self.assertIn("project", subparsers.choices)
130123

131-
user_subparsers = None
132-
for action in subparsers.choices["project"]._actions:
133-
if type(action) == argparse._SubParsersAction:
134-
user_subparsers = action
135-
break
124+
user_subparsers = next(
125+
action
126+
for action in subparsers.choices["project"]._actions
127+
if isinstance(action, argparse._SubParsersAction)
128+
)
136129
self.assertIsNotNone(user_subparsers)
137130
self.assertIn("list", user_subparsers.choices)
138131
self.assertIn("get", user_subparsers.choices)
@@ -145,10 +138,10 @@ def test_parser(self):
145138
actions = user_subparsers.choices["create"]._option_string_actions
146139
self.assertFalse(actions["--description"].required)
147140

148-
user_subparsers = None
149-
for action in subparsers.choices["group"]._actions:
150-
if type(action) == argparse._SubParsersAction:
151-
user_subparsers = action
152-
break
141+
user_subparsers = next(
142+
action
143+
for action in subparsers.choices["group"]._actions
144+
if isinstance(action, argparse._SubParsersAction)
145+
)
153146
actions = user_subparsers.choices["create"]._option_string_actions
154147
self.assertTrue(actions["--name"].required)

‎gitlab/tests/test_config.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@
1515
# You should have received a copy of the GNU Lesser General Public License
1616
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1717

18-
try:
19-
import unittest
20-
except ImportError:
21-
import unittest2 as unittest
18+
import unittest
2219

2320
import mock
2421
import six

‎gitlab/tests/test_gitlab.py

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,11 @@
1616
# You should have received a copy of the GNU Lesser General Public License
1717
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1818

19-
from __future__ import print_function
20-
2119
import os
2220
import pickle
2321
import tempfile
2422
import json
25-
26-
try:
27-
import unittest
28-
except ImportError:
29-
import unittest2 as unittest
23+
import unittest
3024

3125
from httmock import HTTMock # noqa
3226
from httmock import response # noqa
@@ -479,7 +473,7 @@ def resp_cont(url, request):
479473
self.gl.auth()
480474
self.assertEqual(self.gl.user.username, name)
481475
self.assertEqual(self.gl.user.id, id_)
482-
self.assertEqual(type(self.gl.user), CurrentUser)
476+
self.assertIsInstance(self.gl.user, CurrentUser)
483477

484478
def test_hooks(self):
485479
@urlmatch(
@@ -492,7 +486,7 @@ def resp_get_hook(url, request):
492486

493487
with HTTMock(resp_get_hook):
494488
data = self.gl.hooks.get(1)
495-
self.assertEqual(type(data), Hook)
489+
self.assertIsInstance(data, Hook)
496490
self.assertEqual(data.url, "testurl")
497491
self.assertEqual(data.id, 1)
498492

@@ -507,7 +501,7 @@ def resp_get_project(url, request):
507501

508502
with HTTMock(resp_get_project):
509503
data = self.gl.projects.get(1)
510-
self.assertEqual(type(data), Project)
504+
self.assertIsInstance(data, Project)
511505
self.assertEqual(data.name, "name")
512506
self.assertEqual(data.id, 1)
513507

@@ -553,7 +547,7 @@ def resp_get_group(url, request):
553547

554548< 10000 /code>
with HTTMock(resp_get_group):
555549
data = self.gl.groups.get(1)
556-
self.assertEqual(type(data), Group)
550+
self.assertIsInstance(data, Group)
557551
self.assertEqual(data.name, "name")
558552
self.assertEqual(data.path, "path")
559553
self.assertEqual(data.id, 1)
@@ -586,7 +580,7 @@ def resp_get_user(self, url, request):
586580
def test_users(self):
587581
with HTTMock(self.resp_get_user):
588582
user = self.gl.users.get(1)
589-
self.assertEqual(type(user), User)
583+
self.assertIsInstance(user, User)
590584
self.assertEqual(user.name, "name")
591585
self.assertEqual(user.id, 1)
592586

@@ -607,7 +601,7 @@ def resp_get_user_status(url, request):
607601
user = self.gl.users.get(1)
608602
with HTTMock(resp_get_user_status):
609603
status = user.status.get()
610-
self.assertEqual(type(status), UserStatus)
604+
self.assertIsInstance(status, UserStatus)
611605
self.assertEqual(status.message, "test")
612606
self.assertEqual(status.emoji, "thumbsup")
613607

@@ -636,7 +630,7 @@ def resp_mark_as_done(url, request):
636630

637631
with HTTMock(resp_get_todo):
638632
todo = self.gl.todos.list()[0]
639-
self.assertEqual(type(todo), Todo)
633+
self.assertIsInstance(todo, Todo)
640634
self.assertEqual(todo.id, 102)
641635
self.assertEqual(todo.target_type, "MergeRequest")
642636
self.assertEqual(todo.target["assignee"]["username"], "root")
@@ -683,10 +677,10 @@ def resp_update_submodule(url, request):
683677
"committer_name": "Author",
684678
"committer_email": "author@example.com",
685679
"created_at": "2018-09-20T09:26:24.000-07:00",
686-
"message": "Message",
687-
"parent_ids": [ "ae1d9fb46aa2b07ee9836d49862ec4e2c46fbbba" ],
680+
"message": "Message",
681+
"parent_ids": [ "ae1d9fb46aa2b07ee9836d49862ec4e2c46fbbba" ],
688682
"committed_date": "2018-09-20T09:26:24.000-07:00",
689-
"authored_date": "2018-09-20T09:26:24.000-07:00",
683+
"authored_date": "2018-09-20T09:26:24.000-07:00",
690684
"status": null}"""
691685
content = content.encode("utf-8")
692686
return response(200, content, headers, None, 5, request)
@@ -724,5 +718,5 @@ class MyGitlab(gitlab.Gitlab):
724718

725719
config_path = self._default_config()
726720
gl = MyGitlab.from_config("one", [config_path])
727-
self.assertEqual(type(gl).__name__, "MyGitlab")
721+
self.assertIsInstance(gl, MyGitlab)
728722
os.unlink(config_path)

‎gitlab/tests/test_mixins.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,7 @@
1616
# You should have received a copy of the GNU Lesser General Public License
1717
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1818

19-
from __future__ import print_function
20-
21-
try:
22-
import unittest
23-
except ImportError:
24-
import unittest2 as unittest
19+
import unittest
2520

2621
from httmock import HTTMock # noqa
2722
from httmock import response # noqa

‎gitlab/tests/test_types.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@
1515
# You should have received a copy of the GNU Lesser General Public License
1616
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1717

18-
try:
19-
import unittest
20-
ex 1CF5 cept ImportError:
21-
import unittest2 as unittest
18+
import unittest
2219

2320
from gitlab import types
2421

‎gitlab/tests/test_utils.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@
1515
# You should have received a copy of the GNU Lesser General Public License
1616
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1717

18-
try:
19-
import unittest
20-
except ImportError:
21-
import unittest2 as unittest
18+
import unittest
2219

2320
from gitlab import utils
2421

0 commit comments

Comments
 (0)
0