Finesse imports

lovelydinosaur · lovelydinosaur · commit c68c35637165 · 2016-01-21T14:16:26.000Z
diff --git a/coreapi/__init__.py b/coreapi/__init__.py
@@ -1,20 +1,18 @@
 # coding: utf-8
-from coreapi.codecs import BaseCodec, CoreJSONCodec, HALCodec, HTMLCodec, PlainTextCodec, PythonCodec
+from coreapi.client import Client
 from coreapi.document import Array, Document, Link, Object, Error, Field
 from coreapi.exceptions import ParseError, TransportError, ErrorMessage
-from coreapi.history import History
-from coreapi.client import Client
-from coreapi.transports import BaseTransport, HTTPTransport
+from coreapi import codecs, history, transports
 
 
 __version__ = '1.11.4'
 __all__ = [
-    'BaseCodec', 'CoreJSONCodec', 'HALCodec', 'HTMLCodec', 'PlainTextCodec', 'PythonCodec',
-    'negotiate_encoder', 'negotiate_decoder',
     'Array', 'Document', 'Link', 'Object', 'Error', 'Field',
     'ParseError', 'NotAcceptable', 'TransportError', 'ErrorMessage',
-    'BaseTransport', 'HTTPTransport', 'Client', 'History',
-    'load', 'dump', 'get'
+    'Client',
+    'negotiate_encoder', 'negotiate_decoder',
+    'get', 'action', 'reload', 'load', 'dump',
+    'codecs', 'history', 'transports'
 ]
 
 
@@ -45,12 +43,9 @@ def reload(document):
 
 def load(bytestring, content_type=None):
     client = Client()
-    codec = client.negotiate_decoder(content_type)
-    return codec.load(bytestring)
+    return client.load(bytestring, content_type=content_type)
 
 
 def dump(document, accept=None, **kwargs):
     client = Client()
-    codec = client.negotiate_encoder(accept)
-    content = codec.dump(document, **kwargs)
-    return codec.media_type, content
+    return client.dump(document, accept=accept, **kwargs)
diff --git a/coreapi/client.py b/coreapi/client.py
@@ -189,3 +189,20 @@ def action(self, document, keys, params=None, action=None, inplace=None):
         # Perform the action, and return a new document.
         transport = self.determine_transport(link.url)
         return transport.transition(link, params, client=self, link_ancestors=link_ancestors)
+
+    def load(self, bytestring, content_type=None):
+        """
+        Given a bytestring and an optional content_type, return the
+        parsed Document.
+        """
+        codec = self.negotiate_decoder(content_type)
+        return codec.load(bytestring)
+
+    def dump(self, document, accept=None, **kwargs):
+        """
+        Given a document, and an optional accept header, return a two-tuple of
+        the selected media type and encoded bytestring.
+        """
+        codec = self.negotiate_encoder(accept)
+        content = codec.dump(document, **kwargs)
+        return (codec.media_type, content)
diff --git a/coreapi/commandline.py b/coreapi/commandline.py
@@ -442,7 +442,7 @@ def bookmarks_get(name):
 
 def get_history():
     if not os.path.isfile(history_path):
-        return coreapi.History(max_items=20)
+        return coreapi.history.History(max_items=20)
     history_file = open(history_path, 'rb')
     bytestring = history_file.read()
     history_file.close()
diff --git a/tests/test_transitions.py b/tests/test_transitions.py
@@ -1,5 +1,6 @@
 # coding: utf-8
-from coreapi import Document, Link, HTTPTransport, Client
+from coreapi import Document, Link, Client
+from coreapi.transports import HTTPTransport
 import pytest
 
 
