Typing prep

execnet/gateway_io.py

@@ -17,8 +17,9 @@
 
 class Popen2IOMaster(Popen2IO):
  def __init__(self, args, execmodel):
- self.popen = p = execmodel.PopenPiped(args)
- Popen2IO.__init__(self, p.stdin, p.stdout, execmodel=execmodel)
+ PIPE = execmodel.subprocess.PIPE
+ self.popen = p = execmodel.subprocess.Popen(args, stdout=PIPE, stdin=PIPE)
+ super().__init__(p.stdin, p.stdout, execmodel=execmodel)
 
  def wait(self):
  try:

execnet/gateway_socket.py

@@ -2,11 +2,6 @@
 
 from execnet.gateway_bootstrap import HostNotFound
 
-try:
- bytes
-except NameError:
- bytes = str
-
 
 class SocketIO:
  def __init__(self, sock, execmodel):

execnet/multi.py

@@ -11,8 +11,8 @@
 from . import gateway_bootstrap
 from . import gateway_io
 from .gateway_base import get_execmodel
-from .gateway_base import reraise
 from .gateway_base import trace
+from .gateway_base import WorkerPool
 from .xspec import XSpec
 
 NO_ENDMARKER_WANTED = object()
@@ -174,7 +174,7 @@ def allocate_id(self, spec):
  def _register(self, gateway):
  assert not hasattr(gateway, "_group")
  assert gateway.id
- assert id not in self
+ assert gateway.id not in self
  self._gateways.append(gateway)
  gateway._group = self
 
@@ -289,11 +289,11 @@ def waitclose(self):
  if first is None:
  first = sys.exc_info()
  if first:
- reraise(*first)
+ raise first[1].with_traceback(first[2])
 
 
 def safe_terminate(execmodel, timeout, list_of_paired_functions):
- workerpool = execmodel.WorkerPool()
+ workerpool = WorkerPool(execmodel)
 
  def termkill(termfunc, killfunc):
  termreply = workerpool.spawn(termfunc)

execnet/script/shell.py

@@ -32,7 +32,7 @@ def clientside():
  line = sock.recv(4096)
  sys.stdout.write(line)
  sys.stdout.flush()
- except:
+ except BaseException:
  import traceback
 
  print(traceback.print_exc())
@@ -43,7 +43,7 @@ def clientside():
 class promptagent(Thread):
  def __init__(self, clientsock):
  print("server side starting")
- Thread.__init__(self)
+ super.__init__()
  self.clientsock = clientsock
 
  def run(self):
@@ -66,7 +66,7 @@ def run(self):
  try:
  try:
  exec(compile(line + "\n", "<remote pyin>", "single"))
- except:
+ except BaseException:
  print_exc()
  finally:
  sys.stdout = oldout

execnet/script/socketserver.py

@@ -94,7 +94,7 @@ def startserver(serversock, loop=False):
  exec_from_one_connection(serversock)
  except (KeyboardInterrupt, SystemExit):
  raise
- except:
+ except BaseException:
  if debug:
  import traceback
 

execnet/script/socketserverservice.py

@@ -36,7 +36,7 @@ def __init__(self, args):
  win32evtlogutil.AddSourceToRegistry(
  self._svc_display_name_, servicemanager.__file__, "Application"
  )
- win32serviceutil.ServiceFramework.__init__(self, args)
+ super.__init__(args)
  self.hWaitStop = win32event.CreateEvent(None, 0, 0, None)
  self.WAIT_TIME = 1000 # in milliseconds
 

execnet/script/xx.py

@@ -7,6 +7,6 @@
 
 try:
  hostport = sys.argv[1]
-except:
+except BaseException:
  hostport = ":8888"
 gw = register.ServerGateway(hostport)