Removed erroneous uid parameter in user_timeline method and updated allowed params...

diff --git a/docs/api.rst b/docs/api.rst
index 245e29a73140ff794ee8b2cca19d43086cfa3533..1a4e56964f7aa239c68b50cfe17d5a3fbcb5e174 100644 (file)
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -79,7 +79,7 @@ Timeline methods
    :rtype: list of :class:`Status` objects
 
 
-.. method:: API.user_timeline([id/user_id/screen_name], [since_id], [count], \
+.. method:: API.user_timeline([user_id/screen_name], [since_id], [count], \
                               [max_id], [trim_user], [exclude_replies], \
                               [include_rts])
 
@@ -87,7 +87,6 @@ Timeline methods
    the user specified. It's also possible to request another user's timeline
    via the id parameter.
 
-   :param id: |uid|
    :param user_id: |user_id|
    :param screen_name: |screen_name|
    :param since_id: |since_id|

diff --git a/tweepy/api.py b/tweepy/api.py
index a58b0a1faadf2d7ce0d3ee3de16dc63e5694a763..f325ec135ca7335685ce869170cfe10de5f803c0 100644 (file)
--- a/tweepy/api.py
+++ b/tweepy/api.py
@@ -122,16 +122,16 @@ class API(object):
     @property
     def user_timeline(self):
         """ :reference: https://developer.twitter.com/en/docs/tweets/timelines/api-reference/get-statuses-user_timeline
-            :allowed_param: 'id', 'user_id', 'screen_name', 'since_id',
-                            'count', 'max_id', 'trim_user', 'exclude_replies',
+            :allowed_param: 'user_id', 'screen_name', 'since_id', 'count',
+                            'max_id', 'trim_user', 'exclude_replies',
                             'include_rts'
         """
         return bind_api(
             api=self,
             path='/statuses/user_timeline.json',
             payload_type='status', payload_list=True,
-            allowed_param=['id', 'user_id', 'screen_name', 'since_id',
-                           'count', 'max_id', 'trim_user', 'exclude_replies',
+            allowed_param=['user_id', 'screen_name', 'since_id', 'count',
+                           'max_id', 'trim_user', 'exclude_replies',
                            'include_rts']
         )