Merge pull request #1397 from JohnVillalovos/jlvillal/flake8

Fix all issues reported by running: tox -e pep8 and enable pep8 as a linter check

11 files changed, 45 insertions, 50 deletions

diff --git a/gitlab/tests/mixins/test_mixin_methods.py b/gitlab/tests/mixins/test_mixin_methods.py
index 557c020..fbc16a9 100644
--- a/gitlab/tests/mixins/test_mixin_methods.py
+++ b/gitlab/tests/mixins/test_mixin_methods.py
@@ -44,7 +44,7 @@ def test_get_mixin(gl):
 
 
 def test_refresh_mixin(gl):
-    class O(RefreshMixin, FakeObject):
+    class TestClass(RefreshMixin, FakeObject):
         pass
 
     @urlmatch(scheme="http", netloc="localhost", path="/api/v4/tests/42", method="get")
@@ -55,7 +55,7 @@ def test_refresh_mixin(gl):
 
     with HTTMock(resp_cont):
         mgr = FakeManager(gl)
-        obj = O(mgr, {"id": 42})
+        obj = TestClass(mgr, {"id": 42})
         res = obj.refresh()
         assert res is None
         assert obj.foo == "bar"
@@ -265,7 +265,7 @@ def test_save_mixin(gl):
     class M(UpdateMixin, FakeManager):
         pass
 
-    class O(SaveMixin, base.RESTObject):
+    class TestClass(SaveMixin, base.RESTObject):
         pass
 
     @urlmatch(scheme="http", netloc="localhost", path="/api/v4/tests/42", method="put")
@@ -276,7 +276,7 @@ def test_save_mixin(gl):
 
     with HTTMock(resp_cont):
         mgr = M(gl)
-        obj = O(mgr, {"id": 42, "foo": "bar"})
+        obj = TestClass(mgr, {"id": 42, "foo": "bar"})
         obj.foo = "baz"
         obj.save()
         assert obj._attrs["foo"] == "baz"
