@@ -231,9 +231,14 @@ def list(self, obj_class, **kwargs):
231231cls = obj_class
232232if obj_class ._returnClass :
233233cls = obj_class ._returnClass
234-
235- # Remove parameters from kwargs before passing it to constructor
234+
236235cls_kwargs = kwargs .copy ()
236+
237+ # Add _created manually, because we are not creating objects
238+ # through normal path
239+ cls_kwargs ['_created' ]= True
240+
241+ # Remove parameters from kwargs before passing it to constructor
237242for key in ['page' ,'per_page' ]:
238243if key in cls_kwargs :
239244del cls_kwargs [key ]
@@ -524,6 +529,8 @@ class GitlabObject(object):
524529_url = None
525530_returnClass = None
526531_constructorTypes = None
532+ # Tells if _getListOrObject should return list or object when id is None
533+ getListWhenNoId = True
527534canGet = True
528535canList = True
529536canCreate = True
@@ -549,16 +556,18 @@ def list(cls, gl, **kwargs):
549556return gl .list (cls ,** kwargs )
550557
551558def _getListOrObject (self ,cls ,id ,** kwargs ):
552- if id is None :
559+ if id is None and cls . getListWhenNoId :
553560if not cls .canList :
554- raise GitlabGetError
561+ raise GitlabListError
555562return cls .list (self .gitlab ,** kwargs )
556-
563+ elif id is None and not cls .getListWhenNoId :
564+ if not cls .canGet :
565+ raise GitlabGetError
566+ return cls (self .gitlab ,id ,** kwargs )
557567elif isinstance (id ,dict ):
558568if not cls .canCreate :
559569raise GitlabCreateError
560570return cls (self .gitlab ,id ,** kwargs )
561-
562571else :
563572if not cls .canGet :
564573raise GitlabGetError
@@ -587,6 +596,7 @@ def _create(self):
587596
588597json = self .gitlab .create (self )
589598self ._setFromDict (json )
599+ self ._created = True
590600
591601def _update (self ):
592602if not self .canUpdate :
@@ -596,7 +606,7 @@ def _update(self):
596606self ._setFromDict (json )
597607
598608def save (self ):
599- if hasattr ( self , 'id' ) :
609+ if self . _created :
600610self ._update ()
601611else :
602612self ._create ()
@@ -605,24 +615,33 @@ def delete(self):
605615if not self .canDelete :
606616raise NotImplementedError
607617
608- if not hasattr ( self , 'id' ) :
618+ if not self . _created :
609619raise GitlabDeleteError
610620
611621return self .gitlab .delete (self )
612622
613623def __init__ (self ,gl ,data = None ,** kwargs ):
624+ self ._created = False
614625self .gitlab = gl
615626
616627if data is None or isinstance (data ,six .integer_types )or \
617628isinstance (data ,six .string_types ):
618629data = self .gitlab .get (self .__class__ ,data ,** kwargs )
630+ # Object is created because we got it from api
631+ self ._created = True
619632
620633self ._setFromDict (data )
621634
622635if kwargs :
623636for k ,v in kwargs .items ():
624637self .__dict__ [k ]= v
625638
639+ # Special handling for api-objects that don't have id-number in api
640+ # responses. Currently only Labels and Files
641+ if not hasattr (self ,"id" ):
642+ self .id = None
643+
644+
626645def __str__ (self ):
627646return '%s => %s' % (type (self ),str (self .__dict__ ))
628647
