Py2 tests not needed any more

Author: topper-123

pandas/core/indexes/multi.py

@@ -761,27 +761,11 @@ def set_codes(self, codes, level=None, inplace=False,
 
         Examples
         --------
-        >>> idx = pd.MultiIndex.from_tuples([(1, 'one'), (1, 'two'),
-                                            (2, 'one'), (2, 'two')],
+        >>> idx = pd.MultiIndex.from_tuples([(1, 'one'),
+                                             (1, 'two'),
+                                             (2, 'one'),
+                                             (2, 'two')],
                                             names=['foo', 'bar'])
-<<<<<<< HEAD
-        >>> idx.set_codes([[1,0,1,0], [0,0,1,1]])
-        MultiIndex(levels=[[1, 2], ['one', 'two']],
-                   codes=[[1, 0, 1, 0], [0, 0, 1, 1]],
-                   names=['foo', 'bar'])
-        >>> idx.set_codes([1,0,1,0], level=0)
-        MultiIndex(levels=[[1, 2], ['one', 'two']],
-                   codes=[[1, 0, 1, 0], [0, 1, 0, 1]],
-                   names=['foo', 'bar'])
-        >>> idx.set_codes([0,0,1,1], level='bar')
-        MultiIndex(levels=[[1, 2], ['one', 'two']],
-                   codes=[[0, 0, 1, 1], [0, 0, 1, 1]],
-                   names=['foo', 'bar'])
-        >>> idx.set_codes([[1,0,1,0], [0,0,1,1]], level=[0,1])
-        MultiIndex(levels=[[1, 2], ['one', 'two']],
-                   codes=[[1, 0, 1, 0], [0, 0, 1, 1]],
-                   names=['foo', 'bar'])
-=======
         >>> idx.set_codes([[1, 0, 1, 0], [0, 0, 1, 1]])
         MultiIndex([(2, 'one'),
                     (1, 'one'),
@@ -805,12 +789,7 @@ def set_codes(self, codes, level=None, inplace=False,
                     (1, 'one'),
                     (2, 'two'),
                     (1, 'two')],
-<<<<<<< HEAD
-                   dtype='object', names=['foo', 'bar'])
->>>>>>> Update doc string examples and docs
-=======
                    names=['foo', 'bar'])
->>>>>>> don't show useless dtype in repr
         """
         if level is not None and not is_list_like(level):
             if not is_list_like(codes):

pandas/io/formats/printing.py

@@ -451,11 +451,11 @@ def _justify(head, tail):
     >>> _justify([['a', 'b']], [['abc', 'abcd']])
     ([('  a', '   b')], [('abc', 'abcd')])
     """
-    combined = head + tail  # type: Sequence[Sequence[str]]
+    combined = head + tail
 
     # For each position for the sequences in ``combined``,
     # find the length of the largest string.
-    max_length = [0] * len(combined[0])  # type: List[int]
+    max_length = [0] * len(combined[0])
     for inner_seq in combined:
         length = [len(item) for item in inner_seq]
         max_length = [max(x, y) for x, y in zip(max_length, length)]

pandas/tests/util/test_assert_index_equal.py

@@ -4,12 +4,11 @@
 import pytest
 
 from pandas import Categorical, Index, MultiIndex, NaT
-from pandas.util.testing import PY3, assert_index_equal
+from pandas.util.testing import assert_index_equal
 
 
 def test_index_equal_levels_mismatch():
-    if PY3:
-        msg = """Index are different
+    msg = """Index are different
 
 Index levels are different
 \\[left\\]:  1, Int64Index\\(\\[1, 2, 3\\], dtype='int64'\\)
@@ -18,16 +17,6 @@ def test_index_equal_levels_mismatch():
             \\('B', 3\\),
             \\('B', 4\\)\\],
            \\)"""
-    else:
-        msg = """Index are different
-
-Index levels are different
-\\[left\\]:  1, Int64Index\\(\\[1, 2, 3\\], dtype='int64'\\)
-\\[right\\]: 2, MultiIndex\\(\\[\\(u'A', 1\\),
-            \\(u'A', 2\\),
-            \\(u'B', 3\\),
-            \\(u'B', 4\\)\\],
-           \\)"""
 
     idx1 = Index([1, 2, 3])
     idx2 = MultiIndex.from_tuples([("A", 1), ("A", 2),