BUG: Fixed test errors

madphysicist · madphysicist · commit 103ead186b2c · 2016-11-17T23:42:34.000-05:00
PEP8 in tests
Forgot conversion to int in Binary- and HexIntFormatters.
diff --git a/lib/matplotlib/tests/test_ticker.py b/lib/matplotlib/tests/test_ticker.py
@@ -565,7 +565,7 @@ def test_BinaryIntFormatter(n, unsigned, value, expected):
     assert fmt(value) == expected
 
 
-@pytest.mark.parametrize('n, unsigned, value, expected',[
+@pytest.mark.parametrize('n, unsigned, value, expected', [
     # Positive, <4 digits
     (4, False, 37, '0025'),
     (4, True, 37, '0025'),
@@ -603,19 +603,20 @@ def test_LinearScaleFormatter():
     Verifies that the linear transformations are being done correctly.
     """
     # Make a formatter that truncates to two decimal places always
-    base = lambda x, pos=None: '{:0.2f}'.format(x)
+    def baseFormatter(x, pos=None):
+        return '{:0.2f}'.format(x)
 
     inputs = np.arange(-2.5, 13, 2.5)
     outputs = ['{:0.2f}'.format(x) for x in np.arange(7.0)]
 
     # Check a simple case
-    fmt = mticker.LinearScaleFormatter(10, (1, 5), formatter=base)
+    fmt = mticker.LinearScaleFormatter(10, (1, 5), formatter=baseFormatter)
     for i, o in zip(inputs, outputs):
         print(i, fmt(i), o)
         assert fmt(i) == o
 
     # Check a reverse mapping
-    fmt = mticker.LinearScaleFormatter(10, (5, 1), formatter=base)
+    fmt = mticker.LinearScaleFormatter(10, (5, 1), formatter=baseFormatter)
     for i, o in zip(inputs, reversed(outputs)):
         print(i, fmt(i), o)
         assert fmt(i) == o
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -1319,11 +1319,12 @@ class BinaryIntFormatter(Formatter):
     with a `MaxNLocator` with ``integer=True``.
     """
     def __init__(self, n, unsigned=False):
-        self.n = n
+        self.n = int(n)
         self.unsigned = unsigned
 
     def format(self, x):
         n = self.n
+        x = int(x)
         if x < 0:
             if self.unsigned:
                 x = x & ((1 << n) - 1)
@@ -1352,11 +1353,12 @@ class HexIntFormatter(Formatter):
     used with a `MaxNLocator` with ``integer=True``.
     """
     def __init__(self, n, unsigned=False):
-        self.n = n
+        self.n = int(n)
         self.unsigned = unsigned
 
     def format(self, x):
         n = self.n
+        x = int(x)
         if x < 0:
             if self.unsigned:
                 x = x & ((1 << (4 * n)) - 1)
@@ -1416,7 +1418,7 @@ def transform(self, x):
         """
         Transforms a value from the input scale to the output scale.
         """
-        return  (x - self.iMin) / self.iRange * self.oRange + self.oMin
+        return (x - self.iMin) / self.iRange * self.oRange + self.oMin
 
     def __call__(self, x, pos=None):
         return self.formatter(self.transform(x), pos)
