From: Rémi Lapeyre <remi.lapeyre@henki.fr>
Date: Thu, 24 Jan 2019 19:43:13 +0000 (+0100)
Subject: bpo-35717: Fix KeyError exception raised when using enums and compile (GH-11523)
X-Git-Tag: v3.8.0a1~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1fd06f1eca80dcbf3a916133919482a8327f3da4;p=python

bpo-35717: Fix KeyError exception raised when using enums and compile (GH-11523)



https://bugs.python.org/issue17467
---

diff --git a/Lib/enum.py b/Lib/enum.py
index f7452f0cc0..a958ed8748 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 572e8733f4..99fc85074b 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, "<string>", "exec")
+        global_ns = {}
+        local_ls = {}
+        exec(code, global_ns, local_ls)
+
 
 class TestOrder(unittest.TestCase):
 
diff --git a/Misc/ACKS b/Misc/ACKS
index 81b51f7519..c9fa08bd61 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 0000000000..7cae1d1c82
--- /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.