Skip to content

Commit a5f75d8

Browse files
joshthecoderjoshthecoder
committed
More fixes for supporting v1.1 endpoints.
1 parent 99ccfa6 commit a5f75d8

File tree

1 file changed

+43
-44
lines changed

1 file changed

+43
-44
lines changed

‎tweepy/api.py

Lines changed: 43 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,9 @@ def verify_credentials(self, **kargs):
314314

315315
""" account/rate_limit_status """
316316
rate_limit_status = bind_api(
317-
path = '/account/rate_limit_status.json',
317+
path = '/application/rate_limit_status.json',
318318
payload_type = 'json',
319+
allowed_param = ['resources'],
319320
use_cache = False
320321
)
321322

@@ -438,7 +439,7 @@ def update_profile_background_image(self, filename, *args, **kargs):
438439

439440
""" saved_searches """
440441
saved_searches = bind_api(
441-
path = '/saved_searches.json',
442+
path = '/saved_searches/list.json',
442443
payload_type = 'saved_search', payload_list = True,
443444
require_auth = True
444445
)
@@ -463,7 +464,7 @@ def update_profile_background_image(self, filename, *args, **kargs):
463464
""" saved_searches/destroy """
464465
destroy_saved_search = bind_api(
465466
path = '/saved_searches/destroy/{id}.json',
466-
method = 'DELETE',
467+
method = 'POST',
467468
payload_type = 'saved_search',
468469
allowed_param = ['id'],
469470
require_auth = True
@@ -503,37 +504,37 @@ def test(self):
503504
require_auth = True
504505
)
505506

506-
lists = bind_api(
507-
path = '/{user}/lists.json',
507+
lists_all = bind_api(
508+
path = '/lists/list.json',
508509
payload_type = 'list', payload_list = True,
509-
allowed_param = ['user', 'cursor'],
510+
allowed_param = ['screen_name', 'user_id'],
510511
require_auth = True
511512
)
512513

513514
lists_memberships = bind_api(
514-
path = '/{user}/lists/memberships.json',
515+
path = '/lists/memberships.json',
515516
payload_type = 'list', payload_list = True,
516-
allowed_param = ['user', 'cursor'],
517+
allowed_param = ['screen_name', 'user_id', 'filter_to_owned_lists', 'cursor'],
517518
require_auth = True
518519
)
519520

520521
lists_subscriptions = bind_api(
521-
path = '/{user}/lists/subscriptions.json',
522+
path = '/lists/subscriptions.json',
522523
payload_type = 'list', payload_list = True,
523-
allowed_param = ['user', 'cursor'],
524+
allowed_param = ['screen_name', 'user_id', 'cursor'],
524525
require_auth = True
525526
)
526527

527528
list_timeline = bind_api(
528-
path = '/{owner}/lists/{slug}/statuses.json',
529+
path = '/lists/statuses.json',
529530
payload_type = 'status', payload_list = True,
530-
allowed_param = ['owner', 'slug', 'since_id', 'max_id', 'per_page', 'page']
531+
allowed_param = ['owner_screen_name', 'slug', 'owner_id', 'list_id', 'since_id', 'max_id', 'count']
531532
)
532533

533534
get_list = bind_api(
534-
path = '/{owner}/lists/{slug}.json',
535+
path = '/lists/show.json',
535536
payload_type = 'list',
536-
allowed_param = ['owner', 'slug']
537+
allowed_param = ['owner_screen_name', 'owner_id', 'slug', 'list_id']
537538
)
538539

539540
add_list_member = bind_api(
@@ -553,63 +554,61 @@ def test(self):
553554
)
554555

555556
list_members = bind_api(
556-
path = '/{owner}/{slug}/members.json',
557+
path = '/lists/members.json',
557558
payload_type = 'user', payload_list = True,
558-
allowed_param = ['owner', 'slug', 'cursor']
559+
allowed_param = ['owner_screen_name', 'slug', 'list_id', 'owner_id', 'cursor']
559560
)
560561

561-
def is_list_member(self, owner, slug, user_id):
562-
try:
563-
return bind_api(
564-
path = '/%s/%s/members/%s.json' % (owner, slug, user_id),
565-
payload_type = 'user'
566-
)(self)
567-
except TweepError:
568-
return False
562+
show_list_member = bind_api(
563+
path = '/lists/members/show.json',
564+
payload_type = 'user',
565+
allowed_param = ['list_id', 'slug', 'user_id', 'screen_name', 'owner_screen_name', 'owner_id']
566+
)
569567

570568
subscribe_list = bind_api(
571-
path = '/{owner}/{slug}/subscribers.json',
569+
path = '/lists/subscribers/create.json',
572570
method = 'POST',
573571
payload_type = 'list',
574-
allowed_param = ['owner', 'slug'],
572+
allowed_param = ['owner_screen_name', 'slug', 'owner_id', 'list_id'],
575573
require_auth = True
576574
)
577575

578576
unsubscribe_list = bind_api(
579-
path = '/{owner}/{slug}/subscribers.json',
580-
method = 'DELETE',
577+
path = '/lists/subscribers/destroy.json',
578+
method = 'POST',
581579
payload_type = 'list',
582-
allowed_param = ['owner', 'slug'],
580+
allowed_param = ['owner_screen_name', 'slug', 'owner_id', 'list_id'],
583581
require_auth = True
584582
)
585583

586584
list_subscribers = bind_api(
587-
path = '/{owner}/{slug}/subscribers.json',
585+
path = '/lists/subscribers.json',
588586
payload_type = 'user', payload_list = True,
589-
allowed_param = ['owner', 'slug', 'cursor']
587+
allowed_param = ['owner_screen_name', 'slug', 'owner_id', 'list_id', 'cursor']
590588
)
591589

592-
def is_subscribed_list(self, owner, slug, user_id):
593-
try:
594-
return bind_api(
595-
path = '/%s/%s/subscribers/%s.json' % (owner, slug, user_id),
596-
payload_type = 'user'
597-
)(self)
598-
except TweepError:
599-
return False
590+
show_list_subscriber = bind_api(
591+
path = '/lists/subscribers/show.json',
592+
payload_type = 'user',
593+
allowed_param = ['owner_screen_name', 'slug', 'screen_name', 'owner_id', 'list_id', 'user_id']
594+
)
600595

601596
""" trends/available """
602597
trends_available = bind_api(
603598
path = '/trends/available.json',
599+
payload_type = 'json'
600+
)
601+
602+
trends_place = bind_api(
603+
path = '/trends/place.json',
604604
payload_type = 'json',
605-
allowed_param = ['lat', 'long']
605+
allowed_param = ['id', 'exclude']
606606
)
607607

608-
""" trends/location """
609-
trends_location = bind_api(
610-
path = '/trends/{woeid}.json',
608+
trends_closest = bind_api(
609+
path = '/trends/closest.json',
611610
payload_type = 'json',
612-
allowed_param = ['woeid']
611+
allowed_param = ['lat', 'long']
613612
)
614613

615614
""" search """

0 commit comments

Comments
 (0)