Merge pull request matplotlib#509 from mdboom/backend_qt4_bugs

Backend qt4 bugs

Author: jdh2358

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,

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