Address comments

Author: wesm

pandas/indexes/api.py

@@ -1,10 +1,11 @@
-from .base import (Index, _new_Index,  # noqa
-                   _ensure_index, _get_na_value,
-                   InvalidIndexError)
-from .category import CategoricalIndex  # noqa
-from .multi import MultiIndex  # noqa
-from .numeric import NumericIndex, Float64Index, Int64Index  # noqa
-from .range import RangeIndex  # noqa
+from pandas.indexes.base import (Index, _new_Index,  # noqa
+                                 _ensure_index, _get_na_value,
+                                 InvalidIndexError)
+from pandas.indexes.category import CategoricalIndex  # noqa
+from pandas.indexes.multi import MultiIndex  # noqa
+from pandas.indexes.numeric import (NumericIndex, Float64Index,  # noqa
+                                    Int64Index)
+from pandas.indexes.range import RangeIndex  # noqa
 
 import pandas.core.common as com
 import pandas.lib as lib

pandas/tests/indexes/common.py

@@ -14,34 +14,12 @@
 
 import pandas as pd
 
-if PY3:
-    unicode = lambda x: x
-
 
 class Base(object):
     """ base class for index sub-class tests """
     _holder = None
     _compat_props = ['shape', 'ndim', 'size', 'itemsize', 'nbytes']
 
-    # @staticmethod
-    # def setup_indices(cls, indices):
-    #     # setup the test indices in the self.indices dict
-    #     def make_accessor(x):
-    #         @property
-    #         def accessor(self):
-    #             key = '__cached_{0}'.format(x)
-    #             if hasattr(self, key):
-    #                 return getattr(self, key)
-    #             else:
-    #                 result = self.indices[x].copy(deep=True)
-    #                 setattr(self, key, result)
-    #                 return result
-
-    #         return accessor
-
-    #     for name in indices:
-    #         setattr(cls, name, make_accessor(name))
-
     def setup_indices(self):
         for name, idx in self.indices.items():
             setattr(self, name, idx)

pandas/tests/indexes/test_base.py

@@ -29,9 +29,6 @@
 import pandas as pd
 from pandas.lib import Timestamp
 
-if PY3:
-    unicode = lambda x: x
-
 
 class TestIndex(Base, tm.TestCase):
     _holder = Index
@@ -1349,7 +1346,7 @@ def test_string_index_repr(self):
             self.assertEqual(repr(idx), expected)
         else:
             expected = u"""Index([u'a', u'bb', u'ccc'], dtype='object')"""
-            self.assertEqual(unicode(idx), expected)
+            self.assertEqual(u(idx), expected)
 
         # multiple lines
         idx = pd.Index(['a', 'bb', 'ccc'] * 10)
@@ -1368,7 +1365,7 @@ def test_string_index_repr(self):
        u'ccc', u'a', u'bb', u'ccc', u'a', u'bb', u'ccc', u'a', u'bb', u'ccc'],
       dtype='object')"""
 
-            self.assertEqual(unicode(idx), expected)
+            self.assertEqual(u(idx), expected)
 
         # truncated
         idx = pd.Index(['a', 'bb', 'ccc'] * 100)
@@ -1387,7 +1384,7 @@ def test_string_index_repr(self):
        u'ccc', u'a', u'bb', u'ccc', u'a', u'bb', u'ccc', u'a', u'bb', u'ccc'],
       dtype='object', length=300)"""
 
-            self.assertEqual(unicode(idx), expected)
+            self.assertEqual(u(idx), expected)
 
         # short
         idx = pd.Index([u'あ', u'いい', u'ううう'])
@@ -1397,7 +1394,7 @@ def test_string_index_repr(self):
         else:
             expected = u"""\
 Index([u'あ', u'いい', u'ううう'], dtype='object')"""
-            self.assertEqual(unicode(idx), expected)
+            self.assertEqual(u(idx), expected)
 
         # multiple lines
         idx = pd.Index([u'あ', u'いい', u'ううう'] * 10)
@@ -1414,7 +1411,7 @@ def test_string_index_repr(self):
        u'ううう', u'あ', u'いい', u'ううう', u'あ', u'いい', u'ううう', u'あ', u'いい', u'ううう'],
       dtype='object')"""
 
-            self.assertEqual(unicode(idx), expected)
+            self.assertEqual(u(idx), expected)
 
         # truncated
         idx = pd.Index([u'あ', u'いい', u'ううう'] * 100)
@@ -1431,7 +1428,7 @@ def test_string_index_repr(self):
        u'ううう', u'あ', u'いい', u'ううう', u'あ', u'いい', u'ううう', u'あ', u'いい', u'ううう'],
       dtype='object', length=300)"""
 
-            self.assertEqual(unicode(idx), expected)
+            self.assertEqual(u(idx), expected)
 
         # Emable Unicode option -----------------------------------------
         with cf.option_context('display.unicode.east_asian_width', True):
@@ -1443,7 +1440,7 @@ def test_string_index_repr(self):
                 self.assertEqual(repr(idx), expected)
             else:
                 expected = u"""Index([u'あ', u'いい', u'ううう'], dtype='object')"""
-                self.assertEqual(unicode(idx), expected)
+                self.assertEqual(u(idx), expected)
 
             # multiple lines
             idx = pd.Index([u'あ', u'いい', u'ううう'] * 10)
@@ -1462,7 +1459,7 @@ def test_string_index_repr(self):
        u'ううう', u'あ', u'いい', u'ううう', u'あ', u'いい', u'ううう'],
       dtype='object')"""
 
-                self.assertEqual(unicode(idx), expected)
+                self.assertEqual(u(idx), expected)
 
             # truncated
             idx = pd.Index([u'あ', u'いい', u'ううう'] * 100)
@@ -1483,7 +1480,7 @@ def test_string_index_repr(self):
        u'いい', u'ううう'],
       dtype='object', length=300)"""
 
-                self.assertEqual(unicode(idx), expected)
+                self.assertEqual(u(idx), expected)
 
 
 def test_get_combined_index():