Index: leahi_dialin/utils/base.py =================================================================== diff -u -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df -r6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1 --- leahi_dialin/utils/base.py (.../base.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) +++ leahi_dialin/utils/base.py (.../base.py) (revision 6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1) @@ -15,31 +15,17 @@ ############################################################################ import logging import os -from abc import ABC, abstractmethod from datetime import datetime -from enum import Enum from threading import Timer + INTERVAL_1s = 1 INTERVAL_5s = 5 INTERVAL_10s = 10 INTERVAL_60s = 60 -class AbstractObserver(ABC): - """ - Publicly accessible parent class for all observers. - The update method will receive data when data is made available - """ - @abstractmethod - def update(self): - """ - Attach an observer - """ - pass - - class _FauxLogger: def __init__(self, printing_enabled=False): @@ -206,31 +192,6 @@ return "{0}{1}{2}".format(path, i, ext) -class AbstractSubSystem: - - @abstractmethod - def __init__(self): - """ - Initialization function for the sub system - # The abstract base class requires all abstract methods are overridden by children classes - """ - self._observers = [] - self._datetime_fmt = "%m.%d.%Y_%I.%M.%S.%f" - pass - - def attach(self, observer: AbstractObserver): - """ - Attach an observer so it is updated upon published events - """ - self._observers.append(observer) - - def detach(self, observer: AbstractObserver): - """ - Detach an observer - """ - self._observers.remove(observer) - - def publish(keys): """ Decorator that accepts a list of variable names to publish @@ -267,24 +228,6 @@ return _decorator -class DialinEnum(Enum): - - @classmethod - def has_value(cls, value): - return value in cls._value2member_map_ - - -class AlarmEnum(Enum): - def __init__(self, *args): - cls = self.__class__ - if any(self.value == member.value for member in cls): - raise ValueError("aliases not allowed: %r --> %r" % (self.name, cls(self.value).name)) - - @classmethod - def has_value(cls, value): - return value in cls._value2member_map_ - - class IntervalTimer(object): """ A class object that is used to execute a function on a timed interval.