From 9b010db0b869fb4e1bb379b2bacf70e9f6761381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Thu, 7 May 2015 12:51:23 +0200 Subject: [PATCH] Removed obsolete elif branch in file upload code --- src/octoprint/plugins/cura/__init__.py | 15 --------------- src/octoprint/server/api/files.py | 2 -- 2 files changed, 17 deletions(-) diff --git a/src/octoprint/plugins/cura/__init__.py b/src/octoprint/plugins/cura/__init__.py index 78a23501..d2b6a177 100644 --- a/src/octoprint/plugins/cura/__init__.py +++ b/src/octoprint/plugins/cura/__init__.py @@ -68,21 +68,6 @@ class CuraPlugin(octoprint.plugin.SlicerPlugin, self._logger.exception("Error while converting the imported profile") return flask.make_response("Something went wrong while converting imported profile: {message}".format(str(e)), 500) - elif input_name in flask.request.files: - temp_file = tempfile.NamedTemporaryFile("wb", delete=False) - try: - temp_file.close() - upload = flask.request.files[input_name] - upload.save(temp_file.name) - profile_dict = Profile.from_cura_ini(temp_file.name) - except Exception as e: - self._logger.exception("Error while converting the imported profile") - return flask.make_response("Something went wrong while converting imported profile: {message}".format(str(e)), 500) - finally: - os.remove(temp_file) - - filename = upload.filename - else: self._logger.warn("No profile file included for importing, aborting") return flask.make_response("No file included", 400) diff --git a/src/octoprint/server/api/files.py b/src/octoprint/server/api/files.py index 209ece50..9c318a6b 100644 --- a/src/octoprint/server/api/files.py +++ b/src/octoprint/server/api/files.py @@ -135,8 +135,6 @@ def uploadGcodeFile(target): input_upload_path = input_name + "." + settings().get(["server", "uploads", "pathSuffix"]) if input_upload_name in request.values and input_upload_path in request.values: upload = octoprint.filemanager.util.DiskFileWrapper(request.values[input_upload_name], request.values[input_upload_path]) - elif input_name in request.files: - upload = WerkzeugFileWrapper(request.files[input_name]) else: return make_response("No file included", 400)