From 081b91b82246a24a660b72af05b47cf4483def24 Mon Sep 17 00:00:00 2001 From: a_ruban Date: Mon, 16 Apr 2018 16:45:10 +0300 Subject: [PATCH] Fix setup settings --- setup.py | 4 ++-- sia/__init__.py | 12 ++++++------ sia/mixins/http.py | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/setup.py b/setup.py index 59feff3..b6bb313 100644 --- a/setup.py +++ b/setup.py @@ -3,14 +3,14 @@ except ImportError: from distutils.core import setup -from sia import __version__, __authors__, __emails__ +from sia import __version__, __authors__, __email__ setup( name='essentia-sia-api', version=__version__, author=__authors__, - author_email=__emails__, + author_email=__email__, url='https://github.com/essentiaone/essentia-sia-api', description='Sia API wrapper written in Python.', download_url='https://github.com/essentiaone/essentia-sia-api/archive/master.zip', diff --git a/sia/__init__.py b/sia/__init__.py index 997b2c6..3de6852 100644 --- a/sia/__init__.py +++ b/sia/__init__.py @@ -1,8 +1,8 @@ -""" -Provide methainfo about Sia-package. -""" -from sia.sia import Sia # noqa: F401 +try: + from sia.sia import Sia +except ImportError: + from sia import Sia __authors__ = 'Dmytro Striletskyi, Alexander Ruban' -__emails__ = 'dmytro.striletskyi@gmail, alexander.ruban98@gmail.com' -__version__ = '0.0.1-alpha-0' +__email__ = 'dev@essentia.one' +__version__ = '0.0.1a0' diff --git a/sia/mixins/http.py b/sia/mixins/http.py index f5e648e..b788e36 100644 --- a/sia/mixins/http.py +++ b/sia/mixins/http.py @@ -46,7 +46,7 @@ def http_post(self, path, data=None): Helper HTTP POST request function. Sends HTTP POST request to given path with given payload. """ - url = self.address + ':' + str(self.port) + path + url = str(self.address) + ':' + str(self.port) + path resp = requests.post(url, headers=self.headers, data=data) try: resp.raise_for_status() @@ -69,8 +69,8 @@ def get(path, data=None): # pylint: disable=missing-docstring @staticmethod def post(path, data=None): # pylint: disable=missing-docstring - return HttpMixinToDeprecate.http_post(path, data) + return HttpMixinToDeprecate().http_post(path, data) @staticmethod def get_bytes(path, data=None): # pylint: disable=missing-docstring - return HttpMixinToDeprecate.http_get_bytes(path, data) + return HttpMixinToDeprecate().http_get_bytes(path, data)