Merge pull request #13091 from anntzer/mouseevent-str

dstansby · web-flow · commit a7f129ce6acd · 2019-01-04T12:48:08.000Z
Improve MouseEvent str().
diff --git a/doc/api/next_api_changes/2018-01-03-AL.rst b/doc/api/next_api_changes/2018-01-03-AL.rst
@@ -0,0 +1,4 @@
+MouseEvents now include the event name in their ``str()``
+`````````````````````````````````````````````````````````
+
+... instead of the prefix "MPL MouseEvent".
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -1265,12 +1265,7 @@ def __init__(self, name, canvas):
 
 
 class CloseEvent(Event):
-    """
-    An event triggered by a figure being closed
-
-    """
-    def __init__(self, name, canvas, guiEvent=None):
-        Event.__init__(self, name, canvas, guiEvent)
+    """An event triggered by a figure being closed."""
 
 
 class LocationEvent(Event):
@@ -1432,10 +1427,10 @@ def __init__(self, name, canvas, x, y, button=None, key=None,
         self.dblclick = dblclick
 
     def __str__(self):
-        return ("MPL MouseEvent: xy=(%d,%d) xydata=(%s,%s) button=%s " +
-                "dblclick=%s inaxes=%s") % (self.x, self.y, self.xdata,
-                                            self.ydata, self.button,
-                                            self.dblclick, self.inaxes)
+        return (f"{self.name}: "
+                f"xy=({self.x}, {self.y}) xydata=({self.xdata}, {self.ydata}) "
+                f"button={self.button} dblclick={self.dblclick} "
+                f"inaxes={self.inaxes}")
 
 
 class PickEvent(Event):
