From: Martijn Pieters <mj@zopatista.com>
Date: Mon, 3 Feb 2014 13:37:57 +0000 (+0000)
Subject: Remove logging and charade mention.
X-Git-Tag: v2.3.0~5^2~6^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f35838beb6a84b1ece6e775570f6dd668dcd8da0;p=services%2Fpython-requests.git

Remove logging and charade mention.

Logging is Not Allowed, so out it goes.
---

diff --git a/requests/models.py b/requests/models.py
index 2adc549..27b7389 100644
--- a/requests/models.py
+++ b/requests/models.py
@@ -725,7 +725,7 @@ class Response(object):
         if not self.encoding and len(self.content) > 3:
             # No encoding set. JSON RFC 4627 section 3 states we should expect
             # UTF-8, -16 or -32. Detect which one to use; If the detection or
-            # decoding fails, fall back to `self.text` (using charade to make
+            # decoding fails, fall back to `self.text` (using chardet to make
             # a best guess).
             encoding = guess_json_utf(self.content)
             if encoding is not None:
@@ -737,8 +737,6 @@ class Response(object):
                     # and the server didn't bother to tell us what codec *was*
                     # used.
                     pass
-            log.warn('No encoding specified for JSON response, and no '
-                     'UTF codec detected. Falling back to charade best guess.')
         return json.loads(self.text, **kwargs)
 
     @property