Merge pull request #1628 from openhealthcare/dependabot/pip/flake8-3.6.0

Bump flake8 from 3.2.1 to 3.6.0

opal/core/fields.py

@@ -158,9 +158,8 @@ def __get__(self, inst, cls):
             return self
         try:
             foreign_obj = getattr(inst, self.fk_field_name)
-        except:
+        except AttributeError:
             return 'Unknown Lookuplist Entry'
-#        foreign_obj = getattr(inst, self.fk_field_name)
         if foreign_obj is None:
             return getattr(inst, self.ft_field_name)
         else:

opal/core/menus.py

@@ -20,12 +20,12 @@ def __eq__(self, other):
         if not isinstance(other, MenuItem):
             return NotImplemented
 
-        return (self.template_name == other.template_name and
-                self.activepattern == other.activepattern and
-                self.href == other.href and
-                self.icon == other.icon and
-                self.display == other.display and
-                self.index == other.index)
+        return all([self.template_name == other.template_name,
+                    self.activepattern == other.activepattern,
+                    self.href == other.href,
+                    self.icon == other.icon,
+                    self.display == other.display,
+                    self.index == other.index])
 
     def __ne__(self, other):
         if not isinstance(other, MenuItem):

opal/core/pathway/urls.py

@@ -5,7 +5,7 @@
 
 from opal.core.pathway import views, api
 
-PATHWAY_REGEX = "(?P<name>[0-9a-z_\-]+)"
+PATHWAY_REGEX = "(?P<name>[0-9a-z_\-]+)"  # noqa: W605
 PATIENT_ID_REGEX = "(?P<patient_id>[0-9]+)"
 EPISODE_ID_REGEX = "(?P<episode_id>[0-9]+)"
 

test-requirements.txt

@@ -5,6 +5,6 @@ coverage
 coveralls
 celery==3.1.25
 django-celery==3.2.2
-flake8==3.2.1
+flake8==3.6.0
 requests==2.20.1
 psycopg2==2.7.6.1