[gnome-clocks] AlarmItem: Require all arguments for __init__
- From: Paolo Borelli <pborelli src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-clocks] AlarmItem: Require all arguments for __init__
- Date: Mon, 26 Nov 2012 16:34:31 +0000 (UTC)
commit 4418d3c675b54112eecb9c3fd930dfb2d1e7db06
Author: Volker Sobek <reklov live com>
Date: Mon Nov 26 12:31:08 2012 +0100
AlarmItem: Require all arguments for __init__
Require all arguments for __init__ and make sure AlarmDialog always
passes correct arguments.
gnomeclocks/alarm.py | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/gnomeclocks/alarm.py b/gnomeclocks/alarm.py
index 0e9526c..e78f390 100644
--- a/gnomeclocks/alarm.py
+++ b/gnomeclocks/alarm.py
@@ -70,23 +70,14 @@ class AlarmsStorage:
class AlarmItem:
EVERY_DAY = [0, 1, 2, 3, 4, 5, 6]
- def __init__(self, name=None, hour=None, minute=None, days=EVERY_DAY):
+ def __init__(self, name, hour, minute, days):
self.name = name
self.hour = hour
self.minute = minute
self.days = days # list of numbers, 0 == Monday
- # an alarm without any day makes no sense...
- if not self.days:
- self.days = AlarmItem.EVERY_DAY
-
- if hour == None and minute == None:
- self.time = None
- self.snooze_time = None
- self.is_snoozing = False
- else:
- self._update_expiration_time()
- self._reset_snooze(self.time)
+ self._update_expiration_time()
+ self._reset_snooze(self.time)
self.alert = Alert("alarm-clock-elapsed", name)
@@ -282,6 +273,11 @@ class AlarmDialog(Gtk.Dialog):
for btn in self.day_buttons:
if btn.get_active():
days.append(btn.data)
+
+ # if no days were selected, create a daily alarm
+ if not days:
+ days = AlarmItem.EVERY_DAY
+
alarm = AlarmItem(name, h, m, days)
return alarm
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]