BUG: get #1620 fix working on python 3

Author: wesm

pandas/core/format.py

@@ -132,15 +132,17 @@ def to_string(self):
 
 if py3compat.PY3:  # pragma: no cover
     _encode_diff = lambda x: 0
+
+    _strlen = len
 else:
     def _encode_diff(x):
         return len(x) - len(x.decode('utf-8'))
 
-def _strlen(x):
-    try:
-        return len(x.decode('utf-8'))
-    except UnicodeError:
-        return len(x)
+    def _strlen(x):
+        try:
+            return len(x.decode('utf-8'))
+        except UnicodeError:
+            return len(x)
 
 class DataFrameFormatter(object):
     """

pandas/tests/test_frame.py

@@ -2575,14 +2575,15 @@ def test_repr(self):
         fmt.reset_printoptions()
 
     def test_repr_unicode(self):
-        df = DataFrame({'A': ['\xc3\xa4\xc3\xa4\xc3\xa4\xc3\xa4',
-                              '\xc3\xbc\xc3\xbc\xc3\xbc\xc3\xbc']})
+        uval = u'\u03c3\u03c3\u03c3\u03c3'
+        bval = uval.encode('utf-8')
+        df = DataFrame({'A': [uval, uval]})
 
         result = repr(df)
         ex_top = '      A'
         self.assertEqual(result.split('\n')[0].rstrip(), ex_top)
 
-        df = DataFrame({'A': [u'\xe4\xe4\xe4\xe4', u'\xfc\xfc\xfc\xfc']})
+        df = DataFrame({'A': [uval, uval]})
         result = repr(df)
         self.assertEqual(result.split('\n')[0].rstrip(), ex_top)
 

pandas/tseries/resample.py

@@ -45,7 +45,7 @@ def __init__(self, freq='Min', closed='right', label='right', how='mean',
         self.kind = kind
 
         self.convention = convention or 'E'
-        self.convention = convention.lower()
+        self.convention = self.convention.lower()
 
         self.axis = axis
         self.loffset = loffset