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

Commit2a76b74

Browse files
author
Gauvain Pocentek
committed
Rename the _created attribute _from_api
1 parenta636d5a commit2a76b74

File tree

3 files changed

+13
-14
lines changed

3 files changed

+13
-14
lines changed

‎gitlab/__init__.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -351,9 +351,9 @@ def list(self, obj_class, **kwargs):
351351

352352
cls_kwargs=kwargs.copy()
353353

354-
# Add_created manually, because we are not creating objects
354+
# Add_from_api manually, because we are not creating objects
355355
# through normal path
356-
cls_kwargs['_created']=True
356+
cls_kwargs['_from_api']=True
357357

358358
get_all_results=params.get('all',False)
359359

@@ -536,7 +536,7 @@ def _list_projects(self, url, **kwargs):
536536
l= []
537537
foroinr.json():
538538
p=Project(self,o)
539-
p._created=True
539+
p._from_api=True
540540
l.append(p)
541541

542542
returnl
@@ -737,7 +737,7 @@ def _create(self, **kwargs):
737737

738738
json=self.gitlab.create(self,**kwargs)
739739
self._set_from_dict(json)
740-
self._created=True
740+
self._from_api=True
741741

742742
def_update(self,**kwargs):
743743
ifnotself.canUpdate:
@@ -747,7 +747,7 @@ def _update(self, **kwargs):
747747
self._set_from_dict(json)
748748

749749
defsave(self,**kwargs):
750-
ifself._created:
750+
ifself._from_api:
751751
self._update(**kwargs)
752752
else:
753753
self._create(**kwargs)
@@ -756,7 +756,7 @@ def delete(self, **kwargs):
756756
ifnotself.canDelete:
757757
raiseNotImplementedError
758758

759-
ifnotself._created:
759+
ifnotself._from_api:
760760
raiseGitlabDeleteError("Object not yet created")
761761

762762
returnself.gitlab.delete(self,**kwargs)
@@ -772,16 +772,15 @@ def create(cls, gl, data, **kwargs):
772772
returnobj
773773

774774
def__init__(self,gl,data=None,**kwargs):
775-
self._created=False
775+
self._from_api=False
776776
self.gitlab=gl
777777

778778
if (dataisNoneorisinstance(data,six.integer_types)or
779779
isinstance(data,six.string_types)):
780780
ifnotself.canGet:
781781
raiseNotImplementedError
782782
data=self.gitlab.get(self.__class__,data,**kwargs)
783-
# Object is created because we got it from api
784-
self._created=True
783+
self._from_api=True
785784

786785
self._set_from_dict(data)
787786

‎gitlab/tests/test_gitlab.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ def resp_delete_group(url, request):
337337

338338
deftest_delete_unknown_path(self):
339339
obj=Project(self.gl,data={"name":"testname","id":1})
340-
obj._created=True
340+
obj._from_api=True
341341

342342
@urlmatch(scheme="http",netloc="localhost",path="/api/v3/projects/1",
343343
method="delete")
@@ -398,7 +398,7 @@ def test_create_unknown_path(self):
398398
obj=User(self.gl,data={"email":"email","password":"password",
399399
"username":"username","name":"name",
400400
"can_create_group":True})
401-
obj._created=True
401+
obj._from_api=True
402402

403403
@urlmatch(scheme="http",netloc="localhost",path="/api/v3/projects/1",
404404
method="delete")

‎gitlab/tests/test_gitlabobject.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ def test_get_list_or_object_with_get(self):
182182

183183
deftest_get_list_or_object_cant_get(self):
184184
withHTTMock(resp_get_issue):
185-
gl_object=Issue(self.gl,data={"name":"name"})
185+
gl_object=UserProject(self.gl,data={"name":"name"})
186186
self.assertRaises(NotImplementedError,
187187
gl_object._get_list_or_object,
188188
self.gl,id=1)
@@ -245,7 +245,7 @@ def test_save_with_id(self):
245245
"password":"password","id":1,
246246
"username":"username"})
247247
self.assertEqual(obj.name,"testname")
248-
obj._created=True
248+
obj._from_api=True
249249
obj.name="newname"
250250
withHTTMock(resp_update_user):
251251
obj.save()
@@ -259,7 +259,7 @@ def test_save_without_id(self):
259259

260260
deftest_delete(self):
261261
obj=Group(self.gl,data={"name":"testname","id":1})
262-
obj._created=True
262+
obj._from_api=True
263263
withHTTMock(resp_delete_group):
264264
data=obj.delete()
265265
self.assertIs(data,True)

0 commit comments

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