build: remove explicit PY2/PY3 references.

api/tools/BUILD

@@ -4,7 +4,6 @@ py_binary(
     name = "tap2pcap",
     srcs = ["tap2pcap.py"],
     licenses = ["notice"],  # Apache 2
-    python_version = "PY2",
     visibility = ["//visibility:public"],
     deps = ["//envoy/data/tap/v2alpha:pkg_py_proto"],
 )
@@ -16,7 +15,6 @@ py_test(
         "data/tap2pcap_h2_ipv4.pb_text",
         "data/tap2pcap_h2_ipv4.txt",
     ],
-    python_version = "PY2",
     # Don't run this by default, since we don't want to force local dependency on Wireshark/tshark,
     # will explicitly invoke in CI.
     tags = ["manual"],

api/tools/tap2pcap.py

@@ -20,8 +20,8 @@
 from __future__ import print_function
 
 import datetime
+import io
 import socket
-import StringIO
 import subprocess as sp
 import sys
 import time
@@ -32,14 +32,14 @@
 
 
 def DumpEvent(direction, timestamp, data):
-  dump = StringIO.StringIO()
+  dump = io.StringIO()
   dump.write('%s\n' % direction)
   # Adjust to local timezone
   adjusted_dt = timestamp.ToDatetime() - datetime.timedelta(seconds=time.altzone)
   dump.write('%s\n' % adjusted_dt)
   od = sp.Popen(['od', '-Ax', '-tx1', '-v'], stdout=sp.PIPE, stdin=sp.PIPE, stderr=sp.PIPE)
   packet_dump = od.communicate(data)[0]
-  dump.write(packet_dump)
+  dump.write(packet_dump.decode())
   return dump.getvalue()
 
 
@@ -78,7 +78,7 @@ def Tap2Pcap(tap_path, pcap_path):
       '%d,%d' % (remote_port, local_port), '-', pcap_path
   ]
   text2pcap = sp.Popen(text2pcap_args, stdout=sp.PIPE, stdin=sp.PIPE)
-  text2pcap.communicate('\n'.join(dumps))
+  text2pcap.communicate('\n'.join(dumps).encode())
 
 
 if __name__ == '__main__':

api/tools/tap2pcap_test.py

@@ -18,7 +18,7 @@
 
   tap2pcap.Tap2Pcap(tap_path, pcap_path)
   actual_output = sp.check_output(['tshark', '-r', pcap_path, '-d', 'tcp.port==10000,http2', '-P'])
-  with open(expected_path, 'r') as f:
+  with open(expected_path, 'rb') as f:
     expected_output = f.read()
   if actual_output != expected_output:
     print('Mismatch')

test/integration/BUILD

@@ -91,7 +91,6 @@ py_binary(
     name = "capture_fuzz_gen",
     srcs = ["capture_fuzz_gen.py"],
     licenses = ["notice"],  # Apache 2
-    python_version = "PY3",
     visibility = ["//visibility:public"],
     deps = [
         ":capture_fuzz_proto_py_proto",

tools/BUILD

@@ -30,7 +30,6 @@ py_library(
     srcs = [
         "run_command.py",
     ],
-    srcs_version = "PY3",
     visibility = ["//visibility:public"],
 )
 

tools/protodoc/BUILD

@@ -3,15 +3,13 @@ licenses(["notice"])  # Apache 2
 py_binary(
     name = "generate_empty",
     srcs = ["generate_empty.py"],
-    python_version = "PY3",
     visibility = ["//visibility:public"],
     deps = [":protodoc"],
 )
 
 py_binary(
     name = "protodoc",
     srcs = ["protodoc.py"],
-    python_version = "PY3",
     visibility = ["//visibility:public"],
     deps = [
         "//tools/api_proto_plugin",