From 616f5a2d5b883b50749f5418d03a8db66fcd6a83 Mon Sep 17 00:00:00 2001 From: Ethan Furman Date: Sat, 19 Sep 2020 11:35:43 -0700 Subject: [PATCH 1/2] use new StrEnum to ensure all members were strings --- Lib/tkinter/__init__.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py index 1067ab6a8b8a1d..3919397d3cead2 100644 --- a/Lib/tkinter/__init__.py +++ b/Lib/tkinter/__init__.py @@ -144,12 +144,12 @@ def _splitdict(tk, v, cut_minus=True, conv=None): return dict -class EventType(str, enum.Enum): +class EventType(enum.StrEnum): KeyPress = '2' - Key = KeyPress, + Key = KeyPress KeyRelease = '3' ButtonPress = '4' - Button = ButtonPress, + Button = ButtonPress ButtonRelease = '5' Motion = '6' Enter = '7' @@ -180,10 +180,10 @@ class EventType(str, enum.Enum): Colormap = '32' ClientMessage = '33' # undocumented Mapping = '34' # undocumented - VirtualEvent = '35', # undocumented - Activate = '36', - Deactivate = '37', - MouseWheel = '38', + VirtualEvent = '35' # undocumented + Activate = '36' + Deactivate = '37' + MouseWheel = '38' def __str__(self): return self.name From 85c39123700a91ef684115ebf2570b9608c86d2a Mon Sep 17 00:00:00 2001 From: Ethan Furman Date: Tue, 22 Sep 2020 00:23:34 -0700 Subject: [PATCH 2/2] add news entry --- .../NEWS.d/next/Library/2020-09-22-00-23-30.bpo-41817.bnh-VG.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Library/2020-09-22-00-23-30.bpo-41817.bnh-VG.rst diff --git a/Misc/NEWS.d/next/Library/2020-09-22-00-23-30.bpo-41817.bnh-VG.rst b/Misc/NEWS.d/next/Library/2020-09-22-00-23-30.bpo-41817.bnh-VG.rst new file mode 100644 index 00000000000000..6a634bb613260b --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-09-22-00-23-30.bpo-41817.bnh-VG.rst @@ -0,0 +1 @@ +fix `tkinter.EventType` Enum so all members are strings, and none are tuples