Update the history and change the last last references to charade

diff --git a/HISTORY.rst b/HISTORY.rst
index f27ce332ee5034742129459d5edda14d8c542fa4..91d750582f8b5be5b4fbdd251babf7c26b45be81 100644 (file)
--- 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 74f59af853b086d5cea9a67454de4b16bdb37423..3ff66d52d1cf7e5ed1d5ab16f5028d9ff4d399f3 100644 (file)
--- 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

diff --git a/setup.py b/setup.py
index e22be010ef376e0a9140513d060a383a947f9a05..16ba717b681febcb718863db08dd23fba92d2c26 100755 (executable)
--- 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',