CLN: Remove compat checks in tests/io/parser

xref pandas-devgh-25725

Author: gfyoung

pandas/tests/io/parser/test_common.py

@@ -9,6 +9,7 @@
 from collections import OrderedDict
 import csv
 from datetime import datetime
+from io import TextIOWrapper
 import os
 import platform
 from tempfile import TemporaryFile
@@ -75,9 +76,6 @@ def _set_noconvert_columns(self):
 
 
 def test_bytes_io_input(all_parsers):
-    if compat.PY2:
-        pytest.skip("Bytes-related test does not need to work on Python 2.x")
-
     encoding = "cp1255"
     parser = all_parsers
 
@@ -112,8 +110,7 @@ def test_bad_stream_exception(all_parsers, csv_dir_path):
     utf8 = codecs.lookup('utf-8')
     parser = all_parsers
 
-    msg = ("'utf-8' codec can't decode byte" if compat.PY3
-           else "'utf8' codec can't decode byte")
+    msg = "'utf-8' codec can't decode byte"
 
     # Stream must be binary UTF8.
     with open(path, "rb") as handle, codecs.StreamRecoder(
@@ -124,7 +121,6 @@ def test_bad_stream_exception(all_parsers, csv_dir_path):
             parser.read_csv(stream)
 
 
-@pytest.mark.skipif(compat.PY2, reason="PY3-only test")
 def test_read_csv_local(all_parsers, csv1):
     prefix = u("file:///") if compat.is_platform_windows() else u("file://")
     parser = all_parsers
@@ -963,10 +959,7 @@ def test_utf16_bom_skiprows(all_parsers, sep, encoding):
             f.write(bytes_data)
 
         bytes_buffer = BytesIO(data.encode(utf8))
-
-        if compat.PY3:
-            from io import TextIOWrapper
-            bytes_buffer = TextIOWrapper(bytes_buffer, encoding=utf8)
+        bytes_buffer = TextIOWrapper(bytes_buffer, encoding=utf8)
 
         result = parser.read_csv(path, encoding=encoding, **kwargs)
         expected = parser.read_csv(bytes_buffer, encoding=utf8, **kwargs)
@@ -978,7 +971,7 @@ def test_utf16_bom_skiprows(all_parsers, sep, encoding):
 @pytest.mark.parametrize("buffer", [
     False,
     pytest.param(True, marks=pytest.mark.skipif(
-        compat.PY3, reason="Not supported on PY3"))])
+        True, reason="Not supported"))])
 def test_utf16_example(all_parsers, csv_dir_path, buffer):
     path = os.path.join(csv_dir_path, "utf16_ex.txt")
     parser = all_parsers
@@ -1565,22 +1558,17 @@ def test_iteration_open_handle(all_parsers):
     kwargs = dict(squeeze=True, header=None)
 
     with tm.ensure_clean() as path:
-        with open(path, "wb" if compat.PY2 else "w") as f:
+        with open(path, "w") as f:
             f.write("AAA\nBBB\nCCC\nDDD\nEEE\nFFF\nGGG")
 
-        with open(path, "rb" if compat.PY2 else "r") as f:
+        with open(path, "r") as f:
             for line in f:
                 if "CCC" in line:
                     break
 
-            if parser.engine == "c" and compat.PY2:
-                msg = "Mixing iteration and read methods would lose data"
-                with pytest.raises(ValueError, match=msg):
-                    parser.read_csv(f, **kwargs)
-            else:
-                result = parser.read_csv(f, **kwargs)
-                expected = Series(["DDD", "EEE", "FFF", "GGG"], name=0)
-                tm.assert_series_equal(result, expected)
+            result = parser.read_csv(f, **kwargs)
+            expected = Series(["DDD", "EEE", "FFF", "GGG"], name=0)
+            tm.assert_series_equal(result, expected)
 
 
 @pytest.mark.parametrize("data,thousands,decimal", [

pandas/tests/io/parser/test_python_parser_only.py

@@ -8,10 +8,10 @@
 """
 
 import csv
+from io import TextIOWrapper
 
 import pytest
 
-import pandas.compat as compat
 from pandas.compat import BytesIO, StringIO, u
 from pandas.errors import ParserError
 
@@ -83,11 +83,9 @@ def test_sniff_delimiter_encoding(python_parser_only, encoding):
 
     if encoding is not None:
         data = u(data).encode(encoding)
-        data = BytesIO(data)
 
-        if compat.PY3:
-            from io import TextIOWrapper
-            data = TextIOWrapper(data, encoding=encoding)
+        data = BytesIO(data)
+        data = TextIOWrapper(data, encoding=encoding)
     else:
         data = StringIO(data)
 

pandas/tests/io/parser/test_read_fwf.py

@@ -161,9 +161,6 @@ def test_read_csv_compat():
 
 
 def test_bytes_io_input():
-    if not compat.PY3:
-        pytest.skip("Bytes-related test - only needs to work on Python 3")
-
     result = read_fwf(BytesIO("שלום\nשלום".encode('utf8')),
                       widths=[2, 2], encoding="utf8")
     expected = DataFrame([["של", "ום"]], columns=["של", "ום"])
@@ -441,9 +438,6 @@ def test_multiple_delimiters():
 
 
 def test_variable_width_unicode():
-    if not compat.PY3:
-        pytest.skip("Bytes-related test - only needs to work on Python 3")
-
     data = """
 שלום שלום
 ום   שלל
@@ -566,9 +560,7 @@ def test_fwf_compression(compression_only, infer):
 
     kwargs = dict(widths=[5, 5], names=["one", "two"])
     expected = read_fwf(StringIO(data), **kwargs)
-
-    if compat.PY3:
-        data = bytes(data, encoding="utf-8")
+    data = bytes(data, encoding="utf-8")
 
     with tm.ensure_clean(filename="tmp." + extension) as path:
         tm.write_to_compressed(compression, path, data)