Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit23e37c5

Browse files
committed
refactor(objects): make audit event classes consistent
1 parent3193b8d commit23e37c5

File tree

3 files changed

+39
-8
lines changed

3 files changed

+39
-8
lines changed

‎gitlab/tests/objects/test_audit_events.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
importpytest
99
importresponses
1010

11-
fromgitlab.v4.objects.audit_eventsimportAuditEvent,GroupAuditEvent,ProjectAudit
11+
fromgitlab.v4.objects.audit_eventsimport (
12+
AuditEvent,
13+
GroupAuditEvent,
14+
ProjectAuditEvent,
15+
)
1216

1317
id=5
1418

@@ -95,11 +99,11 @@ def test_get_group_audit_events(group, resp_get_audit_event):
9599
deftest_list_project_audit_events(project,resp_list_audit_events):
96100
audit_events=project.audit_events.list()
97101
assertisinstance(audit_events,list)
98-
assertisinstance(audit_events[0],ProjectAudit)
102+
assertisinstance(audit_events[0],ProjectAuditEvent)
99103
assertaudit_events[0].id==id
100104

101105

102106
deftest_get_project_audit_events(project,resp_get_audit_event):
103107
audit_event=project.audit_events.get(id)
104-
assertisinstance(audit_event,ProjectAudit)
108+
assertisinstance(audit_event,ProjectAuditEvent)
105109
assertaudit_event.id==id

‎gitlab/v4/objects/audit_events.py

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
GitLab API:
33
https://docs.gitlab.com/ee/api/audit_events.html
44
"""
5+
importwarnings
56

67
fromgitlab.baseimportRESTManager,RESTObject
78
fromgitlab.mixinsimportRetrieveMixin
@@ -11,6 +12,8 @@
1112
"AuditEventManager",
1213
"GroupAuditEvent",
1314
"GroupAuditEventManager",
15+
"ProjectAuditEvent",
16+
"ProjectAuditEventManager",
1417
"ProjectAudit",
1518
"ProjectAuditManager",
1619
]
@@ -37,12 +40,36 @@ class GroupAuditEventManager(RetrieveMixin, RESTManager):
3740
_list_filters= ("created_after","created_before")
3841

3942

40-
classProjectAudit(RESTObject):
43+
classProjectAuditEvent(RESTObject):
4144
_id_attr="id"
4245

46+
def__init_subclass__(self):
47+
warnings.warn(
48+
"This class has been renamed to ProjectAuditEvent "
49+
"and will be removed in a future release.",
50+
DeprecationWarning,
51+
2,
52+
)
4353

44-
classProjectAuditManager(RetrieveMixin,RESTManager):
54+
55+
classProjectAuditEventManager(RetrieveMixin,RESTManager):
4556
_path="/projects/%(project_id)s/audit_events"
46-
_obj_cls=ProjectAudit
57+
_obj_cls=ProjectAuditEvent
4758
_from_parent_attrs= {"project_id":"id"}
4859
_list_filters= ("created_after","created_before")
60+
61+
def__init_subclass__(self):
62+
warnings.warn(
63+
"This class has been renamed to ProjectAuditEventManager "
64+
"and will be removed in a future release.",
65+
DeprecationWarning,
66+
2,
67+
)
68+
69+
70+
classProjectAudit(ProjectAuditEvent):
71+
pass
72+
73+
74+
classProjectAuditManager(ProjectAuditEventManager):
75+
pass

‎gitlab/v4/objects/projects.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
from .deploymentsimportProjectDeploymentManager
2626
from .environmentsimportProjectEnvironmentManager
2727
from .eventsimportProjectEventManager
28-
from .audit_eventsimportProjectAuditManager
28+
from .audit_eventsimportProjectAuditEventManager
2929
from .export_importimportProjectExportManager,ProjectImportManager
3030
from .filesimportProjectFileManager
3131
from .hooksimportProjectHookManager
@@ -117,7 +117,7 @@ class Project(RefreshMixin, SaveMixin, ObjectDeleteMixin, RepositoryMixin, RESTO
117117
("deployments","ProjectDeploymentManager"),
118118
("environments","ProjectEnvironmentManager"),
119119
("events","ProjectEventManager"),
120-
("audit_events","ProjectAuditManager"),
120+
("audit_events","ProjectAuditEventManager"),
121121
("exports","ProjectExportManager"),
122122
("files","ProjectFileManager"),
123123
("forks","ProjectForkManager"),

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp