Remove code related to support python <= 2.5

Fix #1226

testing/test_assertion.py

@@ -7,7 +7,6 @@ import _pytest.assertion as plugin
 from _pytest.assertion import reinterpret
 from _pytest.assertion import util
 
-needsnewassert = pytest.mark.skipif("sys.version_info < (2,6)")
 PY3 = sys.version_info >= (3, 0)
 
 
@@ -26,7 +25,6 @@ def interpret(expr):
     return reinterpret.reinterpret(expr, py.code.Frame(sys._getframe(1)))
 
 class TestBinReprIntegration:
-    pytestmark = needsnewassert
 
     def test_pytest_assertrepr_compare_called(self, testdir):
         testdir.makeconftest("""
@@ -361,7 +359,6 @@ def test_python25_compile_issue257(testdir):
             *1 failed*
     """)
 
-@needsnewassert
 def test_rewritten(testdir):
     testdir.makepyfile("""
         def test_rewritten():
@@ -374,7 +371,6 @@ def test_reprcompare_notin(mock_config):
         mock_config, 'not in', 'foo', 'aaafoobbb')[1:]
     assert detail == ["'foo' is contained here:", '  aaafoobbb', '?    +++']
 
-@needsnewassert
 def test_pytest_assertrepr_compare_integration(testdir):
     testdir.makepyfile("""
         def test_hello():
@@ -391,7 +387,6 @@ def test_pytest_assertrepr_compare_integration(testdir):
         "*E*50*",
     ])
 
-@needsnewassert
 def test_sequence_comparison_uses_repr(testdir):
     testdir.makepyfile("""
         def test_hello():
@@ -410,7 +405,6 @@ def test_sequence_comparison_uses_repr(testdir):
     ])
 
 
-@pytest.mark.xfail("sys.version_info < (2,6)")
 def test_assert_compare_truncate_longmessage(testdir):
     testdir.makepyfile(r"""
         def test_long():
@@ -438,7 +432,6 @@ def test_assert_compare_truncate_longmessage(testdir):
     ])
 
 
-@needsnewassert
 def test_assertrepr_loaded_per_dir(testdir):
     testdir.makepyfile(test_base=['def test_base(): assert 1 == 2'])
     a = testdir.mkdir('a')
@@ -547,7 +540,7 @@ def test_traceback_failure(testdir):
         "*test_traceback_failure.py:4: AssertionError"
     ])
 
-@pytest.mark.skipif("sys.version_info < (2,5) or '__pypy__' in sys.builtin_module_names or sys.platform.startswith('java')" )
+@pytest.mark.skipif("'__pypy__' in sys.builtin_module_names or sys.platform.startswith('java')" )
 def test_warn_missing(testdir):
     testdir.makepyfile("")
     result = testdir.run(sys.executable, "-OO", "-m", "pytest", "-h")