Fix up style issues

Black can't refactor and flake8 and black disagree about some stuff

flaskbb/utils/database.py

@@ -85,9 +85,11 @@ class HideableQuery(BaseQuery):
 
     def __new__(cls, *args, **kwargs):
         inst = super(HideableQuery, cls).__new__(cls)
-        with_hidden = kwargs.pop("_with_hidden", False) or (
-            current_user and current_user.permissions.get("viewhidden", False)
+        include_hidden = kwargs.pop("_with_hidden", False)
+        has_view_hidden = current_user and current_user.permissions.get(
+            "viewhidden", False
         )
+        with_hidden = include_hidden or has_view_hidden
         if args or kwargs:
             super(HideableQuery, inst).__init__(*args, **kwargs)
             entity = inst._mapper_zero().class_
@@ -136,9 +138,7 @@ class HideableMixin(object):
     @declared_attr
     def hidden_by(cls):
         return db.relationship(
-            'User',
-            uselist=False,
-            foreign_keys=[cls.hidden_by_id],
+            "User", uselist=False, foreign_keys=[cls.hidden_by_id]
         )
 
     def hide(self, user, *args, **kwargs):

flaskbb/utils/populate.py

@@ -123,12 +123,12 @@ def update_settings_from_fixture(fixture, overwrite_group=False,
 
             if setting is not None:
                 setting_is_different = (
-                    setting.value != settings[1]["value"] or
-                    setting.value_type != settings[1]["value_type"] or
-                    setting.name != settings[1]["name"] or
-                    setting.description != settings[1]["description"] or
-                    setting.extra != settings[1].get("extra", "") or
-                    setting.settingsgroup != group.key
+                    setting.value != settings[1]["value"]
+                    or setting.value_type != settings[1]["value_type"]
+                    or setting.name != settings[1]["name"]
+                    or setting.description != settings[1]["description"]
+                    or setting.extra != settings[1].get("extra", "")
+                    or setting.settingsgroup != group.key
                 )
 
             if (

flaskbb/utils/requirements.py

@@ -160,9 +160,9 @@ class CanAccessForum(Requirement):
         if not current_forum:
             raise FlaskBBError("Could not load forum data")
 
-        return set([g.id for g in current_forum.groups]) & set(
-            [g.id for g in user.groups]
-        )
+        forum_groups = {g.id for g in current_forum.groups}
+        user_groups = {g.id for g in user.groups}
+        return forum_groups & user_groups
 
 
 class CanAccessTopic(Requirement):
@@ -171,9 +171,9 @@ class CanAccessTopic(Requirement):
         if not current_forum:
             raise FlaskBBError("Could not load topic data")
 
-        return set([g.id for g in current_forum.groups]) & set(
-            [g.id for g in user.groups]
-        )
+        forum_groups = {g.id for g in current_forum.groups}
+        user_groups = {g.id for g in user.groups}
+        return forum_groups & user_groups
 
 
 def IsAtleastModeratorInForum(forum_id=None, forum=None):

tox.ini

@@ -33,11 +33,10 @@ commands =
 
 
 [flake8]
-ignore = E712, E711, C901
+ignore = E712, E711, C901, W503
 max-complexity = 10
 max-line-length = 80
 exclude = flaskbb/configs/default.py,flaskbb/_compat.py
 
 [pytest]
 addopts =  -vvl --strict --flake8 --capture fd
-