summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gitlab/__init__.py76
-rw-r--r--gitlab/v4/cli.py1
-rw-r--r--gitlab/v4/objects/__init__.py20
-rw-r--r--gitlab/v4/objects/group.py6
-rw-r--r--gitlab/v4/objects/hook.py7
-rw-r--r--gitlab/v4/objects/namespace.py3
-rw-r--r--gitlab/v4/objects/project.py2
-rw-r--r--gitlab/v4/objects/user.py1
8 files changed, 58 insertions, 58 deletions
diff --git a/gitlab/__init__.py b/gitlab/__init__.py
index 0fdfc71..6ee04ad 100644
--- a/gitlab/__init__.py
+++ b/gitlab/__init__.py
@@ -18,7 +18,27 @@
from __future__ import print_function
from __future__ import absolute_import
-from gitlab.v4 import objects
+from gitlab.exceptions import * # noqa
+from gitlab.v4.objects.application import * # noqa
+from gitlab.v4.objects.broadcast_message import * # noqa
+from gitlab.v4.objects.current_user import * # noqa
+from gitlab.v4.objects.deploy_key import * # noqa
+from gitlab.v4.objects.ee import * # noqa
+from gitlab.v4.objects.event import * # noqa
+from gitlab.v4.objects.feature import * # noqa
+from gitlab.v4.objects.group import * # noqa
+from gitlab.v4.objects.hook import * # noqa
+from gitlab.v4.objects.issue import * # noqa
+from gitlab.v4.objects.mergerequest import * # noqa
+from gitlab.v4.objects.namespace import * # noqa
+from gitlab.v4.objects.notification_settings import * # noqa
+from gitlab.v4.objects.project import * # noqa
+from gitlab.v4.objects.runner import * # noqa
+from gitlab.v4.objects.sidekiq import * # noqa
+from gitlab.v4.objects.snippet import * # noqa
+from gitlab.v4.objects.template import * # noqa
+from gitlab.v4.objects.todo import * # noqa
+from gitlab.v4.objects.user import * # noqa
import importlib
import time
import warnings
@@ -106,34 +126,32 @@ class Gitlab(object):
self.per_page = per_page
- self._objects = objects
-
- self.broadcastmessages = objects.BroadcastMessageManager(self)
- self.deploykeys = objects.DeployKeyManager(self)
- self.geonodes = objects.GeoNodeManager(self)
- self.gitlabciymls = objects.GitlabciymlManager(self)
- self.gitignores = objects.GitignoreManager(self)
- self.groups = objects.GroupManager(self)
- self.hooks = objects.HookManager(self)
- self.issues = objects.IssueManager(self)
- self.ldapgroups = objects.LDAPGroupManager(self)
- self.licenses = objects.LicenseManager(self)
- self.namespaces = objects.NamespaceManager(self)
- self.mergerequests = objects.MergeRequestManager(self)
- self.notificationsettings = objects.NotificationSettingsManager(self)
- self.projects = objects.ProjectManager(self)
- self.runners = objects.RunnerManager(self)
- self.settings = objects.ApplicationSettingsManager(self)
- self.sidekiq = objects.SidekiqManager(self)
- self.snippets = objects.SnippetManager(self)
- self.users = objects.UserManager(self)
- self.todos = objects.TodoManager(self)
- self.dockerfiles = objects.DockerfileManager(self)
- self.events = objects.EventManager(self)
- self.audit_events = objects.AuditEventManager(self)
- self.features = objects.FeatureManager(self)
- self.pagesdomains = objects.PagesDomainManager(self)
- self.user_activities = objects.UserActivitiesManager(self)
+ self.broadcastmessages = BroadcastMessageManager(self)
+ self.deploykeys = DeployKeyManager(self)
+ self.geonodes = GeoNodeManager(self)
+ self.gitlabciymls = GitlabciymlManager(self)
+ self.gitignores = GitignoreManager(self)
+ self.groups = GroupManager(self)
+ self.hooks = HookManager(self)
+ self.issues = IssueManager(self)
+ self.ldapgroups = LDAPGroupManager(self)
+ self.licenses = LicenseManager(self)
+ self.namespaces = NamespaceManager(self)
+ self.mergerequests = MergeRequestManager(self)
+ self.notificationsettings = NotificationSettingsManager(self)
+ self.projects = ProjectManager(self)
+ self.runners = RunnerManager(self)
+ self.settings = ApplicationSettingsManager(self)
+ self.sidekiq = SidekiqManager(self)
+ self.snippets = SnippetManager(self)
+ self.users = UserManager(self)
+ self.todos = TodoManager(self)
+ self.dockerfiles = DockerfileManager(self)
+ self.events = EventManager(self)
+ self.audit_events = AuditEventManager(self)
+ self.features = FeatureManager(self)
+ self.pagesdomains = PagesDomainManager(self)
+ self.user_activities = UserActivitiesManager(self)
def __enter__(self):
return self
diff --git a/gitlab/v4/cli.py b/gitlab/v4/cli.py
index a875261..333546b 100644
--- a/gitlab/v4/cli.py
+++ b/gitlab/v4/cli.py
@@ -24,7 +24,6 @@ import sys
import gitlab
import gitlab.base
from gitlab import cli
-import gitlab.v4.objects
class GitlabCLI(object):
diff --git a/gitlab/v4/objects/__init__.py b/gitlab/v4/objects/__init__.py
index 9595c92..e69de29 100644
--- a/gitlab/v4/objects/__init__.py
+++ b/gitlab/v4/objects/__init__.py
@@ -1,20 +0,0 @@
-from gitlab.v4.objects.application import * # noqa
-from gitlab.v4.objects.broadcast_message import * # noqa
-from gitlab.v4.objects.current_user import * # noqa
-from gitlab.v4.objects.deploy_key import * # noqa
-from gitlab.v4.objects.ee import * # noqa
-from gitlab.v4.objects.event import * # noqa
-from gitlab.v4.objects.feature import * # noqa
-from gitlab.v4.objects.group import * # noqa
-from gitlab.v4.objects.hook import * # noqa
-from gitlab.v4.objects.issue import * # noqa
-from gitlab.v4.objects.mergerequest import * # noqa
-from gitlab.v4.objects.namespace import * # noqa
-from gitlab.v4.objects.notification_settings import * # noqa
-from gitlab.v4.objects.project import * # noqa
-from gitlab.v4.objects.runner import * # noqa
-from gitlab.v4.objects.sidekiq import * # noqa
-from gitlab.v4.objects.snippet import * # noqa
-from gitlab.v4.objects.template import * # noqa
-from gitlab.v4.objects.todo import * # noqa
-from gitlab.v4.objects.user import * # noqa
diff --git a/gitlab/v4/objects/group.py b/gitlab/v4/objects/group.py
index 9be2b3f..74cb73a 100644
--- a/gitlab/v4/objects/group.py
+++ b/gitlab/v4/objects/group.py
@@ -2,7 +2,7 @@ from gitlab.base import * # noqa
from gitlab.exceptions import * # noqa
from gitlab.mixins import * # noqa
from gitlab import types
-from gitlab.v4 import objects
+from gitlab.v4.objects.notification_settings import NotificationSettings, NotificationSettingsManager
from gitlab import utils
@@ -421,11 +421,11 @@ class GroupMilestoneManager(CRUDMixin, RESTManager):
_list_filters = ("iids", "state", "search")
-class GroupNotificationSettings(objects.NotificationSettings):
+class GroupNotificationSettings(NotificationSettings):
pass
-class GroupNotificationSettingsManager(objects.NotificationSettingsManager):
+class GroupNotificationSettingsManager(NotificationSettingsManager):
_path = "/groups/%(group_id)s/notification_settings"
_obj_cls = GroupNotificationSettings
_from_parent_attrs = {"group_id": "id"}
diff --git a/gitlab/v4/objects/hook.py b/gitlab/v4/objects/hook.py
index bcf5be5..94d3576 100644
--- a/gitlab/v4/objects/hook.py
+++ b/gitlab/v4/objects/hook.py
@@ -1,3 +1,10 @@
+from gitlab.base import * # noqa
+from gitlab.exceptions import * # noqa
+from gitlab.mixins import * # noqa
+from gitlab import types
+from gitlab import utils
+
+
class Hook(ObjectDeleteMixin, RESTObject):
_url = "/hooks"
_short_print_attr = "url"
diff --git a/gitlab/v4/objects/namespace.py b/gitlab/v4/objects/namespace.py
index 4f2dec7..7e66a39 100644
--- a/gitlab/v4/objects/namespace.py
+++ b/gitlab/v4/objects/namespace.py
@@ -1,8 +1,5 @@
from gitlab.base import * # noqa
-from gitlab.exceptions import * # noqa
from gitlab.mixins import * # noqa
-from gitlab import types
-from gitlab import utils
class Namespace(RESTObject):
diff --git a/gitlab/v4/objects/project.py b/gitlab/v4/objects/project.py
index 0ec5f7e..ad22dbb 100644
--- a/gitlab/v4/objects/project.py
+++ b/gitlab/v4/objects/project.py
@@ -1512,8 +1512,6 @@ class PagesDomain(RESTObject):
class PagesDomainManager(ListMixin, RESTManager):
_path = "/pages/domains"
_obj_cls = PagesDomain
-=======
->>>>>>> 509394d... refactor: structure python objects in a reasonable way:gitlab/v4/objects/project.py
class ProjectRegistryRepository(ObjectDeleteMixin, RESTObject):
diff --git a/gitlab/v4/objects/user.py b/gitlab/v4/objects/user.py
index e324cc1..1da1e94 100644
--- a/gitlab/v4/objects/user.py
+++ b/gitlab/v4/objects/user.py
@@ -2,6 +2,7 @@ from gitlab.base import * # noqa
from gitlab.exceptions import * # noqa
from gitlab.mixins import * # noqa
from gitlab import types
+from gitlab.v4.objects.event import Event, EventManager
from gitlab import utils
View Lorry Controller Status