Fix import of HTTPError (GH-22304) (GH-26047)
Import HTTPError from urllib.error instead of urllib.request.
(cherry picked from commit 5fedf71439187f00c661b16b80d398b74b00390e)
Co-authored-by: Sebastian Rittau <srittau@rittau.biz>
Co-authored-by: Sebastian Rittau <srittau@rittau.biz>
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 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
