Django

Code

Changeset 5453

Show
Ignore:
Timestamp:
06/09/07 22:06:34 (2 years ago)
Author:
mtredinnick
Message:

Fixed #4475 -- Fixed a problem that was preventing streaming tests for the
serializers from ever being run. Based on a patch from ian.g.kelly@gmail.com.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/trunk/AUTHORS

    r5451 r5453  
    131131    Antti Kaihola <http://akaihola.blogspot.com/> 
    132132    Ben Dean Kawamura <ben.dean.kawamura@gmail.com> 
     133    ian.g.kelly@gmail.com 
    133134    Garth Kidd <http://www.deadlybloodyserious.com/> 
    134135    kilian <kilian.cavalotti@lip6.fr> 
  • django/trunk/tests/regressiontests/serializers_regress/tests.py

    r5409 r5453  
    286286    obj = ComplexModel(field1='first',field2='second',field3='third') 
    287287    obj.save() 
    288      
     288 
    289289    # Serialize then deserialize the test database 
    290290    serialized_data = serializers.serialize(format, [obj], indent=2, fields=('field1','field3')) 
    291291    result = serializers.deserialize(format, serialized_data).next() 
    292      
     292 
    293293    # Check that the deserialized object contains data in only the serialized fields. 
    294294    self.assertEqual(result.object.field1, 'first') 
     
    302302    obj = ComplexModel(field1='first',field2='second',field3='third') 
    303303    obj.save() 
    304      
     304 
    305305    # Serialize the test database to a stream 
    306     stream = StringIO()     
     306    stream = StringIO() 
    307307    serializers.serialize(format, [obj], indent=2, stream=stream) 
    308      
     308 
    309309    # Serialize normally for a comparison 
    310310    string_data = serializers.serialize(format, [obj], indent=2) 
    311311 
    312312    # Check that the two are the same 
    313     self.assertEqual(string_data, stream.buffer()) 
     313    self.assertEqual(string_data, stream.getvalue()) 
    314314    stream.close() 
    315      
     315 
    316316for format in serializers.get_serializer_formats(): 
    317317    setattr(SerializerTests, 'test_'+format+'_serializer', curry(serializerTest, format)) 
    318318    setattr(SerializerTests, 'test_'+format+'_serializer_fields', curry(fieldsTest, format)) 
    319     setattr(SerializerTests, 'test_'+format+'_serializer_stream', curry(fieldsTest, format)) 
     319    if format != 'python': 
     320        setattr(SerializerTests, 'test_'+format+'_serializer_stream', curry(streamTest, format))