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
2 changes: 1 addition & 1 deletion butter_cms/__version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '1.3'
__version__ = '2.0'
21 changes: 16 additions & 5 deletions butter_cms/client.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import requests

from .__version__ import __version__
from requests.exceptions import HttpError


class Client(object):
Expand All @@ -26,11 +27,21 @@ def api_get(self, slug='', params=None, path_override=None):
else:
path = self.path

response = requests.get(
url=self.url + path + str(slug),
params=payload,
headers=headers,
)
try:
response = requests.get(
url=self.url + path + str(slug),
params=payload,
headers=headers,
timeout=10,
)
except requests.exceptions.Timeout:
raise

# We are not using response.raise_for_status(), as it only raises errors for definite error codes; we want to raise errors for any status other than 200.
# more info here: https://github.com/ButterCMS/buttercms-python/issues/5
if response.status_code != 200:
raise HttpError(response.status_code)

return response.json()

def get(self, slug='', params=None):
Expand Down