summaryrefslogtreecommitdiffstats
path: root/Lib/tkinter
diff options
context:
space:
mode:
authorEthan Furman <ethan@stoneleaf.us>2021-04-21 17:20:44 (GMT)
committerGitHub <noreply@github.com>2021-04-21 17:20:44 (GMT)
commita02cb474f9c097c83cd444a47e9fb5f99b4aaf45 (patch)
treec9ebd2e0b7762ad1ca1f986966cb2ca02ea7fa6d /Lib/tkinter
parent56c95dfe271b1242bdc8163d4677e311552c00cb (diff)
downloadcpython-a02cb474f9c097c83cd444a47e9fb5f99b4aaf45.zip
cpython-a02cb474f9c097c83cd444a47e9fb5f99b4aaf45.tar.gz
cpython-a02cb474f9c097c83cd444a47e9fb5f99b4aaf45.tar.bz2
bpo-38659: [Enum] add _simple_enum decorator (GH-25497)
add: * `_simple_enum` decorator to transform a normal class into an enum * `_test_simple_enum` function to compare * `_old_convert_` to enable checking `_convert_` generated enums `_simple_enum` takes a normal class and converts it into an enum: @simple_enum(Enum) class Color: RED = 1 GREEN = 2 BLUE = 3 `_old_convert_` works much like` _convert_` does, using the original logic: # in a test file import socket, enum CheckedAddressFamily = enum._old_convert_( enum.IntEnum, 'AddressFamily', 'socket', lambda C: C.isupper() and C.startswith('AF_'), source=_socket, ) `_test_simple_enum` takes a traditional enum and a simple enum and compares the two: # in the REPL or the same module as Color class CheckedColor(Enum): RED = 1 GREEN = 2 BLUE = 3 _test_simple_enum(CheckedColor, Color) _test_simple_enum(CheckedAddressFamily, socket.AddressFamily) Any important differences will raise a TypeError
Diffstat (limited to 'Lib/tkinter')
-rw-r--r--Lib/tkinter/__init__.py5
-rw-r--r--Lib/tkinter/test/test_tkinter/test_misc.py44
2 files changed, 46 insertions, 3 deletions
diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py
index 01dce7e..369004c 100644
--- a/Lib/tkinter/__init__.py
+++ b/Lib/tkinter/__init__.py
@@ -144,7 +144,8 @@ def _splitdict(tk, v, cut_minus=True, conv=None):
return dict
-class EventType(enum.StrEnum):
+@enum._simple_enum(enum.StrEnum)
+class EventType:
KeyPress = '2'
Key = KeyPress
KeyRelease = '3'
@@ -185,8 +186,6 @@ class EventType(enum.StrEnum):
Deactivate = '37'
MouseWheel = '38'
- __str__ = str.__str__
-
class Event:
"""Container for the properties of an event.
diff --git a/Lib/tkinter/test/test_tkinter/test_misc.py b/Lib/tkinter/test/test_tkinter/test_misc.py
index f6e5b4d..d4b7cbd 100644
--- a/Lib/tkinter/test/test_tkinter/test_misc.py
+++ b/Lib/tkinter/test/test_tkinter/test_misc.py
@@ -1,5 +1,6 @@
import unittest
import tkinter
+import enum
from test import support
from tkinter.test.support import AbstractTkTest, AbstractDefaultRootTest
@@ -261,6 +262,49 @@ class MiscTest(AbstractTkTest, unittest.TestCase):
" num=3 delta=-1 focus=True"
" x=10 y=20 width=300 height=200>")
+ def test_eventtype_enum(self):
+ class CheckedEventType(enum.StrEnum):
+ KeyPress = '2'
+ Key = KeyPress
+ KeyRelease = '3'
+ ButtonPress = '4'
+ Button = ButtonPress
+ ButtonRelease = '5'
+ Motion = '6'
+ Enter = '7'
+ Leave = '8'
+ FocusIn = '9'
+ FocusOut = '10'
+ Keymap = '11' # undocumented
+ Expose = '12'
+ GraphicsExpose = '13' # undocumented
+ NoExpose = '14' # undocumented
+ Visibility = '15'
+ Create = '16'
+ Destroy = '17'
+ Unmap = '18'
+ Map = '19'
+ MapRequest = '20'
+ Reparent = '21'
+ Configure = '22'
+ ConfigureRequest = '23'
+ Gravity = '24'
+ ResizeRequest = '25'
+ Circulate = '26'
+ CirculateRequest = '27'
+ Property = '28'
+ SelectionClear = '29' # undocumented
+ SelectionRequest = '30' # undocumented
+ Selection = '31' # undocumented
+ Colormap = '32'
+ ClientMessage = '33' # undocumented
+ Mapping = '34' # undocumented
+ VirtualEvent = '35' # undocumented
+ Activate = '36'
+ Deactivate = '37'
+ MouseWheel = '38'
+ enum._test_simple_enum(CheckedEventType, tkinter.EventType)
+
def test_getboolean(self):
for v in 'true', 'yes', 'on', '1', 't', 'y', 1, True:
self.assertIs(self.root.getboolean(v), True)