summaryrefslogtreecommitdiff
path: root/Lib/os.py
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2010-08-19 17:10:18 +0000
committerVictor Stinner <victor.stinner@haypocalc.com>2010-08-19 17:10:18 +0000
commit38430e2dffa3fd9d1648681f3b705917631bdc9a (patch)
tree29e3b4d324aae125d5468a0eb17253d1e9dc5363 /Lib/os.py
parent9802b39c12712e924bed699812756ce5076b77a3 (diff)
downloadcpython-git-38430e2dffa3fd9d1648681f3b705917631bdc9a.tar.gz
Fix os.get_exec_path() (code and tests) for python -bb
Catch BytesWarning exceptions.
Diffstat (limited to 'Lib/os.py')
-rw-r--r--Lib/os.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/os.py b/Lib/os.py
index 60dc12fcf2..02e8f14a1e 100644
--- a/Lib/os.py
+++ b/Lib/os.py
@@ -387,13 +387,13 @@ def get_exec_path(env=None):
try:
path_list = env.get('PATH')
- except TypeError:
+ except (TypeError, BytesWarning):
path_list = None
if supports_bytes_environ:
try:
path_listb = env[b'PATH']
- except (KeyError, TypeError):
+ except (KeyError, TypeError, BytesWarning):
pass
else:
if path_list is not None: