caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-22 08:08:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use older string format to support earlier python versions (#11920)

Browse Source 
Redis build runs `utils/generate-command-code.py` if there is a change in `src/commands/*.json` files. 

In https://github.com/redis/redis/pull/10273, we used f-string format in this script. f-string feature was introduced in python3.6. 
If a system has an earlier python version, build might fail. 

Added some changes to make that script compatible with earlier python versions.
This commit is contained in:
Ozan Tezcan 2023-03-15 14:55:15 +03:00 committed by GitHub
parent 70b2c4f5fd
commit 72f5aad014
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
utils/generate-command-code.py
View File

@ -252,11 +252,11 @@ class ReplySchema(object):
self.schema = {}
if desc.get("type") == "object":
if desc.get("properties") and desc.get("additionalProperties") is None:
print(f"{self.name}: Any object that has properties should have the additionalProperties field")
print("%s: Any object that has properties should have the additionalProperties field" % {self.name})
exit(1)
elif desc.get("type") == "array":
if desc.get("items") and isinstance(desc["items"], list) and any([desc.get(k) is None for k in ["minItems", "maxItems"]]):
print(f"{self.name}: Any array that has items should have the minItems and maxItems fields")
print("%s: Any array that has items should have the minItems and maxItems fields" % {self.name})
exit(1)
for k, v in desc.items():
if isinstance(v, dict):
@ -543,8 +543,8 @@ if check_command_error_counter != 0:
exit(1)
commands_filename = "commands_with_reply_schema" if args.with_reply_schema else "commands"
print(f"Generating {commands_filename}.c...")
with open(f"{srcdir}/{commands_filename}.c", "w") as f:
print("Generating %s.c..." % {commands_filename})
with open("%s/%s.c" % (srcdir, commands_filename), "w") as f:
f.write("/* Automatically generated by %s, do not edit. */\n\n" % os.path.basename(__file__))
f.write("#include \"server.h\"\n")
f.write(