Testing...

JohnVillalovos · JohnVillalovos · commit adddbefa6c61 · 2021-02-21T16:15:45.000-08:00
diff --git a/gitlab/cli.py b/gitlab/cli.py
@@ -158,12 +158,20 @@ def docs():
         sys.exit("Docs parser is only intended for build_sphinx")
 
     parser = _get_base_parser(add_help=False)
-    cli_module = importlib.import_module("gitlab.v4.cli")
+    # cli_module = importlib.import_module("gitlab.v4.cli")
+    # NOTE: We must delay import of gitlab.v4.cli until now or
+    # otherwise it will cause circular import errors
+    import gitlab.v4.cli
 
-    return _get_parser(cli_module)
+    # return _get_parser(cli_module)
+    return _get_parser(gitlab.v4.cli)
 
 
 def main():
+    # NOTE: We must delay import of gitlab.v4.cli until now or
+    # otherwise it will cause circular import errors
+    import gitlab.v4.cli
+
     if "--version" in sys.argv:
         print(gitlab.__version__)
         sys.exit(0)
@@ -181,10 +189,15 @@ def main():
             parser.print_help()
             sys.exit(0)
         sys.exit(e)
-    cli_module = importlib.import_module("gitlab.v%s.cli" % config.api_version)
+    # We only support v4 API at this time
+    if config.api_version not in ("4",):
+        raise ModuleNotFoundError(name="gitlab.v%s.cli" % self._api_version)
+
+    # cli_module = importlib.import_module("gitlab.v%s.cli" % config.api_version)
 
     # Now we build the entire set of subcommands and do the complete parsing
-    parser = _get_parser(cli_module)
+    # parser = _get_parser(cli_module)
+    parser = _get_parser(gitlab.v4.cli)
     try:
         import argcomplete
 
