diff options
| -rw-r--r-- | Lib/test/test_imp.py | 16 | ||||
| -rw-r--r-- | Misc/NEWS | 4 | ||||
| -rw-r--r-- | Parser/tokenizer.c | 8 |
3 files changed, 26 insertions, 2 deletions
diff --git a/Lib/test/test_imp.py b/Lib/test/test_imp.py index e2b9e9a..3a3059e 100644 --- a/Lib/test/test_imp.py +++ b/Lib/test/test_imp.py @@ -1,4 +1,5 @@ import imp +import sys import unittest from test import support @@ -59,6 +60,21 @@ class ImportTests(unittest.TestCase): '"""Tokenization help for Python programs.\n') fp.close() + def test_issue3594(self): + temp_mod_name = 'test_imp_helper' + sys.path.insert(0, '.') + try: + with open(temp_mod_name + '.py', 'w') as file: + file.write("# coding: cp1252\nu = 'test.test_imp'\n") + file, filename, info = imp.find_module(temp_mod_name) + file.close() + self.assertEquals(file.encoding, 'cp1252') + finally: + del sys.path[0] + support.unlink(temp_mod_name + '.py') + support.unlink(temp_mod_name + '.pyc') + support.unlink(temp_mod_name + '.pyo') + def test_reload(self): import marshal imp.reload(marshal) @@ -12,6 +12,10 @@ What's New in Python 3.0 release candidate 1 Core and Builtins ----------------- +- Issue 3594: Fix Parser/tokenizer.c:fp_setreadl() to open the file being + tokenized by either a file path or file pointer for the benefit of + PyTokenizer_FindEncoding(). + - Issue #3696: Error parsing arguments on OpenBSD <= 4.4 and Cygwin. On these systems, the mbstowcs() function is slightly buggy and must be replaced with strlen() for the purpose of counting of number of wide diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c index e2da3e5..e4cf8e4 100644 --- a/Parser/tokenizer.c +++ b/Parser/tokenizer.c @@ -448,8 +448,12 @@ fp_setreadl(struct tok_state *tok, const char* enc) if (io == NULL) goto cleanup; - stream = PyObject_CallMethod(io, "open", "ssis", - tok->filename, "r", -1, enc); + if (tok->filename) + stream = PyObject_CallMethod(io, "open", "ssis", + tok->filename, "r", -1, enc); + else + stream = PyObject_CallMethod(io, "open", "isis", + fileno(tok->fp), "r", -1, enc); if (stream == NULL) goto cleanup; |