From d31b85b6e35c1fcb6d016a80a032534477882654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Fri, 18 Mar 2016 15:25:27 +0100 Subject: [PATCH] Use dict constructor instead of {} + update Way cleaner look and more consistent. --- src/octoprint/server/api/timelapse.py | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/src/octoprint/server/api/timelapse.py b/src/octoprint/server/api/timelapse.py index 41ad18d5..3764e846 100644 --- a/src/octoprint/server/api/timelapse.py +++ b/src/octoprint/server/api/timelapse.py @@ -28,25 +28,22 @@ from octoprint.server import NO_CONTENT def getTimelapseData(): timelapse = octoprint.timelapse.current - config = {"type": "off"} if timelapse is not None and isinstance(timelapse, octoprint.timelapse.ZTimelapse): - config["type"] = "zchange" - config["postRoll"] = timelapse.post_roll - config["fps"] = timelapse.fps - config.update({ - "retractionZHop": timelapse.retraction_zhop - }) + config = dict(type="zchange", + postRoll=timelapse.post_roll, + fps=timelapse.fps, + retractionZHop=timelapse.retraction_zhop) elif timelapse is not None and isinstance(timelapse, octoprint.timelapse.TimedTimelapse): - config["type"] = "timed" - config["postRoll"] = timelapse.post_roll - config["fps"] = timelapse.fps - config.update({ - "interval": timelapse.interval - }) + config = dict(type="timed", + postRoll=timelapse.post_roll, + fps=timelapse.fps, + interval=timelapse.interval) + else: + config = dict(type="off") files = octoprint.timelapse.get_finished_timelapses() - for file in files: - file["url"] = url_for("index") + "downloads/timelapse/" + file["name"] + for f in files: + f["url"] = url_for("index") + "downloads/timelapse/" + f["name"] result = dict(config=config, files=files)