From e0db6d2edd7f149d4fc89220b638d8ecffa6f1b9 Mon Sep 17 00:00:00 2001
From: Alex Waygood <Alex.Waygood@Gmail.com>
Date: Sun, 30 Apr 2023 15:02:55 +0100
Subject: [PATCH] `urllib3`: move stubs for `ssl_match_hostname` around
 (#10117)

---
 stubs/urllib3/@tests/stubtest_allowlist.txt               | 2 --
 stubs/urllib3/urllib3/connection.pyi                      | 3 +--
 stubs/urllib3/urllib3/connectionpool.pyi                  | 3 +--
 .../urllib3/packages/ssl_match_hostname/__init__.pyi      | 4 ----
 .../packages/ssl_match_hostname/_implementation.pyi       | 3 ---
 stubs/urllib3/urllib3/util/ssl_match_hostname.pyi         | 8 ++++++++
 6 files changed, 10 insertions(+), 13 deletions(-)
 delete mode 100644 stubs/urllib3/urllib3/packages/ssl_match_hostname/__init__.pyi
 delete mode 100644 stubs/urllib3/urllib3/packages/ssl_match_hostname/_implementation.pyi
 create mode 100644 stubs/urllib3/urllib3/util/ssl_match_hostname.pyi

diff --git a/stubs/urllib3/@tests/stubtest_allowlist.txt b/stubs/urllib3/@tests/stubtest_allowlist.txt
index 943c818d5..0a86c7a63 100644
--- a/stubs/urllib3/@tests/stubtest_allowlist.txt
+++ b/stubs/urllib3/@tests/stubtest_allowlist.txt
@@ -14,8 +14,6 @@ urllib3.connectionpool.HTTPConnectionPool.urlopen
 urllib3.connectionpool.HTTPSConnectionPool.__init__
 urllib3.connectionpool.VerifiedHTTPSConnection.__init__
 urllib3.connectionpool.VerifiedHTTPSConnection.set_cert
-urllib3.packages.ssl_match_hostname
-urllib3.packages.ssl_match_hostname._implementation
 urllib3.poolmanager.PoolManager.connection_from_host
 urllib3.poolmanager.PoolManager.connection_from_url
 urllib3.poolmanager.PoolManager.urlopen
diff --git a/stubs/urllib3/urllib3/connection.pyi b/stubs/urllib3/urllib3/connection.pyi
index 51cac4f0a..0ab662e21 100644
--- a/stubs/urllib3/urllib3/connection.pyi
+++ b/stubs/urllib3/urllib3/connection.pyi
@@ -4,8 +4,7 @@ from http.client import HTTPConnection as _HTTPConnection, HTTPException as HTTP
 from typing import Any
 
 from . import exceptions, util
-from .packages import ssl_match_hostname
-from .util import ssl_
+from .util import ssl_, ssl_match_hostname
 
 class DummyConnection: ...
 
diff --git a/stubs/urllib3/urllib3/connectionpool.pyi b/stubs/urllib3/urllib3/connectionpool.pyi
index ccb43e307..20ca0e61b 100644
--- a/stubs/urllib3/urllib3/connectionpool.pyi
+++ b/stubs/urllib3/urllib3/connectionpool.pyi
@@ -7,8 +7,7 @@ from typing_extensions import Literal, Self, TypeAlias
 
 from . import connection, exceptions, request, response
 from .connection import BaseSSLError as BaseSSLError, ConnectionError as ConnectionError, HTTPException as HTTPException
-from .packages import ssl_match_hostname
-from .util import Url, connection as _connection, queue as urllib3queue, retry, timeout, url
+from .util import Url, connection as _connection, queue as urllib3queue, retry, ssl_match_hostname, timeout, url
 
 ClosedPoolError = exceptions.ClosedPoolError
 ProtocolError = exceptions.ProtocolError
diff --git a/stubs/urllib3/urllib3/packages/ssl_match_hostname/__init__.pyi b/stubs/urllib3/urllib3/packages/ssl_match_hostname/__init__.pyi
deleted file mode 100644
index 1915c0e5d..000000000
--- a/stubs/urllib3/urllib3/packages/ssl_match_hostname/__init__.pyi
+++ /dev/null
@@ -1,4 +0,0 @@
-import ssl
-
-CertificateError = ssl.CertificateError
-match_hostname = ssl.match_hostname
diff --git a/stubs/urllib3/urllib3/packages/ssl_match_hostname/_implementation.pyi b/stubs/urllib3/urllib3/packages/ssl_match_hostname/_implementation.pyi
deleted file mode 100644
index c21998013..000000000
--- a/stubs/urllib3/urllib3/packages/ssl_match_hostname/_implementation.pyi
+++ /dev/null
@@ -1,3 +0,0 @@
-class CertificateError(ValueError): ...
-
-def match_hostname(cert, hostname): ...
diff --git a/stubs/urllib3/urllib3/util/ssl_match_hostname.pyi b/stubs/urllib3/urllib3/util/ssl_match_hostname.pyi
new file mode 100644
index 000000000..d0e606fe2
--- /dev/null
+++ b/stubs/urllib3/urllib3/util/ssl_match_hostname.pyi
@@ -0,0 +1,8 @@
+from ssl import _PeerCertRetDictType
+from typing_extensions import Final
+
+__version__: Final[str]
+
+class CertificateError(ValueError): ...
+
+def match_hostname(cert: _PeerCertRetDictType, hostname: str) -> None: ...