diff --git a/pychargifysimple/base.py b/pychargifysimple/base.py index 8087325..b816a39 100644 --- a/pychargifysimple/base.py +++ b/pychargifysimple/base.py @@ -21,14 +21,13 @@ def __init__(self, api_key, subdomain): self.api_key = api_key self.subdomain = subdomain self.url = '{subdomain}.{host}'.format( - subdomain=self.subdomain, host=self.host) + subdomain=self.subdomain, host=self.host + ) def _call_api(self, path, method, params=None, data=None): request = getattr(requests, method) url = 'https://{url}/{path}'.format(url=self.url, path=path) - extra_parameters = { - 'auth': (self.api_key, 'x') - } + extra_parameters = {'auth': (self.api_key, 'x')} if data: extra_parameters['json'] = data diff --git a/pychargifysimple/context_manager.py b/pychargifysimple/context_manager.py index 5e39cfd..45e0a03 100644 --- a/pychargifysimple/context_manager.py +++ b/pychargifysimple/context_manager.py @@ -1,9 +1,10 @@ # -*- coding: utf-8 -*- from contextlib import contextmanager -import mechanicalsoup from fake_useragent import UserAgent +import mechanicalsoup + @contextmanager def login(user, password): diff --git a/pychargifysimple/subscription.py b/pychargifysimple/subscription.py index d6886be..4a9d9dd 100644 --- a/pychargifysimple/subscription.py +++ b/pychargifysimple/subscription.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from pychargifysimple.base import Chargify +from .base import Chargify class ChargifySubscription(Chargify): @@ -41,8 +41,12 @@ def get_subscription(self, subscription): @return: The subscription detail @rtype : dict """ - return self._call_api('{base}/{subscription}.json'.format( - base=self.base, subscription=subscription), method='get').json() + return self._call_api( + '{base}/{subscription}.json'.format( + base=self.base, subscription=subscription + ), + method='get' + ).json() def change_next_billing_at(self, subscription, next_billing_at): """To change the next billing date of a subscription. @@ -57,7 +61,8 @@ def change_next_billing_at(self, subscription, next_billing_at): @rtype : dict """ url = '{base}/{subscription}.json'.format( - base=self.base, subscription=subscription) + base=self.base, subscription=subscription + ) data = { 'subscription': { 'next_billing_at': next_billing_at.isoformat() @@ -79,12 +84,9 @@ def change_expires_at(self, subscription, expires_at): @rtype : dict """ url = '{base}/{subscription}.json'.format( - base=self.base, subscription=subscription) - data = { - 'subscription': { - 'expires_at': expires_at.isoformat() - } - } + base=self.base, subscription=subscription + ) + data = {'subscription': {'expires_at': expires_at.isoformat()}} return self._call_api(url, 'put', data=data).json() @@ -101,7 +103,8 @@ def delete_subscription(self, subscription, customer): @rtype : dict """ url = '{base}/{subscription}/purge.json'.format( - base=self.base, subscription=subscription, customer=customer) + base=self.base, subscription=subscription, customer=customer + ) data = {'ack': customer} return self._call_api(url, 'post', params=data).json() diff --git a/pychargifysimple/web.py b/pychargifysimple/web.py index 4d40a7f..13089ee 100644 --- a/pychargifysimple/web.py +++ b/pychargifysimple/web.py @@ -2,10 +2,9 @@ """A module to manage the web part of chargify like delete subscription.""" import logging -from mechanicalsoup.browser import LinkNotFoundError - -from pychargifysimple.context_manager import login +from .context_manager import login +from mechanicalsoup.browser import LinkNotFoundError logger = logging.getLogger(__name__) @@ -42,14 +41,18 @@ def delete_subscription(self, subscription): with login(self.user, self.password) as browser: browser.open( '{url}/subscriptions/{subscription}/delete'.format( - url=self.url, subscription=subscription)) + url=self.url, subscription=subscription + ) + ) try: browser.select_form('#delete_subscription_form') except LinkNotFoundError: logger.error( 'The subscription {subscription} not found'.format( - subscription=subscription)) + subscription=subscription + ) + ) return browser.submit_selected() diff --git a/setup.py b/setup.py index be53d24..43dca36 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ # http://www.opensource.org/licenses/MIT-license # Copyright (c) 2015, Hobbestigrou -from setuptools import setup, find_packages +from setuptools import find_packages, setup setup( name='pychargifysimple', @@ -35,11 +35,8 @@ ], packages=find_packages(), include_package_data=False, - install_requires=[ - 'MechanicalSoup', 'fake-useragent' - ], + install_requires=['MechanicalSoup', 'fake-useragent'], entry_points={ - 'console_scripts': [ - ], + 'console_scripts': [], }, )