From 65a0186efb6acf4089c581f81047f375a48effd8 Mon Sep 17 00:00:00 2001 From: NaruX Date: Sat, 8 Dec 2018 12:31:28 +0100 Subject: [PATCH] Speicherzeit der piCtory Datei wird in Klasse App verarbeitet raise IndexError bei __getitem__ --- revpimodio2/app.py | 13 ++++++++++++- revpimodio2/device.py | 2 +- revpimodio2/io.py | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/revpimodio2/app.py b/revpimodio2/app.py index 19389f2..d56aa8f 100644 --- a/revpimodio2/app.py +++ b/revpimodio2/app.py @@ -4,12 +4,14 @@ __author__ = "Sven Sager" __copyright__ = "Copyright (C) 2018 Sven Sager" __license__ = "LGPLv3" +from time import strptime + class App(object): """Bildet die App Sektion der config.rsc ab.""" - __slots__ = "name", "version", "language", "layout" + __slots__ = "name", "version", "language", "layout", "savets" def __init__(self, app): """Instantiiert die App-Klasse. @@ -17,5 +19,14 @@ class App(object): self.name = app["name"] self.version = app["version"] self.language = app["language"] + + # Speicherungszeitpunkt laden, wenn vorhanden + self.savets = app.get("saveTS", None) + if self.savets is not None: + try: + self.savets = strptime(self.savets, "%Y%m%d%H%M%S") + except ValueError: + self.savets = None + # TODO: Layout untersuchen und anders abbilden self.layout = app["layout"] diff --git a/revpimodio2/device.py b/revpimodio2/device.py index 2ee4172..c61d289 100644 --- a/revpimodio2/device.py +++ b/revpimodio2/device.py @@ -63,7 +63,7 @@ class DeviceList(object): @return Gefundenes -Objekt""" if type(key) == int: if key not in self.__dict_position: - raise KeyError("no device on position {0}".format(key)) + raise IndexError("no device on position {0}".format(key)) return self.__dict_position[key] else: return getattr(self, key) diff --git a/revpimodio2/io.py b/revpimodio2/io.py index 0c5a4d7..447c917 100644 --- a/revpimodio2/io.py +++ b/revpimodio2/io.py @@ -86,7 +86,7 @@ class IOList(object): """ if type(key) == int: if key not in self.__dict_iobyte: - raise KeyError("byte '{0}' does not exist".format(key)) + raise IndexError("byte '{0}' does not exist".format(key)) return self.__dict_iobyte[key] elif type(key) == slice: return [