chore: use constants from gitlab.const module

JohnVillalovos · JohnVillalovos · commit 18c22e57d32e · 2021-11-16T17:00:40.000-08:00
Have code use constants from the gitlab.const module instead of from
the top-level gitlab module.
diff --git a/gitlab/mixins.py b/gitlab/mixins.py
@@ -618,7 +618,7 @@ class AccessRequestMixin(_RestObjectBase):
     )
     @exc.on_http_error(exc.GitlabUpdateError)
     def approve(
-        self, access_level: int = gitlab.DEVELOPER_ACCESS, **kwargs: Any
+        self, access_level: int = gitlab.const.DEVELOPER_ACCESS, **kwargs: Any
     ) -> None:
         """Approve an access request.
 
diff --git a/tests/functional/api/test_gitlab.py b/tests/functional/api/test_gitlab.py
@@ -118,11 +118,11 @@ def test_namespaces(gl):
 
 def test_notification_settings(gl):
     settings = gl.notificationsettings.get()
-    settings.level = gitlab.NOTIFICATION_LEVEL_WATCH
+    settings.level = gitlab.const.NOTIFICATION_LEVEL_WATCH
     settings.save()
 
     settings = gl.notificationsettings.get()
-    assert settings.level == gitlab.NOTIFICATION_LEVEL_WATCH
+    assert settings.level == gitlab.const.NOTIFICATION_LEVEL_WATCH
 
 
 def test_user_activities(gl):
diff --git a/tests/functional/api/test_snippets.py b/tests/functional/api/test_snippets.py
@@ -33,7 +33,7 @@ def test_project_snippets(project):
             "title": "snip1",
             "file_name": "foo.py",
             "content": "initial content",
-            "visibility": gitlab.VISIBILITY_PRIVATE,
+            "visibility": gitlab.const.VISIBILITY_PRIVATE,
         }
     )
 
diff --git a/tests/unit/test_config.py b/tests/unit/test_config.py
@@ -22,7 +22,8 @@
 import mock
 import pytest
 
-from gitlab import config, USER_AGENT
+import gitlab
+from gitlab import config
 
 custom_user_agent = "my-package/1.0.0"
 
@@ -252,7 +253,7 @@ def test_data_from_helper(m_open, path_exists, tmp_path):
 @pytest.mark.parametrize(
     "config_string,expected_agent",
     [
-        (valid_config, USER_AGENT),
+        (valid_config, gitlab.const.USER_AGENT),
         (custom_user_agent_config, custom_user_agent),
     ],
 )
diff --git a/tests/unit/test_gitlab.py b/tests/unit/test_gitlab.py
@@ -21,7 +21,8 @@
 import pytest
 from httmock import HTTMock, response, urlmatch, with_httmock  # noqa
 
-from gitlab import DEFAULT_URL, Gitlab, GitlabList, USER_AGENT
+import gitlab
+from gitlab import Gitlab, GitlabList
 from gitlab.v4.objects import CurrentUser
 
 localhost = "http://localhost"
@@ -129,19 +130,19 @@ def test_gitlab_token_auth(gl, callback=None):
 
 def test_gitlab_default_url():
     gl = Gitlab()
-    assert gl.url == DEFAULT_URL
+    assert gl.url == gitlab.const.DEFAULT_URL
 
 
 @pytest.mark.parametrize(
     "args, kwargs, expected_url, expected_private_token, expected_oauth_token",
     [
-        ([], {}, DEFAULT_URL, None, None),
-        ([None, token], {}, DEFAULT_URL, token, None),
+        ([], {}, gitlab.const.DEFAULT_URL, None, None),
+        ([None, token], {}, gitlab.const.DEFAULT_URL, token, None),
         ([localhost], {}, localhost, None, None),
         ([localhost, token], {}, localhost, token, None),
         ([localhost, None, token], {}, localhost, None, token),
-        ([], {"private_token": token}, DEFAULT_URL, token, None),
-        ([], {"oauth_token": token}, DEFAULT_URL, None, token),
+        ([], {"private_token": token}, gitlab.const.DEFAULT_URL, token, None),
+        ([], {"oauth_token": token}, gitlab.const.DEFAULT_URL, None, token),
         ([], {"url": localhost}, localhost, None, None),
         ([], {"url": localhost, "private_token": token}, localhost, token, None),
         ([], {"url": localhost, "oauth_token": token}, localhost, None, token),
@@ -185,7 +186,7 @@ class MyGitlab(Gitlab):
 @pytest.mark.parametrize(
     "kwargs,expected_agent",
     [
-        ({}, USER_AGENT),
+        ({}, gitlab.const.USER_AGENT),
         ({"user_agent": "my-package/1.0.0"}, "my-package/1.0.0"),
     ],
 )

Original file line number	Diff line number	Diff line change
`@@ -618,7 +618,7 @@ class AccessRequestMixin(_RestObjectBase):`
`618`	`618`	`)`
`619`	`619`	`@exc.on_http_error(exc.GitlabUpdateError)`
`620`	`620`	`def approve(`
`621`		`- self, access_level: int = gitlab.DEVELOPER_ACCESS, **kwargs: Any`
	`621`	`+ self, access_level: int = gitlab.const.DEVELOPER_ACCESS, **kwargs: Any`
`622`	`622`	`) -> None:`
`623`	`623`	`"""Approve an access request.`
`624`	`624`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ def test_project_snippets(project):`
`33`	`33`	`"title": "snip1",`
`34`	`34`	`"file_name": "foo.py",`
`35`	`35`	`"content": "initial content",`
`36`		`- "visibility": gitlab.VISIBILITY_PRIVATE,`
	`36`	`+ "visibility": gitlab.const.VISIBILITY_PRIVATE,`
`37`	`37`	`}`
`38`	`38`	`)`
`39`	`39`