From d693bd54ea856b1673366ba08c7cae59955af767 Mon Sep 17 00:00:00 2001 From: Panayiotis Papadopoulos Date: Sat, 27 Jul 2013 16:35:45 -0600 Subject: [PATCH 1/3] Pass page and per_page params in User.all --- intercom/user.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/intercom/user.py b/intercom/user.py index 9c0baf25..b8eadc76 100644 --- a/intercom/user.py +++ b/intercom/user.py @@ -131,7 +131,7 @@ def delete(cls, user_id=None, email=None): return cls(resp) @classmethod - def all(cls): + def all(cls, page=0, per_page=500): """ Return all of the Users. >>> users = User.all() @@ -141,7 +141,7 @@ def all(cls): u'first.user@example.com' """ - resp = Intercom.get_users() + resp = Intercom.get_users(page=page, per_page=per_page) return [cls(u) for u in resp['users']] def save(self): From d24c0251b7de3eaec1195c99e7a8ebf5f14c18d0 Mon Sep 17 00:00:00 2001 From: Panayiotis Papadopoulos Date: Sat, 27 Jul 2013 16:38:04 -0600 Subject: [PATCH 2/3] Pass per_page and page attrs to Intercom.get_users --- intercom/intercom.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/intercom/intercom.py b/intercom/intercom.py index 70361524..d79a6974 100644 --- a/intercom/intercom.py +++ b/intercom/intercom.py @@ -110,7 +110,7 @@ def _create_or_update_user(cls, method, **kwargs): return user_dict @classmethod - def get_users(cls): + def get_users(cls, page=0, per_page=500): """ Return a dict for the user represented by the specified email or user_id. @@ -121,7 +121,7 @@ def get_users(cls): 3 """ - user_dict = Intercom._call('GET', Intercom.api_endpoint + 'users') + user_dict = Intercom._call('GET', Intercom.api_endpoint + 'users/?per_page=%i&page=%=i'%(per_page, page)) return user_dict @classmethod From 051838b7826110fb6f6aa381fedce0fa8531fb32 Mon Sep 17 00:00:00 2001 From: Panayiotis Papadopoulos Date: Sat, 27 Jul 2013 16:41:54 -0600 Subject: [PATCH 3/3] Pass params as a dict --- intercom/intercom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/intercom/intercom.py b/intercom/intercom.py index d79a6974..d94fe6bd 100644 --- a/intercom/intercom.py +++ b/intercom/intercom.py @@ -121,7 +121,7 @@ def get_users(cls, page=0, per_page=500): 3 """ - user_dict = Intercom._call('GET', Intercom.api_endpoint + 'users/?per_page=%i&page=%=i'%(per_page, page)) + user_dict = Intercom._call('GET', Intercom.api_endpoint, {'per_page': per_page, 'page': page}) return user_dict @classmethod