Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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`

Expand Down
9 changes: 4 additions & 5 deletions pybutton/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
from __future__ import print_function
from __future__ import unicode_literals

from pybutton.client import Client
from pybutton.error import ButtonClientError
from pybutton.version import VERSION

__all__ = [Client, ButtonClientError, 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
12 changes: 1 addition & 11 deletions pybutton/request.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
]
18 changes: 5 additions & 13 deletions pybutton/resources/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +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

__all__ = [
Accounts,
Customers,
Links,
Merchants,
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
2 changes: 1 addition & 1 deletion pybutton/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION = '2.6.0'
VERSION = '2.6.1'