diff --git a/scripts-dev/check_auth.py b/scripts-dev/check_auth.py
index b3d11f49ec..2a1c5f39d4 100644
--- a/scripts-dev/check_auth.py
+++ b/scripts-dev/check_auth.py
@@ -39,11 +39,11 @@ def check_auth(auth, auth_chain, events):
print("Success:", e.event_id, e.type, e.state_key)
-if __name__ == '__main__':
+if __name__ == "__main__":
parser = argparse.ArgumentParser()
parser.add_argument(
- 'json', nargs='?', type=argparse.FileType('r'), default=sys.stdin
+ "json", nargs="?", type=argparse.FileType("r"), default=sys.stdin
)
args = parser.parse_args()
diff --git a/scripts-dev/check_event_hash.py b/scripts-dev/check_event_hash.py
index 8535f99697..cd5599e9a1 100644
--- a/scripts-dev/check_event_hash.py
+++ b/scripts-dev/check_event_hash.py
@@ -30,7 +30,7 @@ class dictobj(dict):
def main():
parser = argparse.ArgumentParser()
parser.add_argument(
- "input_json", nargs="?", type=argparse.FileType('r'), default=sys.stdin
+ "input_json", nargs="?", type=argparse.FileType("r"), default=sys.stdin
)
args = parser.parse_args()
logging.basicConfig()
diff --git a/scripts-dev/check_signature.py b/scripts-dev/check_signature.py
index 612f17ca7f..ecda103cf7 100644
--- a/scripts-dev/check_signature.py
+++ b/scripts-dev/check_signature.py
@@ -1,4 +1,3 @@
-
import argparse
import json
import logging
@@ -40,7 +39,7 @@ def main():
parser = argparse.ArgumentParser()
parser.add_argument("signature_name")
parser.add_argument(
- "input_json", nargs="?", type=argparse.FileType('r'), default=sys.stdin
+ "input_json", nargs="?", type=argparse.FileType("r"), default=sys.stdin
)
args = parser.parse_args()
@@ -69,5 +68,5 @@ def main():
print("FAIL %s" % (key_id,))
-if __name__ == '__main__':
+if __name__ == "__main__":
main()
diff --git a/scripts-dev/convert_server_keys.py b/scripts-dev/convert_server_keys.py
index ac152b5c42..179be61c30 100644
--- a/scripts-dev/convert_server_keys.py
+++ b/scripts-dev/convert_server_keys.py
@@ -116,5 +116,5 @@ def main():
connection.commit()
-if __name__ == '__main__':
+if __name__ == "__main__":
main()
diff --git a/scripts-dev/definitions.py b/scripts-dev/definitions.py
index 1deb0fe2b7..9eddb6d515 100755
--- a/scripts-dev/definitions.py
+++ b/scripts-dev/definitions.py
@@ -19,10 +19,10 @@ class DefinitionVisitor(ast.NodeVisitor):
self.names = {}
self.attrs = set()
self.definitions = {
- 'def': self.functions,
- 'class': self.classes,
- 'names': self.names,
- 'attrs': self.attrs,
+ "def": self.functions,
+ "class": self.classes,
+ "names": self.names,
+ "attrs": self.attrs,
}
def visit_Name(self, node):
@@ -47,23 +47,23 @@ class DefinitionVisitor(ast.NodeVisitor):
def non_empty(defs):
- functions = {name: non_empty(f) for name, f in defs['def'].items()}
- classes = {name: non_empty(f) for name, f in defs['class'].items()}
+ functions = {name: non_empty(f) for name, f in defs["def"].items()}
+ classes = {name: non_empty(f) for name, f in defs["class"].items()}
result = {}
if functions:
- result['def'] = functions
+ result["def"] = functions
if classes:
- result['class'] = classes
- names = defs['names']
+ result["class"] = classes
+ names = defs["names"]
uses = []
- for name in names.get('Load', ()):
- if name not in names.get('Param', ()) and name not in names.get('Store', ()):
+ for name in names.get("Load", ()):
+ if name not in names.get("Param", ()) and name not in names.get("Store", ()):
uses.append(name)
- uses.extend(defs['attrs'])
+ uses.extend(defs["attrs"])
if uses:
- result['uses'] = uses
- result['names'] = names
- result['attrs'] = defs['attrs']
+ result["uses"] = uses
+ result["names"] = names
+ result["attrs"] = defs["attrs"]
return result
@@ -81,33 +81,33 @@ def definitions_in_file(filepath):
def defined_names(prefix, defs, names):
- for name, funcs in defs.get('def', {}).items():
- names.setdefault(name, {'defined': []})['defined'].append(prefix + name)
+ for name, funcs in defs.get("def", {}).items():
+ names.setdefault(name, {"defined": []})["defined"].append(prefix + name)
defined_names(prefix + name + ".", funcs, names)
- for name, funcs in defs.get('class', {}).items():
- names.setdefault(name, {'defined': []})['defined'].append(prefix + name)
+ for name, funcs in defs.get("class", {}).items():
+ names.setdefault(name, {"defined": []})["defined"].append(prefix + name)
defined_names(prefix + name + ".", funcs, names)
def used_names(prefix, item, defs, names):
- for name, funcs in defs.get('def', {}).items():
+ for name, funcs in defs.get("def", {}).items():
used_names(prefix + name + ".", name, funcs, names)
- for name, funcs in defs.get('class', {}).items():
+ for name, funcs in defs.get("class", {}).items():
used_names(prefix + name + ".", name, funcs, names)
- path = prefix.rstrip('.')
- for used in defs.get('uses', ()):
+ path = prefix.rstrip(".")
+ for used in defs.get("uses", ()):
if used in names:
if item:
- names[item].setdefault('uses', []).append(used)
- names[used].setdefault('used', {}).setdefault(item, []).append(path)
+ names[item].setdefault("uses", []).append(used)
+ names[used].setdefault("used", {}).setdefault(item, []).append(path)
-if __name__ == '__main__':
+if __name__ == "__main__":
- parser = argparse.ArgumentParser(description='Find definitions.')
+ parser = argparse.ArgumentParser(description="Find definitions.")
parser.add_argument(
"--unused", action="store_true", help="Only list unused definitions"
)
@@ -119,7 +119,7 @@ if __name__ == '__main__':
)
parser.add_argument(
"directories",
- nargs='+',
+ nargs="+",
metavar="DIR",
help="Directories to search for definitions",
)
@@ -164,7 +164,7 @@ if __name__ == '__main__':
continue
if ignore and any(pattern.match(name) for pattern in ignore):
continue
- if args.unused and definition.get('used'):
+ if args.unused and definition.get("used"):
continue
result[name] = definition
@@ -196,9 +196,9 @@ if __name__ == '__main__':
continue
result[name] = definition
- if args.format == 'yaml':
+ if args.format == "yaml":
yaml.dump(result, sys.stdout, default_flow_style=False)
- elif args.format == 'dot':
+ elif args.format == "dot":
print("digraph {")
for name, entry in result.items():
print(name)
diff --git a/scripts-dev/federation_client.py b/scripts-dev/federation_client.py
index 41e7b24418..7c19e405d4 100755
--- a/scripts-dev/federation_client.py
+++ b/scripts-dev/federation_client.py
@@ -63,7 +63,7 @@ def encode_canonical_json(value):
# Encode code-points outside of ASCII as UTF-8 rather than \u escapes
ensure_ascii=False,
# Remove unecessary white space.
- separators=(',', ':'),
+ separators=(",", ":"),
# Sort the keys of dictionaries.
sort_keys=True,
# Encode the resulting unicode as UTF-8 bytes.
@@ -145,7 +145,7 @@ def request_json(method, origin_name, origin_key, destination, path, content):
authorization_headers = []
for key, sig in signed_json["signatures"][origin_name].items():
- header = "X-Matrix origin=%s,key=\"%s\",sig=\"%s\"" % (origin_name, key, sig)
+ header = 'X-Matrix origin=%s,key="%s",sig="%s"' % (origin_name, key, sig)
authorization_headers.append(header.encode("ascii"))
print("Authorization: %s" % header, file=sys.stderr)
@@ -161,11 +161,7 @@ def request_json(method, origin_name, origin_key, destination, path, content):
headers["Content-Type"] = "application/json"
result = s.request(
- method=method,
- url=dest,
- headers=headers,
- verify=False,
- data=content,
+ method=method, url=dest, headers=headers, verify=False, data=content
)
sys.stderr.write("Status Code: %d\n" % (result.status_code,))
return result.json()
@@ -241,18 +237,18 @@ def main():
def read_args_from_config(args):
- with open(args.config, 'r') as fh:
+ with open(args.config, "r") as fh:
config = yaml.safe_load(fh)
if not args.server_name:
- args.server_name = config['server_name']
+ args.server_name = config["server_name"]
if not args.signing_key_path:
- args.signing_key_path = config['signing_key_path']
+ args.signing_key_path = config["signing_key_path"]
class MatrixConnectionAdapter(HTTPAdapter):
@staticmethod
def lookup(s, skip_well_known=False):
- if s[-1] == ']':
+ if s[-1] == "]":
# ipv6 literal (with no port)
return s, 8448
@@ -268,9 +264,7 @@ class MatrixConnectionAdapter(HTTPAdapter):
if not skip_well_known:
well_known = MatrixConnectionAdapter.get_well_known(s)
if well_known:
- return MatrixConnectionAdapter.lookup(
- well_known, skip_well_known=True
- )
+ return MatrixConnectionAdapter.lookup(well_known, skip_well_known=True)
try:
srv = srvlookup.lookup("matrix", "tcp", s)[0]
@@ -280,8 +274,8 @@ class MatrixConnectionAdapter(HTTPAdapter):
@staticmethod
def get_well_known(server_name):
- uri = "https://%s/.well-known/matrix/server" % (server_name, )
- print("fetching %s" % (uri, ), file=sys.stderr)
+ uri = "https://%s/.well-known/matrix/server" % (server_name,)
+ print("fetching %s" % (uri,), file=sys.stderr)
try:
resp = requests.get(uri)
@@ -294,12 +288,12 @@ class MatrixConnectionAdapter(HTTPAdapter):
raise Exception("not a dict")
if "m.server" not in parsed_well_known:
raise Exception("Missing key 'm.server'")
- new_name = parsed_well_known['m.server']
- print("well-known lookup gave %s" % (new_name, ), file=sys.stderr)
+ new_name = parsed_well_known["m.server"]
+ print("well-known lookup gave %s" % (new_name,), file=sys.stderr)
return new_name
except Exception as e:
- print("Invalid response from %s: %s" % (uri, e, ), file=sys.stderr)
+ print("Invalid response from %s: %s" % (uri, e), file=sys.stderr)
return None
def get_connection(self, url, proxies=None):
diff --git a/scripts-dev/hash_history.py b/scripts-dev/hash_history.py
index 514d80fa60..d20f6db176 100644
--- a/scripts-dev/hash_history.py
+++ b/scripts-dev/hash_history.py
@@ -79,5 +79,5 @@ def main():
conn.commit()
-if __name__ == '__main__':
+if __name__ == "__main__":
main()
diff --git a/scripts-dev/list_url_patterns.py b/scripts-dev/list_url_patterns.py
index 62e5a07472..26ad7c67f4 100755
--- a/scripts-dev/list_url_patterns.py
+++ b/scripts-dev/list_url_patterns.py
@@ -35,11 +35,11 @@ def find_patterns_in_file(filepath):
find_patterns_in_code(f.read())
-parser = argparse.ArgumentParser(description='Find url patterns.')
+parser = argparse.ArgumentParser(description="Find url patterns.")
parser.add_argument(
"directories",
- nargs='+',
+ nargs="+",
metavar="DIR",
help="Directories to search for definitions",
)
diff --git a/scripts-dev/tail-synapse.py b/scripts-dev/tail-synapse.py
index 7c9985d9f0..44e3a6dbf1 100644
--- a/scripts-dev/tail-synapse.py
+++ b/scripts-dev/tail-synapse.py
@@ -63,5 +63,5 @@ def main():
streams[update.name] = update.position
-if __name__ == '__main__':
+if __name__ == "__main__":
main()
|
