rename Change.object to Change.obj

This commit is contained in:
Laura Klünder 2017-06-12 18:29:21 +02:00
parent ad568fdc0b
commit 9e58a662e0

View file

@ -115,7 +115,7 @@ class Change(models.Model):
self.model_name = value.__name__ self.model_name = value.__name__
@property @property
def object(self) -> models.Model: def obj(self) -> models.Model:
if self.existing_object_pk is not None: if self.existing_object_pk is not None:
if self.created_object is not None: if self.created_object is not None:
raise TypeError('existing_object_pk and created_object can not both be set.') raise TypeError('existing_object_pk and created_object can not both be set.')
@ -133,8 +133,8 @@ class Change(models.Model):
return self.created_object return self.created_object
raise TypeError('existing_model_pk or created_object have to be set.') raise TypeError('existing_model_pk or created_object have to be set.')
@object.setter @obj.setter
def object(self, value: models.Model): def obj(self, value: models.Model):
if isinstance(value, Change): if isinstance(value, Change):
if self.created_object.changeset_id != self.changeset_id: if self.created_object.changeset_id != self.changeset_id:
raise ValueError('value is a Change instance but belongs to a different changeset.') raise ValueError('value is a Change instance but belongs to a different changeset.')
@ -172,7 +172,7 @@ class Change(models.Model):
raise ValidationError('model_name has to be set if action is not delchange.') raise ValidationError('model_name has to be set if action is not delchange.')
try: try:
tmp = self.model_class if self.action == 'create' else self.object # noqa tmp = self.model_class if self.action == 'create' else self.obj # noqa
except TypeError as e: except TypeError as e:
raise ValidationError(str(e)) raise ValidationError(str(e))
except ObjectDoesNotExist: except ObjectDoesNotExist: