From 4662f67e3849d1e3d5127cc5ebc469d1febca57f Mon Sep 17 00:00:00 2001
From: cclauss <cclauss@me.com>
Date: Sat, 24 Aug 2019 10:58:58 +0200
Subject: [PATCH] tools: fix Python 3 issues in inspector_protocol

PR-URL: https://github.com/nodejs/node/pull/29296
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
---
 tools/compress_json.py                             | 14 ++++++++------
 .../inspector_protocol/convert_protocol_to_json.py | 10 ++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tools/compress_json.py b/tools/compress_json.py
index e48a3f2c3cb7cc..dfe64063aeaead 100644
--- a/tools/compress_json.py
+++ b/tools/compress_json.py
@@ -7,14 +7,16 @@
 
 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 @@
 
   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)
diff --git a/tools/inspector_protocol/convert_protocol_to_json.py b/tools/inspector_protocol/convert_protocol_to_json.py
index f98bebcd5e66c5..835e6387120bcc 100755
--- a/tools/inspector_protocol/convert_protocol_to_json.py
+++ b/tools/inspector_protocol/convert_protocol_to_json.py
@@ -21,14 +21,12 @@ def main(argv):
     parser.add_argument("json_file", help="The .json output file write.")
     args = parser.parse_args(argv)
     file_name = os.path.normpath(args.pdl_file)
-    input_file = open(file_name, "r")
-    pdl_string = input_file.read()
+    with open(file_name, "r") as input_file:
+        pdl_string = input_file.read()
     protocol = pdl.loads(pdl_string, file_name, args.map_binary_to_string)
-    input_file.close()
 
-    output_file = open(os.path.normpath(args.json_file), 'wb')
-    json.dump(protocol, output_file, indent=4, separators=(',', ': '))
-    output_file.close()
+    with open(os.path.normpath(args.json_file), 'w') as output_file:
+        json.dump(protocol, output_file, indent=4, separators=(',', ': '))
 
 
 if __name__ == '__main__':