summaryrefslogtreecommitdiff
path: root/py/makeqstrdata.py
diff options
context:
space:
mode:
authorScott Shawcroft <scott@tannewt.org>2018-07-30 12:33:44 -0700
committerGitHub <noreply@github.com>2018-07-30 12:33:44 -0700
commita6d94b68453b8535398ff0b61cd6c4a0c7f77f8b (patch)
tree8defd6392975b8145dc11f0cce9c39a4e440b32a /py/makeqstrdata.py
parent433a29bb70d51abb84c77a911ced43c6ff14706e (diff)
parentb1006170f1dcfa3a9499ef31c19c8f20736b136a (diff)
Merge pull request #1068 from dhalbert/micropython-25ae98f-merge
Micropython 25ae98f merge
Diffstat (limited to 'py/makeqstrdata.py')
-rw-r--r--py/makeqstrdata.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/py/makeqstrdata.py b/py/makeqstrdata.py
index 38fde1a9c..3c0a60909 100644
--- a/py/makeqstrdata.py
+++ b/py/makeqstrdata.py
@@ -114,6 +114,9 @@ def parse_input_headers(infiles):
if ident == "":
# Sort empty qstr above all still
order = -200000
+ elif ident == "__dir__":
+ # Put __dir__ after empty qstr for builtin dir() to work
+ order = -190000
elif ident.startswith("__"):
order -= 100000
qstrs[ident] = (order, ident, qstr)