python-gitlab
diff --git a/‎gitlab/__init__.py
Lines changed: 14 additions & 13 deletions b/‎gitlab/__init__.py
Lines changed: 14 additions & 13 deletions
diff --git a/‎gitlab/__main__.py
Lines changed: 2 additions & 2 deletions b/‎gitlab/__main__.py
Lines changed: 2 additions & 2 deletions
diff --git a/‎gitlab/base.py
Lines changed: 5 additions & 6 deletions b/‎gitlab/base.py
Lines changed: 5 additions & 6 deletions
diff --git a/‎gitlab/cli.py
Lines changed: 13 additions & 9 deletions b/‎gitlab/cli.py
Lines changed: 13 additions & 9 deletions
diff --git a/‎gitlab/client.py
Lines changed: 24 additions & 26 deletions b/‎gitlab/client.py
Lines changed: 24 additions & 26 deletions
diff --git a/‎gitlab/config.py
Lines changed: 1 addition & 1 deletion b/‎gitlab/config.py
Lines changed: 1 addition & 1 deletion
@@ -19,17 +19,18 @@
 import warnings
 from typing import Any
 
-import gitlab.config  # noqa: F401
-from gitlab.version import (  # noqa: F401
-    __author__,
-    __copyright__,
-    __email__,
-    __license__,
-    __title__,
-    __version__,
-)
-from gitlab.client import Gitlab, GitlabList  # noqa: F401
-from gitlab.exceptions import *  # noqa: F401,F403
+from . import config as config  # noqa: F401
+from . import const as const
+from . import exceptions as exceptions  # noqa: F401
+from .client import Gitlab as Gitlab  # noqa: F401
+from .client import GitlabList as GitlabList  # noqa: F401
+from .exceptions import *  # noqa: F401,F403
+from .version import __author__ as __author__  # noqa: F401
+from .version import __copyright__ as __copyright__  # noqa: F401
+from .version import __email__ as __email__  # noqa: F401
+from .version import __license__ as __license__  # noqa: F401
+from .version import __title__ as __title__  # noqa: F401
+from .version import __version__ as __version__  # noqa: F401
 
 warnings.filterwarnings("default", category=DeprecationWarning, module="^gitlab")
 
@@ -39,12 +40,12 @@
 # 'from gitlab.const import *' statement.
 def __getattr__(name: str) -> Any:
     # Deprecate direct access to constants without namespace
-    if name in gitlab.const._DEPRECATED:
+    if name in const._DEPRECATED:
         warnings.warn(
             f"\nDirect access to 'gitlab.{name}' is deprecated and will be "
             f"removed in a future major python-gitlab release. Please "
             f"use 'gitlab.const.{name}' instead.",
             DeprecationWarning,
         )
-        return getattr(gitlab.const, name)
+        return getattr(const, name)
     raise AttributeError(f"module {__name__} has no attribute {name}")
@@ -1,4 +1,4 @@
-import gitlab.cli
+from . import cli
 
 if __name__ == "__main__":
-    gitlab.cli.main()
+    cli.main()
@@ -20,11 +20,10 @@
 from types import ModuleType
 from typing import Any, Dict, Iterable, NamedTuple, Optional, Tuple, Type
 
-import gitlab
-from gitlab import types as g_types
-from gitlab.exceptions import GitlabParsingError
-
 from .client import Gitlab, GitlabList
