Fix all remaining references to charade

diff --git a/requests/compat.py b/requests/compat.py
index 0d61a572df619d5538c6db07af3b9db60d65f587..bdf10d6a9f9c0c073f85ca3cbdbc6c12eca610cd 100644 (file)
--- a/requests/compat.py
+++ b/requests/compat.py
@@ -4,7 +4,7 @@
 pythoncompat
 """
 
-from .packages import charade as chardet
+from .packages import chardet
 
 import sys
 

diff --git a/requests/models.py b/requests/models.py
index 34dce1819cee81444d5cd3b3ac3877d88e8afea7..e2a03d05ec3c2259e8dc05d30599bc94500055e3 100644 (file)
--- a/requests/models.py
+++ b/requests/models.py
@@ -688,7 +688,7 @@ class Response(object):
         """Content of the response, in unicode.
 
         If Response.encoding is None, encoding will be guessed using
-        ``charade``.
+        ``chardet``.
         """
 
         # Try charset from content-type

diff --git a/requests/packages/README.rst b/requests/packages/README.rst
index 3948adb6879cbe7d570a043bca5719d03c1b14d0..c42f376b944c9332ec95593d2796d78ecc336c32 100644 (file)
--- a/requests/packages/README.rst
+++ b/requests/packages/README.rst
@@ -5,4 +5,4 @@ them and submitted as separate pull requests to those libraries.
 
 urllib3 pull requests go here: https://github.com/shazow/urllib3
 
-charade pull requests go here: https://github.com/sigmavirus24/charade
+chardet pull requests go here: https://github.com/chardet/chardet