try reverting windows-specific deadlock fix (to test whether new thing works on windows)

This commit is contained in:
adam j hartz 2016-05-12 21:53:56 -04:00
parent 0ffc7ed518
commit d661c5e7ec

View file

@ -42,16 +42,13 @@ if ON_WINDOWS:
return return
while obj.returncode is None: while obj.returncode is None:
try: try:
outs, errs = obj.communicate(timeout=0.01) obj.wait(0.01)
except TimeoutExpired: except TimeoutExpired:
pass pass
except KeyboardInterrupt: except KeyboardInterrupt:
obj.kill() obj.kill()
outs, errs = obj.communicate()
if obj.poll() is not None: if obj.poll() is not None:
builtins.__xonsh_active_job__ = None builtins.__xonsh_active_job__ = None
obj.stdout = BytesIO(outs)
obj.stderr = BytesIO(errs)
else: else:
def _continue(obj): def _continue(obj):