BUG: "Replaced isinstance with is_integer, and changed test_pad_width to use getattr"

Author: wcwagner

pandas/core/strings.py

@@ -8,7 +8,8 @@
                                  is_object_dtype,
                                  is_string_like,
                                  is_list_like,
-                                 is_scalar)
+                                 is_scalar,
+                                 is_integer)
 from pandas.core.common import _values_from_object
 
 from pandas.core.algorithms import take_1d
@@ -914,7 +915,7 @@ def str_pad(arr, width, side='left', fillchar=' '):
     if len(fillchar) != 1:
         raise TypeError('fillchar must be a character, not str')
 
-    if not isinstance(width, compat.integer_types):
+    if not is_integer(width):
         msg = 'width must be of integer type, not {0}'
         raise TypeError(msg.format(type(width).__name__))
 

pandas/tests/test_strings.py

@@ -1605,13 +1605,12 @@ def test_pad_fillchar(self):
 
     def test_pad_width(self):
         values = Series(['1', '22', 'a', 'bb'])
-        string_methods = Series.str(values)
+        s = Series(values)
 
-        for f_name, f in Series.str.__dict__.items():
-            if f_name in ['center', 'ljust', 'rjust', 'zfill', 'pad']:
-                with tm.assertRaisesRegexp(TypeError,
-                                           "width must be of integer type,*"):
-                    f(string_methods, 'f')
+        for f in ['center', 'ljust', 'rjust', 'zfill', 'pad']:
+            with tm.assertRaisesRegexp(TypeError,
+                                       "width must be of integer type, not*"):
+                getattr(s.str, f)('f')
 
     def test_translate(self):