Changeset 2371

Timestamp:

07/31/07 00:47:42 (1 year ago)

Author:

abaumann

Message:

move common event init code out of PhoneEventSimpleMoto? constructor,
because python won't let us cheat and call it on the "wrong" class in
the extended event init path (Issue #523)

Files:

• plugins/moto-sync/motosync.py (modified) (2 diffs)

plugins/moto-sync/motosync.py

@@ -1349 +1349 @@
-
-
+def moto_event_simple_init(event, data, exceptions):
+    """grab stuff out of the list of values from the phone"""
+    assert(type(data) == list and len(data) >= 10)
+    event.pos = data[0]
+    event.name = data[1]
+    timeflag = data[2]
+    alarmflag = data[3]
+    timestr = data[4]
+    datestr = data[5]
+    event.duration = timedelta(0, 0, 0, 0, data[6])
+    alarmtime = data[7]
+    alarmdate = data[8]
+    event.repeat_type = data[9]
+    event.exceptions = exceptions
+    event.exceptions.sort() # just in case
+
+    if timeflag:
+        event.eventdt = parse_moto_time(datestr, timestr)
+    else:
+        event.eventdt = parse_moto_time(datestr)
+
+    if alarmflag:
+        event.alarmdt = parse_moto_time(alarmdate, alarmtime)
+    else:
+        event.alarmdt = None
+
-class PhoneEventSimpleMoto(PhoneEventSimple):
-    """Constructor for the PhoneEventSimple object with data in Motorola format"""
-    def __init__(self, data, exceptions):
-        """grab stuff out of the list of values from the phone"""
-        PhoneEventSimple.__init__(self)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
@@ -1510 +1513 @@
-
-        # reuse simple constructor to initialise common fields 0-9
-PhoneEventSimpleMoto.__init__
+moto_event_simple_init
-
-        endtime = data[10]