Merge pull request #892 from godaji/remove-unused-code

max-wittig · web-flow · commit 214f7ef5f3b6 · 2019-10-06T17:41:06.000+02:00
Remove unused code and simplify string format.
diff --git a/gitlab/base.py b/gitlab/base.py
@@ -227,7 +227,7 @@ def total(self):
 class RESTManager(object):
     """Base class for CRUD operations on objects.
 
-    Derivated class must define ``_path`` and ``_obj_cls``.
+    Derived class must define ``_path`` and ``_obj_cls``.
 
     ``_path``: Base URL path on which requests will be sent (e.g. '/projects')
     ``_obj_cls``: The class of objects that will be created
diff --git a/gitlab/cli.py b/gitlab/cli.py
@@ -98,7 +98,7 @@ def _get_base_parser(add_help=True):
         "-c",
         "--config-file",
         action="append",
-        help=("Configuration file to use. Can be used " "multiple times."),
+        help="Configuration file to use. Can be used multiple times.",
     )
     parser.add_argument(
         "-g",
diff --git a/gitlab/config.py b/gitlab/config.py
@@ -63,7 +63,7 @@ def __init__(self, gitlab_id=None, config_files=None):
                 self.gitlab_id = self._config.get("global", "default")
             except Exception:
                 raise GitlabIDError(
-                    "Impossible to get the gitlab id " "(not specified in config file)"
+                    "Impossible to get the gitlab id (not specified in config file)"
                 )
 
         try:
diff --git a/gitlab/tests/test_base.py b/gitlab/tests/test_base.py
@@ -56,9 +56,6 @@ class MGR(base.RESTManager):
         class Parent(object):
             id = 42
 
-        class BrokenParent(object):
-            no_id = 0
-
         mgr = MGR(FakeGitlab(), parent=Parent())
         self.assertEqual(mgr._computed_path, "/tests/42/cases")
 

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ def _get_base_parser(add_help=True):`
`98`	`98`	`"-c",`
`99`	`99`	`"--config-file",`
`100`	`100`	`action="append",`
`101`		`- help=("Configuration file to use. Can be used " "multiple times."),`
	`101`	`+ help="Configuration file to use. Can be used multiple times.",`
`102`	`102`	`)`
`103`	`103`	`parser.add_argument(`
`104`	`104`	`"-g",`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ def __init__(self, gitlab_id=None, config_files=None):`
`63`	`63`	`self.gitlab_id = self._config.get("global", "default")`
`64`	`64`	`except Exception:`
`65`	`65`	`raise GitlabIDError(`
`66`		`- "Impossible to get the gitlab id " "(not specified in config file)"`
	`66`	`+ "Impossible to get the gitlab id (not specified in config file)"`
`67`	`67`	`)`
`68`	`68`
`69`	`69`	`try:`