summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2019-10-23 16:49:05 +0100
committerGitHub <noreply@github.com>2019-10-23 16:49:05 +0100
commit92e88a71d31e9a1424acd8a3a8cf9ee02b4af9ea (patch)
treea8a5cd16fb46a2061b05e66570630442526318cb
parentMerge pull request #6243 from matrix-org/babolivier/port_db_fix_imports (diff)
downloadsynapse-92e88a71d31e9a1424acd8a3a8cf9ee02b4af9ea.tar.xz
Cleanup extra quotes from IDEs (#6236)
-rw-r--r--changelog.d/6236.misc1
-rw-r--r--contrib/experiments/test_messaging.py2
-rw-r--r--contrib/graph/graph2.py4
-rw-r--r--synapse/event_auth.py3
4 files changed, 5 insertions, 5 deletions
diff --git a/changelog.d/6236.misc b/changelog.d/6236.misc
new file mode 100644

index 0000000000..686e7a8721 --- /dev/null +++ b/changelog.d/6236.misc
@@ -0,0 +1 @@ +Remove some extra quotation marks across the codebase. \ No newline at end of file diff --git a/contrib/experiments/test_messaging.py b/contrib/experiments/test_messaging.py
index 5ef140ae48..6b22400a60 100644 --- a/contrib/experiments/test_messaging.py +++ b/contrib/experiments/test_messaging.py
@@ -339,7 +339,7 @@ def main(stdscr): root_logger = logging.getLogger() formatter = logging.Formatter( - "%(asctime)s - %(name)s - %(lineno)d - " "%(levelname)s - %(message)s" + "%(asctime)s - %(name)s - %(lineno)d - %(levelname)s - %(message)s" ) if not os.path.exists("logs"): os.makedirs("logs") diff --git a/contrib/graph/graph2.py b/contrib/graph/graph2.py
index 9db8725eee..4619f0e3c1 100644 --- a/contrib/graph/graph2.py +++ b/contrib/graph/graph2.py
@@ -36,7 +36,7 @@ def make_graph(db_name, room_id, file_prefix, limit): args = [room_id] if limit: - sql += " ORDER BY topological_ordering DESC, stream_ordering DESC " "LIMIT ?" + sql += " ORDER BY topological_ordering DESC, stream_ordering DESC LIMIT ?" args.append(limit) @@ -53,7 +53,7 @@ def make_graph(db_name, room_id, file_prefix, limit): for event in events: c = conn.execute( - "SELECT state_group FROM event_to_state_groups " "WHERE event_id = ?", + "SELECT state_group FROM event_to_state_groups WHERE event_id = ?", (event.event_id,), ) diff --git a/synapse/event_auth.py b/synapse/event_auth.py
index 4e91df60e6..e7b722547b 100644 --- a/synapse/event_auth.py +++ b/synapse/event_auth.py
@@ -493,8 +493,7 @@ def _check_power_levels(event, auth_events): new_level_too_big = new_level is not None and new_level > user_level if old_level_too_big or new_level_too_big: raise AuthError( - 403, - "You don't have permission to add ops level greater " "than your own", + 403, "You don't have permission to add ops level greater than your own" )