transport -> transports

lovelydinosaur · lovelydinosaur · commit f633130c3ad1 · 2016-01-21T13:24:40.000Z
diff --git a/coreapi/__init__.py b/coreapi/__init__.py
@@ -4,7 +4,7 @@
 from coreapi.exceptions import ParseError, TransportError, ErrorMessage
 from coreapi.history import History
 from coreapi.client import Client
-from coreapi.transport import BaseTransport, HTTPTransport
+from coreapi.transports import BaseTransport, HTTPTransport
 
 
 __version__ = '1.11.4'
diff --git a/coreapi/transports/__init__.py b/coreapi/transports/__init__.py
@@ -0,0 +1,8 @@
+# coding: utf-8
+from coreapi.transports.base import BaseTransport
+from coreapi.transports.http import HTTPTransport
+
+
+__all__ = [
+    'BaseTransport', 'HTTPTransport'
+]
diff --git a/coreapi/transports/base.py b/coreapi/transports/base.py
@@ -0,0 +1,9 @@
+# coding: utf-8
+import itypes
+
+
+class BaseTransport(itypes.Object):
+    schemes = None
+
+    def transition(self, link, params=None, client=None, link_ancestors=None):
+        raise NotImplementedError()  # pragma: nocover
diff --git a/coreapi/transports/http.py b/coreapi/transports/http.py
@@ -1,9 +1,10 @@
 # coding: utf-8
 from __future__ import unicode_literals
 from collections import OrderedDict
-from coreapi import Document, Object, Link, Array, Error, ErrorMessage
 from coreapi.compat import urlparse
-from coreapi.exceptions import UnsupportedContentType
+from coreapi.document import Document, Object, Link, Array, Error
+from coreapi.exceptions import ErrorMessage, UnsupportedContentType
+from coreapi.transports.base import BaseTransport
 import requests
 import itypes
 import json
@@ -28,13 +29,6 @@ def _coerce_to_error_content(node):
     return node
 
 
-class BaseTransport(itypes.Object):
-    schemes = None
-
-    def transition(self, link, params=None, client=None, link_ancestors=None):
-        raise NotImplementedError()  # pragma: nocover
-
-
 class HTTPTransport(BaseTransport):
     schemes = ['http', 'https']
 
diff --git a/tests/test_commandline.py b/tests/test_commandline.py
@@ -2,7 +2,7 @@
 from coreapi import __version__ as version
 from coreapi import Document, Link
 from coreapi.commandline import client, coerce_key_types
-from coreapi.transport import HTTPTransport
+from coreapi.transports import HTTPTransport
 import pytest
 import os
 import shutil
diff --git a/tests/test_transport.py b/tests/test_transport.py
@@ -1,7 +1,7 @@
 # coding: utf-8
 from coreapi import get_client, get_default_client, Link, Field
 from coreapi.exceptions import TransportError
-from coreapi.transport import HTTPTransport
+from coreapi.transports import HTTPTransport
 import pytest
 import requests
 
