Django

Code

Show
Ignore:
Timestamp:
06/11/07 10:53:42 (2 years ago)
Author:
bouldersprinters
Message:

boulder-oracle-sprint: Merged to [5462]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/boulder-oracle-sprint/tests/regressiontests/serializers_regress/tests.py

    r5422 r5463  
    303303    obj = ComplexModel(field1='first',field2='second',field3='third') 
    304304    obj.save() 
    305      
     305 
    306306    # Serialize then deserialize the test database 
    307307    serialized_data = serializers.serialize(format, [obj], indent=2, fields=('field1','field3')) 
    308308    result = serializers.deserialize(format, serialized_data).next() 
    309      
     309 
    310310    # Check that the deserialized object contains data in only the serialized fields. 
    311311    self.assertEqual(result.object.field1, 'first') 
     
    319319    obj = ComplexModel(field1='first',field2='second',field3='third') 
    320320    obj.save() 
    321      
     321 
    322322    # Serialize the test database to a stream 
    323     stream = StringIO()     
     323    stream = StringIO() 
    324324    serializers.serialize(format, [obj], indent=2, stream=stream) 
    325      
     325 
    326326    # Serialize normally for a comparison 
    327327    string_data = serializers.serialize(format, [obj], indent=2) 
    328328 
    329329    # Check that the two are the same 
    330     self.assertEqual(string_data, stream.buffer()) 
     330    self.assertEqual(string_data, stream.getvalue()) 
    331331    stream.close() 
    332      
     332 
    333333for format in serializers.get_serializer_formats(): 
    334334    setattr(SerializerTests, 'test_'+format+'_serializer', curry(serializerTest, format)) 
    335335    setattr(SerializerTests, 'test_'+format+'_serializer_fields', curry(fieldsTest, format)) 
    336     setattr(SerializerTests, 'test_'+format+'_serializer_stream', curry(fieldsTest, format)) 
     336    if format != 'python': 
     337        setattr(SerializerTests, 'test_'+format+'_serializer_stream', curry(streamTest, format)) 
  • django/branches/boulder-oracle-sprint/tests/regressiontests/templates/tests.py

    r5174 r5463  
    290290            'for-tag-vars03': ("{% for val in values %}{{ forloop.revcounter }}{% endfor %}", {"values": [6, 6, 6]}, "321"), 
    291291            'for-tag-vars04': ("{% for val in values %}{{ forloop.revcounter0 }}{% endfor %}", {"values": [6, 6, 6]}, "210"), 
     292            'for-tag-unpack01': ("{% for key,value in items %}{{ key }}:{{ value }}/{% endfor %}", {"items": (('one', 1), ('two', 2))}, "one:1/two:2/"), 
     293            'for-tag-unpack03': ("{% for key, value in items %}{{ key }}:{{ value }}/{% endfor %}", {"items": (('one', 1), ('two', 2))}, "one:1/two:2/"), 
     294            'for-tag-unpack04': ("{% for key , value in items %}{{ key }}:{{ value }}/{% endfor %}", {"items": (('one', 1), ('two', 2))}, "one:1/two:2/"), 
     295            'for-tag-unpack05': ("{% for key ,value in items %}{{ key }}:{{ value }}/{% endfor %}", {"items": (('one', 1), ('two', 2))}, "one:1/two:2/"), 
     296            'for-tag-unpack06': ("{% for key value in items %}{{ key }}:{{ value }}/{% endfor %}", {"items": (('one', 1), ('two', 2))}, template.TemplateSyntaxError), 
     297            'for-tag-unpack07': ("{% for key,,value in items %}{{ key }}:{{ value }}/{% endfor %}", {"items": (('one', 1), ('two', 2))}, template.TemplateSyntaxError), 
     298            'for-tag-unpack08': ("{% for key,value, in items %}{{ key }}:{{ value }}/{% endfor %}", {"items": (('one', 1), ('two', 2))}, template.TemplateSyntaxError), 
     299            # Ensure that a single loopvar doesn't truncate the list in val. 
     300            'for-tag-unpack09': ("{% for val in items %}{{ val.0 }}:{{ val.1 }}/{% endfor %}", {"items": (('one', 1), ('two', 2))}, "one:1/two:2/"), 
     301            # Otherwise, silently truncate if the length of loopvars differs to the length of each set of items. 
     302            'for-tag-unpack10': ("{% for x,y in items %}{{ x }}:{{ y }}/{% endfor %}", {"items": (('one', 1, 'carrot'), ('two', 2, 'orange'))}, "one:1/two:2/"), 
     303            'for-tag-unpack11': ("{% for x,y,z in items %}{{ x }}:{{ y }},{{ z }}/{% endfor %}", {"items": (('one', 1), ('two', 2))}, ("one:1,/two:2,/", "one:1,INVALID/two:2,INVALID/")), 
     304            'for-tag-unpack12': ("{% for x,y,z in items %}{{ x }}:{{ y }},{{ z }}/{% endfor %}", {"items": (('one', 1, 'carrot'), ('two', 2))}, ("one:1,carrot/two:2,/", "one:1,carrot/two:2,INVALID/")), 
     305            'for-tag-unpack13': ("{% for x,y,z in items %}{{ x }}:{{ y }},{{ z }}/{% endfor %}", {"items": (('one', 1, 'carrot'), ('two', 2, 'cheese'))}, ("one:1,carrot/two:2,cheese/", "one:1,carrot/two:2,cheese/")), 
    292306 
    293307            ### IF TAG ################################################################