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/tkinter | |
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/tkinter')
-rw-r--r-- | Lib/tkinter/__init__.py | 5 | ||||
-rw-r--r-- | Lib/tkinter/test/test_tkinter/test_misc.py | 44 |
2 files changed, 3 insertions, 46 deletions
diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py index 369004c..01dce7e 100644 --- a/Lib/tkinter/__init__.py +++ b/Lib/tkinter/__init__.py @@ -144,8 +144,7 @@ def _splitdict(tk, v, cut_minus=True, conv=None): return dict -@enum._simple_enum(enum.StrEnum) -class EventType: +class EventType(enum.StrEnum): KeyPress = '2' Key = KeyPress KeyRelease = '3' @@ -186,6 +185,8 @@ class EventType: 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 d4b7cbd..f6e5b4d 100644 --- a/Lib/tkinter/test/test_tkinter/test_misc.py +++ b/Lib/tkinter/test/test_tkinter/test_misc.py @@ -1,6 +1,5 @@ import unittest import tkinter -import enum from test import support from tkinter.test.support import AbstractTkTest, AbstractDefaultRootTest @@ -262,49 +261,6 @@ 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) |