diff -r b758351d191f -r cc9b7e14412b web/lib/django/core/serializers/base.py --- a/web/lib/django/core/serializers/base.py Wed May 19 17:43:59 2010 +0200 +++ b/web/lib/django/core/serializers/base.py Tue May 25 02:43:45 2010 +0200 @@ -33,6 +33,7 @@ self.stream = options.get("stream", StringIO()) self.selected_fields = options.get("fields") + self.use_natural_keys = options.get("use_natural_keys", False) self.start_serialization() for obj in queryset: @@ -152,15 +153,16 @@ 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): + def save(self, save_m2m=True, using=None): # Call save on the Model baseclass directly. This bypasses any # model-defined save. The save is also forced to be raw. # This ensures that the data that is deserialized is literally # what came from the file, not post-processed by pre_save/save # methods. - models.Model.save_base(self.object, raw=True) + models.Model.save_base(self.object, using=using, raw=True) if self.m2m_data and save_m2m: for accessor_name, object_list in self.m2m_data.items(): setattr(self.object, accessor_name, object_list)