From: Berker Peksag <berker.peksag@gmail.com>
Date: Wed, 14 Sep 2016 05:09:48 +0000 (+0300)
Subject: Issue #28131: Fix a regression in zipimport's compile_source()
X-Git-Tag: v3.6.0b2~219^2~1^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4aa74c429cabef6aaf91b2b0d4c2163778b1249d;p=thirdparty%2FPython%2Fcpython.git

Issue #28131: Fix a regression in zipimport's compile_source()

zipimport should use the same optimization level as the interpreter.
---

diff --git a/Lib/test/test_zipimport.py b/Lib/test/test_zipimport.py
index 2bb7230c26af..d5b3b22ae1d7 100644
--- a/Lib/test/test_zipimport.py
+++ b/Lib/test/test_zipimport.py
@@ -513,6 +513,19 @@ class UncompressedZipImportTestCase(ImportHooksBaseTestCase):
                  "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 --git a/Misc/NEWS b/Misc/NEWS
index 246ac72e9f9e..e61e98b9c7ed 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ Release date: TBA
 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 --git a/Modules/zipimport.c b/Modules/zipimport.c
index 92a82e6df269..7473a8fe8778 100644
--- a/Modules/zipimport.c
+++ b/Modules/zipimport.c
@@ -1370,7 +1370,7 @@ compile_source(PyObject *pathname, PyObject *source)
     }
 
     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;