Fix crashing when opening the Qt4 figure editor.

mdboom · mdboom · commit b2431ad202f9 · 2011-10-06T10:15:52.000-04:00
diff --git a/lib/matplotlib/backends/backend_qt4.py b/lib/matplotlib/backends/backend_qt4.py
@@ -446,7 +446,7 @@ def edit_parameters(self):
                             fmt += ": %(ylabel)s"
                         fmt += " (%(axes_repr)s)"
                     elif ylabel:
-                        fmt = "%(axes_repr)s (%(ylabel)s)" % ylabel
+                        fmt = "%(axes_repr)s (%(ylabel)s)"
                     else:
                         fmt = "%(axes_repr)s"
                     titles.append(fmt % dict(title = title,
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -563,7 +563,7 @@ def get_drawstyle(self): return self._drawstyle
     def get_linestyle(self): return self._linestyle
 
     def get_linewidth(self): return self._linewidth
-    def get_marker(self): return self._marker
+    def get_marker(self): return self._marker.get_marker()
 
     def get_markeredgecolor(self):
         if (is_string_like(self._markeredgecolor) and
@@ -746,7 +746,7 @@ def set_marker(self, marker):
         %(MarkerAccepts)s
         """
         self._marker.set_marker(marker)
-        
+
     def set_markeredgecolor(self, ec):
         """
         Set the marker edge color
