From: Miss Skeleton (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 9 Oct 2020 20:21:15 +0000 (-0700)
Subject: bpo-41831: Restore str implementation of __str__ in tkinter.EventType (GH-22355)
X-Git-Tag: v3.8.7rc1~124
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f8ebb7b62ea266df5c6e0f910b7a6b0eb73deee4;p=thirdparty%2FPython%2Fcpython.git

bpo-41831: Restore str implementation of __str__ in tkinter.EventType (GH-22355)

(cherry picked from commit eb38c6b7aa35d3003ec0958533421902d19ce408)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
---

diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py
index 479eb016da7f..b685901d4df8 100644
--- a/Lib/tkinter/__init__.py
+++ b/Lib/tkinter/__init__.py
@@ -185,8 +185,7 @@ class EventType(str, enum.Enum):
     Deactivate = '37'
     MouseWheel = '38'
 
-    def __str__(self):
-        return self.name
+    __str__ = str.__str__
 
 
 class Event:
@@ -266,7 +265,7 @@ class Event:
                 'num', 'delta', 'focus',
                 'x', 'y', 'width', 'height')
         return '<%s event%s>' % (
-            self.type,
+            getattr(self.type, 'name', self.type),
             ''.join(' %s=%s' % (k, attrs[k]) for k in keys if k in attrs)
         )
 
diff --git a/Misc/NEWS.d/next/Library/2020-09-22-11-07-50.bpo-41831.k-Eop_.rst b/Misc/NEWS.d/next/Library/2020-09-22-11-07-50.bpo-41831.k-Eop_.rst
new file mode 100644
index 000000000000..84a3f5253a06
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-09-22-11-07-50.bpo-41831.k-Eop_.rst
@@ -0,0 +1,3 @@
+``str()`` for the ``type`` attribute of the ``tkinter.Event`` object always
+returns now the numeric code returned by Tk instead of the name of the event
+type.