merge from master

bear · bear · commit 9df6b6cbee9b · 2015-11-14T14:55:21.000-05:00
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,6 @@
+2015-10-05
+  Added who to api.GetSearch
+
 2014-12-29
   removed reference to simplejson
 
diff --git a/twitter/__init__.py b/twitter/__init__.py
@@ -38,5 +38,7 @@
 from .url import Url
 from .status import Status
 from .user import User, UserStatus
+from .category import Category
+from .media import Media
 from .list import List
 from .api import Api
diff --git a/twitter/api.py b/twitter/api.py
@@ -42,6 +42,7 @@
 
 from twitter import (__version__, _FileCache, json, DirectMessage, List,
                      Status, Trend, TwitterError, User, UserStatus)
+from twitter.category import Category
 
 try:
   # python 3
@@ -277,6 +278,7 @@ def ClearCredentials(self):
 
     def GetSearch(self,
                   term=None,
+                  who=None,
                   geocode=None,
                   since_id=None,
                   max_id=None,
@@ -292,6 +294,8 @@ def GetSearch(self,
         Args:
           term:
             Term to search by. Optional if you include geocode.
+          who:
+            Handle of user's tweets you want. Optional.
           since_id:
             Returns results with an ID greater than (that is, more recent
             than) the specified ID. There are limits to the number of
@@ -350,7 +354,7 @@ def GetSearch(self,
 
         if until:
             parameters['until'] = until
-            
+
         if since:
             parameters['since'] = since
 
@@ -360,12 +364,15 @@ def GetSearch(self,
         if locale:
             parameters['locale'] = locale
 
-        if term is None and geocode is None:
+        if term is None and geocode is None and who is None:
             return []
 
         if term is not None:
             parameters['q'] = term
 
+        if who is not None:
+            parameters['q'] = "from:%s" % (who)
+
         if geocode is not None:
             parameters['geocode'] = ','.join(map(str, geocode))
 
@@ -479,6 +486,40 @@ def GetTrendsWoeid(self, id, exclude=None):
             trends.append(Trend.NewFromJsonDict(trend, timestamp=timestamp))
         return trends
 
+    def GetUserSuggestionCategories(self):
+        """ Return the list of suggested user categories, this can be used in
+            GetUserSuggestion function
+        Returns:
+            A list of categories
+        """
+        url = '%s/users/suggestions.json' % (self.base_url)
+        json_data = self._RequestUrl(url, verb='GET')
+        data = self._ParseAndCheckTwitter(json_data.content)
+
+        categories = []
+
+        for category in data:
+            categories.append(Category.NewFromJsonDict(category))
+        return categories
+
+    def GetUserSuggestion(self, category):
+        """ Returns a list of users in a category
+        Args:
+            category:
+                The Category object to limit the search by
+        Returns:
+            A list of users in that category
+        """
+        url = '%s/users/suggestions/%s.json' % (self.base_url, category.Slug)
+
+        json_data = self._RequestUrl(url, verb='GET')
+        data = self._ParseAndCheckTwitter(json_data.content)
+
+        users = []
+        for user in data['users']:
+            users.append(User.NewFromJsonDict(user))
+        return users
+
     def GetHomeTimeline(self,
                         count=None,
                         since_id=None,
@@ -1585,12 +1626,12 @@ def GetFollowerIDsPaged(self,
         if count is not None:
             parameters['count'] = count
         result = []
-    
+
         parameters['cursor'] = cursor
-    
+
         json = self._RequestUrl(url, 'GET', data=parameters)
         data = self._ParseAndCheckTwitter(json.content)
-    
+
         if 'next_cursor' in data:
             next_cursor = data['next_cursor']
         else:
@@ -1599,7 +1640,7 @@ def GetFollowerIDsPaged(self,
             previous_cursor = data['previous_cursor']
         else:
             previous_cursor = 0
-    
+
         return next_cursor, previous_cursor, data
 
     def GetFollowerIDs(self,
@@ -1638,17 +1679,22 @@ def GetFollowerIDs(self,
         url = '%s/followers/ids.json' % self.base_url
         if not self.__auth:
             raise TwitterError({'message': "twitter.Api instance must be authenticated"})
-  
+
         result = []
         if total_count and total_count < count:
             count = total_count
-  
+
         while True:
+<<<<<<< HEAD
             if total_count and total_count < count:
                 parameters['count'] = total_count
             parameters['cursor'] = cursor
             json = self._RequestUrl(url, 'GET', data=parameters)
             data = self._ParseAndCheckTwitter(json.content.decode('utf-8').decode("utf-8"))
+=======
+            next_cursor, previous_cursor, data = self.GetFollowerIDsPaged(user_id, screen_name, cursor, stringify_ids,
+                                                                          count)
+>>>>>>> master
             result += [x for x in data['ids']]
             if next_cursor == 0 or next_cursor == previous_cursor:
                 break
@@ -1660,7 +1706,7 @@ def GetFollowerIDs(self,
                     break
             sec = self.GetSleepTime('/followers/ids')
             time.sleep(sec)
-  
+
         return result
 
     def GetFollowersPaged(self,
@@ -2073,7 +2119,7 @@ def CreateFriendship(self, user_id=None, screen_name=None, follow=True):
           A twitter.User instance representing the befriended user.
         """
         return self._AddOrEditFriendship(user_id=user_id, screen_name=screen_name, follow=follow)
-    
+
     def _AddOrEditFriendship(self, user_id=None, screen_name=None, uri_end='create', follow_key='follow', follow=True):
         """
         Shared method for Create/Update Friendship.
@@ -2114,7 +2160,8 @@ def UpdateFriendship(self, user_id=None, screen_name=None, follow=True, **kwargs
           A twitter.User instance representing the befriended user.
         """
         follow = kwargs.get('device', follow)
-        return self._AddOrEditFriendship(user_id=user_id, screen_name=screen_name, follow=follow, follow_key='device', uri_end='update')
+        return self._AddOrEditFriendship(user_id=user_id, screen_name=screen_name, follow=follow, follow_key='device',
+                                         uri_end='update')
 
     def DestroyFriendship(self, user_id=None, screen_name=None):
         """Discontinues friendship with a user_id or screen_name.
@@ -2893,7 +2940,7 @@ def GetListTimeline(self,
         """
         parameters = {'slug': slug,
                       'list_id': list_id,
-        }
+                      }
         url = '%s/lists/statuses.json' % (self.base_url)
         parameters['slug'] = slug
         parameters['list_id'] = list_id
@@ -2902,7 +2949,7 @@ def GetListTimeline(self,
                 raise TwitterError({'message': "list_id or slug required"})
             if owner_id is None and not owner_screen_name:
                 raise TwitterError({
-                'message': "if list_id is not given you have to include an owner to help identify the proper list"})
+                    'message': "if list_id is not given you have to include an owner to help identify the proper list"})
         if owner_id:
             parameters['owner_id'] = owner_id
         if owner_screen_name:
@@ -2976,7 +3023,7 @@ def GetListMembers(self,
         """
         parameters = {'slug': slug,
                       'list_id': list_id,
-        }
+                      }
         url = '%s/lists/members.json' % (self.base_url)
         parameters['slug'] = slug
         parameters['list_id'] = list_id
@@ -2985,7 +3032,7 @@ def GetListMembers(self,
                 raise TwitterError({'message': "list_id or slug required"})
             if owner_id is None and not owner_screen_name:
                 raise TwitterError({
-                'message': "if list_id is not given you have to include an owner to help identify the proper list"})
+                    'message': "if list_id is not given you have to include an owner to help identify the proper list"})
         if owner_id:
             parameters['owner_id'] = owner_id
         if owner_screen_name:
@@ -3297,22 +3344,22 @@ def UpdateImage(self,
 
         url = '%s/account/update_profile_image.json' % (self.base_url)
         with open(image, 'rb') as image_file:
-          encoded_image = base64.b64encode(image_file.read())
+            encoded_image = base64.b64encode(image_file.read())
         data = {
-          'image':encoded_image
+            'image': encoded_image
         }
         if include_entities:
-          data['include_entities'] = 1
+            data['include_entities'] = 1
         if skip_status:
-          data['skip_status'] = 1
+            data['skip_status'] = 1
 
         json = self._RequestUrl(url, 'POST', data=data)
         if json.status_code in [200, 201, 202]:
-          return True
+            return True
         if json.status_code == 400:
-          raise TwitterError({'message': "Image data could not be processed"})
+            raise TwitterError({'message': "Image data could not be processed"})
         if json.status_code == 422:
-          raise TwitterError({'message': "The image could not be resized or is too large."})
+            raise TwitterError({'message': "The image could not be resized or is too large."})
 
     def UpdateBanner(self,
                      image,
@@ -3833,15 +3880,15 @@ def _RequestStream(self, url, verb, data=None):
                 return requests.post(url, data=data, stream=True,
                                      auth=self.__auth,
                                      timeout=self._timeout
-                )
+                                     )
             except requests.RequestException as e:
                 raise TwitterError(str(e))
         if verb == 'GET':
             url = self._BuildUrl(url, extra_params=data)
             try:
                 return requests.get(url, stream=True, auth=self.__auth,
                                     timeout=self._timeout
-                )
+                                    )
             except requests.RequestException as e:
                 raise TwitterError(str(e))
         return 0  # if not a POST or GET request
diff --git a/twitter/category.py b/twitter/category.py
@@ -0,0 +1,59 @@
+#!/usr/bin/env python
+
+
+class Category(object):
+    """A class representing the suggested user category structure used by the twitter API.
+
+    The UserStatus structure exposes the following properties:
+
+      category.name
+      category.slug
+      category.size
+    """
+
+    def __init__(self, **kwargs):
+        """An object to hold a Twitter suggested  user category .
+        This class is normally instantiated by the twitter.Api class and
+        returned in a sequence.
+
+        Args:
+          name:
+            name of the category
+          slug:
+
+          size:
+        """
+        param_defaults = {
+            'name': None,
+            'slug': None,
+            'size': None,
+        }
+
+        for (param, default) in param_defaults.iteritems():
+            setattr(self, param, kwargs.get(param, default))
+
+    @property
+    def Name(self):
+        return self.name or False
+
+    @property
+    def Slug(self):
+        return self.slug or False
+
+    @property
+    def Size(self):
+        return self.size or False
+
+    @staticmethod
+    def NewFromJsonDict(data):
+        """Create a new instance based on a JSON dict.
+
+        Args:
+          data: A JSON dict, as converted from the JSON in the twitter API
+        Returns:
+          A twitter.Category instance
+        """
+
+        return Category(name=data.get('name', None),
+                        slug=data.get('slug', None),
+                        size=data.get('size', None))
diff --git a/twitter/media.py b/twitter/media.py
diff --git a/twitter/status.py b/twitter/status.py
