Fixes for recent mypy (#1391)

Including ALPN typing which was totally broken

Author: alex

src/OpenSSL/SSL.py

@@ -289,9 +289,9 @@ class _NoOverlappingProtocols:
 _ALPNSelectCallback = Callable[
     [
         "Connection",
-        typing.Union[typing.List[bytes], _NoOverlappingProtocols],
+        typing.List[bytes],
     ],
-    None,
+    typing.Union[bytes, _NoOverlappingProtocols],
 ]
 _CookieGenerateCallback = Callable[["Connection"], bytes]
 _CookieVerifyCallback = Callable[["Connection", bytes], bool]
@@ -1889,7 +1889,7 @@ def __init__(
         # Negotiation. These strings get copied at some point but it's well
         # after the callback returns, so we have to hang them somewhere to
         # avoid them getting freed.
-        self._alpn_select_callback_args = None
+        self._alpn_select_callback_args: Any = None
 
         # Reference the verify_callback of the Context. This ensures that if
         # set_verify is called again after the SSL object has been created we

src/OpenSSL/_util.py

@@ -7,7 +7,10 @@
 
 from cryptography.hazmat.bindings.openssl.binding import Binding
 
-StrOrBytesPath = Union[str, bytes, os.PathLike]
+if sys.version_info >= (3, 9):
+    StrOrBytesPath = Union[str, bytes, os.PathLike[str], os.PathLike[bytes]]
+else:
+    StrOrBytesPath = Union[str, bytes, os.PathLike]
 
 binding = Binding()
 ffi = binding.ffi

src/OpenSSL/crypto.py

@@ -8,7 +8,6 @@
 from base64 import b16encode
 from collections.abc import Iterable, Sequence
 from functools import partial
-from os import PathLike
 from typing import (
     Any,
     Callable,
@@ -24,6 +23,7 @@
     rsa,
 )
 
+from OpenSSL._util import StrOrBytesPath
 from OpenSSL._util import (
     byte_string as _byte_string,
 )
@@ -87,7 +87,6 @@
     rsa.RSAPublicKey,
 ]
 _Key = Union[_PrivateKey, _PublicKey]
-StrOrBytesPath = Union[str, bytes, PathLike]
 PassphraseCallableT = Union[bytes, Callable[..., bytes]]
 
 

tox.ini

@@ -43,7 +43,7 @@ commands =
 
 [testenv:py311-mypy]
 deps =
-    mypy==1.1.1
+    mypy
 skip_install = true
 commands =
     mypy src