Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Revert "lists: put lists{,_subscriptions,_memberships} on User"

This reverts commit f26e000.

Conflicts:

	tweepy/models.py

Signed-off-by: Bas Westerbaan <bas@fsfe.org>
  • Loading branch information...
commit ed3b249327aa564a500b29c995e0807fe2d9153c 1 parent bd6d169
@bwesterb authored
Showing with 6 additions and 19 deletions.
  1. +6 −6 tweepy/api.py
  2. +0 −13 tweepy/models.py
View
12 tweepy/api.py
@@ -484,27 +484,27 @@ def update_list(self, slug, *args, **kargs):
def lists(self, *args, **kargs):
return bind_api(
- path = '/{owner}/lists.json',
+ path = '/%s/lists.json' % self.auth.get_username(),
parser = parse_lists,
- allowed_param = ['cursor', 'owner'],
+ allowed_param = ['cursor'],
require_auth = True
)(self, *args, **kargs)
lists.pagination_mode = 'cursor'
def lists_memberships(self, *args, **kargs):
return bind_api(
- path = '/{owner}/lists/memberships.json',
+ path = '/%s/lists/memberships.json' % self.auth.get_username(),
parser = parse_lists,
- allowed_param = ['cursor', 'owner'],
+ allowed_param = ['cursor'],
require_auth = True
)(self, *args, **kargs)
lists_memberships.pagination_mode = 'cursor'
def lists_subscriptions(self, *args, **kargs):
return bind_api(
- path = '/{owner}/lists/subscriptions.json',
+ path = '/%s/lists/subscriptions.json' % self.auth.get_username(),
parser = parse_lists,
- allowed_param = ['cursor', 'owner'],
+ allowed_param = ['cursor'],
require_auth = True
)(self, *args, **kargs)
lists_subscriptions.pagination_mode = 'cursor'
View
13 tweepy/models.py
@@ -52,19 +52,6 @@ def unfollow(self):
self._api.destroy_friendship(user_id=self.id)
self.following = False
- def lists_memberships(self):
- return self._api.lists_memberships(owner=self.screen_name)
-
- def lists_subscriptions(self):
- return self._api.lists_subscriptions(owner=self.screen_name)
-
- def lists(self):
- return self._api.lists(owner=self.screen_name)
-
- def followers_ids(self):
- return self._api.followers_ids(user_id=self.id)
-
-
class DirectMessage(Model):
def destroy(self):
Please sign in to comment.
Something went wrong with that request. Please try again.