Merge pull request #182 from ccnmtl/pyup-update-flake8-3.4.1-to-3.5.0

Update flake8 to 3.5.0

CHANGES.txt

@@ -1,3 +1,8 @@
+1.3.3
+==================
+
+* Removed bare except statements
+
 1.3.2 (2017-05-25)
 ==================
 

pagetree/helpers.py

@@ -63,6 +63,6 @@ def block_submitted(block, user):
                 s = block.unlocked(user)
                 if not s:
                     return False
-            except:
+            except AttributeError:
                 pass
     return True

pagetree/migrations/0002_delete_testblock.py

@@ -1,20 +1,26 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
-from django.db import migrations
+import sys
+from django.db import (
+    migrations,
+    DatabaseError, OperationalError, ProgrammingError
+)
 
 
 class ConditionalDeleteModel(migrations.DeleteModel):
-    def database_forwards(self, app_label, schema_editor, from_state,
-                          to_state):
+    def database_forwards(
+            self, app_label, schema_editor, from_state, to_state):
+        # The tests use this model
+        if 'runtests.py' in sys.argv:
+            return
+
         try:
             super(ConditionalDeleteModel, self).database_forwards(
-                self, app_label, schema_editor, from_state, to_state)
-        except:
+                app_label, schema_editor, from_state, to_state)
+        except (DatabaseError, OperationalError, ProgrammingError):
             """ if it fails, it's totally fine. it just means that the
             table we wanted to delete doesn't exist. so we ignore it.
-
-            it would be nice to catch a more specific exception, but
-            different databases raise different ones..."""
+            """
             pass
 
 

pagetree/models.py

@@ -510,7 +510,7 @@ def submitted(self, user):
                         if not s:
                             # there's an unsubmitted block
                             return False
-                    except:
+                    except (AttributeError, ValueError):
                         # most likely: no unlocked() method
                         pass
         # made it all the way through without any blocks

runtests.py

@@ -74,6 +74,7 @@ def main():
     django.setup()
 
     # Fire off the tests
+    call_command('migrate')
     call_command('test')
     call_command('jenkins', '--enable-coverage')
 

test_reqs.txt

@@ -1,7 +1,7 @@
 django-treebeard==4.1.2
 Markdown==2.6.9
 coverage==4.4.1
-flake8==3.4.1
+flake8==3.5.0
 django-jenkins==0.110.0
 pep8==1.7.1
 pyflakes==1.6.0