1 files changed, 86 insertions, 0 deletions
diff --git a/urllib3/sessionmanager.py b/urllib3/sessionmanager.py
new file mode 100644
index 00000000..3df71e6d
--- /dev/null
+++ b/urllib3/sessionmanager.py
@@ -0,0 +1,86 @@
+from .util.retry import Retry
+from .poolmanager import PoolManager, ProxyManager
+from .request import RequestMethods, Request
+from .util.sessioncontext import SessionContext
+
+
+class SessionManager(RequestMethods):
+    """
+    Allows arbitrary requests while maintaining session context across
+    those requests. Currently, that context consists of automatic
+    cookie storage and retrieval.
+
+    :param manager:
+        An appropriate :class:`urllib3.poolmanager.PoolManager` or
+        :class:`urllib3.poolmanager.ProxyManager` object
+        to handle HTTP requests for the SessionManager
+
+    :param context:
+        A predefined :class:`urllib3.util.context.SessionContext` object to use in the session;
+        if not provided, a new one will be created.
+
+    :param headers:
+        Headers to include with all requests, unless other
+        headers are given explicitly.
+
+    Example::
+
+        >>> manager = SessionManager(PoolManager())
+        >>> manager.context.cookie_jar
+        <CookieJar[]>
+        >>> len(manager.context.cookie_jar)
+        0
+        >>> manager.request('GET', 'http://google.com')
+        >>> manager.request('GET', 'http://yahoo.com')
+        >>> len(manager.context.cookie_jar)
+        2
+
+    """
+
+    manager_class = PoolManager
+
+    def __init__(self, context=None, headers=None, manager=None, **manager_kw):
+        super(SessionManager, self).__init__(headers=headers)
+        self.manager = self.manager_class(**manager_kw) if manager is None else manager
+        self.context = context or SessionContext()
+
+    def urlopen(self, method, url, redirect=True, retries=None, **kw):
+        """
+        Same as :meth:`urllib3.poolmanager.PoolManager.urlopen` with added
+        request-context-managing special sauce. The received ``url`` param
+        must be an absolute path.
+
+        This is a low-level method; use :func:`urllib3.request.RequestMethods.request`
+        instead.
+        """
+        headers = kw.pop('headers', self.headers)
+
+        if not isinstance(retries, Retry):
+            retries = Retry.from_int(retries, redirect=redirect)
+
+        # Build a mock Request object to work with
+        request_object = Request(url=url, method=method, headers=headers)
+        self.context.apply_to(request_object)
+        modified_headers = request_object.get_all_headers()
+
+        # Ensure that redirects happen at this level only
+        kw['redirect'] = False
+        kw['headers'] = modified_headers
+
+        response = self.manager.urlopen(method, url, retries=retries, **kw)
+
+        # Retrieve any context from the response
+        self.context.extract_from(response, request_object)
+
+        # Redirect as necessary, and return.
+        if redirect and response.get_redirect_location():
+            kw['redirect'] = redirect
+            kw['headers'] = headers
+            return self.redirect(response=response, method=method,
+                                 retries=retries, url=url, **kw)
+        return response
+
+
+class ProxySessionManager(SessionManager):
+
+    manager_class = ProxyManager