From b940f3921dd1e07bccb7f9cf72a8a8d852191094 Mon Sep 17 00:00:00 2001 From: suzan Date: Tue, 6 Jun 2023 16:11:43 +0300 Subject: [PATCH] conflict --- week5/app.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/week5/app.py b/week5/app.py index 2aa9e81..29d07d1 100644 --- a/week5/app.py +++ b/week5/app.py @@ -41,8 +41,8 @@ def upload_file(): filename, fileextension = os.path.splitext(file.filename) overwrite = request.form["overwrite"] - input_file_path = os.path.join(app.config['UPLOAD_FOLDER'], (filename, fileextension)) - overwritten_file_path = os.path.join(app.config['UPLOAD_FOLDER'], (overwrite, '.png')) + input_file_path = os.path.join(app.config['UPLOAD_FOLDER'], filename + fileextension) + overwritten_file_path = os.path.join(app.config['UPLOAD_FOLDER'], overwrite + ".png") print("[input file path]:", input_file_path) print("[overwritten file path]:", overwritten_file_path)