Merge pull request #123 from blink1073/fix-shell-windows

Fix shell magic on Windows
Calysto · Jan 14, 2017 · 61bf24f · 61bf24f
2 parents fa07b27 + 5d7ff87
commit 61bf24f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/metakernel/magics/shell_magic.py b/metakernel/magics/shell_magic.py
@@ -33,13 +33,13 @@ def line_shell(self, *args):
 
         """
         # get in sync with the cwd
-        self.eval('cd %s' % os.getcwd())
+        self.eval('cd %s' % os.getcwd().replace(os.path.sep, '/'))
 
         command = " ".join(args)
         self.eval(command, True)
 
         if self.cmd == 'cmd':
-            cwd = self.eval('cd')
+            cwd = self.eval('echo %cd%')
         else:
             cwd = self.eval('pwd')
 

diff --git a/metakernel/replwrap.py b/metakernel/replwrap.py
@@ -157,11 +157,11 @@ def run_command(self, command, timeout=None, stream_handler=None,
         res = []
         self._stream_handler = stream_handler
         self._stdin_handler = stdin_handler
-        self.child.sendline(cmdlines[0])
+        self.sendline(cmdlines[0])
         for line in cmdlines[1:]:
             self._expect_prompt(timeout=timeout)
             res.append(self.child.before)
-            self.child.sendline(line)
+            self.sendline(line)
 
         # Command was fully submitted, now wait for the next prompt
         if self._expect_prompt(timeout=timeout) == 1: