p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed staticfiles test that was broken on Windows due to the result of the stdout not being correctly handled as Unicode. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel 2011-03-18 18:47:14 +00:00
parent 0ff6bbf1db
commit bd0daa04f5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/regressiontests/staticfiles_tests/tests.py
View File

@ -66,10 +66,10 @@ class StaticFilesTestCase(TestCase):
# To make sure SVN doesn't hangs itself with the non-ASCII characters # To make sure SVN doesn't hangs itself with the non-ASCII characters
# during checkout, we actually create one file dynamically. # during checkout, we actually create one file dynamically.
self._nonascii_filepath = os.path.join( self._nonascii_filepath = os.path.join(
TEST_ROOT, 'apps', 'test', 'static', 'test', u'fişier.txt') TEST_ROOT, 'apps', 'test', 'static', 'test', u'fi\u015fier.txt')
f = codecs.open(self._nonascii_filepath, 'w', 'utf-8') f = codecs.open(self._nonascii_filepath, 'w', 'utf-8')
try: try:
f.write(u"fişier in the app dir") f.write(u"fi\u015fier in the app dir")
finally: finally:
f.close() f.close()
@ -183,7 +183,8 @@ class TestFindStatic(BuildStaticTestCase, TestDefaults):
call_command('findstatic', filepath, all=False, verbosity='0') call_command('findstatic', filepath, all=False, verbosity='0')
sys.stdout.seek(0) sys.stdout.seek(0)
lines = [l.strip() for l in sys.stdout.readlines()] lines = [l.strip() for l in sys.stdout.readlines()]
contents = codecs.open(lines[1].strip(), "r", "utf-8").read() contents = codecs.open(
smart_unicode(lines[1].strip()), "r", "utf-8").read()
finally: finally:
sys.stdout = _stdout sys.stdout = _stdout
return contents return contents