From d8d9591076a6222bad87c89591b0667180564ec4 Mon Sep 17 00:00:00 2001 From: Ian Cordasco Date: Wed, 18 Dec 2013 08:46:49 -0600 Subject: [PATCH] Update the history and change the last last references to charade --- HISTORY.rst | 5 +++++ docs/user/advanced.rst | 2 +- setup.py | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index f27ce33..91d7505 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 74f59af..3ff66d5 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 `_ to attempt to guess +will use `chardet `_ to attempt to guess the encoding. The only time Requests will not do this is if no explicit charset is present diff --git a/setup.py b/setup.py index e22be01..16ba717 100755 --- a/setup.py +++ b/setup.py @@ -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', -- 2.7.4