Merge pull request #10052 from QuLogic/unit-tests

anntzer · web-flow · commit 6ea7dc7834fe · 2017-12-20T23:54:48.000-08:00
Use consistent float-to-str formatting for tests with units
diff --git a/lib/matplotlib/testing/jpl_units/UnitDblFormatter.py b/lib/matplotlib/testing/jpl_units/UnitDblFormatter.py
@@ -36,12 +36,12 @@ def __call__( self, x, pos = None ):
       if len(self.locs) == 0:
          return ''
       else:
-         return str(x)
+         return '{:.12}'.format(x)
 
    def format_data_short( self, value ):
       "Return the value formatted in 'short' format."
-      return str(value)
+      return '{:.12}'.format(value)
 
    def format_data( self, value ):
       "Return the value formatted into a string."
-      return str(value)
+      return '{:.12}'.format(value)
diff --git a/lib/matplotlib/tests/test_axes.py b/lib/matplotlib/tests/test_axes.py
@@ -631,8 +631,8 @@ def test_polar_units():
     units.register()
 
     pi = np.pi
-    deg = units.UnitDbl(1.0, "deg")
-    km = units.UnitDbl(1.0, "km")
+    deg = units.deg
+    km = units.km
 
     x1 = [pi/6.0, pi/4.0, pi/3.0, pi/2.0]
     x2 = [30.0*deg, 45.0*deg, 60.0*deg, 90.0*deg]
