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

https://bugs.python.org/issue17467
This commit is contained in:
Rémi Lapeyre 2019-01-24 20:43:13 +01:00 committed by Miss Islington (bot)
parent 5c8f537669
commit 1fd06f1eca
4 changed files with 13 additions and 1 deletions

View File

@ -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)

View File

@ -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):

View File

@ -906,6 +906,7 @@ Glenn Langford
Andrew Langmead
Wolfgang Langner
Detlef Lannert
Rémi Lapeyre
Soren Larsen
Amos Latteier
Piers Lauder

View File

@ -0,0 +1,2 @@
Fix KeyError exception raised when using enums and compile. Patch
contributed by Rémi Lapeyre.