Refactor format class list and rename _trim_zeros to _trim_zeros_float

Author: sakarpanta

pandas/io/formats/format.py

@@ -892,9 +892,7 @@ def format_array(values, formatter, float_format=None, na_rep='NaN',
         fmt_klass = Timedelta64Formatter
     elif is_extension_array_dtype(values.dtype):
         fmt_klass = ExtensionArrayFormatter
-    elif is_float_dtype(values.dtype):
-        fmt_klass = FloatArrayFormatter
-    elif is_complex_dtype(values.dtype):
+    elif is_float_dtype(values.dtype) or is_complex_dtype(values.dtype):
         fmt_klass = FloatArrayFormatter
     elif is_integer_dtype(values.dtype):
         fmt_klass = IntArrayFormatter
@@ -1100,7 +1098,7 @@ def format_values_with(float_format):
                 if is_complex:
                     return _trim_zeros_complex(values, na_rep)
                 else:
-                    return _trim_zeros(values, na_rep)
+                    return _trim_zeros_float(values, na_rep)
 
             return values
 
@@ -1433,19 +1431,19 @@ def just(x):
 def _trim_zeros_complex(str_complexes, na_rep='NaN'):
     """
     Separates the real and imaginary parts from the complex number, and
-    executes the _trim_zeros method on each of those.
+    executes the _trim_zeros_float method on each of those.
     """
     def separate_and_trim(str_complex, na_rep):
         num_arr = str_complex.split('+')
-        return (_trim_zeros([num_arr[0]], na_rep) +
+        return (_trim_zeros_float([num_arr[0]], na_rep) +
                 ['+'] +
-                _trim_zeros([num_arr[1][:-1]], na_rep) +
+                _trim_zeros_float([num_arr[1][:-1]], na_rep) +
                 ['j'])
 
     return [''.join(separate_and_trim(x, na_rep)) for x in str_complexes]
 
 
-def _trim_zeros(str_floats, na_rep='NaN'):
+def _trim_zeros_float(str_floats, na_rep='NaN'):
     """
     Trims zeros, leaving just one before the decimal points if need be.
     """