diff options
| author | Miss Skeleton (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-10-09 13:20:48 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-09 13:20:48 -0700 |
| commit | 1f75fc7a9d9efbced2e0b0001ac148268a626d63 (patch) | |
| tree | 0bf313df772c8c2873c6bb3711c98b28bcc902a0 | |
| parent | 43c3eafa1bcdc522870e112d3e2d67ce2451c34b (diff) | |
| download | cpython-git-1f75fc7a9d9efbced2e0b0001ac148268a626d63.tar.gz | |
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>
| -rw-r--r-- | Lib/tkinter/__init__.py | 5 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2020-09-22-11-07-50.bpo-41831.k-Eop_.rst | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py index 11ced6a3af..2175afcffa 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 0000000000..84a3f5253a --- /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. |