Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[mypyc] Fix interaction of Enum caching with _order_ #8120

Merged
merged 3 commits into from
Dec 10, 2019
Merged

[mypyc] Fix interaction of Enum caching with _order_ #8120

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
609256e
[mypyc] Fix interaction of Enum caching with _order_
msullivan Dec 10, 2019
06ee071
fix
msullivan Dec 10, 2019
c3e34b7
Add a comment
msullivan Dec 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion mypyc/genops.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1445,7 +1445,11 @@ def add_non_ext_class_attr(self, non_ext: NonExtClassInfo, lvalue: NameExpr,
self.add_to_non_ext_dict(non_ext, lvalue.name, rvalue, stmt.line)
# We cache enum attributes to speed up enum attribute lookup since they
# are final.
if cdef.info.bases and cdef.info.bases[0].type.fullname == 'enum.Enum':
if (
cdef.info.bases
and cdef.info.bases[0].type.fullname == 'enum.Enum'
and lvalue.name != '_order_'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe add comment about why we skip _order_, since it's a pretty obscure thing (I had to look it up from the docs).

):
attr_to_cache.append(lvalue)

def setup_non_ext_dict(self, cdef: ClassDef, bases: Value) -> Value:
Expand Down
14 changes: 9 additions & 5 deletions mypyc/test-data/run-classes.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ assert o.get(20) == 20
from enum import Enum

class TestEnum(Enum):
_order_ = "a b"
a : int = 1
b : int = 2

Expand All @@ -140,11 +141,14 @@ assert TestEnum.test() == 3
# non-extension classes

[file driver.py]
from native import TestEnum
assert TestEnum.a.name == 'a'
assert TestEnum.a.value == 1
assert TestEnum.b.name == 'b'
assert TestEnum.b.value == 2
import sys
# "_order_" isn't supported in 3.5
if sys.version_info[:2] > (3, 5):
from native import TestEnum
assert TestEnum.a.name == 'a'
assert TestEnum.a.value == 1
assert TestEnum.b.name == 'b'
assert TestEnum.b.value == 2

[case testRunDataclass]
from dataclasses import dataclass, field
Expand Down