get_default_session

lovelydinosaur · lovelydinosaur · commit fb46eeb2cb37 · 2016-01-07T11:03:19.000Z
diff --git a/coreapi/__init__.py b/coreapi/__init__.py
@@ -3,7 +3,8 @@
 from coreapi.document import Array, Document, Link, Object, Error, required
 from coreapi.document import dotted_path_to_list
 from coreapi.exceptions import ParseError, TransportError, ErrorMessage
-from coreapi.sessions import DefaultSession
+from coreapi.sessions import Session
+from coreapi.transport import HTTPTransport
 
 
 __version__ = '1.1.0'
@@ -14,33 +15,43 @@
     'dotted_path_to_list',
     'ParseError', 'NotAcceptable', 'TransportError', 'ErrorMessage',
     'HTTPTransport',
-    'load', 'dump', 'get'
+    'load', 'dump', 'get', 'get_default_session'
 ]
 
 
+_default_session = Session(
+    codecs=[CoreJSONCodec(), HTMLCodec()],
+    transports=[HTTPTransport()]
+)
+
+
+def get_default_session():
+    return _default_session
+
+
 def negotiate_encoder(accept=None):
-    session = DefaultSession()
+    session = _default_session
     return session.negotiate_encoder(accept)
 
 
 def negotiate_decoder(content_type=None):
-    session = DefaultSession()
+    session = _default_session
     return session.negotiate_decoder(content_type)
 
 
 def get(url):
-    session = DefaultSession()
+    session = _default_session
     return session.transition(url, 'get')
 
 
 def load(bytestring, content_type=None):
-    session = DefaultSession()
+    session = _default_session
     codec = session.negotiate_decoder(content_type)
     return codec.load(bytestring)
 
 
 def dump(document, accept=None, **kwargs):
-    session = DefaultSession()
+    session = _default_session
     codec = session.negotiate_encoder(accept)
     content = codec.dump(document, **kwargs)
     return codec.media_type, content
diff --git a/coreapi/document.py b/coreapi/document.py
@@ -20,8 +20,8 @@ def _default_link_func(document, link, **parameters):
     When calling a link the default behavior is to call through
     to the HTTP transport layer.
     """
-    from coreapi.sessions import DefaultSession
-    session = DefaultSession()
+    from coreapi import get_default_session
+    session = get_default_session()
     return session.transition(link.url, link.action, parameters=parameters)
 
 
diff --git a/coreapi/sessions.py b/coreapi/sessions.py
@@ -1,12 +1,12 @@
-from coreapi.codecs import CoreJSONCodec, HTMLCodec
 from coreapi.compat import urlparse
-from coreapi.transport import HTTPTransport
 from coreapi.exceptions import NotAcceptable, ParseError, TransportError
+import itypes
 
 
-class DefaultSession(object):
-    codecs = [CoreJSONCodec(), HTMLCodec()]
-    transports = [HTTPTransport()]
+class Session(object):
+    def __init__(self, codecs, transports):
+        self.codecs = itypes.List(codecs)
+        self.transports = itypes.List(transports)
 
     def get_accept_header(self):
         """
diff --git a/coreapi/transport.py b/coreapi/transport.py
@@ -8,8 +8,8 @@ class HTTPTransport(object):
     schemes = ['http', 'https']
 
     def transition(self, url, action=None, parameters=None):
-        from coreapi.sessions import DefaultSession
-        session = DefaultSession()
+        from coreapi import get_default_session
+        session = get_default_session()
 
         method = 'GET' if (action is None) else action.upper()
         accept = session.get_accept_header()
diff --git a/tests/test_transport.py b/tests/test_transport.py
@@ -1,6 +1,6 @@
 # coding: utf-8
+from coreapi import get_default_session
 from coreapi.exceptions import TransportError
-from coreapi.sessions import DefaultSession
 from coreapi.transport import HTTPTransport
 import pytest
 import requests
@@ -20,19 +20,19 @@ def __init__(self, content):
 # Test transport errors.
 
 def test_unknown_scheme():
-    session = DefaultSession()
+    session = get_default_session()
     with pytest.raises(TransportError):
         session.transition('ftp://example.org')
 
 
 def test_missing_scheme():
-    session = DefaultSession()
+    session = get_default_session()
     with pytest.raises(TransportError):
         session.transition('example.org')
 
 
 def test_missing_hostname():
-    session = DefaultSession()
+    session = get_default_session()
     with pytest.raises(TransportError):
         session.transition('http://')
 
