From 234a34a564aa74e6ff6433e6c66ac2ad01401dca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Thu, 30 Aug 2007 20:58:02 +0000 Subject: Explicitly use UTF-8 as the encoding for the normalization file. --- Lib/test/test_normalization.py | 2 +- Lib/test/test_support.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_normalization.py b/Lib/test/test_normalization.py index f07a87d..ae49996 100644 --- a/Lib/test/test_normalization.py +++ b/Lib/test/test_normalization.py @@ -33,7 +33,7 @@ def unistr(data): class NormalizationTest(unittest.TestCase): def test_main(self): part1_data = {} - for line in open_urlresource(TESTDATAURL): + for line in open_urlresource(TESTDATAURL, encoding="utf-8"): if '#' in line: line = line.split('#')[0] line = line.strip() diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py index 99f57e6..637043d 100644 --- a/Lib/test/test_support.py +++ b/Lib/test/test_support.py @@ -244,7 +244,7 @@ def check_syntax_error(testcase, statement): else: testcase.fail('Missing SyntaxError: "%s"' % statement) -def open_urlresource(url): +def open_urlresource(url, *args, **kw): import urllib, urlparse requires('urlfetch') @@ -253,11 +253,11 @@ def open_urlresource(url): for path in [os.path.curdir, os.path.pardir]: fn = os.path.join(path, filename) if os.path.exists(fn): - return open(fn) + return open(fn, *args, **kw) print('\tfetching %s ...' % url, file=get_original_stdout()) fn, _ = urllib.urlretrieve(url, filename) - return open(fn) + return open(fn, *args, **kw) class WarningMessage(object): -- cgit v0.12