Simplify and move cleaning strip op. from 'format_eng' to '__call__'

afvincent · afvincent · commit 2193c7976ff0 · 2016-06-07T09:50:36.000+02:00
diff --git a/lib/matplotlib/ticker.py b/lib/matplotlib/ticker.py
@@ -1086,6 +1086,7 @@ def __init__(self, unit="", places=None, space_sep=True):
 
     def __call__(self, x, pos=None):
         s = "%s%s" % (self.format_eng(x), self.unit)
+        s = s.strip()  # Remove separator when there is neither prefix nor unit
         return self.fix_minus(s)
 
     def format_eng(self, num):
@@ -1141,10 +1142,6 @@ def format_eng(self, num):
 
         formatted = format_str % (mant, prefix)
 
-        formatted = formatted.strip()
-        if (self.unit != "") and (prefix == self.ENG_PREFIXES[0]):
-            formatted = formatted + self.sep
-
         return formatted
 
 
