pep8-fy the codebase

Makefile

@@ -22,7 +22,7 @@ endif
 # auslib/util/testing.py.
 NOSE_ARGS += auslib/test
 
-ALL_PY_FILES := $(shell find . \( -iname "*.py" -or -iname "*.wsgi" \) -not -path "*vendor*")
+ALL_PY_FILES := $(shell find . \( -iname "*.py" -or -iname "*.wsgi" \) -not -path "*vendor*" -not -path "./lib*")
 
 PYTHON_ENV = PYTHONDONTWRITEBYTECODE=1 PYTHONPATH=$(PYTHONPATH)
 # Used to run the tests. Useful for both CI-driven tests and manual ones.
@@ -62,4 +62,7 @@ ci-tests: virtualenv test-in-virtualenv
 pyflakes: $(ALL_PY_FILES)
 	pyflakes $(ALL_PY_FILES)
 
+pep8: $(ALL_PY_FILES)
+	@pep8 --ignore E501,E711 $(ALL_PY_FILES)
+
 .PHONY: FORCE

admin.py

@@ -10,6 +10,7 @@
 
 
 class APIMiddleware(object):
+
     def __init__(self, wrap_app):
         self.wrap_app = wrap_app
 
@@ -39,7 +40,7 @@ def __call__(self, environ, start_response):
     parser.add_option("--cef-log", dest="cefLog", default="cef.log")
     parser.add_option("--page-title", dest="pageTitle", default="AUS Management")
     parser.add_option("-v", "--verbose", dest="verbose", action="store_true",
-        help="Verbose output")
+                      help="Verbose output")
     options, args = parser.parse_args()
 
     # Logging needs to get set-up before importing the application
@@ -68,6 +69,7 @@ def __call__(self, environ, start_response):
     app.config['SECRET_KEY'] = 'abc123'
     app.config['DEBUG'] = True
     app.config['PAGE_TITLE'] = options.pageTitle
+
     def auth(environ, username, password):
         return username == password
     # The Angular app always makes requests to "/api". The WSGI app that runs

auslib/AUS.py

@@ -15,20 +15,23 @@ def isSpecialURL(url, specialForceHosts):
             return True
     return False
 
+
 def isForbiddenUrl(url, whitelistedDomains):
     domain = urlparse(url)[1]
     if domain not in whitelistedDomains:
         cef_event("Forbidden domain", CEF_ALERT, domain=domain)
         return True
     return False
 
+
 def getFallbackChannel(channel):
     return channel.split('-cck-')[0]
 
 
 class AUSRandom:
     """Abstract getting a randint to make it easier to test the range of
     possible values"""
+
     def __init__(self, min=0, max=99):
         self.min = min
         self.max = max
@@ -37,9 +40,11 @@ def getInt(self):
         return randint(self.min, self.max)
 
     def getRange(self):
-        return range(self.min, self.max+1)
+        return range(self.min, self.max + 1)
+
 
 class AUS:
+
     def __init__(self):
         self.specialForceHosts = None
         self.rand = AUSRandom()
@@ -53,11 +58,11 @@ def evaluateRules(self, updateQuery):
             fallbackChannel=getFallbackChannel(updateQuery['channel'])
         )
 
-        ### XXX throw any N->N update rules and keep the highest priority remaining one
+        # XXX throw any N->N update rules and keep the highest priority remaining one
         if len(rules) < 1:
             return None, None
 
-        rules = sorted(rules,key=lambda rule: rule['priority'], reverse=True)
+        rules = sorted(rules, key=lambda rule: rule['priority'], reverse=True)
         rule = rules[0]
         self.log.debug("Matching rule: %s" % rule)
 

auslib/admin/base.py

@@ -10,14 +10,15 @@
 
 from auslib.admin.views.csrf import CSRFView
 from auslib.admin.views.permissions import UsersView, PermissionsView, \
-  SpecificPermissionView
+    SpecificPermissionView
 from auslib.admin.views.releases import SingleLocaleView, \
-  SingleReleaseView, ReleaseHistoryView, \
-  ReleasesAPIView
+    SingleReleaseView, ReleaseHistoryView, \
+    ReleasesAPIView
 from auslib.admin.views.rules import RulesAPIView, \
-  SingleRuleView, RuleHistoryAPIView
+    SingleRuleView, RuleHistoryAPIView
 from auslib.admin.views.history import DiffView, FieldView
 
+
 @app.errorhandler(500)
 def isa(error):
     log.error("Caught ISE 500 error.")
@@ -28,6 +29,8 @@ def isa(error):
     return error
 
 # bug 887790: add necessary security headers
+
+
 @app.after_request
 def add_security_headers(response):
     response.headers['X-Frame-Options'] = 'DENY'

auslib/admin/views/base.py

@@ -9,6 +9,7 @@
 
 import logging
 
+
 def requirelogin(f):
     def decorated(*args, **kwargs):
         username = request.environ.get('REMOTE_USER')
@@ -18,6 +19,7 @@ def decorated(*args, **kwargs):
         return f(*args, changed_by=username, **kwargs)
     return decorated
 
