Merge pull request Calysto#156 from Calysto/replwrap-fix

Replwrap fixes

Author: blink1073

metakernel/pexpect.py

@@ -24,8 +24,7 @@ def spawn(command, args=[], timeout=30, maxread=2000,
     '''
     codec_errors = kwargs.get('codec_errors', kwargs.get('errors', 'strict'))
     if pty is None:
-        if not isinstance(command, (list, tuple)):
-            command = shlex.split(command, posix=False)
+        command = shlex.split(command, posix=os.name == 'posix')
         command += args
         child = PopenSpawn(command, timeout=timeout, maxread=maxread,
                            searchwindowsize=searchwindowsize,

metakernel/replwrap.py

@@ -12,6 +12,7 @@
 if PY3:
     def u(s):
         return s
+    basestring = str
 else:
     def u(s):
         if isinstance(s, str):
@@ -33,7 +34,6 @@ class REPLWrapper(object):
     :param cmd_or_spawn: This can either be an instance of
     :class:`pexpect.spawn` in which a REPL has already been started,
     or a str command to start a new REPL process.
-    :param str args: The arguments to pass to the command
     :param str prompt_regex:  Regular expression representing process prompt, eg ">>>" in Python.
     :param str continuation_prompt_regex: Regular expression repesenting process continuation prompt, e.g. "..." in Python.
     :param str prompt_change_cmd: Optional kernel command that sets continuation-of-line-prompts, eg PS1 and PS2, such as "..." in Python.
@@ -54,15 +54,14 @@ class REPLWrapper(object):
     """
 
     def __init__(self, cmd_or_spawn, prompt_regex, prompt_change_cmd,
-                 args=[],
                  new_prompt_regex=PEXPECT_PROMPT,
                  continuation_prompt_regex=PEXPECT_CONTINUATION_PROMPT,
                  stdin_prompt_regex=PEXPECT_STDIN_PROMPT,
                  extra_init_cmd=None,
                  prompt_emit_cmd=None,
                  echo=False):
-        if isinstance(cmd_or_spawn, (str, list, tuple)):
-            self.child = pexpect.spawnu(cmd_or_spawn, args=args, echo=echo,
+        if isinstance(cmd_or_spawn, basestring):
+            self.child = pexpect.spawnu(cmd_or_spawn, echo=echo,
                                         codec_errors="ignore",
                                         encoding="utf-8")
         else:
@@ -96,6 +95,7 @@ def __init__(self, cmd_or_spawn, prompt_regex, prompt_change_cmd,
 
         self._stream_handler = None
         self._stdin_handler = None
+
         self._expect_prompt()
 
         if extra_init_cmd is not None:
@@ -159,10 +159,12 @@ def run_command(self, command, timeout=None, stream_handler=None,
         res = []
         self._stream_handler = stream_handler
         self._stdin_handler = stdin_handler
+
         self.sendline(cmdlines[0])
         for line in cmdlines[1:]:
-            self._expect_prompt(timeout=timeout)
-            res.append(self.child.before)
+            if not self.prompt_emit_cmd:
+                self._expect_prompt(timeout=timeout)
+                res.append(self.child.before)
             self.sendline(line)
 
         # Command was fully submitted, now wait for the next prompt