From: Kenneth Reitz <me@kennethreitz.com>
Date: Thu, 13 Oct 2011 18:34:56 +0000 (-0400)
Subject: blargh
X-Git-Tag: v0.8.0~94^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a0e9b21c9da518d757bb5bd7510b50e6095de85c;p=services%2Fpython-requests.git

blargh
---

diff --git a/requests/_config.py b/requests/_config.py
index 7ecc2a1..d30b70b 100644
--- a/requests/_config.py
+++ b/requests/_config.py
@@ -39,8 +39,12 @@ def get_config(config=None, default_config=None):
 # Module-level defaults.
 defaults = dict()
 
-defaults['base_headers'] = {'User-Agent': 'python-requests.org'}
-defaults['accept_gzip'] = True
+defaults['base_headers'] = {
+    'User-Agent': 'python-requests.org',
+    'Accept-Encoding': ', '.join([ 'identity', 'deflate', 'compress', 'gzip' ]),
+}
+
+# defaults['accept_gzip'] = True
 defaults['proxies'] = {}
 defaults['verbose'] = None
 defaults['timeout'] = None
@@ -50,3 +54,9 @@ defaults['keep_alive'] = True
 defaults['max_connections'] = 10
 
 
+defaults['hooks'] = {
+    'args': list(),
+    'pre_request': list(),
+    'post_request': list(),
+    'response': list()
+}
\ No newline at end of file
diff --git a/requests/utils.py b/requests/utils.py
index 832a11f..43b6df7 100644
--- a/requests/utils.py
+++ b/requests/utils.py
@@ -280,6 +280,8 @@ def get_unicode_from_response(r):
     3. fall back and replace all unicode characters
 
     """
+    # TODO: DEBUG
+    return r.content
 
     tried_encodings = []