Skip to content

ssl.pyi: fix ssl.Purpose definition in py3 #3054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
srittau merged 1 commit into from
Jun 20, 2019
Merged

ssl.pyi: fix ssl.Purpose definition in py3 #3054

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions stdlib/2and3/ssl.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# Stubs for ssl

from typing import (
Any, Dict, Callable, List, NamedTuple, Optional, Set, Tuple, Union,
Any, Callable, ClassVar, Dict, List, NamedTuple, Optional, Set, Tuple, Union,
)
import enum
import socket
import sys

Expand Down Expand Up @@ -172,12 +173,16 @@ if sys.version_info < (3,) or sys.version_info >= (3, 4):
ALERT_DESCRIPTION_UNSUPPORTED_EXTENSION: int
ALERT_DESCRIPTION_USER_CANCELLED: int

if sys.version_info < (3,) or sys.version_info >= (3, 4):
_PurposeType = NamedTuple('_PurposeType', [('nid', int), ('shortname', str), ('longname', str), ('oid', str)])
class Purpose:
SERVER_AUTH: _PurposeType
CLIENT_AUTH: _PurposeType

if sys.version_info < (3,):
class _ASN1Object(NamedTuple('_ASN1Object', [('nid', int), ('shortname', str), ('longname', str), ('oid', str)])): ...
class Purpose(_ASN1Object):
SERVER_AUTH: ClassVar[Purpose]
CLIENT_AUTH: ClassVar[Purpose]
if sys.version_info >= (3, 4):
class _ASN1Object(NamedTuple('_ASN1Object', [('nid', int), ('shortname', str), ('longname', str), ('oid', str)])): ...
class Purpose(_ASN1Object, enum.Enum):
SERVER_AUTH = ...
CLIENT_AUTH = ...

class SSLSocket(socket.socket):
context: SSLContext
Expand Down Expand Up @@ -224,7 +229,7 @@ class SSLContext:
def load_cert_chain(self, certfile: str, keyfile: Optional[str] = ...,
password: _PasswordType = ...) -> None: ...
if sys.version_info < (3,) or sys.version_info >= (3, 4):
def load_default_certs(self, purpose: _PurposeType = ...) -> None: ...
def load_default_certs(self, purpose: Purpose = ...) -> None: ...
def load_verify_locations(self, cafile: Optional[str] = ...,
capath: Optional[str] = ...,
cadata: Union[str, bytes, None] = ...) -> None: ...
Expand Down