serious flake8 lint cleanup; apologies for the extra large diffs

Author: bear

setup.cfg

@@ -0,0 +1,7 @@
+[check-manifest]
+ignore =
+  .travis.yml
+  violations.flake8.txt
+
+[flake8]
+ignore = E111,E126,E201,E202,E221,E302,E501

tests/test_api.py

@@ -1,8 +1,10 @@
 # encoding: utf-8
 
-import twitter
+import os
 import time
+import urllib
 import unittest
+import twitter
 
 from apikey import (CONSUMER_KEY,
                     CONSUMER_SECRET,
@@ -30,7 +32,7 @@ def testTwitterError(self):
                          curry(self._OpenTestData, 'public_timeline_error.json'))
         # Manually try/catch so we can check the exception's value
         try:
-            statuses = self._api.GetUserTimeline()
+            self._api.GetUserTimeline()
         except twitter.TwitterError, error:
             # If the error message matches, the test passes
             self.assertEqual('test error', error.message)
@@ -48,7 +50,7 @@ def testGetUserTimeline(self):
         self.assertEqual(89512102, statuses[0].id)
         self.assertEqual(718443, statuses[0].user.id)
 
-    #def testGetFriendsTimeline(self):
+    # def testGetFriendsTimeline(self):
     #  '''Test the twitter.Api GetFriendsTimeline method'''
     #  self._AddHandler('https://api.twitter.com/1.1/statuses/friends_timeline/kesuke.json',
     #                   curry(self._OpenTestData, 'friends_timeline-kesuke.json'))
@@ -101,7 +103,7 @@ def testPostUpdateLatLon(self):
         print 'Testing PostUpdateLatLon'
         self._AddHandler('https://api.twitter.com/1.1/statuses/update.json',
                          curry(self._OpenTestData, 'update_latlong.json'))
-        #test another update with geo parameters, again test somewhat arbitrary
+        # test another update with geo parameters, again test somewhat arbitrary
         status = self._api.PostUpdate(u'Моё судно на воздушной подушке полно угрей'.encode('utf8'), latitude=54.2,
                                       longitude=-2)
         self.assertEqual(u'Моё судно на воздушной подушке полно угрей', status.text)
@@ -148,7 +150,7 @@ def testGetFollowers(self):
         alexkingorg = [u.status for u in users if u.screen_name == 'alexkingorg']
         self.assertEqual(89554432, alexkingorg[0].id)
 
-    #def testGetFeatured(self):
+    # def testGetFeatured(self):
     #  '''Test the twitter.Api GetFeatured method'''
     #  self._AddHandler('https://api.twitter.com/1.1/statuses/featured.json',
     #                   curry(self._OpenTestData, 'featured.json'))
@@ -322,4 +324,3 @@ class MockHTTPBasicAuthHandler(object):
     def add_password(self, realm, uri, user, passwd):
         # TODO(dewitt): Add verification that the proper args are passed
         pass
-

tests/test_parse_tweet.py

@@ -7,35 +7,35 @@ class ParseTest(unittest.TestCase):
     """ Test the ParseTweet class """
 
     def testParseTweets(self):
-        handles4 = u"""Do not use this word! Hurting me! @raja7727: @qadirbasha @manion @Jayks3 உடன்பிறப்பு”""";
+        handles4 = u"""Do not use this word! Hurting me! @raja7727: @qadirbasha @manion @Jayks3 உடன்பிறப்பு”"""
 
         data = twitter.ParseTweet("@twitter", handles4)
         self.assertEqual([data.RT, data.MT, len(data.UserHandles)], [False, False, 4])
 
-        hashtag_n_URL = u"மனதிற்கு மிகவும் நெருக்கமான பாடல்! உயிரையே கொடுக்கலாம் சார்! #KeladiKanmani https://www.youtube.com/watch?v=FHTiG_g2fM4 … #HBdayRajaSir";
+        hashtag_n_URL = u"""மனதிற்கு மிகவும் நெருக்கமான பாடல்! உயிரையே கொடுக்கலாம் சார்! #KeladiKanmani https://www.youtube.com/watch?v=FHTiG_g2fM4 … #HBdayRajaSir"""
 
         data = twitter.ParseTweet("@twitter", hashtag_n_URL)
         self.assertEqual([len(data.Hashtags), len(data.URLs)], [2, 1])
-        self.assertEqual(len(data.Emoticon),0)
+        self.assertEqual(len(data.Emoticon), 0)
 
-        url_only = u"""The #Rainbow #Nebula, 544,667 #lightyears away. pic.twitter.com/2A4wSUK25A""";
+        url_only = u"""The #Rainbow #Nebula, 544,667 #lightyears away. pic.twitter.com/2A4wSUK25A"""
         data = twitter.ParseTweet("@twitter", url_only)
         self.assertEqual([data.MT, len(data.Hashtags), len(data.URLs)], [False, 3, 1])
