Fix User.timeline() method.

This method now properly returns the user timeline specifed by User.id

diff --git a/CHANGELOG b/CHANGELOG
index e6c83081b57190d9550e7da3f5dabf50e3375f52..6fd1d16fca2b15775ea6c03e123665c39cc7346f 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -24,6 +24,7 @@ during upgrade will be listed here.
        - send_direct_message() now accepts either a user/screen_name/user_id for recipient of DM
 + tweepy.debug() enables httplib debug mode
 + New Sphinx documentation (Thanks Kumar!) in doc/
++ Fix User.timeline() to return correct timeline
 
 1.2 -> 1.3 [Current release]
 =====================

diff --git a/tweepy/models.py b/tweepy/models.py
index 609730e112b081a4cf257aa3553aebb111921481..27be6277ef023e7e6426164e10536df15ddac515 100644 (file)
--- a/tweepy/models.py
+++ b/tweepy/models.py
@@ -36,16 +36,16 @@ class Status(Model):
 class User(Model):
 
     def timeline(self, **kargs):
-        return self._api.user_timeline(**kargs)
+        return self._api.user_timeline(user_id=self.id, **kargs)
 
     def mentions(self, **kargs):
         return self._api.mentions(**kargs)
 
     def friends(self, **kargs):
-        return self._api.friends(self.id, **kargs)
+        return self._api.friends(user_id=self.id, **kargs)
 
     def followers(self, **kargs):
-        return self._api.followers(self.id, **kargs)
+        return self._api.followers(user_idself.id, **kargs)
 
     def follow(self):
         self._api.create_friendship(user_id=self.id)