From dba1017d76aef14fe0f0249fee833eada435c41e Mon Sep 17 00:00:00 2001 From: Shashank Agarwal Date: Wed, 27 Aug 2014 13:44:01 -0400 Subject: [PATCH] Provides a link to the list of encoding in Python Better links Added link to standard encodings in io html documentation Removed link to Python2 documentations and left link to Python3 only --- doc/source/io.rst | 8 ++++++-- pandas/io/parsers.py | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/doc/source/io.rst b/doc/source/io.rst index ad0a5bb3b67c9..0930dad19958d 100644 --- a/doc/source/io.rst +++ b/doc/source/io.rst @@ -165,7 +165,9 @@ They can take a number of arguments: - ``converters``: a dictionary of functions for converting values in certain columns, where keys are either integers or column labels - ``encoding``: a string representing the encoding to use for decoding - unicode data, e.g. ``'utf-8``` or ``'latin-1'``. + unicode data, e.g. ``'utf-8``` or ``'latin-1'``. `Full list of Python + standard encodings + `_ - ``verbose``: show number of NA values inserted in non-numeric columns - ``squeeze``: if True then output with only one column is turned into Series - ``error_bad_lines``: if False then any lines causing an error will be skipped :ref:`bad lines ` @@ -372,7 +374,9 @@ result in byte strings being decoded to unicode in the result: df['word'][1] Some formats which encode all characters as multiple bytes, like UTF-16, won't -parse correctly at all without specifying the encoding. +parse correctly at all without specifying the encoding. `Full list of Python +standard encodings +`_ .. _io.index_col: diff --git a/pandas/io/parsers.py b/pandas/io/parsers.py index 6d2afbad36e35..68e3fb2348958 100644 --- a/pandas/io/parsers.py +++ b/pandas/io/parsers.py @@ -132,7 +132,9 @@ class ParserWarning(Warning): delimiter : string, default None Alternative argument name for sep. Regular expressions are accepted. encoding : string, default None - Encoding to use for UTF when reading/writing (ex. 'utf-8') + Encoding to use for UTF when reading/writing (ex. 'utf-8'). `List of Python + standard encodings + `_ squeeze : boolean, default False If the parsed data only contains one column then return a Series na_filter : boolean, default True