conflict

1 year ago · b940f3921d
parent afded16691
commit b940f3921d
1 changed files with 2 additions and 2 deletions
--- 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)