monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-12-18 08:43:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/UpdateUrllib3' into dev

Browse source
This commit is contained in:
JackDandy 2023-09-20 17:53:13 +01:00
commit fff851efdc
3 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CHANGES.md
View file

@ -11,7 +11,7 @@
* Update Requests library 2.29.0 (87d63de) to 2.31.0 (8812812) * 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 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 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) * 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 * Fix regex that was not using py312 notation
* Change sort backlog and manual segment search results episode number * 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 * 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) ### 3.29.10 (2023-09-19 12:55:00 UTC)
* Fix Metacritic cards * Fix Metacritic cards

2
lib/urllib3/_version.py
View file

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

9
lib/urllib3/contrib/pyopenssl.py
View file

@ -54,21 +54,12 @@ except ImportError:
import logging import logging
import ssl import ssl
import typing import typing
import warnings
from io import BytesIO from io import BytesIO
from socket import socket as socket_cls from socket import socket as socket_cls
from socket import timeout from socket import timeout
from .. import util 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: if typing.TYPE_CHECKING:
from OpenSSL.crypto import X509 # type: ignore[import] from OpenSSL.crypto import X509 # type: ignore[import]