move function to better place

diff --git a/RecordTimer.py b/RecordTimer.py
index 63ddaab0c77109190b2e30e47f27b535f3014ede..dde6c4ccb1a7dfb3f74dd5ac1ad8b2be2c25fdda 100644 (file)
--- a/RecordTimer.py
+++ b/RecordTimer.py
@@ -122,13 +122,7 @@ class RecordTimerEntry(timer.TimerEntry, object):
        def log(self, code, msg):
                self.log_entries.append((int(time.time()), code, msg))
                print "[TIMER]", msg
-       
-       def resetState(self):
-               self.state = self.StateWaiting
-               self.cancelled = False
-               self.first_try_prepare = True
-               self.timeChanged()
-       
+
        def calculateFilename(self):
                service_name = self.service_ref.getServiceName()
                begin_date = time.strftime("%Y%m%d %H%M", time.localtime(self.begin))

diff --git a/timer.py b/timer.py
index 056963513bd9a2699d9802d3715cda892ab10406..be629099f62e7f91464f92178e16553dcd7b5003 100644 (file)
--- a/timer.py
+++ b/timer.py
@@ -21,7 +21,13 @@ class TimerEntry:
                self.backoff = 0
                
                self.disabled = False
-               
+
+       def resetState(self):
+               self.state = self.StateWaiting
+               self.cancelled = False
+               self.first_try_prepare = True
+               self.timeChanged()
+
        def resetRepeated(self):
                self.repeated = int(0)