From ba51500c1e480b8a49e5e001bc62609de280fa5f Mon Sep 17 00:00:00 2001 From: Will Myers Date: Tue, 5 Jun 2018 11:45:25 -0400 Subject: [PATCH 1/2] Add HTTPResponseError to top-level import --- CHANGELOG.md | 4 ++++ pybutton/__init__.py | 3 +-- pybutton/request.py | 10 ---------- pybutton/resources/__init__.py | 8 -------- pybutton/version.py | 2 +- 5 files changed, 6 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ea25eb..fb4eae5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ Current Version - +2.6.1 June 5, 2018 + - Added `HTTPResponseError` to top-level import + - Remove `__all__` imports: they never worked + 2.6.0 May 17, 2018 - Added `HTTPResponseError` diff --git a/pybutton/__init__.py b/pybutton/__init__.py index c40568f..9ba0101 100644 --- a/pybutton/__init__.py +++ b/pybutton/__init__.py @@ -5,6 +5,5 @@ from pybutton.client import Client from pybutton.error import ButtonClientError +from pybutton.error import HTTPResponseError from pybutton.version import VERSION - -__all__ = [Client, ButtonClientError, VERSION] diff --git a/pybutton/request.py b/pybutton/request.py index 0cc1cb8..76dffc8 100644 --- a/pybutton/request.py +++ b/pybutton/request.py @@ -151,13 +151,3 @@ def query_dict(url): if (url_components): query_string = url_components.query return parse_qs(query_string) - - -__all__ = [ - Request, - urlopen, - HTTPError, - request, - request_url, - query_dict, -] diff --git a/pybutton/resources/__init__.py b/pybutton/resources/__init__.py index 3d2b0e9..50d6408 100644 --- a/pybutton/resources/__init__.py +++ b/pybutton/resources/__init__.py @@ -8,11 +8,3 @@ from pybutton.resources.links import Links from pybutton.resources.merchants import Merchants from pybutton.resources.orders import Orders - -__all__ = [ - Accounts, - Customers, - Links, - Merchants, - Orders -] diff --git a/pybutton/version.py b/pybutton/version.py index 3fd9fb7..bff5353 100644 --- a/pybutton/version.py +++ b/pybutton/version.py @@ -1 +1 @@ -VERSION = '2.6.0' +VERSION = '2.6.1' From 1bd92fa935d2daa33cc0f52e76f79decedae022b Mon Sep 17 00:00:00 2001 From: Will Myers Date: Tue, 5 Jun 2018 11:55:54 -0400 Subject: [PATCH 2/2] Add flake8 exceptions --- pybutton/__init__.py | 8 ++++---- pybutton/request.py | 2 +- pybutton/resources/__init__.py | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pybutton/__init__.py b/pybutton/__init__.py index 9ba0101..565262b 100644 --- a/pybutton/__init__.py +++ b/pybutton/__init__.py @@ -3,7 +3,7 @@ from __future__ import print_function from __future__ import unicode_literals -from pybutton.client import Client -from pybutton.error import ButtonClientError -from pybutton.error import HTTPResponseError -from pybutton.version import VERSION +from pybutton.client import Client # noqa: 401 +from pybutton.error import ButtonClientError # noqa: 401 +from pybutton.error import HTTPResponseError # noqa: 401 +from pybutton.version import VERSION # noqa: 401 diff --git a/pybutton/request.py b/pybutton/request.py index 76dffc8..230aaa7 100644 --- a/pybutton/request.py +++ b/pybutton/request.py @@ -64,7 +64,7 @@ def request(url, method, headers, data=None, timeout=None): else: from urllib2 import Request from urllib2 import urlopen - from urllib2 import HTTPError + from urllib2 import HTTPError # noqa: 401 from urllib import urlencode from urlparse import urlunsplit from urlparse import urlparse diff --git a/pybutton/resources/__init__.py b/pybutton/resources/__init__.py index 50d6408..8c6cd0b 100644 --- a/pybutton/resources/__init__.py +++ b/pybutton/resources/__init__.py @@ -3,8 +3,8 @@ from __future__ import print_function from __future__ import unicode_literals -from pybutton.resources.accounts import Accounts -from pybutton.resources.customers import Customers -from pybutton.resources.links import Links -from pybutton.resources.merchants import Merchants -from pybutton.resources.orders import Orders +from pybutton.resources.accounts import Accounts # noqa: 401 +from pybutton.resources.customers import Customers # noqa: 401 +from pybutton.resources.links import Links # noqa: 401 +from pybutton.resources.merchants import Merchants # noqa: 401 +from pybutton.resources.orders import Orders # noqa: 401