fix issue with utf8 for encoding url params

adds tests for in/out friendships

Author: jeremylow

requirements.testing.txt

@@ -16,3 +16,5 @@ check-manifest
 tox
 tox-pyenv
 pycodestyle
+
+hypothesis

testdata/get_incoming_friendships.json

@@ -0,0 +1 @@
+{"previous_cursor_str": "0", "next_cursor": 0, "previous_cursor": 0, "ids": [12], "next_cursor_str": "0"}

testdata/get_outgoing_friendships.json

@@ -0,0 +1 @@
+{"previous_cursor_str": "0", "next_cursor": 0, "previous_cursor": 0, "ids": [12], "next_cursor_str": "0"}

tests/test_api_30.py

@@ -580,7 +580,7 @@ def testGetFavorites(self):
             resp_data = f.read()
         responses.add(GET, DEFAULT_URL, body=resp_data)
 
-        resp = self.api.GetFavorites()
+        resp = self.api.GetFavorites(user_id=12, count=1, since_id=10, max_id=200)
         self.assertTrue(type(resp) is list)
         fav = resp[0]
         self.assertEqual(fav.id, 677180133447372800)
@@ -1294,7 +1294,6 @@ def testGetStatuses(self):
             resp = self.api.GetStatuses(status_ids)
 
             self.assertTrue(type(resp) is list)
-            print(resp)
             self.assertEqual(set(respitem.id for respitem in resp), set(status_ids))
             self.assertFalse(resp != resp)
 
@@ -1736,3 +1735,21 @@ def test_get_retweets_of_me(self):
         self.assertRaises(
             twitter.TwitterError,
             lambda: self.api.GetRetweetsOfMe(count='asdf'))
+
+    @responses.activate
+    def test_incoming_friendships(self):
+        with open('testdata/get_incoming_friendships.json') as f:
+            responses.add(GET, DEFAULT_URL, f.read())
+        resp = self.api.IncomingFriendship(cursor=1, stringify_ids=True)
+        assert resp
+        assert isinstance(resp, list)
+        assert resp[0] == 12
+
+    @responses.activate
+    def test_outgoing_friendships(self):
+        with open('testdata/get_outgoing_friendships.json') as f:
+            responses.add(GET, DEFAULT_URL, f.read())
+        resp = self.api.OutgoingFriendship(cursor=1, stringify_ids=True)
+        assert resp
+        assert isinstance(resp, list)
+        assert resp[0] == 12

tests/test_unicode.py

@@ -8,6 +8,10 @@
 import warnings
 
 import responses
+
+from hypothesis import given, example
+from hypothesis import strategies as st
+
 import twitter
 
 warnings.filterwarnings('ignore', category=DeprecationWarning)
@@ -41,19 +45,22 @@ def tearDown(self):
         sys.stderr = self._stderr
         pass
 
-    def test_trend_repr1(self):
+    @given(text=st.text())
+    @example(text="#نفسك_تبيع_ايه_للسعوديه")
+    def test_trend_repr1(self, text):
         trend = twitter.Trend(
-            name="#نفسك_تبيع_ايه_للسعوديه",
+            name=text,
             url="http://twitter.com/search?q=%23ChangeAConsonantSpoilAMovie",
             timestamp='whatever')
         try:
             trend.__repr__()
         except Exception as e:
             self.fail(e)
 
-    def test_trend_repr2(self):
+    @given(text=st.text())
+    @example(text="#N\u00e3oD\u00eaUnfTagueirosSdv")
+    def test_trend_repr2(self, text):
         trend = twitter.Trend(
-            name="#N\u00e3oD\u00eaUnfTagueirosSdv",
             url='http://twitter.com/search?q=%23ChangeAConsonantSpoilAMovie',
             timestamp='whatever')
 
@@ -72,23 +79,25 @@ def test_trend_repr3(self):
 
         resp = self.api.GetTrendsCurrent()
         for r in resp:
-            print(r.__str__())
             try:
                 r.__repr__()
             except Exception as e:
                 self.fail(e)
 
+    @given(text=st.text())
     @responses.activate
-    def test_unicode_get_search(self):
+    def test_unicode_get_search(self, text):
         responses.add(responses.GET, DEFAULT_URL, body=b'{}', status=200)
         try:
-            self.api.GetSearch(term="#ابشري_قابوس_جاء")
+            self.api.GetSearch(term=text)
         except Exception as e:
             self.fail(e)
 
-    def test_constructed_status(self):
+    @given(text=st.text())
+    @example(text='可以倒着飞的飞机')
+    def test_constructed_status(self, text):
         s = twitter.Status()
-        s.text = "可以倒着飞的飞机"
+        s.text = text
         s.created_at = "016-02-13T23:00:00"
         s.screen_name = "himawari8bot"
         s.id = 1
@@ -101,8 +110,3 @@ def test_post_with_bytes_string(self):
         status = 'x'
         length = twitter.twitter_utils.calc_expected_status_length(status)
         assert length == 1
-
-
-if __name__ == "__main__":
-    suite = unittest.TestLoader().loadTestsFromTestCase(ApiTest)
-    unittest.TextTestRunner(verbosity=2).run(suite)

twitter/api.py

@@ -4868,7 +4868,13 @@ def _EncodeParameters(parameters):
         if not isinstance(parameters, dict):
             raise TwitterError("`parameters` must be a dict.")
         else:
-            return urlencode(dict((k, v) for k, v in parameters.items() if v is not None))
+            params = dict()
+            for k, v in parameters.items():
+                if v is not None:
+                    if getattr(v, 'encode', None):
+                        v = v.encode('utf8')
+                    params.update({k: v})
+            return urlencode(params)
 
     def _ParseAndCheckTwitter(self, json_data):
         """Try and parse the JSON returned from Twitter and return