flake8/black reformatting

Author: jagerman

.flake8

@@ -2,3 +2,4 @@
 per-file-ignores = __init__.py:F401 sogs/session_pb2.py:E501
 max-line-length = 100
 extend-ignore = E203  # See https://github.com/psf/black/issues/315
+exclude=sogs/config.py

sogs/__main__.py

@@ -7,7 +7,7 @@
 from . import config
 from . import model
 from . import crypto
-from . import logging
+from . import logging  # noqa: F401
 
 ap = AP(epilog="""
 
@@ -25,7 +25,7 @@
      # List room info:
     python3 -msogs -L
 
-""", formatter_class=RawDescriptionHelpFormatter)
+""", formatter_class=RawDescriptionHelpFormatter)  # noqa: E501
 
 actions = ap.add_mutually_exclusive_group()
 

sogs/model.py

@@ -126,7 +126,11 @@ def messages_size(self):
         actually used to store the message, and does not include various ancillary metadata such as
         edit history, the signature, deleted entries, etc."""
         return db.conn.execute(
-            "SELECT COUNT(*), COALESCE(SUM(data_size), 0) FROM messages WHERE room = ? AND data IS NOT NULL",
+            """
+            SELECT COUNT(*), COALESCE(SUM(data_size), 0)
+            FROM messages
+            WHERE room = ? AND data IS NOT NULL
+            """,
             (self.id,),
         ).fetchone()[0:2]
 
@@ -438,8 +442,8 @@ def get_all_global_moderators():
     m, hm, a, ha = [], [], [], []
     for row in db.conn.execute("SELECT * FROM users WHERE moderator"):
         u = User(row=row)
-        l = ((a if u.global_admin else m) if u.visible_mod else (ha if u.global_admin else hm))
-        l.append(u)
+        lst = (a if u.global_admin else m) if u.visible_mod else (ha if u.global_admin else hm)
+        lst.append(u)
 
     return (m, a, hm, ha)
 

sogs/onion_request.py

@@ -90,7 +90,11 @@ def handle_onionreq_plaintext(body):
                 response = app.full_dispatch_request()
             if response.status_code == 200:
                 data = response.get_data()
-                app.logger.debug("Onion sub-request for {} returned success, {} bytes".format(endpoint, len(data)))
+                app.logger.debug(
+                    "Onion sub-request for {} returned success, {} bytes".format(
+                        endpoint, len(data)
+                    )
+                )
                 return data
             app.logger.warn(
                 "Onion sub-request for {} {} returned status {}".format(

sogs/web.py

@@ -2,11 +2,11 @@
 
 app = flask.Flask(__name__)
 
-from . import logging
-from . import routes
-from . import onion_request
-from . import legacy_routes
-from . import cleanup
+from . import logging  # noqa: F401, E402
+from . import routes  # noqa: F401, E402
+from . import onion_request  # noqa: F401, E402
+from . import legacy_routes  # noqa: F401, E402
+from . import cleanup  # noqa: F401, E402
 
 # Monkey-patch app.get/post/etc. for Flask <2 compatibility
 if not hasattr(flask.Flask, 'post'):