testing: remove some unused code

Author: bluetech

execnet/gateway.py

@@ -169,19 +169,15 @@ def rinfo_source(channel):
 
 def _find_non_builtin_globals(source, codeobj):
     import ast
-
-    try:
-        import __builtin__
-    except ImportError:
-        import builtins as __builtin__
+    import builtins
 
     vars = dict.fromkeys(codeobj.co_varnames)
     return [
         node.id
         for node in ast.walk(ast.parse(source))
         if isinstance(node, ast.Name)
         and node.id not in vars
-        and node.id not in __builtin__.__dict__
+        and node.id not in builtins.__dict__
     ]
 
 

testing/test_basics.py

@@ -75,8 +75,7 @@ def test_subprocess_interaction(anypython):
 
     def send(line):
         popen.stdin.write(line)
-        if sys.version_info > (3, 0) or sys.platform.startswith("java"):
-            popen.stdin.flush()
+        popen.stdin.flush()
 
     def receive():
         return popen.stdout.readline()
@@ -121,10 +120,7 @@ def test_io_message(anypython, tmpdir, execmodel):
         py.code.Source(
             gateway_base,
             """
-        try:
-            from io import BytesIO
-        except ImportError:
-            from StringIO import StringIO as BytesIO
+        from io import BytesIO
         import tempfile
         temp_out = BytesIO()
         temp_in = BytesIO()

testing/test_channel.py

@@ -4,7 +4,6 @@
 import time
 
 import pytest
-from test_gateway import _find_version
 
 
 needs_early_gc = pytest.mark.skipif("not hasattr(sys, 'getrefcount')")
@@ -211,17 +210,14 @@ def check_channel_callback_stays_active(self, gw, earlyfree=True):
         l = []
         channel = gw.remote_exec(
             source="""
-            try:
-                import thread
-            except ImportError:
-                import _thread as thread
+            import _thread
             import time
             def producer(subchannel):
                 for i in range(5):
                     time.sleep(0.15)
                     subchannel.send(i*100)
             channel2 = channel.receive()
-            thread.start_new_thread(producer, (channel2,))
+            _thread.start_new_thread(producer, (channel2,))
             del channel2
             """
         )

testing/test_gateway.py

@@ -2,8 +2,6 @@
 mostly functional tests of gateways.
 """
 import os
-import socket
-import subprocess
 import sys
 from textwrap import dedent
 
@@ -12,7 +10,6 @@
 import pytest
 from execnet import gateway_base
 from execnet import gateway_io
-from test_serializer import _find_version
 
 TESTTIMEOUT = 10.0  # seconds
 needs_osdup = pytest.mark.skipif("not hasattr(os, 'dup')")

testing/test_rsync.py

@@ -2,7 +2,6 @@
 import py
 import pytest
 from execnet import RSync
-from test_serializer import _find_version
 
 
 @pytest.fixture(scope="module")

testing/test_serializer.py

@@ -1,4 +1,3 @@
-import os
 import subprocess
 import sys
 import tempfile
@@ -10,26 +9,8 @@
 MINOR_VERSIONS = {"3": "543210", "2": "76"}
 
 
-def _find_version(suffix=""):
-    name = "python" + suffix
-    executable = py.path.local.sysfind(name)
-    if executable is None:
-        if sys.platform == "win32" and suffix == "3":
-            for name in ("python31", "python30"):
-                executable = py.path.local(rf"c:\\{name}\python.exe")
-                if executable.check():
-                    return executable
-        for tail in MINOR_VERSIONS.get(suffix, ""):
-            path = py.path.local.sysfind(f"{name}.{tail}")
-            if path:
-                return path
-
-        else:
-            pytest.skip(f"can't find a {name!r} executable")
-    return executable
-
-
-TEMPDIR = _py2_wrapper = _py3_wrapper = None
+TEMPDIR = None
+_py3_wrapper = None
 
 
 def setup_module(mod):
@@ -56,8 +37,8 @@ def dump(self, obj_rep):
 import sys
 sys.path.insert(0, %r)
 import gateway_base as serializer
-if sys.version_info > (3, 0): # Need binary output
-    sys.stdout = sys.stdout.detach()
+# Need binary output
+sys.stdout = sys.stdout.detach()
 sys.stdout.write(serializer.dumps_internal(%s))
 """
             % (pyimportdir, obj_rep)
@@ -83,8 +64,7 @@ def load(self, data, option_args="__class__"):
 import sys
 sys.path.insert(0, %r)
 import gateway_base as serializer
-if sys.version_info > (3, 0):
-    sys.stdin = sys.stdin.detach()
+sys.stdin = sys.stdin.detach()
 loader = serializer.Unserializer(sys.stdin)
 loader.%s
 obj = loader.load()