Merge branch 'master' into pull_coverage

tests/test_api.py

@@ -77,6 +77,12 @@ class TweepyAPITests(TweepyTestCase):
         u = self.api.get_user(783214)
         self.assertEqual(u.screen_name, 'twitter')
 
+    def testlookupusers(self):
+        def check(users):
+            self.assertEqual(len(users), 2)
+        check(self.api.lookup_users(user_ids=[6844292, 6253282]))
+        check(self.api.lookup_users(screen_names=['twitterapi', 'twitter']))
+
     def testsearchusers(self):
         self.api.search_users('twitter')
 

tests/test_utils.py

@@ -8,3 +8,8 @@ class TweepyUtilsTests(TestCase):
         result = parse_datetime("Wed Aug 27 13:08:45 +0000 2008")
         self.assertEqual(datetime(2008, 8, 27, 13, 8, 45), result)
 
+    def testlist_to_csv(self):
+        self.assertEqual("1,2,3", list_to_csv([1,2,3]))
+        self.assertEqual("bird,tweet,nest,egg",
+                         list_to_csv(["bird", "tweet", "nest", "egg"]))
+

tweepy/models.py

@@ -3,8 +3,7 @@
 # See LICENSE for details.
 
 from tweepy.error import TweepError
-from tweepy.utils import parse_datetime, parse_html_value, parse_a_href, \
-        parse_search_datetime, unescape_html
+from tweepy.utils import parse_datetime, parse_html_value, parse_a_href
 
 
 class ResultSet(list):

tweepy/utils.py

@@ -14,6 +14,7 @@ from email.utils import parsedate
 def parse_datetime(string):
     return datetime(*(parsedate(string)[:6]))
 
+
 def parse_html_value(html):
 
     return html[html.find('>')+1:html.rfind('<')]
@@ -26,41 +27,6 @@ def parse_a_href(atag):
     return atag[start:end]
 
 
-def parse_search_datetime(string):
-    # Set locale for date parsing
-    locale.setlocale(locale.LC_TIME, 'C')
-
-    # We must parse datetime this way to work in python 2.4
-    date = datetime(*(time.strptime(string, '%a, %d %b %Y %H:%M:%S +0000')[0:6]))
-
-    # Reset locale back to the default setting
-    locale.setlocale(locale.LC_TIME, '')
-    return date
-
-
-def unescape_html(text):
-    """Created by Fredrik Lundh (http://effbot.org/zone/re-sub.htm#unescape-html)"""
-    def fixup(m):
-        text = m.group(0)
-        if text[:2] == "&#":
-            # character reference
-            try:
-                if text[:3] == "&#x":
-                    return unichr(int(text[3:-1], 16))
-                else:
-                    return unichr(int(text[2:-1]))
-            except ValueError:
-                pass
-        else:
-            # named entity
-            try:
-                text = unichr(htmlentitydefs.name2codepoint[text[1:-1]])
-            except KeyError:
-                pass
-        return text # leave as is
-    return re.sub("&#?\w+;", fixup, text)
-
-
 def convert_to_utf8_str(arg):
     # written by Michael Norton (http://docondev.blogspot.com/)
     if isinstance(arg, unicode):