[Python-checkins] Add quotes to code to be a string

Tue Jun 9 08:39:10 EDT 2020

https://github.com/python/cpython/commit/4b378acb97a575892c0e372a6bb0c17da1ccdf3e
commit: 4b378acb97a575892c0e372a6bb0c17da1ccdf3e
branch: 3.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2020年06月09日T05:39:01-07:00
summary:
Add quotes to code to be a string
files:
A Misc/NEWS.d/next/Library/2020-06-04-16-25-15.bpo-40807.yYyLWx.rst
M Lib/codeop.py
M Lib/test/test_codeop.py

diff --git a/Lib/codeop.py b/Lib/codeop.py
index 3c37f35eb0250..3c2bb6083561e 100644
--- a/Lib/codeop.py
+++ b/Lib/codeop.py
@@ -57,6 +57,7 @@
 """
 
 import __future__
+import warnings
 
 _features = [getattr(__future__, fname)
 for fname in __future__.all_feature_names]
@@ -83,15 +84,18 @@ def _maybe_compile(compiler, source, filename, symbol):
 except SyntaxError as err:
 pass
 
- try:
- code1 = compiler(source + "\n", filename, symbol)
- except SyntaxError as e:
- err1 = e
-
- try:
- code2 = compiler(source + "\n\n", filename, symbol)
- except SyntaxError as e:
- err2 = e
+ # Suppress warnings after the first compile to avoid duplication.
+ with warnings.catch_warnings():
+ warnings.simplefilter("ignore")
+ try:
+ code1 = compiler(source + "\n", filename, symbol)
+ except SyntaxError as e:
+ err1 = e
+
+ try:
+ code2 = compiler(source + "\n\n", filename, symbol)
+ except SyntaxError as e:
+ err2 = e
 
 try:
 if code:
diff --git a/Lib/test/test_codeop.py b/Lib/test/test_codeop.py
index 4d52d15fa0fb3..8e278b9b2311e 100644
--- a/Lib/test/test_codeop.py
+++ b/Lib/test/test_codeop.py
@@ -294,6 +294,11 @@ def test_filename(self):
 self.assertNotEqual(compile_command("a = 1\n", "abc").co_filename,
 compile("a = 1\n", "def", 'single').co_filename)
 
+ def test_warning(self):
+ # Test that the warning is only returned once.
+ with support.check_warnings((".*invalid", DeprecationWarning)) as w:
+ compile_command("'\e'")
+ self.assertEqual(len(w.warnings), 1)
 
 if __name__ == "__main__":
 unittest.main()
diff --git a/Misc/NEWS.d/next/Library/2020-06-04-16-25-15.bpo-40807.yYyLWx.rst b/Misc/NEWS.d/next/Library/2020-06-04-16-25-15.bpo-40807.yYyLWx.rst
new file mode 100644
index 0000000000000..532b809b77eed
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-06-04-16-25-15.bpo-40807.yYyLWx.rst
@@ -0,0 +1,2 @@
+Stop codeop._maybe_compile, used by code.InteractiveInterpreter (and IDLE).
+from from emitting each warning three times.
