Import directly from modules

Importing from the base of a module is deprecated and will be removed in
a future major version. Nothing internally should be doing this.

2 files changed, 4 insertions, 3 deletions

diff --git a/pandora/clientbuilder.py b/pandora/clientbuilder.py
index 6c29678..53abdf4 100644
--- a/pandora/clientbuilder.py
+++ b/pandora/clientbuilder.py
@@ -7,7 +7,8 @@ configuration formats into a fully built APIClient.
 import os.path
 
 from .py2compat import ConfigParser
-from . import Encryptor, APITransport, DEFAULT_API_HOST, APIClient
+from .client import APIClient
+from .transport import Encryptor, APITransport, DEFAULT_API_HOST
 
 
 class TranslatingDict(dict):
diff --git a/pandora/models/pandora.py b/pandora/models/pandora.py
index 3ffac7d..c041b40 100644
--- a/pandora/models/pandora.py
+++ b/pandora/models/pandora.py
@@ -1,6 +1,6 @@
-from .. import BaseAPIClient
-from . import Field, PandoraModel, PandoraListModel, PandoraDictListModel
+from ..client import BaseAPIClient
 from ..errors import ParameterMissing
+from . import Field, PandoraModel, PandoraListModel, PandoraDictListModel
 
 
 class Station(PandoraModel):