summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Rittau <srittau@rittau.biz>2021-05-11 23:01:33 (GMT)
committerGitHub <noreply@github.com>2021-05-11 23:01:33 (GMT)
commit5fedf71439187f00c661b16b80d398b74b00390e (patch)
tree1e417bbe95eb381c33461cc390100573cb2b1711
parent23ae2c3bacc167f7bbfea1846bbbc9dde63a1bfd (diff)
downloadcpython-5fedf71439187f00c661b16b80d398b74b00390e.zip
cpython-5fedf71439187f00c661b16b80d398b74b00390e.tar.gz
cpython-5fedf71439187f00c661b16b80d398b74b00390e.tar.bz2
Fix import of HTTPError (GH-22304)
Import HTTPError from urllib.error instead of urllib.request.
-rw-r--r--Lib/distutils/command/upload.py3
-rw-r--r--Lib/distutils/tests/test_upload.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py
index 95e9fda..e0ecb65 100644
--- a/Lib/distutils/command/upload.py
+++ b/Lib/distutils/command/upload.py
@@ -9,7 +9,8 @@ import os
import io
import hashlib
from base64 import standard_b64encode
-from urllib.request import urlopen, Request, HTTPError
+from urllib.error import HTTPError
+from urllib.request import urlopen, Request
from urllib.parse import urlparse
from distutils.errors import DistutilsError, DistutilsOptionError
from distutils.core import PyPIRCCommand
diff --git a/Lib/distutils/tests/test_upload.py b/Lib/distutils/tests/test_upload.py
index bca5516..74f0bc0 100644
--- a/Lib/distutils/tests/test_upload.py
+++ b/Lib/distutils/tests/test_upload.py
@@ -2,7 +2,7 @@
import os
import unittest
import unittest.mock as mock
-from urllib.request import HTTPError
+from urllib.error import HTTPError
from test.support import run_unittest