Address comments by @jreback

Author: vnlitvinov

doc/source/whatsnew/v0.25.0.rst

@@ -141,7 +141,6 @@ Bug Fixes
 - Bug in :func:`to_datetime` which would raise an (incorrect) ``ValueError`` when called with a date far into the future and the ``format`` argument specified instead of raising ``OutOfBoundsDatetime`` (:issue:`23830`)
 - Bug in an error message in :meth:`DataFrame.plot`. Improved the error message if non-numerics are passed to :meth:`DataFrame.plot` (:issue:`25481`)
 - Bug in error messages in :meth:`DataFrame.corr` and :meth:`Series.corr`. Added the possibility of using a callable. (:issue:`25729`)
-- Bug in `TextReader()` not properly working with UTF8 on Windows on Python 3.6+ (fix for :issue:`15086` instead of a workaround)
 
 Categorical
 ^^^^^^^^^^^
@@ -236,6 +235,7 @@ I/O
 - Bug in :func:`json_normalize` for ``errors='ignore'`` where missing values in the input data, were filled in resulting ``DataFrame`` with the string "nan" instead of ``numpy.nan`` (:issue:`25468`)
 - :meth:`DataFrame.to_html` now raises ``TypeError`` when using an invalid type for the ``classes`` parameter instead of ``AsseertionError`` (:issue:`25608`)
 - Bug in :meth:`DataFrame.to_string` and :meth:`DataFrame.to_latex` that would lead to incorrect output when the ``header`` keyword is used (:issue:`16718`)
+- Bug in :func:`read_csv` not properly interpreting the UTF8 encoded filenames on Windows on Python 3.6+ (:issue:`15086`)
 -
 
 

pandas/tests/io/parser/test_common.py

@@ -5,8 +5,8 @@
 specific classification into the other test modules.
 """
 
-import sys
 import codecs
+import ctypes
 from collections import OrderedDict
 import csv
 from datetime import datetime
@@ -1905,15 +1905,14 @@ def test_suppress_error_output(all_parsers, capsys):
     assert captured.err == ""
 
 
-def __should_skip_utf8_test():
+def __windows_ansi_encoding_not_cp1252():
     if compat.is_platform_windows():
-        import ctypes
         ansi_codepage = ctypes.cdll.kernel32.GetACP()
-        return ansi_codepage != 1252 and sys.version_info < (3, 6)
+        return ansi_codepage != 1252 and not compat.PY36
     return False
 
-@pytest.mark.skipif(__should_skip_utf8_test(),
-                    reason="Python < 3.6 won't pass on non-1252 codepage")
+@pytest.mark.skipif(__windows_ansi_encoding_not_cp1252(),
+                    reason="On Python < 3.6 won't pass on non-1252 codepage")
 def test_filename_with_special_chars(all_parsers):
     # see gh-15086.
     parser = all_parsers