Merge pull request #2951 from jreback/series_dtype

CLN: argument order and dtype formatting to be consistent with standard

Author: jreback

pandas/core/format.py

@@ -65,19 +65,19 @@
 
 class SeriesFormatter(object):
 
-    def __init__(self, series, buf=None, header=True, length=True, dtype=True,
-                 na_rep='NaN', name=False, float_format=None):
+    def __init__(self, series, buf=None, header=True, length=True,
+                 na_rep='NaN', name=False, float_format=None, dtype=True):
         self.series = series
         self.buf = buf if buf is not None else StringIO(u"")
         self.name = name
         self.na_rep = na_rep
         self.length = length
-        self.dtype  = dtype
         self.header = header
 
         if float_format is None:
             float_format = get_option("display.float_format")
         self.float_format = float_format
+        self.dtype  = dtype
 
     def _get_footer(self):
         footer = u''

pandas/core/series.py

@@ -1057,7 +1057,7 @@ def __unicode__(self):
                                     name=True,
                                     dtype=True)
         else:
-            result = u'Series([], Dtype: %s)' % self.dtype
+            result = u'Series([], dtype: %s)' % self.dtype
 
         assert type(result) == unicode
         return result
@@ -1080,8 +1080,8 @@ def _tidy_repr(self, max_vals=20):
                                     dtype=False, name=False)
         tail = self[-(max_vals - num):]._get_repr(print_header=False,
                                                   length=False,
-                                                  dtype=False,
-                                                  name=False)
+                                                  name=False,
+                                                  dtype=False)
         result = head + '\n...\n' + tail
         result = '%s\n%s' % (result, self._repr_footer())
 
@@ -1090,8 +1090,8 @@ def _tidy_repr(self, max_vals=20):
     def _repr_footer(self):
         namestr = u"Name: %s, " % com.pprint_thing(
             self.name) if self.name is not None else ""
-        return u'%sLength: %d, Dtype: %s' % (namestr, len(self),
-                                             com.pprint_thing(self.dtype.name))
+        return u'%sLength: %d, dtype: %s' % (namestr, len(self),
+                                             str(self.dtype.name))
 
     def to_string(self, buf=None, na_rep='NaN', float_format=None,
                   nanRep=None, length=False, dtype=False, name=False):

pandas/tests/test_format.py

@@ -591,7 +591,7 @@ def test_long_series(self):
 
         import re
         str_rep = str(s)
-        nmatches = len(re.findall('Dtype',str_rep))
+        nmatches = len(re.findall('dtype',str_rep))
         self.assert_(nmatches == 1)
 
     def test_to_string(self):