MAINT: Prefer FS encoding over UTF-8

gfyoung · gfyoung · commit 5a4bcc1bc92b · 2019-01-21T05:39:53.000Z
diff --git a/pandas/io/parsers.py b/pandas/io/parsers.py
@@ -1315,7 +1315,8 @@ def _validate_usecols_arg(usecols):
             # see gh-13253
             #
             # Python 2.x compatibility
-            usecols = {col.encode("utf-8") for col in usecols}
+            encoding = sys.getfilesystemencoding() or "utf-8"
+            usecols = {col.encode(encoding) for col in usecols}
 
         return usecols, usecols_dtype
     return usecols, None

Original file line number	Diff line number	Diff line change
`@@ -1315,7 +1315,8 @@ def _validate_usecols_arg(usecols):`
`1315`	`1315`	`# see gh-13253`
`1316`	`1316`	`#`
`1317`	`1317`	`# Python 2.x compatibility`
`1318`		`- usecols = {col.encode("utf-8") for col in usecols}`
	`1318`	`+ encoding = sys.getfilesystemencoding() or "utf-8"`
	`1319`	`+ usecols = {col.encode(encoding) for col in usecols}`
`1319`	`1320`
`1320`	`1321`	`return usecols, usecols_dtype`
`1321`	`1322`	`return usecols, None`