(original) (raw)

changeset: 103776:7bec326972f5 branch: 3.5 parent: 103758:36550e4f9b4c user: Berker Peksag berker.peksag@gmail.com date: Wed Sep 14 08:09:48 2016 +0300 files: Lib/test/test_zipimport.py Misc/NEWS Modules/zipimport.c description: Issue #28131: Fix a regression in zipimport's compile_source() zipimport should use the same optimization level as the interpreter. diff -r 36550e4f9b4c -r 7bec326972f5 Lib/test/test_zipimport.py --- a/Lib/test/test_zipimport.py Tue Sep 13 12:21:47 2016 +0000 +++ b/Lib/test/test_zipimport.py Wed Sep 14 08:09:48 2016 +0300 @@ -513,6 +513,19 @@ "some.data": (NOW, "some data")} self.doTest(pyc_ext, files, TESTMOD) + def testDefaultOptimizationLevel(self): + # zipimport should use the default optimization level (#28131) + src = """if 1: # indent hack + def test(val): + assert(val) + return val\n""" + files = {TESTMOD + '.py': (NOW, src)} + self.makeZip(files) + sys.path.insert(0, TEMP_ZIP) + mod = importlib.import_module(TESTMOD) + self.assertEqual(mod.test(1), 1) + self.assertRaises(AssertionError, mod.test, False) + def testImport_WithStuff(self): # try importing from a zipfile which contains additional # stuff at the beginning of the file diff -r 36550e4f9b4c -r 7bec326972f5 Misc/NEWS --- a/Misc/NEWS Tue Sep 13 12:21:47 2016 +0000 +++ b/Misc/NEWS Wed Sep 14 08:09:48 2016 +0300 @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Issue #28131: Fix a regression in zipimport's compile_source(). zipimport + should use the same optimization level as the interpreter. + - Issue #25221: Fix corrupted result from PyLong_FromLong(0) when Python is compiled with NSMALLPOSINTS = 0. diff -r 36550e4f9b4c -r 7bec326972f5 Modules/zipimport.c --- a/Modules/zipimport.c Tue Sep 13 12:21:47 2016 +0000 +++ b/Modules/zipimport.c Wed Sep 14 08:09:48 2016 +0300 @@ -1370,7 +1370,7 @@ } code = Py_CompileStringObject(PyBytes_AsString(fixed_source), - pathname, Py_file_input, NULL, 1); + pathname, Py_file_input, NULL, -1); Py_DECREF(fixed_source); return code; /berker.peksag@gmail.com