From c83eaf4f395300471311a67be34d8d306c2b3861 Mon Sep 17 00:00:00 2001 From: "John L. Villalovos" Date: Mon, 22 Feb 2021 16:19:17 -0800 Subject: [PATCH] chore: remove usage of 'from ... import *' In gitlab/v4/objects/*.py remove usage of: * from gitlab.base import * * from gitlab.mixins import * Change them to: * from gitlab.base import CLASS_NAME * from gitlab.mixins import CLASS_NAME Programmatically update code to explicitly import needed classes only. After the change the output of: $ flake8 gitlab/v4/objects/*py | grep 'REST\|Mixin' Is empty. Before many messages about unable to determine if it was a valid name. --- gitlab/v4/objects/access_requests.py | 10 ++++++++-- gitlab/v4/objects/appearance.py | 4 ++-- gitlab/v4/objects/applications.py | 4 ++-- gitlab/v4/objects/audit_events.py | 4 ++-- gitlab/v4/objects/award_emojis.py | 4 ++-- gitlab/v4/objects/badges.py | 4 ++-- gitlab/v4/objects/boards.py | 4 ++-- gitlab/v4/objects/branches.py | 4 ++-- gitlab/v4/objects/broadcast_messages.py | 4 ++-- gitlab/v4/objects/clusters.py | 4 ++-- gitlab/v4/objects/commits.py | 4 ++-- gitlab/v4/objects/container_registry.py | 4 ++-- gitlab/v4/objects/custom_attributes.py | 4 ++-- gitlab/v4/objects/deploy_keys.py | 4 ++-- gitlab/v4/objects/deploy_tokens.py | 4 ++-- gitlab/v4/objects/deployments.py | 4 ++-- gitlab/v4/objects/discussions.py | 4 ++-- gitlab/v4/objects/environments.py | 11 +++++++++-- gitlab/v4/objects/epics.py | 12 ++++++++++-- gitlab/v4/objects/events.py | 4 ++-- gitlab/v4/objects/export_import.py | 4 ++-- gitlab/v4/objects/features.py | 4 ++-- gitlab/v4/objects/files.py | 11 +++++++++-- gitlab/v4/objects/geo_nodes.py | 10 ++++++++-- gitlab/v4/objects/groups.py | 4 ++-- gitlab/v4/objects/hooks.py | 4 ++-- gitlab/v4/objects/issues.py | 17 +++++++++++++++-- gitlab/v4/objects/jobs.py | 4 ++-- gitlab/v4/objects/labels.py | 13 +++++++++++-- gitlab/v4/objects/ldap.py | 3 +-- gitlab/v4/objects/members.py | 4 ++-- gitlab/v4/objects/merge_request_approvals.py | 12 ++++++++++-- gitlab/v4/objects/merge_requests.py | 14 ++++++++++++-- gitlab/v4/objects/milestones.py | 4 ++-- gitlab/v4/objects/namespaces.py | 4 ++-- gitlab/v4/objects/notes.py | 13 +++++++++++-- gitlab/v4/objects/notification_settings.py | 4 ++-- gitlab/v4/objects/packages.py | 4 ++-- gitlab/v4/objects/pages.py | 4 ++-- gitlab/v4/objects/personal_access_tokens.py | 4 ++-- gitlab/v4/objects/pipelines.py | 14 ++++++++++++-- gitlab/v4/objects/projects.py | 12 ++++++++++-- gitlab/v4/objects/push_rules.py | 11 +++++++++-- gitlab/v4/objects/releases.py | 4 ++-- gitlab/v4/objects/runners.py | 10 ++++++++-- gitlab/v4/objects/services.py | 11 +++++++++-- gitlab/v4/objects/settings.py | 4 ++-- gitlab/v4/objects/sidekiq.py | 3 +-- gitlab/v4/objects/snippets.py | 4 ++-- gitlab/v4/objects/statistics.py | 4 ++-- gitlab/v4/objects/tags.py | 4 ++-- gitlab/v4/objects/templates.py | 4 ++-- gitlab/v4/objects/todos.py | 4 ++-- gitlab/v4/objects/triggers.py | 4 ++-- gitlab/v4/objects/users.py | 15 +++++++++++++-- gitlab/v4/objects/variables.py | 4 ++-- gitlab/v4/objects/wikis.py | 4 ++-- 57 files changed, 244 insertions(+), 114 deletions(-) diff --git a/gitlab/v4/objects/access_requests.py b/gitlab/v4/objects/access_requests.py index a38b98eb6..7eef47527 100644 --- a/gitlab/v4/objects/access_requests.py +++ b/gitlab/v4/objects/access_requests.py @@ -1,5 +1,11 @@ -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import ( + AccessRequestMixin, + CreateMixin, + DeleteMixin, + ListMixin, + ObjectDeleteMixin, +) __all__ = [ diff --git a/gitlab/v4/objects/appearance.py b/gitlab/v4/objects/appearance.py index f48a0c164..bbb3ff2f0 100644 --- a/gitlab/v4/objects/appearance.py +++ b/gitlab/v4/objects/appearance.py @@ -1,6 +1,6 @@ from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import GetWithoutIdMixin, SaveMixin, UpdateMixin __all__ = [ diff --git a/gitlab/v4/objects/applications.py b/gitlab/v4/objects/applications.py index 3fc3def7b..ddb9d234d 100644 --- a/gitlab/v4/objects/applications.py +++ b/gitlab/v4/objects/applications.py @@ -1,5 +1,5 @@ -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import CreateMixin, DeleteMixin, ListMixin, ObjectDeleteMixin __all__ = [ "Application", diff --git a/gitlab/v4/objects/audit_events.py b/gitlab/v4/objects/audit_events.py index 24ec3096c..d9d411948 100644 --- a/gitlab/v4/objects/audit_events.py +++ b/gitlab/v4/objects/audit_events.py @@ -3,8 +3,8 @@ https://docs.gitlab.com/ee/api/audit_events.html#project-audit-events """ -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import RetrieveMixin __all__ = [ "ProjectAudit", diff --git a/gitlab/v4/objects/award_emojis.py b/gitlab/v4/objects/award_emojis.py index 43efa2c25..806121ccb 100644 --- a/gitlab/v4/objects/award_emojis.py +++ b/gitlab/v4/objects/award_emojis.py @@ -1,5 +1,5 @@ -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import NoUpdateMixin, ObjectDeleteMixin __all__ = [ diff --git a/gitlab/v4/objects/badges.py b/gitlab/v4/objects/badges.py index 94b97a957..4edcc512f 100644 --- a/gitlab/v4/objects/badges.py +++ b/gitlab/v4/objects/badges.py @@ -1,5 +1,5 @@ -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import BadgeRenderMixin, CRUDMixin, ObjectDeleteMixin, SaveMixin __all__ = [ diff --git a/gitlab/v4/objects/boards.py b/gitlab/v4/objects/boards.py index 3936259e3..d0176b711 100644 --- a/gitlab/v4/objects/boards.py +++ b/gitlab/v4/objects/boards.py @@ -1,5 +1,5 @@ -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import CRUDMixin, ObjectDeleteMixin, SaveMixin __all__ = [ diff --git a/gitlab/v4/objects/branches.py b/gitlab/v4/objects/branches.py index f14fd7923..ff9ed9997 100644 --- a/gitlab/v4/objects/branches.py +++ b/gitlab/v4/objects/branches.py @@ -1,7 +1,7 @@ from gitlab import cli from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import NoUpdateMixin, ObjectDeleteMixin __all__ = [ diff --git a/gitlab/v4/objects/broadcast_messages.py b/gitlab/v4/objects/broadcast_messages.py index f6d6507ca..dc2cb9460 100644 --- a/gitlab/v4/objects/broadcast_messages.py +++ b/gitlab/v4/objects/broadcast_messages.py @@ -1,5 +1,5 @@ -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import CRUDMixin, ObjectDeleteMixin, SaveMixin __all__ = [ diff --git a/gitlab/v4/objects/clusters.py b/gitlab/v4/objects/clusters.py index 8c8744ef9..2a7064e4c 100644 --- a/gitlab/v4/objects/clusters.py +++ b/gitlab/v4/objects/clusters.py @@ -1,6 +1,6 @@ from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import CRUDMixin, CreateMixin, ObjectDeleteMixin, SaveMixin __all__ = [ diff --git a/gitlab/v4/objects/commits.py b/gitlab/v4/objects/commits.py index 712a49f57..1d66e2383 100644 --- a/gitlab/v4/objects/commits.py +++ b/gitlab/v4/objects/commits.py @@ -1,7 +1,7 @@ from gitlab import cli from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import CreateMixin, ListMixin, RefreshMixin, RetrieveMixin from .discussions import ProjectCommitDiscussionManager diff --git a/gitlab/v4/objects/container_registry.py b/gitlab/v4/objects/container_registry.py index 80d892262..99bc7d2a6 100644 --- a/gitlab/v4/objects/container_registry.py +++ b/gitlab/v4/objects/container_registry.py @@ -1,7 +1,7 @@ from gitlab import cli from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import DeleteMixin, ListMixin, ObjectDeleteMixin, RetrieveMixin __all__ = [ diff --git a/gitlab/v4/objects/custom_attributes.py b/gitlab/v4/objects/custom_attributes.py index f48b3f7ea..a4e979527 100644 --- a/gitlab/v4/objects/custom_attributes.py +++ b/gitlab/v4/objects/custom_attributes.py @@ -1,5 +1,5 @@ -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import DeleteMixin, ObjectDeleteMixin, RetrieveMixin, SetMixin __all__ = [ diff --git a/gitlab/v4/objects/deploy_keys.py b/gitlab/v4/objects/deploy_keys.py index da2fddd9b..d674c0417 100644 --- a/gitlab/v4/objects/deploy_keys.py +++ b/gitlab/v4/objects/deploy_keys.py @@ -1,7 +1,7 @@ from gitlab import cli from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import CRUDMixin, ListMixin, ObjectDeleteMixin, SaveMixin __all__ = [ diff --git a/gitlab/v4/objects/deploy_tokens.py b/gitlab/v4/objects/deploy_tokens.py index 95a77a01c..b9d0bad7d 100644 --- a/gitlab/v4/objects/deploy_tokens.py +++ b/gitlab/v4/objects/deploy_tokens.py @@ -1,5 +1,5 @@ -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import CreateMixin, DeleteMixin, ListMixin, ObjectDeleteMixin __all__ = [ diff --git a/gitlab/v4/objects/deployments.py b/gitlab/v4/objects/deployments.py index fcd9b4907..300d26b25 100644 --- a/gitlab/v4/objects/deployments.py +++ b/gitlab/v4/objects/deployments.py @@ -1,5 +1,5 @@ -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import CreateMixin, RetrieveMixin, SaveMixin, UpdateMixin __all__ = [ diff --git a/gitlab/v4/objects/discussions.py b/gitlab/v4/objects/discussions.py index e9a12b3ca..b65c27bdd 100644 --- a/gitlab/v4/objects/discussions.py +++ b/gitlab/v4/objects/discussions.py @@ -1,5 +1,5 @@ -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import CreateMixin, RetrieveMixin, SaveMixin, UpdateMixin from .notes import ( ProjectCommitDiscussionNoteManager, ProjectIssueDiscussionNoteManager, diff --git a/gitlab/v4/objects/environments.py b/gitlab/v4/objects/environments.py index 8570076c0..d969203a0 100644 --- a/gitlab/v4/objects/environments.py +++ b/gitlab/v4/objects/environments.py @@ -1,7 +1,14 @@ from gitlab import cli from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import ( + CreateMixin, + DeleteMixin, + ObjectDeleteMixin, + RetrieveMixin, + SaveMixin, + UpdateMixin, +) __all__ = [ diff --git a/gitlab/v4/objects/epics.py b/gitlab/v4/objects/epics.py index 43c926c01..8cf6fc30f 100644 --- a/gitlab/v4/objects/epics.py +++ b/gitlab/v4/objects/epics.py @@ -1,7 +1,15 @@ from gitlab import types from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import ( + CRUDMixin, + CreateMixin, + DeleteMixin, + ListMixin, + ObjectDeleteMixin, + SaveMixin, + UpdateMixin, +) from .events import GroupEpicResourceLabelEventManager diff --git a/gitlab/v4/objects/events.py b/gitlab/v4/objects/events.py index 6e0872a4b..43eba8d64 100644 --- a/gitlab/v4/objects/events.py +++ b/gitlab/v4/objects/events.py @@ -1,6 +1,6 @@ from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import ListMixin, RetrieveMixin __all__ = [ diff --git a/gitlab/v4/objects/export_import.py b/gitlab/v4/objects/export_import.py index 59d110ee8..054517c0b 100644 --- a/gitlab/v4/objects/export_import.py +++ b/gitlab/v4/objects/export_import.py @@ -1,5 +1,5 @@ -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import CreateMixin, DownloadMixin, GetWithoutIdMixin, RefreshMixin __all__ = [ diff --git a/gitlab/v4/objects/features.py b/gitlab/v4/objects/features.py index 449b2e72a..d96615e95 100644 --- a/gitlab/v4/objects/features.py +++ b/gitlab/v4/objects/features.py @@ -1,7 +1,7 @@ from gitlab import utils from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import DeleteMixin, ListMixin, ObjectDeleteMixin __all__ = [ diff --git a/gitlab/v4/objects/files.py b/gitlab/v4/objects/files.py index 8477989c3..bb4349891 100644 --- a/gitlab/v4/objects/files.py +++ b/gitlab/v4/objects/files.py @@ -1,8 +1,15 @@ import base64 from gitlab import cli, utils from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import ( + CreateMixin, + DeleteMixin, + GetMixin, + ObjectDeleteMixin, + SaveMixin, + UpdateMixin, +) __all__ = [ diff --git a/gitlab/v4/objects/geo_nodes.py b/gitlab/v4/objects/geo_nodes.py index 0652702ad..b9a1e4945 100644 --- a/gitlab/v4/objects/geo_nodes.py +++ b/gitlab/v4/objects/geo_nodes.py @@ -1,7 +1,13 @@ from gitlab import cli from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import ( + DeleteMixin, + ObjectDeleteMixin, + RetrieveMixin, + SaveMixin, + UpdateMixin, +) __all__ = [ diff --git a/gitlab/v4/objects/groups.py b/gitlab/v4/objects/groups.py index fc14346ea..d96acfd5e 100644 --- a/gitlab/v4/objects/groups.py +++ b/gitlab/v4/objects/groups.py @@ -1,7 +1,7 @@ from gitlab import cli, types from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import CRUDMixin, ListMixin, ObjectDeleteMixin, SaveMixin from .access_requests import GroupAccessRequestManager from .badges import GroupBadgeManager from .boards import GroupBoardManager diff --git a/gitlab/v4/objects/hooks.py b/gitlab/v4/objects/hooks.py index 93a014225..85acf4eab 100644 --- a/gitlab/v4/objects/hooks.py +++ b/gitlab/v4/objects/hooks.py @@ -1,5 +1,5 @@ -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import CRUDMixin, NoUpdateMixin, ObjectDeleteMixin, SaveMixin __all__ = [ diff --git a/gitlab/v4/objects/issues.py b/gitlab/v4/objects/issues.py index 2d7d57034..dfd43f554 100644 --- a/gitlab/v4/objects/issues.py +++ b/gitlab/v4/objects/issues.py @@ -1,7 +1,20 @@ from gitlab import cli, types from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import ( + CRUDMixin, + CreateMixin, + DeleteMixin, + ListMixin, + ObjectDeleteMixin, + ParticipantsMixin, + RetrieveMixin, + SaveMixin, + SubscribableMixin, + TimeTrackingMixin, + TodoMixin, + UserAgentDetailMixin, +) from .award_emojis import ProjectIssueAwardEmojiManager from .discussions import ProjectIssueDiscussionManager from .events import ( diff --git a/gitlab/v4/objects/jobs.py b/gitlab/v4/objects/jobs.py index 33fc9916d..6513d7591 100644 --- a/gitlab/v4/objects/jobs.py +++ b/gitlab/v4/objects/jobs.py @@ -1,7 +1,7 @@ from gitlab import cli, utils from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import RefreshMixin, RetrieveMixin __all__ = [ diff --git a/gitlab/v4/objects/labels.py b/gitlab/v4/objects/labels.py index 441035f7c..513f1eb6c 100644 --- a/gitlab/v4/objects/labels.py +++ b/gitlab/v4/objects/labels.py @@ -1,6 +1,15 @@ from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import ( + CreateMixin, + DeleteMixin, + ListMixin, + ObjectDeleteMixin, + RetrieveMixin, + SaveMixin, + SubscribableMixin, + UpdateMixin, +) __all__ = [ diff --git a/gitlab/v4/objects/ldap.py b/gitlab/v4/objects/ldap.py index e6ff42a59..72c8e7f39 100644 --- a/gitlab/v4/objects/ldap.py +++ b/gitlab/v4/objects/ldap.py @@ -1,6 +1,5 @@ from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject, RESTObjectList __all__ = [ diff --git a/gitlab/v4/objects/members.py b/gitlab/v4/objects/members.py index 32ac9a230..5802aa837 100644 --- a/gitlab/v4/objects/members.py +++ b/gitlab/v4/objects/members.py @@ -1,7 +1,7 @@ from gitlab import cli from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import CRUDMixin, ObjectDeleteMixin, SaveMixin __all__ = [ diff --git a/gitlab/v4/objects/merge_request_approvals.py b/gitlab/v4/objects/merge_request_approvals.py index ec2da14fd..cd09e32c7 100644 --- a/gitlab/v4/objects/merge_request_approvals.py +++ b/gitlab/v4/objects/merge_request_approvals.py @@ -1,6 +1,14 @@ from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import ( + CreateMixin, + DeleteMixin, + GetWithoutIdMixin, + ListMixin, + ObjectDeleteMixin, + SaveMixin, + UpdateMixin, +) __all__ = [ diff --git a/gitlab/v4/objects/merge_requests.py b/gitlab/v4/objects/merge_requests.py index f6c56114d..f749ba83f 100644 --- a/gitlab/v4/objects/merge_requests.py +++ b/gitlab/v4/objects/merge_requests.py @@ -1,7 +1,17 @@ from gitlab import cli, types from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject, RESTObjectList +from gitlab.mixins import ( + CRUDMixin, + ListMixin, + ObjectDeleteMixin, + ParticipantsMixin, + RetrieveMixin, + SaveMixin, + SubscribableMixin, + TimeTrackingMixin, + TodoMixin, +) from .commits import ProjectCommit, ProjectCommitManager from .issues import ProjectIssue, ProjectIssueManager from .merge_request_approvals import ( diff --git a/gitlab/v4/objects/milestones.py b/gitlab/v4/objects/milestones.py index deb59700d..7aebc8ecf 100644 --- a/gitlab/v4/objects/milestones.py +++ b/gitlab/v4/objects/milestones.py @@ -1,7 +1,7 @@ from gitlab import cli from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject, RESTObjectList +from gitlab.mixins import CRUDMixin, ObjectDeleteMixin, SaveMixin from .issues import GroupIssue, GroupIssueManager, ProjectIssue, ProjectIssueManager from .merge_requests import ( ProjectMergeRequest, diff --git a/gitlab/v4/objects/namespaces.py b/gitlab/v4/objects/namespaces.py index e761a3674..a9e1ef56a 100644 --- a/gitlab/v4/objects/namespaces.py +++ b/gitlab/v4/objects/namespaces.py @@ -1,5 +1,5 @@ -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import RetrieveMixin __all__ = [ diff --git a/gitlab/v4/objects/notes.py b/gitlab/v4/objects/notes.py index 23c7fa854..88a461ab6 100644 --- a/gitlab/v4/objects/notes.py +++ b/gitlab/v4/objects/notes.py @@ -1,7 +1,16 @@ from gitlab import cli from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import ( + CRUDMixin, + CreateMixin, + DeleteMixin, + GetMixin, + ObjectDeleteMixin, + RetrieveMixin, + SaveMixin, + UpdateMixin, +) from .award_emojis import ( ProjectIssueNoteAwardEmojiManager, ProjectMergeRequestNoteAwardEmojiManager, diff --git a/gitlab/v4/objects/notification_settings.py b/gitlab/v4/objects/notification_settings.py index 9b320d799..3aee51473 100644 --- a/gitlab/v4/objects/notification_settings.py +++ b/gitlab/v4/objects/notification_settings.py @@ -1,5 +1,5 @@ -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import GetWithoutIdMixin, SaveMixin, UpdateMixin __all__ = [ diff --git a/gitlab/v4/objects/packages.py b/gitlab/v4/objects/packages.py index a0c0f25e3..3e646851f 100644 --- a/gitlab/v4/objects/packages.py +++ b/gitlab/v4/objects/packages.py @@ -1,5 +1,5 @@ -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import DeleteMixin, GetMixin, ListMixin, ObjectDeleteMixin __all__ = [ diff --git a/gitlab/v4/objects/pages.py b/gitlab/v4/objects/pages.py index 27167eb96..4cd1a5a67 100644 --- a/gitlab/v4/objects/pages.py +++ b/gitlab/v4/objects/pages.py @@ -1,5 +1,5 @@ -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import CRUDMixin, ListMixin, ObjectDeleteMixin, SaveMixin __all__ = [ diff --git a/gitlab/v4/objects/personal_access_tokens.py b/gitlab/v4/objects/personal_access_tokens.py index 211bd92cd..7d2c5ce0e 100644 --- a/gitlab/v4/objects/personal_access_tokens.py +++ b/gitlab/v4/objects/personal_access_tokens.py @@ -1,5 +1,5 @@ -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import ListMixin __all__ = [ diff --git a/gitlab/v4/objects/pipelines.py b/gitlab/v4/objects/pipelines.py index ddd32f844..9f0516a52 100644 --- a/gitlab/v4/objects/pipelines.py +++ b/gitlab/v4/objects/pipelines.py @@ -1,7 +1,17 @@ from gitlab import cli, types from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import ( + CRUDMixin, + CreateMixin, + DeleteMixin, + ListMixin, + ObjectDeleteMixin, + RefreshMixin, + RetrieveMixin, + SaveMixin, + UpdateMixin, +) __all__ = [ diff --git a/gitlab/v4/objects/projects.py b/gitlab/v4/objects/projects.py index 19c5a2afc..63fae9081 100644 --- a/gitlab/v4/objects/projects.py +++ b/gitlab/v4/objects/projects.py @@ -1,7 +1,15 @@ from gitlab import cli, types, utils from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import ( + CRUDMixin, + CreateMixin, + ListMixin, + ObjectDeleteMixin, + RefreshMixin, + SaveMixin, + UpdateMixin, +) from .access_requests import ProjectAccessRequestManager from .badges import ProjectBadgeManager diff --git a/gitlab/v4/objects/push_rules.py b/gitlab/v4/objects/push_rules.py index 5f1618b76..e580ab895 100644 --- a/gitlab/v4/objects/push_rules.py +++ b/gitlab/v4/objects/push_rules.py @@ -1,5 +1,12 @@ -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import ( + CreateMixin, + DeleteMixin, + GetWithoutIdMixin, + ObjectDeleteMixin, + SaveMixin, + UpdateMixin, +) __all__ = [ diff --git a/gitlab/v4/objects/releases.py b/gitlab/v4/objects/releases.py index d9112e4cc..bbeea248f 100644 --- a/gitlab/v4/objects/releases.py +++ b/gitlab/v4/objects/releases.py @@ -1,7 +1,7 @@ from gitlab import cli from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import CRUDMixin, NoUpdateMixin, ObjectDeleteMixin, SaveMixin __all__ = [ diff --git a/gitlab/v4/objects/runners.py b/gitlab/v4/objects/runners.py index 390b9d33d..dd7f0e3ff 100644 --- a/gitlab/v4/objects/runners.py +++ b/gitlab/v4/objects/runners.py @@ -1,7 +1,13 @@ from gitlab import cli from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import ( + CRUDMixin, + ListMixin, + NoUpdateMixin, + ObjectDeleteMixin, + SaveMixin, +) __all__ = [ diff --git a/gitlab/v4/objects/services.py b/gitlab/v4/objects/services.py index ff7e92088..c63833646 100644 --- a/gitlab/v4/objects/services.py +++ b/gitlab/v4/objects/services.py @@ -1,7 +1,14 @@ from gitlab import cli from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import ( + DeleteMixin, + GetMixin, + ListMixin, + ObjectDeleteMixin, + SaveMixin, + UpdateMixin, +) __all__ = [ diff --git a/gitlab/v4/objects/settings.py b/gitlab/v4/objects/settings.py index a73173658..0d07488d2 100644 --- a/gitlab/v4/objects/settings.py +++ b/gitlab/v4/objects/settings.py @@ -1,6 +1,6 @@ from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import GetWithoutIdMixin, SaveMixin, UpdateMixin __all__ = [ diff --git a/gitlab/v4/objects/sidekiq.py b/gitlab/v4/objects/sidekiq.py index f1f0e4b6e..84306bc98 100644 --- a/gitlab/v4/objects/sidekiq.py +++ b/gitlab/v4/objects/sidekiq.py @@ -1,7 +1,6 @@ from gitlab import cli from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager __all__ = [ diff --git a/gitlab/v4/objects/snippets.py b/gitlab/v4/objects/snippets.py index 4664f0a37..20db75f26 100644 --- a/gitlab/v4/objects/snippets.py +++ b/gitlab/v4/objects/snippets.py @@ -1,7 +1,7 @@ from gitlab import cli, utils from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import CRUDMixin, ObjectDeleteMixin, SaveMixin, UserAgentDetailMixin from .award_emojis import ProjectSnippetAwardEmojiManager from .discussions import ProjectSnippetDiscussionManager diff --git a/gitlab/v4/objects/statistics.py b/gitlab/v4/objects/statistics.py index 53d0c7dc6..2dbcdfe80 100644 --- a/gitlab/v4/objects/statistics.py +++ b/gitlab/v4/objects/statistics.py @@ -1,5 +1,5 @@ -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import GetWithoutIdMixin, RefreshMixin __all__ = [ diff --git a/gitlab/v4/objects/tags.py b/gitlab/v4/objects/tags.py index 1f333c566..56d7fb6e7 100644 --- a/gitlab/v4/objects/tags.py +++ b/gitlab/v4/objects/tags.py @@ -1,7 +1,7 @@ from gitlab import cli from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import NoUpdateMixin, ObjectDeleteMixin __all__ = [ diff --git a/gitlab/v4/objects/templates.py b/gitlab/v4/objects/templates.py index 2fbfddf3f..4da864bcb 100644 --- a/gitlab/v4/objects/templates.py +++ b/gitlab/v4/objects/templates.py @@ -1,5 +1,5 @@ -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import RetrieveMixin __all__ = [ diff --git a/gitlab/v4/objects/todos.py b/gitlab/v4/objects/todos.py index edde46e3b..33ad7ee23 100644 --- a/gitlab/v4/objects/todos.py +++ b/gitlab/v4/objects/todos.py @@ -1,7 +1,7 @@ from gitlab import cli from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import DeleteMixin, ListMixin, ObjectDeleteMixin __all__ = [ diff --git a/gitlab/v4/objects/triggers.py b/gitlab/v4/objects/triggers.py index f5dadcaa7..822a1df31 100644 --- a/gitlab/v4/objects/triggers.py +++ b/gitlab/v4/objects/triggers.py @@ -1,7 +1,7 @@ from gitlab import cli from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import CRUDMixin, ObjectDeleteMixin, SaveMixin __all__ = [ diff --git a/gitlab/v4/objects/users.py b/gitlab/v4/objects/users.py index c33243550..84e52add9 100644 --- a/gitlab/v4/objects/users.py +++ b/gitlab/v4/objects/users.py @@ -1,7 +1,18 @@ from gitlab import cli, types from gitlab import exceptions as exc -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import ( + CRUDMixin, + CreateMixin, + DeleteMixin, + GetWithoutIdMixin, + ListMixin, + NoUpdateMixin, + ObjectDeleteMixin, + RetrieveMixin, + SaveMixin, + UpdateMixin, +) from .custom_attributes import UserCustomAttributeManager from .events import UserEventManager diff --git a/gitlab/v4/objects/variables.py b/gitlab/v4/objects/variables.py index 2094a5fcd..025e3bedc 100644 --- a/gitlab/v4/objects/variables.py +++ b/gitlab/v4/objects/variables.py @@ -4,8 +4,8 @@ https://docs.gitlab.com/ee/api/project_level_variables.html https://docs.gitlab.com/ee/api/group_level_variables.html """ -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import CRUDMixin, ObjectDeleteMixin, SaveMixin __all__ = [ diff --git a/gitlab/v4/objects/wikis.py b/gitlab/v4/objects/wikis.py index 8cadaa085..f2c1c2ab4 100644 --- a/gitlab/v4/objects/wikis.py +++ b/gitlab/v4/objects/wikis.py @@ -1,5 +1,5 @@ -from gitlab.base import * # noqa -from gitlab.mixins import * # noqa +from gitlab.base import RESTManager, RESTObject +from gitlab.mixins import CRUDMixin, ObjectDeleteMixin, SaveMixin __all__ = [