diff --git a/setup.py b/setup.py index 884f5f2..c108fe1 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,7 @@ keywords=['api', 'rest', 'tsheets'], install_requires=[ 'requests>=2.7.0', - 'python-dateutil==2.4.2', - 'pytz==2015.7' + 'python-dateutil==2.8.1', + 'pytz>=2015.7' ] ) diff --git a/tsheets/bridge.py b/tsheets/bridge.py index 8cf8c7e..fcc1f47 100644 --- a/tsheets/bridge.py +++ b/tsheets/bridge.py @@ -40,7 +40,7 @@ def next_batch(self, url, name, options, is_singleton = False, mode="list"): s_dict[key] = list(value.values()) has_more = data.get('more', None) result = {"items": self.items_from_data(data, name, is_singleton, mode), - "has_more": (has_more == 'true'), + "has_more": (has_more == True), "supplemental": s_dict} return result else: diff --git a/tsheets/results.py b/tsheets/results.py index 91dd896..769c1f1 100644 --- a/tsheets/results.py +++ b/tsheets/results.py @@ -9,6 +9,8 @@ def __init__(self, url, options, repo, bridge, is_singleton=False, mode="list"): self.repo = repo self.model = repo.model self.name = class_to_endpoint(self.model.__name__) + ('' if is_singleton else 's') + if isinstance(self.repo, repos.TimesheetsDeleted): + self.name = 'timesheets_deleted' self.index = -1 self.loaded = [] self.bridge = bridge