diff --git a/attractsdk/__init__.py b/attractsdk/__init__.py index dec0c4c..a1fd9c1 100644 --- a/attractsdk/__init__.py +++ b/attractsdk/__init__.py @@ -1,5 +1,5 @@ -from attractsdk.api import Api -from attractsdk.nodes import Node -from attractsdk.nodes import NodeType -from attractsdk.exceptions import ResourceNotFound, UnauthorizedAccess, MissingConfig -from attractsdk.config import __version__, __pypi_packagename__ +from .api import Api +from .nodes import Node +from .nodes import NodeType +from .exceptions import ResourceNotFound, UnauthorizedAccess, MissingConfig +from .config import __version__, __pypi_packagename__ diff --git a/attractsdk/api.py b/attractsdk/api.py index 242e927..36cea0c 100644 --- a/attractsdk/api.py +++ b/attractsdk/api.py @@ -5,9 +5,9 @@ import logging import platform import sys -import attractsdk.utils as utils -from attractsdk import exceptions -from attractsdk.config import __version__ +from . import utils +from . import exceptions +from .config import __version__ class Api(object): @@ -47,7 +47,8 @@ class Api(object): Api._api_singleton = Api( endpoint=kwargs["endpoint"], username=kwargs["username"], - password=kwargs["password"]) + password=kwargs["password"], + token=kwargs["token"] if kwargs.get("token") else None) except KeyError: #raise exceptions.MissingConfig("Missing configuration value") print("Missing configuration value. Initialize with Api.Default().") @@ -76,6 +77,7 @@ class Api(object): payload = {'username': self.username} if self.token: + print("no tokens") return self.token else: # If token is not set we do initial request with username and password diff --git a/attractsdk/nodes.py b/attractsdk/nodes.py index 30bb31b..f7b01a7 100755 --- a/attractsdk/nodes.py +++ b/attractsdk/nodes.py @@ -1,9 +1,9 @@ -from resource import List -from resource import Find -from resource import Create -from resource import Post -from resource import Update -from resource import Delete +from .resource import List +from .resource import Find +from .resource import Create +from .resource import Post +from .resource import Update +from .resource import Delete class Node(List, Find, Create, Post, Update, Delete): diff --git a/attractsdk/resource.py b/attractsdk/resource.py index 0b41fa0..294a1dd 100644 --- a/attractsdk/resource.py +++ b/attractsdk/resource.py @@ -1,7 +1,7 @@ import uuid -import attractsdk.utils as utils -from attractsdk.api import Api +from . import utils +from .api import Api class Resource(object):