diff --git a/django/core/serializers/base.py b/django/core/serializers/base.py index 484b3fc66d..d22746dcc5 100644 --- a/django/core/serializers/base.py +++ b/django/core/serializers/base.py @@ -152,7 +152,8 @@ class DeserializedObject(object): self.m2m_data = m2m_data def __repr__(self): - return "" % smart_str(self.object) + return "" % ( + self.object._meta.app_label, self.object._meta.object_name, self.object.pk) def save(self, save_m2m=True, using=None): # Call save on the Model baseclass directly. This bypasses any diff --git a/tests/modeltests/serializers/models.py b/tests/modeltests/serializers/models.py index cf1bf50c24..45d57e58d4 100644 --- a/tests/modeltests/serializers/models.py +++ b/tests/modeltests/serializers/models.py @@ -149,8 +149,8 @@ __test__ = {'API_TESTS':""" # database since the data was serialized (we'll simulate that below). >>> for obj in serializers.deserialize("xml", xml): ... print obj - - + + # Deserializing data with different field values doesn't change anything in the # database until we call save(): @@ -183,8 +183,8 @@ __test__ = {'API_TESTS':""" >>> json = serializers.serialize("json", Article.objects.all()) >>> for obj in serializers.deserialize("json", json): ... print obj - - + + >>> json = json.replace("Poker has no place on television", "Just kidding; I love TV poker") >>> for obj in serializers.deserialize("json", json): @@ -205,7 +205,7 @@ __test__ = {'API_TESTS':""" >>> for obj in serializers.deserialize("json", json): ... print obj - + # Objects ids can be referenced before they are defined in the serialization data # However, the deserialization process will need to be contained within a transaction @@ -275,7 +275,7 @@ None >>> obj = list(serializers.deserialize("json", serialized))[0] >>> print obj - + """} @@ -310,8 +310,8 @@ try: >>> obs = list(serializers.deserialize("yaml", serialized)) >>> for i in obs: ... print i - - + + # Custom field with non trivial to string convertion value with YAML serializer @@ -324,7 +324,7 @@ try: >>> serialized = serializers.serialize("yaml", Player.objects.all()) >>> obj = list(serializers.deserialize("yaml", serialized))[0] >>> print obj - + """