From 63818bd37165a193272fda4afcabcdcaa4d1f0d5 Mon Sep 17 00:00:00 2001 From: BBaoVanC Date: Sun, 4 Oct 2020 11:13:59 -0500 Subject: [PATCH] Change usage of str.format() to f-strings --- configtest.py | 24 ++++++++++++------------ imgupload.py | 18 +++++++++--------- keyctl.py | 13 ++++++------- 3 files changed, 27 insertions(+), 28 deletions(-) diff --git a/configtest.py b/configtest.py index af1aeed..60d7c3c 100644 --- a/configtest.py +++ b/configtest.py @@ -35,7 +35,7 @@ unset_settings = [i for i in defaults.keys() if i not in dir(settings)] if len(unset_settings) > 0: for unset in unset_settings: checksettings.remove(unset) - print("[!] {0} is unset. The default value is type {1} with value {2}".format(unset, deftypes[unset].__name__, defaults[unset])) + print(f"[!] {unset} is unset. The default value is type {deftypes[unset].__name__} with value {defaults[unset]}") else: print("[" + u"\u2713" + "] Found all required settings!") @@ -45,7 +45,7 @@ typesgood = True typeswrong = [] for testtype in checksettings: if type(getattr(settings, testtype)) is not deftypes[testtype]: - print("[!] {0} requires {1}, but is {2}".format(testtype, deftypes[testtype].__name__, type(getattr(settings, testtype)).__name__)) + print(f"[!] {testtype} requires {deftypes[testtype].__name__}, but is {type(getattr(settings, testtype)).__name__}") typeswrong.append(testtype) typesgood = False @@ -63,7 +63,7 @@ if "ALLOWED_EXTENSIONS" in checksettings: if len(invalid_exts) > 0: print("[!] The following extensions listed in ALLOWED_EXTENSIONS are invalid:") for e in invalid_exts: - print(" {0} is listed in ALLOWED_EXTENSIONS, but doesn't start with a .".format(e)) + print(f" {e} is listed in ALLOWED_EXTENSIONS, but doesn't start with a .") else: print("[" + u"\u2713" + "] ALLOWED_EXTENSIONS is good!") @@ -73,7 +73,7 @@ uploadfolder_exists = True if "UPLOAD_FOLDER" in checksettings: if not os.path.isdir(settings.UPLOAD_FOLDER): uploadfolder_exists = False - print("[!] The directory set in UPLOAD_FOLDER ('{0}') doesn't exist!".format(settings.UPLOAD_FOLDER)) + print(f"[!] The directory set in UPLOAD_FOLDER ('{settings.UPLOAD_FOLDER}') doesn't exist!") else: print("[" + u"\u2713" + "] UPLOAD_FOLDER exists!") @@ -92,14 +92,14 @@ if "ROOTURL" in checksettings: if not rooturl_good: print(" With your current settings, this is what a generated url would look like:") - print(" {0}example.png".format(settings.ROOTURL)) + print(f" {settings.ROOTURL}example.png") else: print("[" + u"\u2713" + "] ROOTURL is good!") # Ask the user if SAVELOG is the intended filename if "SAVELOG" in checksettings: - print("[*] SAVELOG was interpreted to be {0}".format(settings.SAVELOG)) + print(f"[*] SAVELOG was interpreted to be {settings.SAVELOG}") print("[*] If this is not the intended filename, please fix it.") @@ -111,32 +111,32 @@ if len(unset_settings) > 0: summarygood = False print("Unset settings:") for unset in unset_settings: - print(" {0}".format(unset)) + print(f" {unset}") if len(typeswrong) > 0: summarygood = False print("Incorrect types:") for wtype in typeswrong: - print(" {0}".format(wtype)) + print(f" {wtype}") if len(invalid_exts) > 0: summarygood = False print("Invalid extensions:") for wext in invalid_exts: - print(" '{0}'".format(wext)) + print(f" '{wext}'") if not uploadfolder_exists: summarygood = False - print("UPLOAD_FOLDER ({0}) does not exist!".format(settings.UPLOAD_FOLDER)) + print(f"UPLOAD_FOLDER ({settings.UPLOAD_FOLDER}) does not exist!") if not rooturl_good: summarygood = False print("ROOTURL may cause issues!") print("With current settings, this is what a generated URL would look like:") - print("{0}example.png".format(settings.ROOTURL)) + print(f"{settings.ROOTURL}example.png") if "SAVELOG" in checksettings: - print("[*] SAVELOG is {0}".format(settings.SAVELOG)) + print(f"[*] SAVELOG is {settings.SAVELOG}") if summarygood: print("[" + u"\u2713" + "] This configuration passes all tests!") diff --git a/imgupload.py b/imgupload.py index 3dfc823..cf61cf5 100644 --- a/imgupload.py +++ b/imgupload.py @@ -27,11 +27,11 @@ def allowed_extension(testext): def log_savelog(key, ip, savedname): if settings.SAVELOG_KEYPREFIX > 0: with open(settings.SAVELOG, "a+") as slogf: - slogf.write("[{0}] {1}: {2} - {3}\n".format(datetime.datetime.now(), key[:settings.SAVELOG_KEYPREFIX], ip, savedname)) + slogf.write(f"[{datetime.datetime.now()}] {key[:settings.SAVELOG_KEYPREFIX]}: {ip} - {savedname}\n") os.chmod(settings.SAVELOG, settings.SAVELOG_CHMOD) else: with open(settings.SAVELOG, "a+") as slogf: - slogf.write("[{0}] {1} - {2}\n".format(datetime.datetime.now(), ip, savedname)) + slogf.write(f"[{datetime.datetime.now()}] {ip} - {savedname}\n") os.chmod(settings.SAVELOG, settings.SAVELOG_CHMOD) @app.route("/upload", methods = ["POST"]) @@ -68,20 +68,20 @@ def upload(): fext = Path(f.filename).suffix # get the uploaded extension if allowed_extension(fext): # if the extension is allowed if not "imageName" in request.form.keys(): - print("Generating file with extension {0}".format(fext)) + print(f"Generating file with extension {fext}") fname = functions.generate_name() + fext # generate file name - print("Generated name: {0}".format(fname)) + print(f"Generated name: {fname}") else: fname = request.form["imageName"] if len(fname) > 0: - print("Request imageName: {0}".format(fname)) + print(f"Request imageName: {fname}") if not fname.lower().endswith(fext.lower()): # if requested name doesn't have the correct extension fname += fext # add the extension - print("Added extension; new filename: {0}".format(fname)) + print(f"Added extension; new filename: {fname}") else: print("Requested filename is blank!") fname = functions.generate_name() + fext # generate a valid filename - print("Generated name: {0}".format(fname)) + print(f"Generated name: {fname}") if f: # if the uploaded image exists print("Uploaded image exists") @@ -89,7 +89,7 @@ def upload(): print("Requested filename already exists!") return jsonify({'status': 'error', 'error': 'FILENAME_TAKEN'}), status.HTTP_409_CONFLICT f.save(os.path.join(settings.UPLOAD_FOLDER, fname)) # save the image - print("Saved to {0}".format(fname)) + print(f"Saved to {fname}") url = settings.ROOTURL + fname # construct the url to the image if settings.SAVELOG != "/dev/null": print("Saving to savelog") @@ -106,7 +106,7 @@ def upload(): else: # if the key was not valid print("Key is invalid!") - print("Request key: {0}".format(request.form["uploadKey"])) + print(f"Request key: {request.form["uploadKey"]}") return jsonify({'status': 'error', 'error': 'UNAUTHORIZED'}), status.HTTP_401_UNAUTHORIZED else: # if uploadKey was not found in request body diff --git a/keyctl.py b/keyctl.py index 9a983ae..9594f5f 100644 --- a/keyctl.py +++ b/keyctl.py @@ -31,7 +31,7 @@ def savekey(key): logging.info("uploadkeys file doesn't exist, it will be created.") with open("uploadkeys", "a+") as keyfile: keyfile.write(str(key) + "\n") # add the key - logging.debug("Saved a key to uploadkeys: {0}".format(key)) + logging.debug(f"Saved a key to uploadkeys: {key}") def rmkey(delkey): @@ -85,14 +85,14 @@ def cmd_list(args): if len(validkeys[i]) > 6: showkey += "..." # add ellipses since the key was shortened in list - print(" [{0}] {1}".format(i+1, showkey)) + print(f" [{i+1}] {showkey}") def cmd_generate(args): k = genkey(args.length) - logging.debug("Generated a new key: {0}".format(k)) + logging.debug(f"Generated a new key: {k}") savekey(k) - print("Your new key is: {0}".format(k)) + print(f"Your new key is: {k}") def cmd_add(args): @@ -104,7 +104,6 @@ def cmd_add(args): print(ak) if input("Is the above key correct? [y/N] ").lower() == "y": logging.debug("Interpreted as yes") - ask_for_key = False savekey(ak) logging.info("Added.") else: @@ -124,14 +123,14 @@ def cmd_dedupe(args): for d in dupes: r = rmkey(d) logging.debug(r) - logging.info("Removed duplicate key: {0}".format(d)) + logging.info(f"Removed duplicate key: {d}") else: logging.info("[" + u"\u2713" + "] No duplicate keys found!") def cmd_show(args): for k in get_keys(): if k[:6] == args.prefix: - print("Key: {0}".format(k)) + print(f"Key: {k}") break