From: Ian Cordasco <graffatcolmingov@gmail.com>
Date: Wed, 18 Dec 2013 14:43:18 +0000 (-0600)
Subject: Fix all remaining references to charade
X-Git-Tag: v2.2.0~2^2~6^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9379a14cb41916ce71fd94feaa26808b7770511d;p=services%2Fpython-requests.git

Fix all remaining references to charade
---

diff --git a/requests/compat.py b/requests/compat.py
index 0d61a57..bdf10d6 100644
--- 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 34dce18..e2a03d0 100644
--- 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 3948adb..c42f376 100644
--- 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