+
 def requirepermission(url, options=['product']):
     def wrap(f):
         def decorated(*args, **kwargs):
@@ -41,7 +43,9 @@ def decorated(*args, **kwargs):
         return decorated
     return wrap
 
+
 class AdminView(MethodView):
+
     def __init__(self, *args, **kwargs):
         self.log = logging.getLogger(self.__class__.__name__)
         MethodView.__init__(self, *args, **kwargs)
@@ -68,11 +72,10 @@ class HistoryAdminView(AdminView):
 
     def getAllRevisionKeys(self, revisions, primary_keys):
         try:
-            all_keys = [
+            all_keys = sorted([
                 x for x in revisions[0].keys()
                 if x not in self.history_keys and x not in primary_keys
-            ]
-            all_keys.sort()
+            ])
         except IndexError:
             all_keys = None
         return all_keys

auslib/admin/views/csrf.py

@@ -5,13 +5,16 @@
 
 __all__ = ["CSRFView"]
 
+
 def get_csrf_headers():
     # Instantiating a Form makes sure there's a CSRF token available
     # and puts an hmac key in the session.
     form = Form()
     return {'X-CSRF-Token': form.csrf_token._value()}
 
+
 class CSRFView(AdminView):
     """/csrf_token"""
+
     def get(self):
         return Response(headers=get_csrf_headers())

auslib/admin/views/forms.py

@@ -8,11 +8,14 @@
 import logging
 log = logging.getLogger(__name__)
 
+
 class DisableableTextInput(TextInput):
     """A TextInput widget that supports being disabled."""
+
     def __init__(self, disabled, *args, **kwargs):
         self.disabled = disabled
         TextInput.__init__(self, *args, **kwargs)
+
     def __call__(self, *args, **kwargs):
         if self.disabled:
             kwargs['disabled'] = 'disabled'
@@ -21,12 +24,13 @@ def __call__(self, *args, **kwargs):
 
 class JSONStringField(StringField):
     """StringField that parses incoming data as JSON."""
+
     def process_formdata(self, valuelist):
         if valuelist and valuelist[0]:
             try:
                 self.data = json.loads(valuelist[0])
             # XXX: use JSONDecodeError when the servers support it
-            except ValueError, e:
+            except ValueError as e:
                 # WTForms catches ValueError, which JSONDecodeError is a child
                 # of. Because of this, we need to wrap this error in something
                 # else in order for it to be properly raised.
@@ -45,6 +49,7 @@ def _value(self):
 
 class NullableStringField(StringField):
     """StringField that parses incoming data converting empty strings to None's."""
+
     def process_formdata(self, valuelist):
         if valuelist and valuelist[0]:
             if valuelist[0] == '':
@@ -56,6 +61,7 @@ def process_formdata(self, valuelist):
             log.debug('No value list, setting self.data to None')
             self.data = None
 
