trivial: Resolve pep8 issues

flake8 3.2.0 updates the pycodestyle dependency to 2.2.0, which in
turn resolves a bug with E305. Upgrading results in a small number of
additional pep8 issues. Resolve these now.

Signed-off-by: Stephen Finucane <stephen@that.guru>

diff --git a/patchwork/admin.py b/patchwork/admin.py
index e80415a90867befb6ef9cf0721f0769d603a6888..d43cc4ddcb755c449ca04b1840bb87169052f0ec 100644 (file)
--- a/patchwork/admin.py
+++ b/patchwork/admin.py
@@ -47,6 +47,8 @@ class UserProfileInline(admin.StackedInline):
 
 class UserAdmin(BaseUserAdmin):
     inlines = (UserProfileInline, )
+
+
 admin.site.unregister(User)
 admin.site.register(User, UserAdmin)
 
@@ -61,6 +63,8 @@ class ProjectAdmin(admin.ModelAdmin):
     inlines = [
         DelegationRuleInline,
     ]
+
+
 admin.site.register(Project, ProjectAdmin)
 
 
@@ -74,11 +78,15 @@ class PersonAdmin(admin.ModelAdmin):
     has_account.boolean = True
     has_account.admin_order_field = 'user'
     has_account.short_description = 'Account'
+
+
 admin.site.register(Person, PersonAdmin)
 
 
 class StateAdmin(admin.ModelAdmin):
     list_display = ('name', 'action_required')
+
+
 admin.site.register(State, StateAdmin)
 
 
@@ -87,6 +95,8 @@ class SubmissionAdmin(admin.ModelAdmin):
     list_filter = ('project', )
     search_fields = ('name', 'submitter__name', 'submitter__email')
     date_hierarchy = 'date'
+
+
 admin.site.register(Submission, SubmissionAdmin)
 admin.site.register(CoverLetter, SubmissionAdmin)
 
@@ -104,6 +114,8 @@ class PatchAdmin(admin.ModelAdmin):
     is_pull_request.boolean = True
     is_pull_request.admin_order_field = 'pull_url'
     is_pull_request.short_description = 'Pull'
+
+
 admin.site.register(Patch, PatchAdmin)
 
 
@@ -111,6 +123,8 @@ class CommentAdmin(admin.ModelAdmin):
     list_display = ('submission', 'submitter', 'date')
     search_fields = ('submission__name', 'submitter__name', 'submitter__email')
     date_hierarchy = 'date'
+
+
 admin.site.register(Comment, CommentAdmin)
 
 
@@ -130,6 +144,8 @@ class SeriesAdmin(admin.ModelAdmin):
     def received_all(self, series):
         return series.received_all
     received_all.boolean = True
+
+
 admin.site.register(Series, SeriesAdmin)
 
 
@@ -148,6 +164,8 @@ class SeriesInline(admin.StackedInline):
 
 class SeriesReferenceAdmin(admin.ModelAdmin):
     model = SeriesReference
+
+
 admin.site.register(SeriesReference, SeriesReferenceAdmin)
 
 
@@ -157,6 +175,8 @@ class CheckAdmin(admin.ModelAdmin):
     exclude = ('date', )
     search_fields = ('patch__name', 'project__name')
     date_hierarchy = 'date'
+
+
 admin.site.register(Check, CheckAdmin)
 
 
@@ -164,9 +184,13 @@ class BundleAdmin(admin.ModelAdmin):
     list_display = ('name', 'owner', 'project', 'public')
     list_filter = ('public', 'project')
     search_fields = ('name', 'owner')
+
+
 admin.site.register(Bundle, BundleAdmin)
 
 
 class TagAdmin(admin.ModelAdmin):
     list_display = ('name',)
+
+
 admin.site.register(Tag, TagAdmin)

diff --git a/patchwork/bin/pwclient b/patchwork/bin/pwclient
index ce18e541a7a43379302c656f1437a3815f395777..48d7be972e4ce353ad83075031ea2df8103784b0 100755 (executable)
--- a/patchwork/bin/pwclient
+++ b/patchwork/bin/pwclient
@@ -377,6 +377,7 @@ def patch_id_from_hash(rpc, project, hash):
         sys.exit(1)
     return patch_id
 
+
 auth_actions = ['check_create', 'update']
 
 
@@ -606,7 +607,8 @@ def main():
     config.read([CONFIG_FILE])
 
     if not config.has_section('options') and os.path.exists(CONFIG_FILE):
-        sys.stderr.write('%s is in the old format. Migrating it...' % CONFIG_FILE)
+        sys.stderr.write('%s is in the old format. Migrating it...' %
+                         CONFIG_FILE)
 
         old_project = config.get('base', 'project')
 
@@ -793,5 +795,6 @@ def main():
         action_parser.print_help()
         sys.exit(1)
 
+
 if __name__ == "__main__":
     main()

diff --git a/patchwork/models.py b/patchwork/models.py
index a27dda65649adf8258045b063bf0811410780cef..15a2936168bac38488c1e0e909ef7ecc843c68ca 100644 (file)
--- a/patchwork/models.py
+++ b/patchwork/models.py
@@ -172,6 +172,7 @@ def _user_saved_callback(sender, created, instance, **kwargs):
         profile = UserProfile(user=instance)
     profile.save()
 
+
 models.signals.post_save.connect(_user_saved_callback, sender=User)
 
 
@@ -907,4 +908,5 @@ def _patch_change_callback(sender, instance, **kwargs):
     notification.last_modified = datetime.datetime.now()
     notification.save()
 
+
 models.signals.pre_save.connect(_patch_change_callback, sender=Patch)

diff --git a/patchwork/templatetags/syntax.py b/patchwork/templatetags/syntax.py
index 341a181952e9d57b95e81b66f90b7f672309e9c9..27ff8c3a16b8331d02524b5f598f100b00236000 100644 (file)
--- a/patchwork/templatetags/syntax.py
+++ b/patchwork/templatetags/syntax.py
@@ -33,6 +33,7 @@ def _compile(value):
     regex, cls = value
     return re.compile(regex, re.M | re.I), cls
 
+
 _patch_span_res = [_compile(x) for x in [
     (r'^(Index:?|diff|\-\-\-|\+\+\+|\*\*\*) .*$', 'p_header'),
     (r'^\+.*$', 'p_add'),

diff --git a/patchwork/views/xmlrpc.py b/patchwork/views/xmlrpc.py
index 0c3f581d8f4b13cc77a60c8d49be924f4b25162c..6ef957c667e4962d1833b60c3c103c9e3275d0ad 100644 (file)
--- a/patchwork/views/xmlrpc.py
+++ b/patchwork/views/xmlrpc.py
@@ -133,6 +133,7 @@ class PatchworkXMLRPCDispatcher(SimpleXMLRPCDispatcher,
 
         return response
 
+
 dispatcher = PatchworkXMLRPCDispatcher()
 
 # XMLRPC view function