summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Pieters <mj@zopatista.com>2014-02-03 13:37:57 +0000
committerMartijn Pieters <mj@zopatista.com>2014-02-03 13:37:57 +0000
commitf35838beb6a84b1ece6e775570f6dd668dcd8da0 (patch)
tree760e9728189908e658ffdc90ab92113b3c749604
parent5ee8b348ebab9a7c427a87355dd089c83ee74be9 (diff)
downloadpython-requests-f35838beb6a84b1ece6e775570f6dd668dcd8da0.tar.gz
Remove logging and charade mention.
Logging is Not Allowed, so out it goes.
-rw-r--r--requests/models.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/requests/models.py b/requests/models.py
index 2adc5492..27b73899 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