Fix import of HTTPError (GH-22304)

Import HTTPError from urllib.error instead of urllib.request.

diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py
index 95e9fda186fc8f5b884215f7bea251b515e72cae..e0ecb655b93fafaeaad82062591e055219921f7d 100644 (file)
--- 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 bca5516d2f74f68f26b4592e12fc8082c099f7ab..74f0bc0a67131b0678c894daece1bdbc765df992 100644 (file)
--- 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