+
 def NoneOrType(type_):
     """A helper method for SelectField's that returns the value coerced to
        the specified type when it is not None. By default, a SelectField coerces
@@ -67,18 +73,23 @@ def coercer(value):
             return type_(value)
     return coercer
 
+
 class DbEditableForm(Form):
     data_version = IntegerField('data_version', validators=[Required()], widget=HiddenInput())
 
+
 class PermissionForm(DbEditableForm):
     options = JSONStringField('Options')
 
+
 class NewPermissionForm(PermissionForm):
     permission = StringField('Permission', validators=[Required()])
 
+
 class ExistingPermissionForm(PermissionForm):
     permission = StringField('Permission', validators=[Required()], widget=DisableableTextInput(disabled=True))
 
+
 class PartialReleaseForm(Form):
     # Because we do implicit release creation in the Releases views, we can't
     # have data_version be Required(). The views are responsible for checking
@@ -92,39 +103,42 @@ class PartialReleaseForm(Form):
     copyTo = JSONStringField('Copy To', default=list)
     alias = JSONStringField('Alias', default=list)
 
+
 class RuleForm(Form):
-    backgroundRate = IntegerField('Background Rate', validators=[Required(), NumberRange(0, 100) ])
+    backgroundRate = IntegerField('Background Rate', validators=[Required(), NumberRange(0, 100)])
     priority = IntegerField('Priority', validators=[Required()])
     mapping = SelectField('Mapping', validators=[])
-    product = NullableStringField('Product', validators=[Length(0, 15)] )
-    version = NullableStringField('Version', validators=[Length(0,10) ])
-    buildID = NullableStringField('BuildID', validators=[Length(0,20) ])
-    channel = NullableStringField('Channel', validators=[Length(0,75) ])
-    locale = NullableStringField('Locale', validators=[Length(0,200) ])
-    distribution = NullableStringField('Distribution', validators=[Length(0,100) ])
-    buildTarget = NullableStringField('Build Target', validators=[Length(0,75) ])
-    osVersion = NullableStringField('OS Version', validators=[Length(0,1000) ])
-    distVersion = NullableStringField('Dist Version', validators=[Length(0,100) ])
-    comment = NullableStringField('Comment', validators=[Length(0,500) ])
-    update_type = SelectField('Update Type', choices=[('minor','minor'), ('major', 'major')], validators=[])
-    headerArchitecture = NullableStringField('Header Architecture', validators=[Length(0,10) ])
+    product = NullableStringField('Product', validators=[Length(0, 15)])
+    version = NullableStringField('Version', validators=[Length(0, 10)])
+    buildID = NullableStringField('BuildID', validators=[Length(0, 20)])
+    channel = NullableStringField('Channel', validators=[Length(0, 75)])
+    locale = NullableStringField('Locale', validators=[Length(0, 200)])
+    distribution = NullableStringField('Distribution', validators=[Length(0, 100)])
+    buildTarget = NullableStringField('Build Target', validators=[Length(0, 75)])
+    osVersion = NullableStringField('OS Version', validators=[Length(0, 1000)])
+    distVersion = NullableStringField('Dist Version', validators=[Length(0, 100)])
+    comment = NullableStringField('Comment', validators=[Length(0, 500)])
+    update_type = SelectField('Update Type', choices=[('minor', 'minor'), ('major', 'major')], validators=[])
+    headerArchitecture = NullableStringField('Header Architecture', validators=[Length(0, 10)])
+
 
 class EditRuleForm(DbEditableForm):
-    backgroundRate = IntegerField('Background Rate', validators=[Optional(), NumberRange(0, 100) ])
+    backgroundRate = IntegerField('Background Rate', validators=[Optional(), NumberRange(0, 100)])
     priority = IntegerField('Priority', validators=[Optional()])
     mapping = SelectField('Mapping', validators=[Optional()], coerce=NoneOrType(unicode))
-    product = NullableStringField('Product', validators=[Optional(), Length(0, 15)] )
-    version = NullableStringField('Version', validators=[Optional(), Length(0,10) ])
-    buildID = NullableStringField('BuildID', validators=[Optional(), Length(0,20) ])
-    channel = NullableStringField('Channel', validators=[Optional(), Length(0,75) ])
-    locale = NullableStringField('Locale', validators=[Optional(), Length(0,200) ])
-    distribution = NullableStringField('Distribution', validators=[Optional(), Length(0,100) ])
-    buildTarget = NullableStringField('Build Target', validators=[Optional(), Length(0,75) ])
-    osVersion = NullableStringField('OS Version', validators=[Optional(), Length(0,1000) ])
-    distVersion = NullableStringField('Dist Version', validators=[Optional(), Length(0,100) ])
-    comment = NullableStringField('Comment', validators=[Optional(), Length(0,500) ])
-    update_type = SelectField('Update Type', choices=[('minor','minor'), ('major', 'major')], validators=[Optional()], coerce=NoneOrType(unicode))
-    headerArchitecture = NullableStringField('Header Architecture', validators=[Optional(), Length(0,10) ])
+    product = NullableStringField('Product', validators=[Optional(), Length(0, 15)])
+    version = NullableStringField('Version', validators=[Optional(), Length(0, 10)])
+    buildID = NullableStringField('BuildID', validators=[Optional(), Length(0, 20)])
+    channel = NullableStringField('Channel', validators=[Optional(), Length(0, 75)])
+    locale = NullableStringField('Locale', validators=[Optional(), Length(0, 200)])
+    distribution = NullableStringField('Distribution', validators=[Optional(), Length(0, 100)])
+    buildTarget = NullableStringField('Build Target', validators=[Optional(), Length(0, 75)])
+    osVersion = NullableStringField('OS Version', validators=[Optional(), Length(0, 1000)])
+    distVersion = NullableStringField('Dist Version', validators=[Optional(), Length(0, 100)])
+    comment = NullableStringField('Comment', validators=[Optional(), Length(0, 500)])
+    update_type = SelectField('Update Type', choices=[('minor', 'minor'), ('major', 'major')], validators=[Optional()], coerce=NoneOrType(unicode))
+    headerArchitecture = NullableStringField('Header Architecture', validators=[Optional(), Length(0, 10)])
+
 
 class CompleteReleaseForm(Form):
     name = StringField('Name', validators=[Required()])

auslib/admin/views/history.py

@@ -43,17 +43,18 @@ def format_value(self, value):
     def get(self, type_, change_id, field):
         try:
             value = self.get_value(type_, change_id, field)
-        except KeyError, msg:
+        except KeyError as msg:
             cef_event("Bad input", CEF_WARN, errors=str(msg), field=field)
             return Response(status=400, response=str(msg))
-        except ValueError, msg:
+        except ValueError as msg:
             return Response(status=404, response=str(msg))
         value = self.format_value(value)
         return Response(value, content_type='text/plain')
 
 
 class DiffView(FieldView):
     """/diff/:type/:id/:field"""
+
     def get(self, type_, change_id, field):
         value = self.get_value(type_, change_id, field)
         previous = self.get_value(type_, int(change_id) - 1, field)