Browse Source

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

https://bugs.python.org/issue17467
pull/11670/head
Rémi Lapeyre 7 years ago
committed by Miss Islington (bot)
parent
commit
1fd06f1eca
  1. 2
      Lib/enum.py
  2. 9
      Lib/test/test_enum.py
  3. 1
      Misc/ACKS
  4. 2
      Misc/NEWS.d/next/Library/2019-01-11-17-56-15.bpo-35717.6TDTB_.rst

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

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

1
Misc/ACKS

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

2
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.
Loading…
Cancel
Save