aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--RecordTimer.py8
-rw-r--r--timer.py8
2 files changed, 8 insertions, 8 deletions
diff --git a/RecordTimer.py b/RecordTimer.py
index 63ddaab0..dde6c4cc 100644
--- 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 05696351..be629099 100644
--- 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)