diff options
author | Ethan Furman <ethan@stoneleaf.us> | 2021-04-20 02:12:24 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-20 02:12:24 (GMT) |
commit | 503cdc7c124cebbd777008bdf7bd9aa666b25f07 (patch) | |
tree | ed9e0d1622622b1c37940d312de7d6e679bc8db2 /Lib/ssl.py | |
parent | dbac8f40e81eb0a29dc833e6409a1abf47467da6 (diff) | |
download | cpython-503cdc7c124cebbd777008bdf7bd9aa666b25f07.zip cpython-503cdc7c124cebbd777008bdf7bd9aa666b25f07.tar.gz cpython-503cdc7c124cebbd777008bdf7bd9aa666b25f07.tar.bz2 |
Revert "bpo-38659: [Enum] add _simple_enum decorator (GH-25285)" (GH-25476)
This reverts commit dbac8f40e81eb0a29dc833e6409a1abf47467da6.
Diffstat (limited to 'Lib/ssl.py')
-rw-r--r-- | Lib/ssl.py | 13 |
1 files changed, 4 insertions, 9 deletions
@@ -94,7 +94,6 @@ import sys import os from collections import namedtuple from enum import Enum as _Enum, IntEnum as _IntEnum, IntFlag as _IntFlag -from enum import _simple_enum, _test_simple_enum import _ssl # if we can't import it, let the error propagate @@ -156,8 +155,7 @@ _PROTOCOL_NAMES = {value: name for name, value in _SSLMethod.__members__.items() _SSLv2_IF_EXISTS = getattr(_SSLMethod, 'PROTOCOL_SSLv2', None) -@_simple_enum(_IntEnum) -class TLSVersion: +class TLSVersion(_IntEnum): MINIMUM_SUPPORTED = _ssl.PROTO_MINIMUM_SUPPORTED SSLv3 = _ssl.PROTO_SSLv3 TLSv1 = _ssl.PROTO_TLSv1 @@ -167,8 +165,7 @@ class TLSVersion: MAXIMUM_SUPPORTED = _ssl.PROTO_MAXIMUM_SUPPORTED -@_simple_enum(_IntEnum) -class _TLSContentType: +class _TLSContentType(_IntEnum): """Content types (record layer) See RFC 8446, section B.1 @@ -182,8 +179,7 @@ class _TLSContentType: INNER_CONTENT_TYPE = 0x101 -@_simple_enum(_IntEnum) -class _TLSAlertType: +class _TLSAlertType(_IntEnum): """Alert types for TLSContentType.ALERT messages See RFC 8466, section B.2 @@ -224,8 +220,7 @@ class _TLSAlertType: NO_APPLICATION_PROTOCOL = 120 -@_simple_enum(_IntEnum) -class _TLSMessageType: +class _TLSMessageType(_IntEnum): """Message types (handshake protocol) See RFC 8446, section B.3 |