Merge branch 'unicodesafe-ls'

paykroyd · Nov 17, 2011 · 69a09eb · 69a09eb
2 parents 9e86e6b + 1f32705
commit 69a09eb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/IPython/core/interactiveshell.py b/IPython/core/interactiveshell.py
@@ -2082,8 +2082,10 @@ def system_raw(self, cmd):
             with AvoidUNCPath() as path:
                 if path is not None:
                     cmd = '"pushd %s &&"%s' % (path, cmd)
+                cmd = py3compat.unicode_to_str(cmd)
                 ec = os.system(cmd)
         else:
+            cmd = py3compat.unicode_to_str(cmd)
             ec = os.system(cmd)
 
         # We explicitly do NOT return the subprocess status code, because

diff --git a/IPython/core/tests/test_interactiveshell.py b/IPython/core/tests/test_interactiveshell.py
@@ -220,3 +220,11 @@ def test_1(self):
         """Test safe_execfile with non-ascii path
         """
         _ip.shell.safe_execfile(self.fname, {}, raise_exceptions=True)
+
+
+class TestSystemRaw(unittest.TestCase):
+    def test_1(self):
+        """Test system_raw with non-ascii cmd
+        """
+        cmd = ur'''python -c "'åäö'"   '''
+        _ip.shell.system_raw(cmd)