Merge pull request #12600 from anntzer/style

jklymak · web-flow · commit 1943707625b0 · 2018-10-23T19:46:44.000-07:00
Minor style fixes.
diff --git a/lib/matplotlib/tests/test_rcparams.py b/lib/matplotlib/tests/test_rcparams.py
@@ -1,6 +1,5 @@
 from collections import OrderedDict
 import copy
-from itertools import chain
 import os
 from unittest import mock
 import warnings
@@ -197,12 +196,12 @@ def test_Issue_1713():
 def generate_validator_testcases(valid):
     validation_tests = (
         {'validator': validate_bool,
-         'success': chain(((_, True) for _ in
-                           ('t', 'y', 'yes', 'on', 'true', '1', 1, True)),
-                           ((_, False) for _ in
-                            ('f', 'n', 'no', 'off', 'false', '0', 0, False))),
-        'fail': ((_, ValueError)
-                 for _ in ('aardvark', 2, -1, [], ))},
+         'success': (*((_, True) for _ in
+                       ('t', 'y', 'yes', 'on', 'true', '1', 1, True)),
+                     *((_, False) for _ in
+                       ('f', 'n', 'no', 'off', 'false', '0', 0, False))),
+         'fail': ((_, ValueError)
+                  for _ in ('aardvark', 2, -1, [], ))},
         {'validator': validate_stringlist,
          'success': (('', []),
                      ('a,b', ['a', 'b']),
@@ -313,7 +312,6 @@ def generate_validator_testcases(valid):
                      ('(0, 1, 0, 1)', [0.0, 1.0, 0.0, 1.0]),  # RGBA tuple
                      ((0, 1, 0, 1), (0, 1, 0, 1)),  # non-string version
                      ('(0, 1, "0.5")', [0.0, 1.0, 0.5]),  # unusual but valid
-
                     ),
          'fail': (('tab:veryblue', ValueError),  # invalid name
                   ('C123', ValueError),  # invalid RGB(A) code and cycle index
diff --git a/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py b/lib/mpl_toolkits/axisartist/grid_helper_curvelinear.py
@@ -71,8 +71,6 @@ def get_tick_iterators(self, axes):
         ti1 = g.get_tick_iterator(self.nth_coord_ticks, side)
         ti2 = g.get_tick_iterator(1-self.nth_coord_ticks, side, minor=True)
 
-        #ti2 = g.get_tick_iterator(1-self.nth_coord_ticks, self.side, minor=True)
-
         return chain(ti1, ti2), iter([])
 
 
diff --git a/tutorials/text/text_intro.py b/tutorials/text/text_intro.py
@@ -429,6 +429,6 @@ def formatoddticks(x, pos):
 # Legends and Annotations
 # =======================
 #
-#   - Legends: :doc:`/tutorials/intermediate/legend_guide`
-#   - Annotations: :doc:`/tutorials/text/annotations`
+# - Legends: :doc:`/tutorials/intermediate/legend_guide`
+# - Annotations: :doc:`/tutorials/text/annotations`
 #

Original file line number	Diff line number	Diff line change
`@@ -429,6 +429,6 @@ def formatoddticks(x, pos):`
`429`	`429`	`# Legends and Annotations`
`430`	`430`	`# =======================`
`431`	`431`	`#`
`432`		-# - Legends: :doc:`/tutorials/intermediate/legend_guide`
`433`		-# - Annotations: :doc:`/tutorials/text/annotations`
	`432`	+# - Legends: :doc:`/tutorials/intermediate/legend_guide`
	`433`	+# - Annotations: :doc:`/tutorials/text/annotations`
`434`	`434`	`#`