+from .exceptions import GitlabParsingError
+from .types import GitlabAttribute
+from .version import __version__
 
 __all__ = [
     "RequiredOptional",
@@ -35,7 +34,7 @@
 
 
 _URL_ATTRIBUTE_ERROR = (
-    f"https://python-gitlab.readthedocs.io/en/{gitlab.__version__}/"
+    f"https://python-gitlab.readthedocs.io/en/{__version__}/"
     f"faq.html#attribute-error-list"
 )
 
@@ -317,7 +316,7 @@ class RESTManager(object):
     _path: Optional[str] = None
     _obj_cls: Optional[Type[RESTObject]] = None
     _from_parent_attrs: Dict[str, Any] = {}
-    _types: Dict[str, Type[g_types.GitlabAttribute]] = {}
+    _types: Dict[str, Type[GitlabAttribute]] = {}
 
     _computed_path: Optional[str]
     _parent: Optional[RESTObject]
 
@@ -27,8 +27,10 @@
 
 from requests.structures import CaseInsensitiveDict
 
-import gitlab.config
-from gitlab.base import RESTObject
+from . import __version__
+from . import config as gl_config
+from .base import RESTObject
+from .client import Gitlab
 
 # This regex is based on:
 # https://github.com/jpvanhal/inflection/blob/master/inflection/__init__.py
@@ -246,10 +248,10 @@ def _get_base_parser(add_help: bool = True) -> argparse.ArgumentParser:
 def _get_parser() -> argparse.ArgumentParser:
     # NOTE: We must delay import of gitlab.v4.cli until now or
     # otherwise it will cause circular import errors
-    import gitlab.v4.cli
+    from .v4 import cli
 
     parser = _get_base_parser()
-    return gitlab.v4.cli.extend_parser(parser)
+    return cli.extend_parser(parser)
 
 
 def _parse_value(v: Any) -> Any:
@@ -279,7 +281,7 @@ def docs() -> argparse.ArgumentParser:  # pragma: no cover
 
 def main() -> None:
     if "--version" in sys.argv:
-        print(gitlab.__version__)
+        print(__version__)
         sys.exit(0)
 
     parser = _get_base_parser(add_help=False)
@@ -289,8 +291,8 @@ def main() -> None:
     # any subparser setup
     (options, _) = parser.parse_known_args(sys.argv)
     try:
-        config = gitlab.config.GitlabConfigParser(options.gitlab, options.config_file)
-    except gitlab.config.ConfigError as e:
+        config = gl_config.GitlabConfigParser(options.gitlab, options.config_file)
+    except gl_config.ConfigError as e:
         if "--help" in sys.argv or "-h" in sys.argv:
             parser.print_help()
             sys.exit(0)
@@ -346,7 +348,7 @@ def main() -> None:
     args_dict = {k: _parse_value(v) for k, v in args_dict.items() if v is not None}
 
     try:
-        gl = gitlab.Gitlab.merge_config(vars(options), gitlab_id, config_files)
+        gl = Gitlab.merge_config(vars(options), gitlab_id, config_files)
         if gl.private_token or gl.oauth_token:
             gl.auth()
     except Exception as e:
@@ -355,4 +357,6 @@ def main() -> None:
     if debug:
         gl.enable_debug()
 
-    gitlab.v4.cli.run(gl, what, action, args_dict, verbose, output, fields)
+    from .v4 import cli
+
+    cli.run(gl, what, action, args_dict, verbose, output, fields)
@@ -24,10 +24,8 @@
 import requests.utils
 from requests_toolbelt.multipart.encoder import MultipartEncoder  # type: ignore
 
-import gitlab.config
-import gitlab.const
-import gitlab.exceptions
-from gitlab import utils
+from . import config as gl_config
+from . import const, exceptions, utils
 
 REDIRECT_MSG = (
     "python-gitlab detected a {status_code} ({reason!r}) redirection. You must update "
@@ -73,7 +71,7 @@ def __init__(
         per_page: Optional[int] = None,
         pagination: Optional[str] = None,
         order_by: Optional[str] = None,
-        user_agent: str = gitlab.const.USER_AGENT,
+        user_agent: str = const.USER_AGENT,
         retry_transient_errors: bool = False,
     ) -> None:
 
@@ -110,9 +108,9 @@ def __init__(
             raise ModuleNotFoundError(name=f"gitlab.v{self._api_version}.objects")
         # NOTE: We must delay import of gitlab.v4.objects until now or
         # otherwise it will cause circular import errors
-        import gitlab.v4.objects
+        from .v4 import objects as v4_objects
 
-        objects = gitlab.v4.objects
+        objects = v4_objects
         self._objects = objects
 
         self.broadcastmessages = objects.BroadcastMessageManager(self)
@@ -202,9 +200,9 @@ def __setstate__(self, state: Dict[str, Any]) -> None:
             raise ModuleNotFoundError(name=f"gitlab.v{self._api_version}.objects")
         # otherwise it will cause circular import errors
-        import gitlab.v4.objects
+        from .v4 import objects as v4_objects
 
-        self._objects = gitlab.v4.objects
+        self._objects = v4_objects
 
     @property
     def url(self) -> str:
@@ -237,7 +235,7 @@ def from_config(
         Raises:
             gitlab.config.GitlabDataError: If the configuration is not correct.
         """
-        config = gitlab.config.GitlabConfigParser(
+        config = gl_config.GitlabConfigParser(
             gitlab_id=gitlab_id, config_files=config_files
         )
         return cls(
@@ -287,14 +285,14 @@ def merge_config(
         Raises:
             gitlab.config.GitlabDataError: If the configuration is not correct.
         """
-        config = gitlab.config.GitlabConfigParser(
+        config = gl_config.GitlabConfigParser(
             gitlab_id=gitlab_id, config_files=config_files
         )
         url = (
             options.get("server_url")
             or config.url
             or os.getenv("CI_SERVER_URL")
-            or gitlab.const.DEFAULT_URL
+            or const.DEFAULT_URL
         )
         private_token, oauth_token, job_token = cls._merge_auth(options, config)
 
@@ -313,7 +311,7 @@ def merge_config(
         )
 
     @staticmethod
-    def _merge_auth(options: dict, config: gitlab.config.GitlabConfigParser) -> Tuple:
+    def _merge_auth(options: dict, config: gl_config.GitlabConfigParser) -> Tuple:
         """
         Return a tuple where at most one of 3 token types ever has a value.
         Since multiple types of tokens may be present in the environment,
@@ -371,7 +369,7 @@ def version(self) -> Tuple[str, str]:
 
         return cast(str, self._server_version), cast(str, self._server_revision)
 
-    @gitlab.exceptions.on_http_error(gitlab.exceptions.GitlabVerifyError)
+    @exceptions.on_http_error(exceptions.GitlabVerifyError)
     def lint(self, content: str, **kwargs: Any) -> Tuple[bool, List[str]]:
         """Validate a gitlab CI configuration.
 
@@ -392,7 +390,7 @@ def lint(self, content: str, **kwargs: Any) -> Tuple[bool, List[str]]:
             assert not isinstance(data, requests.Response)
         return (data["status"] == "valid", data["errors"])
 
-    @gitlab.exceptions.on_http_error(gitlab.exceptions.GitlabMarkdownError)
+    @exceptions.on_http_error(exceptions.GitlabMarkdownError)
     def markdown(
         self, text: str, gfm: bool = False, project: Optional[str] = None, **kwargs: Any
     ) -> str:
@@ -419,7 +417,7 @@ def markdown(
             assert not isinstance(data, requests.Response)
         return data["html"]
 
-    @gitlab.exceptions.on_http_error(gitlab.exceptions.GitlabLicenseError)
+    @exceptions.on_http_error(exceptions.GitlabLicenseError)
     def get_license(self, **kwargs: Any) -> Dict[str, Any]:
         """Retrieve information about the current license.
 
@@ -438,7 +436,7 @@ def get_license(self, **kwargs: Any) -> Dict[str, Any]:
             return result
         return {}
 
-    @gitlab.exceptions.on_http_error(gitlab.exceptions.GitlabLicenseError)
+    @exceptions.on_http_error(exceptions.GitlabLicenseError)
     def set_license(self, license: str, **kwargs: Any) -> Dict[str, Any]:
         """Add a new license.
 
@@ -529,7 +527,7 @@ def _get_base_url(self, url: Optional[str] = None) -> str:
             The base URL
         """
         if not url:
-            return gitlab.const.DEFAULT_URL
+            return const.DEFAULT_URL
 
         return url.rstrip("/")
 
@@ -563,7 +561,7 @@ def _check_redirects(self, result: requests.Response) -> None:
             if item.request.method == "GET":
                 continue
             target = item.headers.get("location")
-            raise gitlab.exceptions.RedirectError(
+            raise exceptions.RedirectError(
                 REDIRECT_MSG.format(
                     status_code=item.status_code,
                     reason=item.reason,
@@ -718,13 +716,13 @@ def http_request(
                 pass
 
             if result.status_code == 401:
-                raise gitlab.exceptions.GitlabAuthenticationError(
+                raise exceptions.GitlabAuthenticationError(
                     response_code=result.status_code,
                     error_message=error_message,
                     response_body=result.content,
                 )
 
-            raise gitlab.exceptions.GitlabHttpError(
+            raise exceptions.GitlabHttpError(
                 response_code=result.status_code,
                 error_message=error_message,
                 response_body=result.content,
@@ -770,7 +768,7 @@ def http_get(
             try:
                 return result.json()
             except Exception as e:
-                raise gitlab.exceptions.GitlabParsingError(
+                raise exceptions.GitlabParsingError(
                     error_message="Failed to parse the server message"
                 ) from e
         else:
@@ -867,7 +865,7 @@ def http_post(
             if result.headers.get("Content-Type", None) == "application/json":
                 return result.json()
         except Exception as e:
-            raise gitlab.exceptions.GitlabParsingError(
+            raise exceptions.GitlabParsingError(
                 error_message="Failed to parse the server message"
             ) from e
         return result
@@ -915,7 +913,7 @@ def http_put(
         try:
             return result.json()
         except Exception as e:
-            raise gitlab.exceptions.GitlabParsingError(
+            raise exceptions.GitlabParsingError(
                 error_message="Failed to parse the server message"
             ) from e
 
@@ -935,7 +933,7 @@ def http_delete(self, path: str, **kwargs: Any) -> requests.Response:
         """
         return self.http_request("delete", path, **kwargs)
 
-    @gitlab.exceptions.on_http_error(gitlab.exceptions.GitlabSearchError)
+    @exceptions.on_http_error(exceptions.GitlabSearchError)
     def search(
         self, scope: str, search: str, **kwargs: Any
     ) -> Union["GitlabList", List[Dict[str, Any]]]:
@@ -1009,7 +1007,7 @@ def _query(
         try:
             self._data: List[Dict[str, Any]] = result.json()
         except Exception as e:
-            raise gitlab.exceptions.GitlabParsingError(
+            raise exceptions.GitlabParsingError(
                 error_message="Failed to parse the server message"
             ) from e
 
 
@@ -23,7 +23,7 @@
 from pathlib import Path
 from typing import List, Optional, Union
 
-from gitlab.const import USER_AGENT
+from .const import USER_AGENT
 
 _DEFAULT_FILES: List[str] = [
     "/etc/python-gitlab.cfg",