Response to review comments

madphysicist · madphysicist · commit 9d8d3ab42699 · 2017-01-31T13:55:47.000-05:00
diff --git a/lib/matplotlib/tests/test_ticker.py b/lib/matplotlib/tests/test_ticker.py
@@ -582,23 +582,32 @@ def test_percentformatter(self, xmax, decimals, symbol,
 
 
 class TestEngFormatter(object):
-    def test_formatting(self):
+    unit_data = ['', u's']
+
+    input_data = [0.1, 1, 999.9, 1001]
+
+    expected_data = {
+        '': {
+            0.1: u'100 m',
+            1: u'1',
+            999.99: u'999.9',
+            1001: u'1.001 k',
+        }
+        u's': {
+            0.1: u'100 ms',
+            1: u'1 s',
+            999.99: u'999.9 s',
+            1001: u'1.001 ks',
+        }
+    }
+
+    @pytest.mark.parametrize('unit', unit_data)
+    @pytest.mark.parametrize('input', input_data)
+    def test_formatting(self, unit, input):
         """
-        Create two instances of EngFormatter with default parameters, with and
-        without a unit string ('s' for seconds). Test the formatting in some
-        cases, especially the case when no SI prefix is present, for values in
-        [1, 1000).
-
-        Should not raise exceptions.
+        Test the formatting of EngFormatter with some inputs, against
+        instances with and without units. Cases focus on when no SI
+        prefix is present, for values in [1, 1000).
         """
-        unitless = mticker.EngFormatter()
-        assert unitless(0.1) == u'100 m'
-        assert unitless(1) == u'1'
-        assert unitless(999.9) == u'999.9'
-        assert unitless(1001) == u'1.001 k'
-
-        with_unit = mticker.EngFormatter(unit=u's')
-        assert with_unit(0.1) == u'100 ms'
-        assert with_unit(1) == u'1 s'
-        assert with_unit(999.9) == u'999.9 s'
-        assert with_unit(1001) == u'1.001 ks'
+        fmt = mticker.EngFormatter(unit)
+        assert fmt(input) == self.expected_data[unit][input]
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -8,22 +8,20 @@
 minor tick locating and formatting.  Generic tick locators and
 formatters are provided, as well as domain specific custom ones.
 
-
 Default Formatter
 -----------------
 
 The default formatter identifies when the x-data being
 plotted is a small range on top of a large off set.  To
 reduce the chances that the ticklabels overlap the ticks
-are labeled as deltas from a fixed offset.  For example::
+are labeled as deltas from a fixed offset. For example::
 
    ax.plot(np.arange(2000, 2010), range(10))
 
 will have tick of 0-9 with an offset of +2e3.  If this
 is not desired turn off the use of the offset on the default
 formatter::
 
-
    ax.get_xaxis().get_major_formatter().set_useOffset(False)
 
 set the rcParam ``axes.formatter.useoffset=False`` to turn it off
