Merge branch 'feature/UpdateUrllib3' into dev

CHANGES.md

@@ -11,7 +11,7 @@
 * Update Requests library 2.29.0 (87d63de) to 2.31.0 (8812812)
 * Update soupsieve 2.3.2.post1 (792d566) to 2.4.1 (2e66beb)
 * Update Tornado Web Server 6.3.2 (e3aa6c5) to 6.3.3 (e4d6984)
-* Update urllib3 1.26.15 (25cca389) to 2.0.4 (af7c78fa)
+* Update urllib3 1.26.15 (25cca389) to 2.0.5 (d9f85a7)
 * Add thefuzz 0.19.0 (c2cd4f4) as a replacement with fallback to fuzzywuzzy 0.18.0 (2188520)
 * Fix regex that was not using py312 notation
 * Change sort backlog and manual segment search results episode number
@@ -19,6 +19,11 @@
 * Add search of grouped options in shows drop down at view-show
 
 
+[develop changelog]
+
+* Update urllib3 1.26.15 (25cca389) to 2.0.4 (af7c78f)
+
+
 ### 3.29.10 (2023-09-19 12:55:00 UTC)
 
 * Fix Metacritic cards

lib/urllib3/_version.py

@@ -1,4 +1,4 @@
 # This file is protected via CODEOWNERS
 from __future__ import annotations
 
-__version__ = "2.0.4"
+__version__ = "2.0.5"

lib/urllib3/contrib/pyopenssl.py

@@ -54,21 +54,12 @@ except ImportError:
 import logging
 import ssl
 import typing
-import warnings
 from io import BytesIO
 from socket import socket as socket_cls
 from socket import timeout
 
 from .. import util
 
-warnings.warn(
-    "'urllib3.contrib.pyopenssl' module is deprecated and will be removed "
-    "in urllib3 v2.1.0. Read more in this issue: "
-    "https://github.com/urllib3/urllib3/issues/2680",
-    category=DeprecationWarning,
-    stacklevel=2,
-)
-
 if typing.TYPE_CHECKING:
     from OpenSSL.crypto import X509  # type: ignore[import]