further remove config

diff --git a/requests/adapters.py b/requests/adapters.py
index e5001ee3a8f235f4ce526ab65854feab6ac6b890..2f45e2a030fbf157fb57153d7a289b3b7a47b0a6 100644 (file)
--- a/requests/adapters.py
+++ b/requests/adapters.py
@@ -34,8 +34,8 @@ class BaseAdapter(object):
     def __init__(self):
         super(BaseAdapter, self).__init__()
 
-    # def send(self):
-    #     raise NotImplementedError
+    def send(self):
+        raise NotImplementedError
 
     def close(self):
         raise NotImplementedError

diff --git a/requests/defaults.py b/requests/defaults.py
index 26c68121992f786c8ebc5eae93268315e46d3f28..c54026ceefacbb1a6f30345668ef94f80245b2dd 100644 (file)
--- a/requests/defaults.py
+++ b/requests/defaults.py
@@ -19,18 +19,3 @@ Configurations:
 """
 
 SCHEMAS = ['http', 'https']
-
-from .utils import default_user_agent
-
-defaults = dict()
-
-defaults['base_headers'] = {
-    'User-Agent': default_user_agent(),
-    'Accept-Encoding': ', '.join(('gzip', 'deflate', 'compress')),
-    'Accept': '*/*'
-}
-
-# Consumed at the session level, not connection.
-defaults['max_redirects'] = 30
-defaults['trust_env'] = True
-# defaults['support_http0.9'] = True

diff --git a/requests/sessions.py b/requests/sessions.py
index 7dc6a7552c700dcd6cd51ac95f706a15e78ccb1e..d5fa9f554c0401d031b3638e809c1cb0c6a91fa5 100644 (file)
--- a/requests/sessions.py
+++ b/requests/sessions.py
@@ -12,10 +12,9 @@ requests (cookies, auth, proxies).
 from copy import deepcopy
 from .compat import cookielib
 from .cookies import cookiejar_from_dict, remove_cookie_by_name
-from .defaults import defaults
 from .models import Request
 from .hooks import dispatch_hook
-from .utils import header_expand, from_key_val_list
+from .utils import header_expand, from_key_val_list, default_headers
 from .packages.urllib3.poolmanager import PoolManager
 
 from .compat import urlparse, urljoin
@@ -25,7 +24,7 @@ from .utils import requote_uri
 
 from .status_codes import codes
 REDIRECT_STATI = (codes.moved, codes.found, codes.other, codes.temporary_moved)
-
+DEFAULT_REDIRECT_LIMIT = 30
 
 
 def merge_kwargs(local_kwarg, default_kwarg):
@@ -135,11 +134,6 @@ class SessionMixin(object):
 
 
 
-
-
-
-
-
 class Session(SessionMixin):
     """A Requests session."""
 
@@ -198,8 +192,13 @@ class Session(SessionMixin):
         #: SSL certificate.
         self.cert = cert
 
-        for (k, v) in list(defaults.items()):
-            self.config.setdefault(k, deepcopy(v))
+        #: Maximum number of redirects to follow.
+        self.max_redirects = DEFAULT_REDIRECT_LIMIT
+
+        #: Should we trust the environment
+        self.trust_env = True
+
+        self.default_headers = default_headers()
 
         # Set up a CookieJar to be used by default
         if isinstance(cookies, cookielib.CookieJar):

diff --git a/requests/utils.py b/requests/utils.py
index 91a3b760d830e2c8a58d0ff66f885342e80d78d4..ca4591fda0a62222b6f8852f87d5a685066da96e 100644 (file)
--- a/requests/utils.py
+++ b/requests/utils.py
@@ -556,7 +556,7 @@ def default_user_agent():
         _implementation_version = platform.python_version()  # Complete Guess
     else:
         _implementation_version = 'Unknown'
-        
+
     try:
         p_system = platform.system()
         p_release = platform.release()
@@ -570,6 +570,13 @@ def default_user_agent():
             '%s/%s' % (p_system, p_release),
         ])
 
+def default_headers():
+    return {
+        'User-Agent': default_user_agent(),
+        'Accept-Encoding': ', '.join(('gzip', 'deflate', 'compress')),
+        'Accept': '*/*'
+    }
+
 
 def parse_header_links(value):
     """Return a dict of parsed link headers proxies.