From: Antoine Pitrou <solipsis@pitrou.net>
Date: Tue, 16 Dec 2008 15:23:10 +0000 (+0000)
Subject: Merged revisions 67814 via svnmerge from
X-Git-Tag: v3.0.1~232
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=271dcc325f21aad5d0a0493d09374e58d6a8433e;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 67814 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r67814 | antoine.pitrou | 2008-12-16 15:25:45 +0100 (mar., 16 déc. 2008) | 3 lines

  Try to fix #4674: test_normalization failure on some buildbots.
........
---

diff --git a/Lib/test/test_normalization.py b/Lib/test/test_normalization.py
index 58843348bb69..9e85e0a91568 100644
--- a/Lib/test/test_normalization.py
+++ b/Lib/test/test_normalization.py
@@ -9,7 +9,7 @@ TESTDATAFILE = "NormalizationTest.txt"
 TESTDATAURL = "http://www.unicode.org/Public/" + unidata_version + "/ucd/" + TESTDATAFILE
 
 if os.path.exists(TESTDATAFILE):
-    f = open(TESTDATAFILE)
+    f = open(TESTDATAFILE, encoding='utf-8')
     l = f.readline()
     f.close()
     if not unidata_version in l: