diff --git a/requests/_config.py b/requests/_config.py index 7ecc2a10..d30b70b8 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 832a11f3..43b6df70 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 = []