From 4662f67e3849d1e3d5127cc5ebc469d1febca57f Mon Sep 17 00:00:00 2001 From: cclauss Date: Sat, 24 Aug 2019 10:58:58 +0200 Subject: tools: fix Python 3 issues in inspector_protocol PR-URL: https://github.com/nodejs/node/pull/29296 Reviewed-By: Jiawen Geng Reviewed-By: Trivikram Kamat --- tools/compress_json.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'tools/compress_json.py') diff --git a/tools/compress_json.py b/tools/compress_json.py index e48a3f2c3c..dfe64063ae 100644 --- a/tools/compress_json.py +++ b/tools/compress_json.py @@ -7,14 +7,16 @@ import zlib try: xrange # Python 2 + PY2 = True except NameError: + PY2 = False xrange = range # Python 3 if __name__ == '__main__': - fp = open(sys.argv[1]) - obj = json.load(fp) - text = json.dumps(obj, separators=(',', ':')) + with open(sys.argv[1]) as fp: + obj = json.load(fp) + text = json.dumps(obj, separators=(',', ':')).encode('utf-8') data = zlib.compress(text, zlib.Z_BEST_COMPRESSION) # To make decompression a little easier, we prepend the compressed data @@ -24,8 +26,8 @@ if __name__ == '__main__': step = 20 slices = (data[i:i+step] for i in xrange(0, len(data), step)) - slices = [','.join(str(ord(c)) for c in s) for s in slices] + slices = [','.join(str(ord(c) if PY2 else c) for c in s) for s in slices] text = ',\n'.join(slices) - fp = open(sys.argv[2], 'w') - fp.write(text) + with open(sys.argv[2], 'w') as fp: + fp.write(text) -- cgit v1.2.3