Restored setting linestyle or marker to 'None' if only one is given in fmt

lennart0901 · lennart0901 · commit 24e1301feff2 · 2014-10-20T21:25:19.000+02:00
diff --git a/lib/matplotlib/axes/_base.py b/lib/matplotlib/axes/_base.py
@@ -111,6 +111,11 @@ def _process_plot_format(fmt):
             raise ValueError(
                 'Unrecognized character %c in format string' % c)
 
+    if linestyle is None and marker is not None:
+        linestyle = 'None'
+    if marker is None and linestyle is not None:
+        marker = 'None'
+
     return linestyle, marker, color
 
 
diff --git a/lib/matplotlib/tests/test_fmt.py b/lib/matplotlib/tests/test_fmt.py
@@ -20,14 +20,14 @@ def _fmt_parsing_invalid_helper(fmt):
 
 
 def test_fmt_parsing():
-    test_cases = (('-', ('-', None, None)),
-                  ('--', ('--', None, None)),
-                  ('-.', ('-.', None, None)),
-                  (':', (':', None, None)),
-                  ('-g', ('-', None, 'g')),
-                  ('--r', ('--', None, 'r')),
-                  ('-.k', ('-.', None, 'k')),
-                  (':b', (':', None, 'b')),
+    test_cases = (('-', ('-', 'None', None)),
+                  ('--', ('--', 'None', None)),
+                  ('-.', ('-.', 'None', None)),
+                  (':', (':', 'None', None)),
+                  ('-g', ('-', 'None', 'g')),
+                  ('--r', ('--', 'None', 'r')),
+                  ('-.k', ('-.', 'None', 'k')),
+                  (':b', (':', 'None', 'b')),
                   ('-o', ('-', 'o', None)),
                   ('--,', ('--', ',', None)),
                   ('-..', ('-.', '.', None)),
@@ -36,17 +36,17 @@ def test_fmt_parsing():
                   ('--r<', ('--', '<', 'r')),
                   (':>g', (':', '>', 'g')),
                   ('.-.k', ('-.', '.', 'k')),
-                  ('-c', ('-', None, 'c')),
+                  ('-c', ('-', 'None', 'c')),
                   ('-1m', ('-', '1', 'm')),
                   ('-y2', ('-', '2', 'y')),
                   ('w-3', ('-', '3', 'w')),
                   ('--.', ('--', '.', None)),
                   ('-4k', ('-', '4', 'k')),
-                  ('sk', (None, 's', 'k')),
+                  ('sk', ('None', 's', 'k')),
                   ('r', (None, None, 'r')),
                   ('1.0', (None, None, '1.0')),
                   ('0.8', (None, None, '0.8')),
-                  ('p', (None, 'p', None)),
+                  ('p', ('None', 'p', None)),
                   ('*--', ('--', '*', None)),
                   ('kh:', (':', 'h', 'k')),
                   ('H-r', ('-', 'H', 'r')),
