Commit 91d5b7ae authored by Omer Murat Yildirim's avatar Omer Murat Yildirim
Browse files

fix merge conflicts

parents ff9523ed 79e00a53
......@@ -15,6 +15,7 @@ You may also use Git to clone the repository from
Github and install it manually:
git clone https://github.com/tweepy/tweepy.git
cd tweepy
python setup.py install
**Note** only Python 2.6 and 2.7 are supported at
......
......@@ -71,7 +71,7 @@ class API(object):
@property
def home_timeline(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/statuses/home_timeline
""" :reference: https://dev.twitter.com/rest/reference/get/statuses/home_timeline
:allowed_param:'since_id', 'max_id', 'count'
"""
return bind_api(
......@@ -89,7 +89,7 @@ class API(object):
@property
def _statuses_lookup(self):
""" :reference: https://dev.twitter.com/docs/api/1.5/get/statuses/lookup
""" :reference: https://dev.twitter.com/rest/reference/get/statuses/lookup
:allowed_param:'id', 'include_entities', 'trim_user', 'map'
"""
return bind_api(
......@@ -102,7 +102,7 @@ class API(object):
@property
def user_timeline(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/statuses/user_timeline
""" :reference: https://dev.twitter.com/rest/reference/get/statuses/user_timeline
:allowed_param:'id', 'user_id', 'screen_name', 'since_id'
"""
return bind_api(
......@@ -115,7 +115,7 @@ class API(object):
@property
def mentions_timeline(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/statuses/mentions_timeline
""" :reference: https://dev.twitter.com/rest/reference/get/statuses/mentions_timeline
:allowed_param:'since_id', 'max_id', 'count'
"""
return bind_api(
......@@ -141,7 +141,7 @@ class API(object):
@property
def retweets_of_me(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/statuses/retweets_of_me
""" :reference: https://dev.twitter.com/rest/reference/get/statuses/retweets_of_me
:allowed_param:'since_id', 'max_id', 'count'
"""
return bind_api(
......@@ -154,8 +154,8 @@ class API(object):
@property
def get_status(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/statuses/show
:allowed_param:'id
""" :reference: https://dev.twitter.com/rest/reference/get/statuses/show/%3Aid
:allowed_param:'id'
"""
return bind_api(
api=self,
......@@ -166,7 +166,7 @@ class API(object):
@property
def update_status(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/post/statuses/update
""" :reference: https://dev.twitter.com/rest/reference/post/statuses/update
:allowed_param:'status', 'in_reply_to_status_id', 'lat', 'long', 'source', 'place_id', 'display_coordinates'
"""
return bind_api(
......@@ -179,7 +179,9 @@ class API(object):
)
def update_with_media(self, filename, *args, **kwargs):
""" :reference: https://dev.twitter.com/docs/api/1.1/post/statuses/update_with_media """
""" :reference: https://dev.twitter.com/rest/reference/post/statuses/update_with_media
:allowed_param:'status', 'possibly_sensitive', 'in_reply_to_status_id', 'lat', 'long', 'place_id', 'display_coordinates'
"""
f = kwargs.pop('file', None)
headers, post_data = API._pack_image(filename, 3072, form_field='media[]', f=f)
kwargs.update({'headers': headers, 'post_data': post_data})
......@@ -198,7 +200,7 @@ class API(object):
@property
def destroy_status(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/post/statuses/destroy
""" :reference: https://dev.twitter.com/rest/reference/post/statuses/destroy/%3Aid
:allowed_param:'id'
"""
return bind_api(
......@@ -212,7 +214,7 @@ class API(object):
@property
def retweet(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/post/statuses/retweet
""" :reference: https://dev.twitter.com/rest/reference/post/statuses/retweet/%3Aid
:allowed_param:'id'
"""
return bind_api(
......@@ -226,7 +228,7 @@ class API(object):
@property
def retweets(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/statuses/retweets
""" :reference: https://dev.twitter.com/rest/reference/get/statuses/retweets/%3Aid
:allowed_param:'id', 'count'
"""
return bind_api(
......@@ -239,7 +241,7 @@ class API(object):
@property
def retweeters(self):
"""
""" :reference: https://dev.twitter.com/rest/reference/get/statuses/retweeters/ids
:allowed_param:'id', 'cursor', 'stringify_ids
"""
return bind_api(
......@@ -251,8 +253,8 @@ class API(object):
@property
def get_user(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/users/show
:allowed_param:'id', 'user_id', 'screen_name
""" :reference: https://dev.twitter.com/rest/reference/get/users/show
:allowed_param:'id', 'user_id', 'screen_name'
"""
return bind_api(
api=self,
......@@ -263,8 +265,8 @@ class API(object):
@property
def get_oembed(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/statuses/oembed
:allowed_param:'id', 'url', 'maxwidth', 'hide_media', 'omit_script', 'align', 'related', 'lang
""" :reference: https://dev.twitter.com/rest/reference/get/statuses/oembed
:allowed_param:'id', 'url', 'maxwidth', 'hide_media', 'omit_script', 'align', 'related', 'lang'
"""
return bind_api(
api=self,
......@@ -279,8 +281,8 @@ class API(object):
@property
def _lookup_users(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/users/lookup.json
allowed_param=['user_id', 'screen_name'],
""" :reference: https://dev.twitter.com/rest/reference/get/users/lookup
allowed_param='user_id', 'screen_name'
"""
return bind_api(
api=self,
......@@ -295,7 +297,7 @@ class API(object):
@property
def search_users(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/users/search
""" :reference: https://dev.twitter.com/rest/reference/get/users/search
:allowed_param:'q', 'count', 'page'
"""
return bind_api(
......@@ -308,8 +310,8 @@ class API(object):
@property
def suggested_users(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/users/suggestions/%3slug
:allowed_param:'slug', 'lang
""" :reference: https://dev.twitter.com/rest/reference/get/users/suggestions/%3Aslug
:allowed_param:'slug', 'lang'
"""
return bind_api(
api=self,
......@@ -321,7 +323,7 @@ class API(object):
@property
def suggested_categories(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/users/suggestions
""" :reference: https://dev.twitter.com/rest/reference/get/users/suggestions
:allowed_param:'lang'
"""
return bind_api(
......@@ -334,7 +336,7 @@ class API(object):
@property
def suggested_users_tweets(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/users/suggestions/%3slug/members
""" :reference: https://dev.twitter.com/rest/reference/get/users/suggestions/%3Aslug/members
:allowed_param:'slug'
"""
return bind_api(
......@@ -347,7 +349,7 @@ class API(object):
@property
def direct_messages(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/direct_messages
""" :reference: https://dev.twitter.com/rest/reference/get/direct_messages
:allowed_param:'since_id', 'max_id', 'count'
"""
return bind_api(
......@@ -360,7 +362,7 @@ class API(object):
@property
def get_direct_message(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/direct_messages/show
""" :reference: https://dev.twitter.com/rest/reference/get/direct_messages/show
:allowed_param:'id'
"""
return bind_api(
......@@ -373,7 +375,7 @@ class API(object):
@property
def sent_direct_messages(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/direct_messages/sent
""" :reference: https://dev.twitter.com/rest/reference/get/direct_messages/sent
:allowed_param:'since_id', 'max_id', 'count', 'page'
"""
return bind_api(
......@@ -386,7 +388,7 @@ class API(object):
@property
def send_direct_message(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/post/direct_messages/new
""" :reference: https://dev.twitter.com/rest/reference/post/direct_messages/new
:allowed_param:'user', 'screen_name', 'user_id', 'text'
"""
return bind_api(
......@@ -400,13 +402,13 @@ class API(object):
@property
def destroy_direct_message(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/delete/direct_messages/destroy
""" :reference: https://dev.twitter.com/rest/reference/post/direct_messages/destroy
:allowed_param:'id'
"""
return bind_api(
api=self,
path='/direct_messages/destroy.json',
method='DELETE',
method='POST',
payload_type='direct_message',
allowed_param=['id'],
require_auth=True
......@@ -414,7 +416,7 @@ class API(object):
@property
def create_friendship(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/post/friendships/create
""" :reference: https://dev.twitter.com/rest/reference/post/friendships/create
:allowed_param:'id', 'user_id', 'screen_name', 'follow'
"""
return bind_api(
......@@ -428,13 +430,13 @@ class API(object):
@property
def destroy_friendship(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/delete/friendships/destroy
""" :reference: https://dev.twitter.com/rest/reference/post/friendships/destroy
:allowed_param:'id', 'user_id', 'screen_name'
"""
return bind_api(
api=self,
path='/friendships/destroy.json',
method='DELETE',
method='POST',
payload_type='user',
allowed_param=['id', 'user_id', 'screen_name'],
require_auth=True
......@@ -442,8 +444,8 @@ class API(object):
@property
def show_friendship(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/friendships/show
:allowed_param:'source_id', 'source_screen_name',
""" :reference: https://dev.twitter.com/rest/reference/get/friendships/show
:allowed_param:'source_id', 'source_screen_name'
"""
return bind_api(
api=self,
......@@ -459,7 +461,7 @@ class API(object):
@property
def _lookup_friendships(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/friendships/lookup
""" :reference: https://dev.twitter.com/rest/reference/get/friendships/lookup
:allowed_param:'user_id', 'screen_name'
"""
return bind_api(
......@@ -472,8 +474,8 @@ class API(object):
@property
def friends_ids(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/friends/ids
:allowed_param:'id', 'user_id', 'screen_name', 'cursor
""" :reference: https://dev.twitter.com/rest/reference/get/friends/ids
:allowed_param:'id', 'user_id', 'screen_name', 'cursor'
"""
return bind_api(
api=self,
......@@ -484,8 +486,8 @@ class API(object):
@property
def friends(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/friends/list
:allowed_param:'id', 'user_id', 'screen_name', 'cursor
""" :reference: https://dev.twitter.com/rest/reference/get/friends/list
:allowed_param:'id', 'user_id', 'screen_name', 'cursor'
"""
return bind_api(
api=self,
......@@ -496,8 +498,8 @@ class API(object):
@property
def friendships_incoming(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/friendships/incoming
:allowed_param:'cursor
""" :reference: https://dev.twitter.com/rest/reference/get/friendships/incoming
:allowed_param:'cursor'
"""
return bind_api(
api=self,
......@@ -508,8 +510,8 @@ class API(object):
@property
def friendships_outgoing(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/friendships/outgoing
:allowed_param:'cursor
""" :reference: https://dev.twitter.com/rest/reference/get/friendships/outgoing
:allowed_param:'cursor'
"""
return bind_api(
api=self,
......@@ -520,8 +522,8 @@ class API(object):
@property
def followers_ids(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/followers/ids
:allowed_param:'id', 'user_id', 'screen_name', 'cursor', 'count
""" :reference: https://dev.twitter.com/rest/reference/get/followers/ids
:allowed_param:'id', 'user_id', 'screen_name', 'cursor', 'count'
"""
return bind_api(
api=self,
......@@ -532,7 +534,7 @@ class API(object):
@property
def followers(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/followers/list
""" :reference: https://dev.twitter.com/rest/reference/get/followers/list
:allowed_param:'id', 'user_id', 'screen_name', 'cursor', 'count', 'skip_status', 'include_user_entities'
"""
return bind_api(
......@@ -544,7 +546,9 @@ class API(object):
)
def verify_credentials(self, **kargs):
""" account/verify_credentials """
""" :reference: https://dev.twitter.com/rest/reference/get/account/verify_credentials
:allowed_param:'include_entities', 'skip_status'
"""
try:
return bind_api(
api=self,
......@@ -560,7 +564,7 @@ class API(object):
@property
def rate_limit_status(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/account/rate_limit_status
""" :reference: https://dev.twitter.com/rest/reference/get/application/rate_limit_status
:allowed_param:'resources'
"""
return bind_api(
......@@ -573,7 +577,7 @@ class API(object):
@property
def set_delivery_device(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/post/account/update_delivery_device
""" :reference: https://dev.twitter.com/rest/reference/post/account/update_delivery_device
:allowed_param:'device'
"""
return bind_api(
......@@ -604,7 +608,9 @@ class API(object):
)
def update_profile_image(self, filename, file_=None):
""" :reference: https://dev.twitter.com/docs/api/1.1/post/account/update_profile_image """
""" :reference: https://dev.twitter.com/rest/reference/post/account/update_profile_image
:allowed_param:'include_entities', 'skip_status'
"""
headers, post_data = API._pack_image(filename, 700, f=file_)
return bind_api(
api=self,
......@@ -616,7 +622,9 @@ class API(object):
)(self, post_data=post_data, headers=headers)
def update_profile_background_image(self, filename, **kargs):
""" :reference: https://dev.twitter.com/docs/api/1.1/post/account/update_profile_background_image """
""" :reference: https://dev.twitter.com/rest/reference/post/account/update_profile_background_image
:allowed_param:'tile', 'include_entities', 'skip_status', 'use'
"""
f = kargs.pop('file', None)
headers, post_data = API._pack_image(filename, 800, f=f)
bind_api(
......@@ -629,7 +637,9 @@ class API(object):
)(self, post_data=post_data, headers=headers)
def update_profile_banner(self, filename, **kargs):
""" :reference: https://dev.twitter.com/docs/api/1.1/post/account/update_profile_banner """
""" :reference: https://dev.twitter.com/rest/reference/post/account/update_profile_banner
:allowed_param:'width', 'height', 'offset_left', 'offset_right'
"""
f = kargs.pop('file', None)
headers, post_data = API._pack_image(filename, 700, form_field="banner", f=f)
bind_api(
......@@ -642,7 +652,7 @@ class API(object):
@property
def update_profile(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/post/account/update_profile
""" :reference: https://dev.twitter.com/rest/reference/post/account/update_profile
:allowed_param:'name', 'url', 'location', 'description'
"""
return bind_api(
......@@ -656,8 +666,8 @@ class API(object):
@property
def favorites(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/favorites
:allowed_param:'screen_name', 'user_id', 'max_id', 'count', 'since_id', 'max_id
""" :reference: https://dev.twitter.com/rest/reference/get/favorites/list
:allowed_param:'screen_name', 'user_id', 'max_id', 'count', 'since_id', 'max_id'
"""
return bind_api(
api=self,
......@@ -668,7 +678,7 @@ class API(object):
@property
def create_favorite(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/post/favorites/create
""" :reference:https://dev.twitter.com/rest/reference/post/favorites/create
:allowed_param:'id'
"""
return bind_api(
......@@ -682,7 +692,7 @@ class API(object):
@property
def destroy_favorite(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/post/favorites/destroy
""" :reference: https://dev.twitter.com/rest/reference/post/favorites/destroy
:allowed_param:'id'
"""
return bind_api(
......@@ -696,7 +706,7 @@ class API(object):
@property
def create_block(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/post/blocks/create
""" :reference: https://dev.twitter.com/rest/reference/post/blocks/create
:allowed_param:'id', 'user_id', 'screen_name'
"""
return bind_api(
......@@ -710,13 +720,13 @@ class API(object):
@property
def destroy_block(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/delete/blocks/destroy
""" :reference: https://dev.twitter.com/rest/reference/post/blocks/destroy
:allowed_param:'id', 'user_id', 'screen_name'
"""
return bind_api(
api=self,
path='/blocks/destroy.json',
method='DELETE',
method='POST',
payload_type='user',
allowed_param=['id', 'user_id', 'screen_name'],
require_auth=True
......@@ -724,7 +734,7 @@ class API(object):
@property
def blocks(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/blocks/blocking
""" :reference: https://dev.twitter.com/rest/reference/get/blocks/list
:allowed_param:'cursor'
"""
return bind_api(
......@@ -737,7 +747,7 @@ class API(object):
@property
def blocks_ids(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/blocks/ids """
""" :reference: https://dev.twitter.com/rest/reference/get/blocks/ids """
return bind_api(
api=self,
path='/blocks/ids.json',
......@@ -747,7 +757,7 @@ class API(object):
@property
def report_spam(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/post/report_spam
""" :reference: https://dev.twitter.com/rest/reference/post/users/report_spam
:allowed_param:'user_id', 'screen_name'
"""
return bind_api(
......@@ -761,7 +771,7 @@ class API(object):
@property
def saved_searches(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/saved_searches/show/%3Aid """
""" :reference: https://dev.twitter.com/rest/reference/get/saved_searches/show/%3Aid """
return bind_api(
api=self,
path='/saved_searches/list.json',
......@@ -771,7 +781,7 @@ class API(object):
@property
def get_saved_search(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/saved_searches/show/%3Aid
""" :reference: https://dev.twitter.com/rest/reference/get/saved_searches/show/%3Aid
:allowed_param:'id'
"""
return bind_api(
......@@ -784,7 +794,7 @@ class API(object):
@property
def create_saved_search(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/post/saved_searches/create
""" :reference: https://dev.twitter.com/rest/reference/post/saved_searches/create
:allowed_param:'query'
"""
return bind_api(
......@@ -798,7 +808,7 @@ class API(object):
@property
def destroy_saved_search(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/post/saved_searches/destroy
""" :reference: https://dev.twitter.com/rest/reference/post/saved_searches/destroy/%3Aid
:allowed_param:'id'
"""
return bind_api(
......@@ -812,7 +822,7 @@ class API(object):
@property
def create_list(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/post/lists/create
""" :reference: https://dev.twitter.com/rest/reference/post/lists/create
:allowed_param:'name', 'mode', 'description'
"""
return bind_api(
......@@ -826,7 +836,7 @@ class API(object):
@property
def destroy_list(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/post/lists/destroy
""" :reference: https://dev.twitter.com/rest/reference/post/lists/destroy
:allowed_param:'owner_screen_name', 'owner_id', 'list_id', 'slug'
"""
return bind_api(
......@@ -840,7 +850,7 @@ class API(object):
@property
def update_list(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/post/lists/update
""" :reference: https://dev.twitter.com/rest/reference/post/lists/update
:allowed_param: list_id', 'slug', 'name', 'mode', 'description', 'owner_screen_name', 'owner_id'
"""
return bind_api(
......@@ -854,7 +864,7 @@ class API(object):
@property
def lists_all(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/lists/list
""" :reference: https://dev.twitter.com/rest/reference/get/lists/list
:allowed_param:'screen_name', 'user_id'
"""
return bind_api(
......@@ -867,7 +877,7 @@ class API(object):
@property
def lists_memberships(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/lists/memberships
""" :reference: https://dev.twitter.com/rest/reference/get/lists/memberships
:allowed_param:'screen_name', 'user_id', 'filter_to_owned_lists', 'cursor'
"""
return bind_api(
......@@ -880,7 +890,7 @@ class API(object):
@property
def lists_subscriptions(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/lists/subscriptions
""" :reference: https://dev.twitter.com/rest/reference/get/lists/subscriptions
:allowed_param:'screen_name', 'user_id', 'cursor'
"""
return bind_api(
......@@ -908,8 +918,8 @@ class API(object):
@property
def get_list(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/lists/show
:allowed_param:'owner_screen_name', 'owner_id', 'slug', 'list_id
""" :reference: https://dev.twitter.com/rest/reference/get/lists/show
:allowed_param:'owner_screen_name', 'owner_id', 'slug', 'list_id'
"""
return bind_api(
api=self,
......@@ -963,6 +973,7 @@ class API(object):
""" :reference: https://dev.twitter.com/docs/api/1.1/post/lists/members/create_all
:allowed_param:'screen_name', 'user_id', 'slug', 'lit_id',
'owner_id', 'owner_screen_name'
"""
return bind_api(
api=self,
......@@ -987,6 +998,7 @@ class API(object):
""" :reference: https://dev.twitter.com/docs/api/1.1/post/lists/members/destroy_all
:allowed_param:'screen_name', 'user_id', 'slug', 'lit_id',
'owner_id', 'owner_screen_name'
"""
return bind_api(
api=self,
......@@ -1088,7 +1100,7 @@ class API(object):
@property
def trends_available(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/trends/available """
""" :reference: https://dev.twitter.com/rest/reference/get/trends/available """
return bind_api(
api=self,
path='/trends/available.json',
......@@ -1097,8 +1109,8 @@ class API(object):
@property
def trends_place(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/trends/place
:allowed_param:'id', 'exclude
""" :reference: https://dev.twitter.com/rest/reference/get/trends/place
:allowed_param:'id', 'exclude'
"""
return bind_api(
api=self,
......@@ -1109,8 +1121,8 @@ class API(object):
@property
def trends_closest(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/trends/closest
:allowed_param:'lat', 'long
""" :reference: https://dev.twitter.com/rest/reference/get/trends/closest
:allowed_param:'lat', 'long'
"""
return bind_api(
api=self,
......@@ -1139,7 +1151,7 @@ class API(object):
@property
def trends_daily(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/trends/daily
:allowed_param:'date', 'exclude
:allowed_param:'date', 'exclude'
"""
return bind_api(
api=self,
......@@ -1151,7 +1163,7 @@ class API(object):
@property
def trends_weekly(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/trends/weekly
:allowed_param:'date', 'exclude
:allowed_param:'date', 'exclude'
"""
return bind_api(
api=self,
......@@ -1162,8 +1174,8 @@ class API(object):
@property
def reverse_geocode(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/geo/reverse_geocode
:allowed_param:'lat', 'long', 'accuracy', 'granularity', 'max_results
""" :reference: https://dev.twitter.com/rest/reference/get/geo/reverse_geocode
:allowed_param:'lat', 'long', 'accuracy', 'granularity', 'max_results'
"""
return bind_api(
api=self,
......@@ -1175,8 +1187,8 @@ class API(object):
@property
def geo_id(self):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/geo/id
:allowed_param:'id
""" :reference: https://dev.twitter.com/rest/reference/get/geo/id/%3Aplace_id
:allowed_param:'id'
"""
return bind_api(
api=self,
......@@ -1190,6 +1202,7 @@ class API(object):
""" :reference: https://dev.twitter.com/docs/api/1.1/get/geo/search
:allowed_param:'lat', 'long', 'query', 'ip', 'granularity',
'accuracy', 'max_results', 'co