summaryrefslogtreecommitdiffstats
path: root/Lib/http
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2013-06-14 00:57:26 (GMT)
committerBrett Cannon <brett@python.org>2013-06-14 00:57:26 (GMT)
commit0a140668faf18bf7f8d2ea15e57da5e2a0625292 (patch)
tree97522129bc600a6eff09899ae7a177b5f3e980b3 /Lib/http
parent9702a17a6ab90d026449dd20631a6f380d007b3d (diff)
downloadcpython-0a140668faf18bf7f8d2ea15e57da5e2a0625292.zip
cpython-0a140668faf18bf7f8d2ea15e57da5e2a0625292.tar.gz
cpython-0a140668faf18bf7f8d2ea15e57da5e2a0625292.tar.bz2
Issue #18200: Update the stdlib (except tests) to use
ModuleNotFoundError.
Diffstat (limited to 'Lib/http')
-rw-r--r--Lib/http/client.py2
-rw-r--r--Lib/http/cookiejar.py2
-rw-r--r--Lib/http/server.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/Lib/http/client.py b/Lib/http/client.py
index 939615b..188f4f6 100644
--- a/Lib/http/client.py
+++ b/Lib/http/client.py
@@ -1156,7 +1156,7 @@ class HTTPConnection:
try:
import ssl
-except ImportError:
+except ModuleNotFoundError:
pass
else:
class HTTPSConnection(HTTPConnection):
diff --git a/Lib/http/cookiejar.py b/Lib/http/cookiejar.py
index be828eb..fd40ee0 100644
--- a/Lib/http/cookiejar.py
+++ b/Lib/http/cookiejar.py
@@ -35,7 +35,7 @@ import time
import urllib.parse, urllib.request
try:
import threading as _threading
-except ImportError:
+except ModuleNotFoundError:
import dummy_threading as _threading
import http.client # only for the default HTTP port
from calendar import timegm
diff --git a/Lib/http/server.py b/Lib/http/server.py
index e47e034..48e3f97 100644
--- a/Lib/http/server.py
+++ b/Lib/http/server.py
@@ -904,7 +904,7 @@ def nobody_uid():
return nobody
try:
import pwd
- except ImportError:
+ except ModuleNotFoundError:
return -1
try:
nobody = pwd.getpwnam('nobody')[2]