Sourcery refactored master branch

TwitterSearch/TwitterSearch/TwitterSearch.py

@@ -287,8 +287,7 @@ def getSearchResults(self, order):
         """
         Temporary method just to demonstrate Java-like API naming for future refactoring
         """
-        results = TwitterSearchResults(self.search_tweets(order))
-        return results
+        return TwitterSearchResults(self.search_tweets(order))
 
     def connect(self):
         """

TwitterSearch/TwitterSearch/TwitterSearchException.py

@@ -35,10 +35,7 @@ class TwitterSearchException(Exception):
 
     def __init__(self, code, msg=None):
         self.code = code
-        if msg:
-            self.message = msg
-        else:
-            self.message = self._error_codes.get(code)
+        self.message = msg if msg else self._error_codes.get(code)
 
     def __str__(self):
         return "Error %i: %s" % (self.code, self.message)

TwitterSearch/setup.py

@@ -8,10 +8,7 @@ def readme():
         return f.read()
 
 def requirements():
-    req = []
-    for line in open('requirements.txt','r'):
-        req.append(line.split()[0])
-    return req
+    return [line.split()[0] for line in open('requirements.txt','r')]
 
 setup(name='TwitterSearch',
       version='1.0.1',

TwitterSearch/tests/test_ts.py

@@ -22,8 +22,7 @@ def createTS(self):
     def apiAnsweringMachine(self, filename):
         """ Generates faked API responses by returing content of a given file """
         f = open(filename, 'r')
-        for line in f:
-            yield line
+        yield from f
         f.close()
 
     def setUp(self):
@@ -116,7 +115,7 @@ def test_TS_search_usertimeline_iterable(self):
         tuo = self.createTUO()
         tweet_cnt = 0
 
-        for tweet in ts.search_tweets_iterable(tuo):
+        for _ in ts.search_tweets_iterable(tuo):
             tweet_cnt += 1
 
         # test statistics
@@ -176,7 +175,7 @@ def test_TS_search_tweets_iterable(self):
         ts = self.createTS()
 
         tweet_cnt = 0
-        for tweet in ts.search_tweets_iterable(tso):
+        for _ in ts.search_tweets_iterable(tso):
             tweet_cnt += 1
 
         self.assertEqual( (cnt*4-1), tweet_cnt, "Wrong amount of tweets")

TwitterSearch/tests/test_tso.py

@@ -101,7 +101,7 @@ def test_TSO_maxID(self):
         """ Tests TwitterSearchOrder.set_max_id() """
 
         tso = self.getCopy()
-        correct_values = [ self.generateInt(1,999999999) for x in range(0,10) ]
+        correct_values = [self.generateInt(1,999999999) for x in range(10)]
 
         for value in correct_values:
             tso.set_max_id(value)
@@ -121,7 +121,7 @@ def test_TSO_sinceID(self):
         """ Tests TwitterSearchOrder.set_since_id() """
 
         tso = self.getCopy()
-        correct_values = [ self.generateInt(1,999999999) for x in range(0,10) ]
+        correct_values = [self.generateInt(1,999999999) for x in range(10)]
 
         for value in correct_values:
             tso.set_since_id(value)
@@ -162,7 +162,7 @@ def test_TSO_geo(self):
                 tso.set_geocode( value, value, radius, imperial_metric=unit)
                 self.assertTrue(False, "Not raising exception for lat %s, lon %s, radius %s and metric %s" % (value,value,radius,unit))
             except TwitterSearchException as e:
-                self.assertTrue((e.code == 1004 or e.code == 1005), "Wrong exception code")
+                self.assertTrue(e.code in [1004, 1005], "Wrong exception code")
 
         try:
             tso.set_geocode(2.0,1.0,10, imperial_metric='foo')
@@ -178,7 +178,7 @@ def test_TSO_count(self):
         """ Tests TwitterSearchOrder.set_count() """
 
         tso = self.getCopy()
-        correct_values = [ self.generateInt(minimum=1,maximum=100) for x in range(0,10) ]
+        correct_values = [self.generateInt(minimum=1,maximum=100) for x in range(10)]
 
         for value in correct_values:
             tso.set_count(value)
@@ -198,7 +198,7 @@ def test_TSO_callback(self):
         """ Tests TwitterSearchOrder.set_callback() """
 
         tso = self.getCopy()
-        correct_values = [ self.generateString() for x in range(0,10) ]
+        correct_values = [self.generateString() for x in range(10)]
 
         for value in correct_values:
             tso.set_callback(value)
@@ -417,10 +417,10 @@ def test_TSO_setURL(self):
     def test_TO_exceptions(self):
         """ Tests unimplemented TwitterOrder functions aiming for exceptions """
 
-        value = "foo"
         exc_class = NotImplementedError
         to = TwitterOrder()
         with self.assertRaises(exc_class):
+            value = "foo"
             to.set_search_url(value)
             to.create_search_url()
 

after/backends/ny_times.py

@@ -31,11 +31,10 @@ def _get_results(self):
         return response.json()['results']
 
     def _prepare_request_data(self):
-        data = {
+        return {
             'query': self.movie,
             'api-key': self.api_key
         }
-        return data
 
 
 class Review(BaseReview):