From 0a0748a7d68ae01f99de2bfbbdd8441c1a0ecad2 Mon Sep 17 00:00:00 2001 From: Karen Tracey Date: Wed, 3 Mar 2010 13:40:52 +0000 Subject: [PATCH] Fixed the files test to not care whether the names are reported as bytestrings or unicode. Refs #12898. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12676 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/modeltests/files/models.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/modeltests/files/models.py b/tests/modeltests/files/models.py index 271fd8de9e..67c27b54b5 100644 --- a/tests/modeltests/files/models.py +++ b/tests/modeltests/files/models.py @@ -67,14 +67,14 @@ ValueError: The 'normal' attribute has no file associated with it. >>> dirs [] >>> files.sort() ->>> files -['default.txt', 'django_test.txt'] +>>> files == ['default.txt', 'django_test.txt'] +True >>> obj1.save() >>> dirs, files = temp_storage.listdir('tests') >>> files.sort() ->>> files -['assignment.txt', 'default.txt', 'django_test.txt'] +>>> files == ['assignment.txt', 'default.txt', 'django_test.txt'] +True # Files can be read in a little at a time, if necessary. @@ -113,13 +113,13 @@ ValueError: The 'normal' attribute has no file associated with it. # Multiple files with the same name get _N appended to them. ->>> objs = [Storage() for i in range(3)] ->>> for o in objs: -... o.normal.save('multiple_files.txt', ContentFile('Same Content')) +>>> objs = [Storage() for i in range(3)] +>>> for o in objs: +... o.normal.save('multiple_files.txt', ContentFile('Same Content')) >>> [o.normal for o in objs] [, , ] ->>> for o in objs: -... o.delete() +>>> for o in objs: +... o.delete() # Default values allow an object to access a single file.