From: Kenneth Reitz <me@kennethreitz.com>
Date: Mon, 17 Dec 2012 08:16:21 +0000 (-0500)
Subject: meh
X-Git-Tag: v1.0.0~43
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e766f0b67caa6facf4a9173f1dc3eb931dd16e24;p=services%2Fpython-requests.git

meh
---

diff --git a/requests/adapters.py b/requests/adapters.py
index 2f45e2a..10ed251 100644
--- a/requests/adapters.py
+++ b/requests/adapters.py
@@ -10,7 +10,7 @@ and maintain connections.
 import os
 from .models import Response
 from .packages.urllib3.poolmanager import PoolManager
-from .utils import DEFAULT_CA_BUNDLE_PATH
+from .utils import DEFAULT_CA_BUNDLE_PATH, get_encoding_from_headers
 
 import socket
 from .structures import CaseInsensitiveDict
@@ -43,9 +43,7 @@ class BaseAdapter(object):
 
 class HTTPAdapter(BaseAdapter):
     """Built-In HTTP Adapter for Urllib3."""
-    def __init__(self,
-        pool_connections=DEFAULT_POOLSIZE,
-        pool_maxsize=DEFAULT_POOLSIZE):
+    def __init__(self, pool_connections=DEFAULT_POOLSIZE, pool_maxsize=DEFAULT_POOLSIZE):
         self.max_retries = DEFAULT_RETRIES
         self.config = {}
 
@@ -103,7 +101,7 @@ class HTTPAdapter(BaseAdapter):
         response.headers = CaseInsensitiveDict(getattr(resp, 'headers', {}))
 
         # Set encoding.
-        # response.encoding = get_encoding_from_headers(response.headers)
+        response.encoding = get_encoding_from_headers(response.headers)
         response.raw = resp
 
         if isinstance(req.url, bytes):