From: Ethan Furman <ethan@stoneleaf.us>
Date: Tue, 22 Sep 2020 15:01:17 +0000 (-0700)
Subject: bpo-41817: use new StrEnum to ensure all members are strings (GH-22348)
X-Git-Tag: v3.10.0a1~74
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea0711a9f9f207d6d4ca037d90de6ec60db131b0;p=thirdparty%2FPython%2Fcpython.git

bpo-41817: use new StrEnum to ensure all members are strings (GH-22348)

* use new StrEnum to ensure all members are strings
---

diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py
index 1067ab6a8b8a..3919397d3cea 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
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 000000000000..6a634bb61326
--- /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