-        self.assertEqual(len(data.Emoticon),0)
+        self.assertEqual(len(data.Emoticon), 0)
 
-        url_handle = u"""RT ‏@BarackObama POTUS recommends Python-Twitter #unrelated picture pic.twitter.com/w8lFIfuUmI""";
+        url_handle = u"""RT ‏@BarackObama POTUS recommends Python-Twitter #unrelated picture pic.twitter.com/w8lFIfuUmI"""
         data = twitter.ParseTweet("@twitter", url_handle)
         self.assertEqual([data.RT, len(data.Hashtags), len(data.URLs), len(data.UserHandles)], [True, 1, 1, 1])
-        self.assertEqual(len(data.Emoticon),0)
+        self.assertEqual(len(data.Emoticon), 0)
 
     def testEmoticon(self):
-        url_handle = u"""RT ‏@BarackObama POTUS recommends :-) Python-Twitter #unrelated picture pic.twitter.com/w8lFIfuUmI""";
+        url_handle = u"""RT ‏@BarackObama POTUS recommends :-) Python-Twitter #unrelated picture pic.twitter.com/w8lFIfuUmI"""
         data = twitter.ParseTweet("@twitter", url_handle)
         self.assertEqual([data.RT, len(data.Hashtags), len(data.URLs), len(data.UserHandles)], [True, 1, 1, 1])
-        self.assertEqual(len(data.Emoticon),1)
+        self.assertEqual(len(data.Emoticon), 1)
 
-        url_handle = u"""RT @cats ^-^ cute! But kitty litter :-( #unrelated picture""";
+        url_handle = u"""RT @cats ^-^ cute! But kitty litter :-( #unrelated picture"""
         data = twitter.ParseTweet("@cats", url_handle)
         self.assertEqual([data.RT, len(data.Hashtags), len(data.URLs), len(data.UserHandles)], [True, 1, 0, 1])
-        self.assertEqual(len(data.Emoticon),2)
-        self.assertEqual(data.Emoticon,['^-^',':-('])
+        self.assertEqual(len(data.Emoticon), 2)
+        self.assertEqual(data.Emoticon, ['^-^', ':-('])

tests/test_status.py

@@ -17,9 +17,7 @@ def _GetSampleUser(self):
                             description=u'Canvas. JC Penny. Three ninety-eight.',
                             location='Okinawa, Japan',
                             url='https://twitter.com/kesuke',
-                            profile_image_url='https://twitter.com/system/user/pro'
-                                              'file_image/718443/normal/kesuke.pn'
-                                              'g')
+                            profile_image_url='https://twitter.com/system/user/profile_image/718443/normal/kesuke.png')
 
     def _GetSampleStatus(self):
         return twitter.Status(created_at='Fri Jan 26 23:17:14 +0000 2007',
@@ -29,10 +27,10 @@ def _GetSampleStatus(self):
 
     def testInit(self):
         '''Test the twitter.Status constructor'''
-        status = twitter.Status(created_at='Fri Jan 26 23:17:14 +0000 2007',
-                                id=4391023,
-                                text=u'A légpárnás hajóm tele van angolnákkal.',
-                                user=self._GetSampleUser())
+        twitter.Status(created_at='Fri Jan 26 23:17:14 +0000 2007',
+                       id=4391023,
+                       text=u'A légpárnás hajóm tele van angolnákkal.',
+                       user=self._GetSampleUser())
 
     def testProperties(self):
         '''Test all of the twitter.Status properties'''
@@ -117,7 +115,7 @@ def testNewFromJsonDict(self):
         data = json.loads(StatusTest.SAMPLE_JSON)
         status = twitter.Status.NewFromJsonDict(data)
         self.assertEqual(self._GetSampleStatus(), status)
-    
+
     def testStatusRepresentation(self):
         status = self._GetSampleStatus()
-        self.assertEqual("Status(ID=4391023, screen_name='kesuke', created_at='Fri Jan 26 23:17:14 +0000 2007')", status.__repr__())
+        self.assertEqual("Status(ID=4391023, screen_name='kesuke', created_at='Fri Jan 26 23:17:14 +0000 2007')", status.__repr__())

tests/test_trend.py

@@ -13,9 +13,9 @@ def _GetSampleTrend(self):
 
     def testInit(self):
         '''Test the twitter.Trend constructor'''
-        trend = twitter.Trend(name='Kesuke Miyagi',
-                              query='Kesuke Miyagi',
-                              timestamp='Fri Jan 26 23:17:14 +0000 2007')
+        twitter.Trend(name='Kesuke Miyagi',
+                      query='Kesuke Miyagi',
+                      timestamp='Fri Jan 26 23:17:14 +0000 2007')
 
     def testProperties(self):
         '''Test all of the twitter.Trend properties'''

tests/test_user.py

@@ -23,17 +23,15 @@ def _GetSampleUser(self):
                                               'ile_image/673483/normal/me.jpg',
                             status=self._GetSampleStatus())
 
