cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix crashes in prepare_report.py caused by using str where bytes is expected and vice-versa

Browse Source 
1) `Popen.communicate()` expects `bytes` (a raw, binary string) if `stdout`/`stderr` are open in binary mode but is given output from `json.loads()` which is str (an abstract unicode string). Encoding the `str` object into `bytes` using UTF-8 encoding fixes that.
2) `REPORT_FILE` gets opened in binary mode which means that functions like `write()` expect `bytes`. We're giving them `str` which results in an error. Changed mode to text solves the problem.
This commit is contained in:
cameel 2020-01-20 11:20:18 +01:00
parent 1b19524036
commit d48883ca17
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/bytecodecompare/prepare_report.py
View File

@ -6,7 +6,7 @@ import subprocess
import json
SOLC_BIN = sys.argv[1]
REPORT_FILE = open("report.txt", "wb")
REPORT_FILE = open("report.txt", "w")
for optimize in [False, True]:
for f in sorted(glob.glob("*.sol")):
@ -26,9 +26,9 @@ for optimize in [False, True]:
if optimize:
args += ['--optimize']
proc = subprocess.Popen(args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
(out, err) = proc.communicate(json.dumps(input_json))
(out, err) = proc.communicate(json.dumps(input_json).encode('utf-8'))
try:
result = json.loads(out.strip())
result = json.loads(out.decode('utf-8').strip())
for filename in sorted(result['contracts'].keys()):
for contractName in sorted(result['contracts'][filename].keys()):
contractData = result['contracts'][filename][contractName]