djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tools/gen-cpydiff.py: Don't rename foo to ufoo in diff output.

Browse Source 
Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
This commit is contained in:
Jim Mussared 2021-08-12 15:28:12 +10:00 committed by Damien George
parent c737cde947
commit ee549d725a
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/gen-cpydiff.py
View File

@ -50,7 +50,6 @@ INDEXTEMPLATE = "../docs/differences/index_template.txt"
INDEX = "index.rst" INDEX = "index.rst"
HEADER = ".. This document was generated by tools/gen-cpydiff.py\n\n" HEADER = ".. This document was generated by tools/gen-cpydiff.py\n\n"
UIMPORTLIST = {"struct", "collections", "json"}
CLASSMAP = {"Core": "Core language", "Types": "Builtin types"} CLASSMAP = {"Core": "Core language", "Types": "Builtin types"}
INDEXPRIORITY = ["syntax", "core_language", "builtin_types", "modules"] INDEXPRIORITY = ["syntax", "core_language", "builtin_types", "modules"]
RSTCHARS = ["=", "-", "~", "`", ":"] RSTCHARS = ["=", "-", "~", "`", ":"]
@ -94,21 +93,12 @@ def readfiles():
return files return files
def uimports(code):
"""converts CPython module names into MicroPython equivalents"""
for uimport in UIMPORTLIST:
uimport = bytes(uimport, "utf8")
code = code.replace(uimport, b"u" + uimport)
return code
def run_tests(tests): def run_tests(tests):
"""executes all tests""" """executes all tests"""
results = [] results = []
for test in tests: for test in tests:
with open(TESTPATH + test.name, "rb") as f: with open(TESTPATH + test.name, "rb") as f:
input_cpy = f.read() input_py = f.read()
input_upy = uimports(input_cpy)
process = subprocess.Popen( process = subprocess.Popen(
CPYTHON3, CPYTHON3,
@ -117,7 +107,7 @@ def run_tests(tests):
stdin=subprocess.PIPE, stdin=subprocess.PIPE,
stderr=subprocess.PIPE, stderr=subprocess.PIPE,
) )
output_cpy = [com.decode("utf8") for com in process.communicate(input_cpy)] output_cpy = [com.decode("utf8") for com in process.communicate(input_py)]
process = subprocess.Popen( process = subprocess.Popen(
MICROPYTHON, MICROPYTHON,
@ -126,7 +116,7 @@ def run_tests(tests):
stdin=subprocess.PIPE, stdin=subprocess.PIPE,
stderr=subprocess.PIPE, stderr=subprocess.PIPE,
) )
output_upy = [com.decode("utf8") for com in process.communicate(input_upy)] output_upy = [com.decode("utf8") for com in process.communicate(input_py)]
if output_cpy[0] == output_upy[0] and output_cpy[1] == output_upy[1]: if output_cpy[0] == output_upy[0] and output_cpy[1] == output_upy[1]:
status = "Supported" status = "Supported"