-
     def testInit(self):
         '''Test the twitter.User constructor'''
-        user = twitter.User(id=673483,
-                            name='DeWitt',
-                            screen_name='dewitt',
-                            description=u'Indeterminate things',
-                            url='https://twitter.com/dewitt',
-                            profile_image_url='https://twitter.com/system/user/prof'
-                                              'ile_image/673483/normal/me.jpg',
-                            status=self._GetSampleStatus())
+        twitter.User(id=673483,
+                     name='DeWitt',
+                     screen_name='dewitt',
+                     description=u'Indeterminate things',
+                     url='https://twitter.com/dewitt',
+                     profile_image_url='https://twitter.com/system/user/profile_image/673483/normal/me.jpg',
+                     status=self._GetSampleStatus())
 
     def testProperties(self):
         '''Test all of the twitter.User properties'''
@@ -48,10 +46,8 @@ def testProperties(self):
         self.assertEqual('Indeterminate things', user.description)
         user.location = 'San Francisco, CA'
         self.assertEqual('San Francisco, CA', user.location)
-        user.profile_image_url = 'https://twitter.com/system/user/profile_i' \
-                                 'mage/673483/normal/me.jpg'
-        self.assertEqual('https://twitter.com/system/user/profile_image/6734'
-                         '83/normal/me.jpg', user.profile_image_url)
+        user.profile_image_url = 'https://twitter.com/system/user/profile_image/673483/normal/me.jpg'
+        self.assertEqual('https://twitter.com/system/user/profile_image/673483/normal/me.jpg', user.profile_image_url)
         self.status = self._GetSampleStatus()
         self.assertEqual(4212713, self.status.id)
 

twitter/__init__.py

@@ -21,23 +21,23 @@
 __author__ = '[email protected]'
 __version__ = '2.3'
 
-import json
+import json                                 # noqa
 
 try:
-    from hashlib import md5
+    from hashlib import md5                 # noqa
 except ImportError:
-    from md5 import md5
+    from md5 import md5                     # noqa
 
-from ._file_cache import _FileCache
-from .error import TwitterError
-from .direct_message import DirectMessage
-from .hashtag import Hashtag
-from .parse_tweet import ParseTweet
-from .trend import Trend
-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
+from ._file_cache import _FileCache         # noqa
+from .error import TwitterError             # noqa
+from .direct_message import DirectMessage   # noqa
+from .hashtag import Hashtag                # noqa
+from .parse_tweet import ParseTweet         # noqa
+from .trend import Trend                    # noqa
+from .url import Url                        # noqa
+from .status import Status                  # noqa
+from .user import User, UserStatus          # noqa
+from .category import Category              # noqa
+from .media import Media                    # noqa
+from .list import List                      # noqa
+from .api import Api                        # noqa

twitter/_file_cache.py

@@ -65,7 +65,7 @@ def _GetUsername(self):
                    os.getenv('USERNAME') or \
                    os.getlogin() or \
                    'nobody'
-        except (AttributeError, IOError, OSError) as e:
+        except (AttributeError, IOError, OSError):
             return 'nobody'
 
     def _GetTmpCachePath(self):
@@ -131,17 +131,18 @@ def __init__(self, timeline_owner, tweet):
     def __str__(self):
         """ for display method """
         return "owner %s, urls: %d, hashtags %d, user_handles %d, len_tweet %d, RT = %s, MT = %s" % (
-        self.Owner, len(self.URLs), len(self.Hashtags), len(self.UserHandles), len(self.tweet), self.RT, self.MT)
+                self.Owner, len(self.URLs), len(self.Hashtags), len(self.UserHandles),
+                len(self.tweet), self.RT, self.MT)
 
     @staticmethod
     def getAttributeRT(tweet):
         """ see if tweet is a RT """
-        return re.search(ParseTweet.regexp["RT"], tweet.strip()) != None
+        return re.search(ParseTweet.regexp["RT"], tweet.strip()) is not None
 
     @staticmethod
     def getAttributeMT(tweet):
         """ see if tweet is a MT """
-        return re.search(ParseTweet.regexp["MT"], tweet.strip()) != None
+        return re.search(ParseTweet.regexp["MT"], tweet.strip()) is not None
 
     @staticmethod
     def getUserHandles(tweet):