Merge pull request #134 from cash/func_wrappers

replaces copied functions with internal functions in engine module

chess/engine.py

@@ -240,3 +240,43 @@ def pid(self):
 
     def __repr__(self):
         return "<SpurProcess at {0} (pid={1})>".format(hex(id(self)), self.pid())
+
+
+def _popen_engine(command, engine_cls, setpgrp=False, _popen_lock=threading.Lock(), **kwargs):
+    """
+    Opens a local chess engine process.
+
+    :param engine_cls: Engine class
+    :param setpgrp: Open the engine process in a new process group. This will
+        stop signals (such as keyboards interrupts) from propagating from the
+        parent process. Defaults to ``False``.
+    """
+    engine = engine_cls()
+
+    popen_args = {}
+    if setpgrp:
+        try:
+            # Windows
+            popen_args["creationflags"] = subprocess.CREATE_NEW_PROCESS_GROUP
+        except AttributeError:
+            # Unix
+            popen_args["preexec_fn"] = os.setpgrp
+    popen_args.update(kwargs)
+
+    # Work around possible race condition in Python 2 subprocess module,
+    # that can occur when concurrently opening processes.
+    with _popen_lock:
+        PopenProcess(engine, command, **popen_args)
+
+    return engine
+
+
+def _spur_spawn_engine(shell, command, engine_cls):
+    """
+    Spawns a remote engine using a `Spur`_ shell.
+
+    .. _Spur: https://pypi.python.org/pypi/spur
+    """
+    engine = engine_cls()
+    SpurProcess(engine, shell, command)
+    return engine

chess/uci.py

@@ -23,6 +23,8 @@
 from chess.engine import SpurProcess
 from chess.engine import LOGGER
 from chess.engine import FUTURE_POLL_TIMEOUT
+from chess.engine import _popen_engine
+from chess.engine import _spur_spawn_engine
 
 import chess
 
@@ -1179,24 +1181,7 @@ def popen_engine(command, engine_cls=Engine, setpgrp=False, _popen_lock=threadin
         stop signals (such as keyboards interrupts) from propagating from the
         parent process. Defaults to ``False``.
     """
-    engine = engine_cls()
-
-    popen_args = {}
-    if setpgrp:
-        try:
-            # Windows
-            popen_args["creationflags"] = subprocess.CREATE_NEW_PROCESS_GROUP
-        except AttributeError:
-            # Unix
-            popen_args["preexec_fn"] = os.setpgrp
-    popen_args.update(kwargs)
-
-    # Work around possible race condition in Python 2 subprocess module,
-    # that can occur when concurrently opening processes.
-    with _popen_lock:
-        PopenProcess(engine, command, **popen_args)
-
-    return engine
+    return _popen_engine(command, engine_cls, setpgrp, _popen_lock, **kwargs)
 
 
 def spur_spawn_engine(shell, command, engine_cls=Engine):
@@ -1210,6 +1195,4 @@ def spur_spawn_engine(shell, command, engine_cls=Engine):
 
     .. _Spur: https://pypi.python.org/pypi/spur
     """
-    engine = engine_cls()
-    SpurProcess(engine, shell, command)
-    return engine
+    return _spur_spawn_engine(shell, command, engine_cls)

chess/xboard.py

@@ -23,6 +23,8 @@
 from chess.engine import SpurProcess
 from chess.engine import LOGGER
 from chess.engine import FUTURE_POLL_TIMEOUT
+from chess.engine import _popen_engine
+from chess.engine import _spur_spawn_engine
 
 import chess
 
@@ -725,7 +727,7 @@ def is_alive(self):
         return self.process.is_alive()
 
 
-def popen_engine(command, engine_cls=Engine, setpgrp=False, _popen_lock=threading.Lock()):
+def popen_engine(command, engine_cls=Engine, setpgrp=False, _popen_lock=threading.Lock(), **kwargs):
     """
     Opens a local chess engine process.
 
@@ -739,23 +741,7 @@ def popen_engine(command, engine_cls=Engine, setpgrp=False, _popen_lock=threadin
         stop signals (such as keyboards interrupts) from propagating from the
         parent process. Defaults to ``False``.
     """
-    engine = engine_cls()
-
-    kwargs = {}
-    if setpgrp:
-        try:
-            # Windows
-            kwargs["creationflags"] = subprocess.CREATE_NEW_PROCESS_GROUP
-        except AttributeError:
-            # Unix
-            kwargs["preexec_fn"] = os.setpgrp
-
-    # Work around possible race condition in Python 2 subprocess module,
-    # that can occur when concurrently opening processes.
-    with _popen_lock:
-        PopenProcess(engine, command, **kwargs)
-
-    return engine
+    return _popen_engine(command, engine_cls, setpgrp, _popen_lock, **kwargs)
 
 
 def spur_spawn_engine(shell, command, engine_cls=Engine):
@@ -769,6 +755,4 @@ def spur_spawn_engine(shell, command, engine_cls=Engine):
 
     .. _Spur: https://pypi.python.org/pypi/spur
     """
-    engine = engine_cls()
-    SpurProcess(engine, shell, command)
-    return engine
+    return _spur_spawn_engine(shell, command, engine_cls)