summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-02-20 03:19:25 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-02-20 03:19:25 (GMT)
commit4b068190aa4de5ade2d755ee25dbf3d21452616a (patch)
treec8d3f36e693dbc7c407e5ded530d7ba848b69788 /Lib
parent2fc224f0904f398be79e40616cc8a4570375c786 (diff)
downloadcpython-4b068190aa4de5ade2d755ee25dbf3d21452616a.zip
cpython-4b068190aa4de5ade2d755ee25dbf3d21452616a.tar.gz
cpython-4b068190aa4de5ade2d755ee25dbf3d21452616a.tar.bz2
fix None errno #5312
Diffstat (limited to 'Lib')
-rw-r--r--Lib/os.py4
-rw-r--r--Lib/test/test_subprocess.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/Lib/os.py b/Lib/os.py
index 5a020d3..65f88ba 100644
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -372,8 +372,8 @@ def _execvpe(file, args, env=None):
saved_exc = e
saved_tb = tb
if saved_exc:
- raise error(saved_exc).with_traceback(saved_tb)
- raise error(last_exc).with_traceback(tb)
+ raise saved_exc.with_traceback(saved_tb)
+ raise last_exc.with_traceback(tb)
# Change environ to automatically call putenv(), unsetenv if they exist.
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 5d3e040..2070495 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -535,7 +535,7 @@ class ProcessTestCase(unittest.TestCase):
# Windows raises IOError
except (IOError, OSError) as err:
if err.errno != 2: # ignore "no such file"
- pass # XXX see #5312
+ raise
#
# POSIX tests