diff options
| author | Ian Cordasco <graffatcolmingov@gmail.com> | 2013-12-18 08:46:49 -0600 |
|---|---|---|
| committer | Ian Cordasco <graffatcolmingov@gmail.com> | 2013-12-18 08:46:49 -0600 |
| commit | d8d9591076a6222bad87c89591b0667180564ec4 (patch) | |
| tree | 4841b5c9630b2891f177644c3bfe3dcce08e8200 | |
| parent | 9379a14cb41916ce71fd94feaa26808b7770511d (diff) | |
| download | python-requests-swap-charade-for-chardet.tar.gz | |
Update the history and change the last last references to charadeswap-charade-for-chardet
| -rw-r--r-- | HISTORY.rst | 5 | ||||
| -rw-r--r-- | docs/user/advanced.rst | 2 | ||||
| -rwxr-xr-x | setup.py | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/HISTORY.rst b/HISTORY.rst index f27ce332..91d75058 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -3,6 +3,11 @@ Release History --------------- +2.x.y (yyyy-mm-dd) +++++++++++++++++++ + +- Switch back to using chardet since charade has merged with it + 2.1.0 (2013-12-05) ++++++++++++++++++ diff --git a/docs/user/advanced.rst b/docs/user/advanced.rst index 74f59af8..3ff66d52 100644 --- a/docs/user/advanced.rst +++ b/docs/user/advanced.rst @@ -369,7 +369,7 @@ Encodings When you receive a response, Requests makes a guess at the encoding to use for decoding the response when you call the ``Response.text`` method. Requests will first check for an encoding in the HTTP header, and if none is present, -will use `charade <http://pypi.python.org/pypi/charade>`_ to attempt to guess +will use `chardet <http://pypi.python.org/pypi/chardet>`_ to attempt to guess the encoding. The only time Requests will not do this is if no explicit charset is present @@ -17,7 +17,7 @@ if sys.argv[-1] == 'publish': packages = [ 'requests', 'requests.packages', - 'requests.packages.charade', + 'requests.packages.chardet', 'requests.packages.urllib3', 'requests.packages.urllib3.packages', 'requests.packages.urllib3.contrib', |