@@ -261,13 +261,13 @@ def assertExportResult(self, item, expected_value):
261
261
self .assertXmlEquivalent (fp .getvalue (), expected_value )
262
262
263
263
def _check_output (self ):
264
- expected_value = u '<?xml version="1.0" ?>\n <items><item><age>22</age><name>John\xa3 </name></item></items>'
264
+ expected_value = b '<?xml version="1.0" encoding="utf-8" ?>\n <items><item><age>22</age><name>John\xc2 \xa3 </name></item></items>'
265
265
self .assertXmlEquivalent (self .output .getvalue (), expected_value )
266
266
267
267
def test_multivalued_fields (self ):
268
268
self .assertExportResult (
269
269
TestItem (name = [u'John\xa3 ' , u'Doe' ]),
270
- u '<?xml version="1.0" ?>\n <items><item><name><value>John\xa3 </value><value>Doe</value></name></item></items>'
270
+ b '<?xml version="1.0" encoding="utf-8" ?>\n <items><item><name><value>John\xc2 \xa3 </value><value>Doe</value></name></item></items>'
271
271
)
272
272
273
273
def test_nested_item (self ):
@@ -276,19 +276,19 @@ def test_nested_item(self):
276
276
i3 = TestItem (name = u'buz' , age = i2 )
277
277
278
278
self .assertExportResult (i3 ,
279
- u '<?xml version="1.0" ?>\n '
280
- u '<items>'
281
- u '<item>'
282
- u '<age>'
283
- u '<age>'
284
- u '<age>22</age>'
285
- u '<name>foo\xa3 hoo</name>'
286
- u '</age>'
287
- u '<name>bar</name>'
288
- u '</age>'
289
- u '<name>buz</name>'
290
- u '</item>'
291
- u '</items>'
279
+ b '<?xml version="1.0" encoding="utf-8" ?>\n '
280
+ b '<items>'
281
+ b '<item>'
282
+ b '<age>'
283
+ b '<age>'
284
+ b '<age>22</age>'
285
+ b '<name>foo\xc2 \xa3 hoo</name>'
286
+ b '</age>'
287
+ b '<name>bar</name>'
288
+ b '</age>'
289
+ b '<name>buz</name>'
290
+ b '</item>'
291
+ b '</items>'
292
292
)
293
293
294
294
def test_nested_list_item (self ):
@@ -297,16 +297,16 @@ def test_nested_list_item(self):
297
297
i3 = TestItem (name = u'buz' , age = [i1 , i2 ])
298
298
299
299
self .assertExportResult (i3 ,
300
- u '<?xml version="1.0" ?>\n '
301
- u '<items>'
302
- u '<item>'
303
- u '<age>'
304
- u '<value><name>foo</name></value>'
305
- u '<value><name>bar</name><v2><egg><value>spam</value></egg></v2></value>'
306
- u '</age>'
307
- u '<name>buz</name>'
308
- u '</item>'
309
- u '</items>'
300
+ b '<?xml version="1.0" encoding="utf-8" ?>\n '
301
+ b '<items>'
302
+ b '<item>'
303
+ b '<age>'
304
+ b '<value><name>foo</name></value>'
305
+ b '<value><name>bar</name><v2><egg><value>spam</value></egg></v2></value>'
306
+ b '</age>'
307
+ b '<name>buz</name>'
308
+ b '</item>'
309
+ b '</items>'
310
310
)
311
311
312
312
0 commit comments