From 1fd06f1eca80dcbf3a916133919482a8327f3da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Lapeyre?= Date: Thu, 24 Jan 2019 20:43:13 +0100 Subject: bpo-35717: Fix KeyError exception raised when using enums and compile (GH-11523) https://bugs.python.org/issue17467 --- Lib/enum.py | 2 +- Lib/test/test_enum.py | 9 +++++++++ Misc/ACKS | 1 + .../NEWS.d/next/Library/2019-01-11-17-56-15.bpo-35717.6TDTB_.rst | 2 ++ 4 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 Misc/NEWS.d/next/Library/2019-01-11-17-56-15.bpo-35717.6TDTB_.rst diff --git a/Lib/enum.py b/Lib/enum.py index f7452f0..a958ed8 100644 --- a/Lib/enum.py +++ b/Lib/enum.py @@ -419,7 +419,7 @@ class EnumMeta(type): if module is None: try: module = sys._getframe(2).f_globals['__name__'] - except (AttributeError, ValueError) as exc: + except (AttributeError, ValueError, KeyError) as exc: pass if module is None: _make_class_unpicklable(enum_class) diff --git a/Lib/test/test_enum.py b/Lib/test/test_enum.py index 572e873..99fc850 100644 --- a/Lib/test/test_enum.py +++ b/Lib/test/test_enum.py @@ -1858,6 +1858,15 @@ class TestEnum(unittest.TestCase): REVERT_ALL = "REVERT_ALL" RETRY = "RETRY" + def test_empty_globals(self): + # bpo-35717: sys._getframe(2).f_globals['__name__'] fails with KeyError + # when using compile and exec because f_globals is empty + code = "from enum import Enum; Enum('Animal', 'ANT BEE CAT DOG')" + code = compile(code, "", "exec") + global_ns = {} + local_ls = {} + exec(code, global_ns, local_ls) + class TestOrder(unittest.TestCase): diff --git a/Misc/ACKS b/Misc/ACKS index 81b51f7..c9fa08b 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -906,6 +906,7 @@ Glenn Langford Andrew Langmead Wolfgang Langner Detlef Lannert +Rémi Lapeyre Soren Larsen Amos Latteier Piers Lauder diff --git a/Misc/NEWS.d/next/Library/2019-01-11-17-56-15.bpo-35717.6TDTB_.rst b/Misc/NEWS.d/next/Library/2019-01-11-17-56-15.bpo-35717.6TDTB_.rst new file mode 100644 index 0000000..7cae1d1 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-01-11-17-56-15.bpo-35717.6TDTB_.rst @@ -0,0 +1,2 @@ +Fix KeyError exception raised when using enums and compile. Patch +contributed by Rémi Lapeyre. -- cgit v0.12