Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed staticfiles test that was broken on Windows due to the result o…

…f the stdout not being correctly handled as Unicode.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15879 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit bd0daa04f5c886c8eeebac0c48ef6a326cbf689e 1 parent 0ff6bbf
@jezdez jezdez authored
Showing with 4 additions and 3 deletions.
  1. +4 −3 tests/regressiontests/staticfiles_tests/tests.py
View
7 tests/regressiontests/staticfiles_tests/tests.py
@@ -66,10 +66,10 @@ def setUp(self):
# To make sure SVN doesn't hangs itself with the non-ASCII characters
# during checkout, we actually create one file dynamically.
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')
try:
- f.write(u"fişier in the app dir")
+ f.write(u"fi\u015fier in the app dir")
finally:
f.close()
@@ -183,7 +183,8 @@ def _get_file(self, filepath):
call_command('findstatic', filepath, all=False, verbosity='0')
sys.stdout.seek(0)
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:
sys.stdout = _stdout
return contents
Please sign in to comment.
Something went wrong with that request. Please try again.