diff --git a/gitlab/tests/mixins/test_object_mixins_attributes.py b/gitlab/tests/mixins/test_object_mixins_attributes.py
index 3502a93..d54fa3a 100644
--- a/gitlab/tests/mixins/test_object_mixins_attributes.py
+++ b/gitlab/tests/mixins/test_object_mixins_attributes.py
@@ -27,35 +27,35 @@ from gitlab.mixins import (
 
 
 def test_access_request_mixin():
-    class O(AccessRequestMixin):
+    class TestClass(AccessRequestMixin):
         pass
 
-    obj = O()
+    obj = TestClass()
     assert hasattr(obj, "approve")
 
 
 def test_subscribable_mixin():
-    class O(SubscribableMixin):
+    class TestClass(SubscribableMixin):
         pass
 
-    obj = O()
+    obj = TestClass()
     assert hasattr(obj, "subscribe")
     assert hasattr(obj, "unsubscribe")
 
 
 def test_todo_mixin():
-    class O(TodoMixin):
+    class TestClass(TodoMixin):
         pass
 
-    obj = O()
+    obj = TestClass()
     assert hasattr(obj, "todo")
 
 
 def test_time_tracking_mixin():
-    class O(TimeTrackingMixin):
+    class TestClass(TimeTrackingMixin):
         pass
 
-    obj = O()
+    obj = TestClass()
     assert hasattr(obj, "time_stats")
     assert hasattr(obj, "time_estimate")
     assert hasattr(obj, "reset_time_estimate")
@@ -64,16 +64,16 @@ def test_time_tracking_mixin():
 
 
 def test_set_mixin():
-    class O(SetMixin):
+    class TestClass(SetMixin):
         pass
 
-    obj = O()
+    obj = TestClass()
     assert hasattr(obj, "set")
 
 
 def test_user_agent_detail_mixin():
-    class O(UserAgentDetailMixin):
+    class TestClass(UserAgentDetailMixin):
         pass
 
-    obj = O()
+    obj = TestClass()
     assert hasattr(obj, "user_agent_detail")
diff --git a/gitlab/tests/objects/test_appearance.py b/gitlab/tests/objects/test_appearance.py
index 7c52301..43ea574 100644
--- a/gitlab/tests/objects/test_appearance.py
+++ b/gitlab/tests/objects/test_appearance.py
@@ -63,4 +63,4 @@ def test_get_update_appearance(gl, resp_application_appearance):
 
 
 def test_update_appearance(gl, resp_application_appearance):
-    resp = gl.appearance.update(title=new_title, description=new_description)
+    gl.appearance.update(title=new_title, description=new_description)
diff --git a/gitlab/tests/objects/test_bridges.py b/gitlab/tests/objects/test_bridges.py
index ea8c634..4d39186 100644
--- a/gitlab/tests/objects/test_bridges.py
+++ b/gitlab/tests/objects/test_bridges.py
@@ -1,12 +1,10 @@
 """
 GitLab API: https://docs.gitlab.com/ee/api/jobs.html#list-pipeline-bridges
 """
-import re
-
 import pytest
 import responses
 
-from gitlab.v4.objects import Project, ProjectPipelineBridge
+from gitlab.v4.objects import ProjectPipelineBridge
 
 
 @pytest.fixture
diff --git a/gitlab/tests/objects/test_project_merge_request_approvals.py b/gitlab/tests/objects/test_project_merge_request_approvals.py
index a8e31e6..d8ed3a8 100644
--- a/gitlab/tests/objects/test_project_merge_request_approvals.py
+++ b/gitlab/tests/objects/test_project_merge_request_approvals.py
@@ -241,7 +241,7 @@ def test_project_approval_manager_update_uses_post(project, resp_snippet):
     assert isinstance(
         approvals, gitlab.v4.objects.merge_request_approvals.ProjectApprovalManager
     )
-    assert approvals._update_uses_post == True
+    assert approvals._update_uses_post is True
 
 
 def test_list_merge_request_approval_rules(project, resp_snippet):
@@ -257,7 +257,7 @@ def test_update_merge_request_approvals_set_approvers(project, resp_snippet):
         approvals,
         gitlab.v4.objects.merge_request_approvals.ProjectMergeRequestApprovalManager,
     )
-    assert approvals._update_uses_post == True
+    assert approvals._update_uses_post is True
     response = approvals.set_approvers(
         updated_approval_rule_approvals_required,
         approver_ids=updated_approval_rule_user_ids,
@@ -277,7 +277,7 @@ def test_create_merge_request_approvals_set_approvers(project, resp_snippet):
         approvals,
         gitlab.v4.objects.merge_request_approvals.ProjectMergeRequestApprovalManager,
     )
