Added flake8 linter and modified code to pass without any errors.

app.py

@@ -8,30 +8,31 @@
 # URL routes
 from controllers import admin, api, dev, error, home, index, job, sitemap, static, user
 
-ROUTES = [('/', index.IndexController),
-          ('/home', home.HomeController),
-          ('/user', user.IndexController),
-          ('/user/auths', user.AuthsController),
-          ('/user/email', user.EmailController),
-          ('/user/password', user.PasswordController),
-          ('/user/signup', user.SignupController),
-          ('/user/login', user.LoginController),
-          ('/user/logout', user.LogoutController),
-          ('/user/forgotpassword', user.ForgotPasswordController),
-          ('/user/resetpassword', user.ResetPasswordController),
-          ('/terms', static.StaticController),
-          ('/privacy', static.StaticController),
-          ('/sitemap.xml', sitemap.SitemapController),
-          ('/admin', admin.AdminController),
-          ('/api/upload', api.UploadController),
-          ('/dev', dev.DevController),
-          ('/job/auths', job.AuthsController),
-          ('/job/email', job.EmailController),
-          #('/errors/(.*)', static.StaticController), # uncomment to test static error pages
-          ('/logerror', error.LogErrorController),
-          ('/policyviolation', error.PolicyViolationController),
-          ('/(.*)', error.ErrorController)
-         ]
+ROUTES = [
+    ('/', index.IndexController),
+    ('/home', home.HomeController),
+    ('/user', user.IndexController),
+    ('/user/auths', user.AuthsController),
+    ('/user/email', user.EmailController),
+    ('/user/password', user.PasswordController),
+    ('/user/signup', user.SignupController),
+    ('/user/login', user.LoginController),
+    ('/user/logout', user.LogoutController),
+    ('/user/forgotpassword', user.ForgotPasswordController),
+    ('/user/resetpassword', user.ResetPasswordController),
+    ('/terms', static.StaticController),
+    ('/privacy', static.StaticController),
+    ('/sitemap.xml', sitemap.SitemapController),
+    ('/admin', admin.AdminController),
+    ('/api/upload', api.UploadController),
+    ('/dev', dev.DevController),
+    ('/job/auths', job.AuthsController),
+    ('/job/email', job.EmailController),
+    # ('/errors/(.*)', static.StaticController), # uncomment to test static error pages
+    ('/logerror', error.LogErrorController),
+    ('/policyviolation', error.PolicyViolationController),
+    ('/(.*)', error.ErrorController)
+]
 
 # any extra config needed when the app starts
 cookie_args = {

controllers/base.py

@@ -5,7 +5,6 @@
 import json
 import logging
 import os
-import urllib2
 
 # app engine api imports
 from google.appengine.api import app_identity, memcache, taskqueue, users
@@ -21,7 +20,7 @@
 from config.constants import VIEWS_PATH, SUPPORT_EMAIL
 
 # lib imports
-from gae_html import cacheAndRender
+from gae_html import cacheAndRender # NOQA: F401
 
 
 class BaseController(webapp2.RequestHandler):
@@ -61,7 +60,7 @@ def dispatch(self):
         # only run the regular action if there isn't already an error or redirect
         if self.response.status_int == 200:
             webapp2.RequestHandler.dispatch(self)
-        
+
             if hasattr(self, "after"):
                 try:
                     self.after(*self.request.route_args, **self.request.route_kwargs)
@@ -200,6 +199,7 @@ def user(self):
                 user = auth.user
             else:
                 del self.session['auth_key']
+
         return user
 
     def deferEmail(self, to, subject, filename, reply_to=None, attachments=None, **kwargs):
@@ -209,7 +209,7 @@ def deferEmail(self, to, subject, filename, reply_to=None, attachments=None, **k
             params['reply_to'] = reply_to
 
         # this supports passing a template as well as a file
-        if type(filename) == type(""):
+        if isinstance(filename, basestring):
             filename = "emails/" + filename
         template = self.jinja_env.get_template(filename)
 
@@ -242,7 +242,7 @@ def validate(self):
                 form_data[name] = self.request.get(name)
             except UnicodeDecodeError:
                 return self.renderError(400)
-            
+
             valid, data = validator(form_data[name])
             if valid:
                 valid_data[name] = data
@@ -253,7 +253,7 @@ def validate(self):
 
 
 def withUser(action):
-    def decorate(*args,  **kwargs):
+    def decorate(*args, **kwargs):
         controller = args[0]
         if controller.user:
             return action(*args, **kwargs)
@@ -264,7 +264,7 @@ def decorate(*args,  **kwargs):
 
 
 def withoutUser(action):
-    def decorate(*args,  **kwargs):
+    def decorate(*args, **kwargs):
         controller = args[0]
         if not controller.user:
             return action(*args, **kwargs)
@@ -275,7 +275,7 @@ def decorate(*args,  **kwargs):
 
 
 def removeSlash(action):
-    def decorate(*args,  **kwargs):
+    def decorate(*args, **kwargs):
         controller = args[0]
         if controller.request.path.endswith("/"):
             return controller.redirect(controller.request.path[:-1], permanent=True)
@@ -284,7 +284,7 @@ def decorate(*args,  **kwargs):
 
 
 def validateReferer(action):
-    def decorate(*args,  **kwargs):
+    def decorate(*args, **kwargs):
         controller = args[0]
         referer = controller.request.headers.get("referer")
         if not referer.startswith("http://" + controller.request.headers.get("host")):
@@ -300,9 +300,11 @@ def decorate(*args,  **kwargs):
 #       (whereas the BaseController uses webapp2) and webapp 1 doesn't use the dispatch method
 #       which is why we have this custom second-level decorator defined to call it manually.
 def testDispatch(action):
+
     class MockApp(object):
         debug = True
-    def decorate(*args,  **kwargs):
+
+    def decorate(*args, **kwargs):
         if helpers.testing():
             controller = args[0]
             # this will go into an infinite loop of dispatching itself if we don't stop it
@@ -314,4 +316,5 @@ def decorate(*args,  **kwargs):
                 controller.dispatch()
         else:
             return action(*args, **kwargs)
+
     return decorate

controllers/dev.py

@@ -50,9 +50,9 @@ def post(self):
             modified = []
 
             # do migration work
-            #q = model.User.query()
-            #for item in q:
-            #    modified.append(item)
+            # q = model.User.query()
+            # for item in q:
+            #     modified.append(item)
 
             if modified:
                 model.ndb.put_multi(modified)

controllers/error.py

@@ -53,6 +53,7 @@ class StaticPageError(Exception):
     def __init__(self, reason):
         self.message = "Static Error Page: " + reason
 
+
 class PolicyViolationError(Exception):
     def __init__(self, reason):
         self.message = "Content Security Policy Violation: " + reason

controllers/job.py

@@ -2,6 +2,7 @@
 from datetime import datetime, timedelta
 import json
 import logging
+import urllib2
 
 from google.appengine.api import mail
 
@@ -79,7 +80,7 @@ def post(self):
             # an error here logs the status code but not the message
             # which is way more helpful, so we get it manually
             try:
-                response = self.SENDGRID.client.mail.send.post(request_body=message.get())
+                self.SENDGRID.client.mail.send.post(request_body=message.get())
             except urllib2.HTTPError, e:
                 logging.error(e.read())
         else:

controllers/user.py

@@ -1,4 +1,4 @@
-from datetime import datetime, timedelta
+from datetime import datetime
 
 from google.appengine.api import images
 from google.appengine.ext import blobstore
@@ -63,7 +63,7 @@ def login(self, user, new=False, remember=False):
 class IndexController(blobstore_handlers.BlobstoreUploadHandler, FormController):
 
     # TODO: need a serving URL for non-image files and this should work in prod
-    #self.user.pic_url = 'https://' + self.gcs_bucket + '.storage.googleapis.com/' + rel_path
+    # self.user.pic_url = 'https://' + self.gcs_bucket + '.storage.googleapis.com/' + rel_path
 
     # this is sometimes called by the blob service, so it won't include the CSRF
     SKIP_CSRF = True
@@ -92,7 +92,7 @@ def post(self):
                 images.delete_serving_url(self.user.pic_blob)
             if self.user.pic_blob:
                 blobstore.delete(self.user.pic_blob)
-            
+
             self.user.pic_gcs = None
             self.user.pic_blob = None
             self.user.pic_url = None
@@ -118,7 +118,7 @@ def post(self):
 
                 self.user.pic_gcs = upload.gs_object_name
                 self.user.pic_blob = upload.key()
-        
+
             if errors:
                 return self.redisplay({}, errors)
 
@@ -144,7 +144,9 @@ def post(self):
 
         try:
             auth_key = model.ndb.Key(urlsafe=str_key)
-        except:
+        except Exception:
+            # this is really a ProtocolBufferDecodeError, but we can't catch that
+            # see https://github.com/googlecloudplatform/datastore-ndb-python/issues/143
             self.flash('error', 'Invalid session.')
         else:
             if auth_key.parent() != self.user.key:
@@ -168,7 +170,7 @@ def get(self):
 
     @withUser
     def post(self):
-        
+
         form_data, errors, valid_data = self.validate()
 
         hashed_password = model.User.hashPassword(valid_data["password"], self.user.password_salt)
@@ -207,7 +209,7 @@ def get(self):
 
     @withUser
     def post(self):
-        
+
         form_data, errors, valid_data = self.validate()
 
         hashed_password = model.User.hashPassword(valid_data["password"], self.user.password_salt)
@@ -220,7 +222,7 @@ def post(self):
             self.redisplay(form_data, errors)
         else:
             password_salt, hashed_password = model.User.changePassword(valid_data["new_password"])
-            
+
             self.user.populate(password_salt=password_salt, hashed_password=hashed_password)
             self.user.put()
             self.uncache(self.user.slug)
@@ -245,7 +247,7 @@ def get(self):
 
     @withoutUser
     def post(self):
-        
+
         form_data, errors, valid_data = self.validate()
 
         # extra validation to make sure that email address isn't already in use
@@ -278,7 +280,7 @@ def get(self):
 
     @withoutUser
     def post(self):
-        
+
         form_data, errors, valid_data = self.validate()
 
         # check that the user exists and the password matches
@@ -308,7 +310,7 @@ def post(self):
         str_key = self.session['auth_key']
         try:
             auth_key = model.ndb.Key(urlsafe=str_key)
-        except:
+        except Exception:
             pass
         else:
             self.uncache(str_key)
@@ -328,7 +330,7 @@ def get(self):
 
     @withoutUser
     def post(self):
-        
+
         form_data, errors, valid_data = self.validate()
 
         if errors:
@@ -372,7 +374,7 @@ def get(self):
         self.renderTemplate('user/reset_password.html', key=self.key, token=self.token)
 
     def post(self):
-        
+
         form_data, errors, valid_data = self.validate()
 
         if errors: