diff --git a/IPython/frontend/_process/killableprocess.py b/IPython/frontend/_process/killableprocess.py index 1ef8f2e..86fbc6f 100644 --- a/IPython/frontend/_process/killableprocess.py +++ b/IPython/frontend/_process/killableprocess.py @@ -71,16 +71,11 @@ mswindows = (sys.platform == "win32") skip = False if mswindows: - # Some versions of windows, in some strange corner cases, give - # errror with the killableprocess. - if sys.version_info[:2] > (2, 4): - import platform - if platform.uname()[3] == '' or platform.uname()[3] > '6.0.6000': - skip = True - else: - import winprocess - else: + import platform + if platform.uname()[3] == '' or platform.uname()[3] > '6.0.6000': skip = True + else: + import winprocess else: import signal diff --git a/IPython/frontend/_process/pipedprocess.py b/IPython/frontend/_process/pipedprocess.py index 2cda128..1b145af 100644 --- a/IPython/frontend/_process/pipedprocess.py +++ b/IPython/frontend/_process/pipedprocess.py @@ -50,7 +50,7 @@ class PipedProcess(Thread): """ env = os.environ env['TERM'] = 'xterm' - process = Popen((self.command_string + ' 2>&1', ), shell=True, + process = Popen(self.command_string + ' 2>&1', shell=True, env=env, universal_newlines=True, stdout=PIPE, stdin=PIPE, ) diff --git a/IPython/frontend/tests/test_process.py b/IPython/frontend/tests/test_process.py index 8f6784f..dc8db5f 100644 --- a/IPython/frontend/tests/test_process.py +++ b/IPython/frontend/tests/test_process.py @@ -20,8 +20,6 @@ from IPython.frontend._process import PipedProcess from IPython.testing import decorators as testdec -# FIXME -@testdec.skip("This doesn't work under Windows") def test_capture_out(): """ A simple test to see if we can execute a process and get the output. """ @@ -33,8 +31,6 @@ def test_capture_out(): assert result == '1' -# FIXME -@testdec.skip("This doesn't work under Windows") def test_io(): """ Checks that we can send characters on stdin to the process. """ @@ -51,8 +47,6 @@ def test_io(): assert result == test_string -# FIXME -@testdec.skip("This doesn't work under Windows") def test_kill(): """ Check that we can kill a process, and its subprocess. """