-    assert approvals._update_uses_post == True
+    assert approvals._update_uses_post is True
     response = approvals.set_approvers(
         new_approval_rule_approvals_required,
         approver_ids=new_approval_rule_user_ids,
diff --git a/gitlab/tests/objects/test_runners.py b/gitlab/tests/objects/test_runners.py
index 30fdb41..7185c26 100644
--- a/gitlab/tests/objects/test_runners.py
+++ b/gitlab/tests/objects/test_runners.py
@@ -200,7 +200,7 @@ def resp_runner_verify():
 
 def test_owned_runners_list(gl: gitlab.Gitlab, resp_get_runners_list):
     runners = gl.runners.list()
-    assert runners[0].active == True
+    assert runners[0].active is True
     assert runners[0].id == 6
     assert runners[0].name == "test-name"
     assert len(runners) == 1
@@ -208,7 +208,7 @@ def test_owned_runners_list(gl: gitlab.Gitlab, resp_get_runners_list):
 
 def test_project_runners_list(gl: gitlab.Gitlab, resp_get_runners_list):
     runners = gl.projects.get(1, lazy=True).runners.list()
-    assert runners[0].active == True
+    assert runners[0].active is True
     assert runners[0].id == 6
     assert runners[0].name == "test-name"
     assert len(runners) == 1
@@ -216,7 +216,7 @@ def test_project_runners_list(gl: gitlab.Gitlab, resp_get_runners_list):
 
 def test_group_runners_list(gl: gitlab.Gitlab, resp_get_runners_list):
     runners = gl.groups.get(1, lazy=True).runners.list()
-    assert runners[0].active == True
+    assert runners[0].active is True
     assert runners[0].id == 6
     assert runners[0].name == "test-name"
     assert len(runners) == 1
@@ -224,7 +224,7 @@ def test_group_runners_list(gl: gitlab.Gitlab, resp_get_runners_list):
 
 def test_all_runners_list(gl: gitlab.Gitlab, resp_get_runners_list):
     runners = gl.runners.all()
-    assert runners[0].active == True
+    assert runners[0].active is True
     assert runners[0].id == 6
     assert runners[0].name == "test-name"
     assert len(runners) == 1
@@ -238,7 +238,7 @@ def test_create_runner(gl: gitlab.Gitlab, resp_runner_register):
 
 def test_get_update_runner(gl: gitlab.Gitlab, resp_runner_detail):
     runner = gl.runners.get(6)
-    assert runner.active == True
+    assert runner.active is True
     runner.tag_list.append("new")
     runner.save()
 
@@ -259,14 +259,14 @@ def test_disable_group_runner(gl: gitlab.Gitlab, resp_runner_disable):
 
 def test_enable_project_runner(gl: gitlab.Gitlab, resp_runner_enable):
     runner = gl.projects.get(1, lazy=True).runners.create({"runner_id": 6})
-    assert runner.active == True
+    assert runner.active is True
     assert runner.id == 6
     assert runner.name == "test-name"
 
 
 def test_enable_group_runner(gl: gitlab.Gitlab, resp_runner_enable):
     runner = gl.groups.get(1, lazy=True).runners.create({"runner_id": 6})
-    assert runner.active == True
+    assert runner.active is True
     assert runner.id == 6
     assert runner.name == "test-name"
 
diff --git a/gitlab/tests/objects/test_submodules.py b/gitlab/tests/objects/test_submodules.py
index 539af7b..69c1cd7 100644
--- a/gitlab/tests/objects/test_submodules.py
+++ b/gitlab/tests/objects/test_submodules.py
@@ -4,8 +4,6 @@ GitLab API: https://docs.gitlab.com/ce/api/repository_submodules.html
 import pytest
 import responses
 
-from gitlab.v4.objects import Project
-
 
 @pytest.fixture
 def resp_update_submodule():
diff --git a/gitlab/tests/test_base.py b/gitlab/tests/test_base.py
index 6ca261d..1c811cf 100644
--- a/gitlab/tests/test_base.py
+++ b/gitlab/tests/test_base.py
@@ -80,7 +80,7 @@ class TestRESTObject:
 
         assert {"foo": "bar"} == obj._attrs
         assert {} == obj._updated_attrs
-        assert None == obj._create_managers()
+        assert obj._create_managers() is None
         assert fake_manager == obj.manager
         assert fake_gitlab == obj.manager.gitlab
 
@@ -92,7 +92,7 @@ class TestRESTObject:
         assert isinstance(unpickled, FakeObject)
         assert hasattr(unpickled, "_module")
         assert unpickled._module == original_obj_module
-        pickled2 = pickle.dumps(unpickled)
+        pickle.dumps(unpickled)
 
     def test_attrs(self, fake_manager):
         obj = FakeObject(fake_manager, {"foo": "bar"})
@@ -112,7 +112,7 @@ class TestRESTObject:
         assert 42 == obj.get_id()
 
         obj.id = None
-        assert None == obj.get_id()
+        assert obj.get_id() is None
 
     def test_custom_id_attr(self, fake_manager):
         class OtherFakeObject(FakeObject):
diff --git a/gitlab/tests/test_config.py b/gitlab/tests/test_config.py
index 58ccbb0..18b54c8 100644
--- a/gitlab/tests/test_config.py
+++ b/gitlab/tests/test_config.py
@@ -16,7 +16,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
-import unittest
 from textwrap import dedent
 
 import mock
@@ -154,9 +153,9 @@ def test_valid_data(m_open, path_exists):
     assert "one" == cp.gitlab_id
     assert "http://one.url" == cp.url
     assert "ABCDEF" == cp.private_token
-    assert None == cp.oauth_token
+    assert cp.oauth_token is None
     assert 2 == cp.timeout
-    assert True == cp.ssl_verify
+    assert cp.ssl_verify is True
     assert cp.per_page is None
 
     fd = io.StringIO(valid_config)
@@ -166,9 +165,9 @@ def test_valid_data(m_open, path_exists):
     assert "two" == cp.gitlab_id
     assert "https://two.url" == cp.url
     assert "GHIJKL" == cp.private_token
-    assert None == cp.oauth_token
+    assert cp.oauth_token is None
     assert 10 == cp.timeout
-    assert False == cp.ssl_verify
+    assert cp.ssl_verify is False
 
     fd = io.StringIO(valid_config)
     fd.close = mock.Mock(return_value=None)
@@ -177,7 +176,7 @@ def test_valid_data(m_open, path_exists):
     assert "three" == cp.gitlab_id
     assert "https://three.url" == cp.url
     assert "MNOPQR" == cp.private_token
-    assert None == cp.oauth_token
+    assert cp.oauth_token is None
     assert 2 == cp.timeout
     assert "/path/to/CA/bundle.crt" == cp.ssl_verify
     assert 50 == cp.per_page
@@ -188,10 +187,10 @@ def test_valid_data(m_open, path_exists):
     cp = config.GitlabConfigParser(gitlab_id="four")
     assert "four" == cp.gitlab_id
     assert "https://four.url" == cp.url
-    assert None == cp.private_token
+    assert cp.private_token is None
     assert "STUV" == cp.oauth_token
     assert 2 == cp.timeout
-    assert True == cp.ssl_verify
+    assert cp.ssl_verify is True
 
 
 @mock.patch("os.path.exists")
@@ -227,7 +226,7 @@ def test_data_from_helper(m_open, path_exists, tmp_path):
     cp = config.GitlabConfigParser(gitlab_id="helper")
     assert "helper" == cp.gitlab_id
     assert "https://helper.url" == cp.url
-    assert None == cp.private_token
+    assert cp.private_token is None
     assert "secret" == cp.oauth_token
 
 
diff --git a/gitlab/tests/test_gitlab.py b/gitlab/tests/test_gitlab.py
index 4a82207..127b2c1 100644
--- a/gitlab/tests/test_gitlab.py
+++ b/gitlab/tests/test_gitlab.py
@@ -86,10 +86,10 @@ def test_gitlab_build_list(gl):
     assert obj.total == 2
 
     with HTTMock(resp_page_2):
-        l = list(obj)
-    assert len(l) == 2
-    assert l[0]["a"] == "b"
-    assert l[1]["c"] == "d"
+        test_list = list(obj)
+    assert len(test_list) == 2
+    assert test_list[0]["a"] == "b"
+    assert test_list[1]["c"] == "d"
 
 
 @with_httmock(resp_page_1, resp_page_2)
diff --git a/gitlab/tests/test_gitlab_http_methods.py b/gitlab/tests/test_gitlab_http_methods.py
index 253ad16..020fabf 100644
--- a/gitlab/tests/test_gitlab_http_methods.py
+++ b/gitlab/tests/test_gitlab_http_methods.py
@@ -3,7 +3,7 @@ import requests
 
 from httmock import HTTMock, urlmatch, response
 
-from gitlab import *
+from gitlab import GitlabHttpError, GitlabList, GitlabParsingError
 
 
 def test_build_url(gl):
@@ -219,7 +219,7 @@ def test_delete_request(gl):
     with HTTMock(resp_cont):
         result = gl.http_delete("/projects")
         assert isinstance(result, requests.Response)
-        assert result.json() == True
+        assert result.json() is True
 
 
 def test_delete_request_404(gl):