1.1 --- a/EventAggregatorSupport/Formatting.py Tue May 07 23:57:19 2013 +0200
1.2 +++ b/EventAggregatorSupport/Formatting.py Fri Jun 14 00:40:23 2013 +0200
1.3 @@ -98,10 +98,10 @@
1.4 # Start the collection.
1.5
1.6 if mimetype == "text/calendar" and vCalendar is not None:
1.7 - write = vCalendar.iterwrite(write=write).write
1.8 - write("BEGIN", {}, "VCALENDAR")
1.9 - write("PRODID", {}, "-//MoinMoin//EventAggregatorSummary")
1.10 - write("VERSION", {}, "2.0")
1.11 + _write = vCalendar.iterwrite(write=write).write
1.12 + _write("BEGIN", {}, "VCALENDAR")
1.13 + _write("PRODID", {}, "-//MoinMoin//EventAggregatorSummary")
1.14 + _write("VERSION", {}, "2.0")
1.15
1.16 elif mimetype == "application/rss+xml":
1.17
1.18 @@ -137,7 +137,7 @@
1.19 # End the collection.
1.20
1.21 if mimetype == "text/calendar" and vCalendar is not None:
1.22 - write("END", {}, "VCALENDAR")
1.23 + _write("END", {}, "VCALENDAR")
1.24
1.25 elif mimetype == "application/rss+xml":
1.26 write('</channel>\r\n')
1.27 @@ -171,7 +171,7 @@
1.28 # NOTE: A custom formatter making attributes for links and plain
1.29 # NOTE: text for values could be employed here.
1.30
1.31 - write = vCalendar.iterwrite(write=write).write
1.32 + _write = vCalendar.iterwrite(write=write).write
1.33
1.34 # Get the summary details.
1.35
1.36 @@ -180,12 +180,12 @@
1.37
1.38 # Output the event details.
1.39
1.40 - write("BEGIN", {}, "VEVENT")
1.41 - write("UID", {}, link)
1.42 - write("URL", {}, link)
1.43 - write("DTSTAMP", {}, "%04d%02d%02dT%02d%02d%02dZ" % event_metadata["created"].as_tuple()[:6])
1.44 - write("LAST-MODIFIED", {}, "%04d%02d%02dT%02d%02d%02dZ" % event_metadata["last-modified"].as_tuple()[:6])
1.45 - write("SEQUENCE", {}, "%d" % event_metadata["sequence"])
1.46 + _write("BEGIN", {}, "VEVENT")
1.47 + _write("UID", {}, link)
1.48 + _write("URL", {}, link)
1.49 + _write("DTSTAMP", {}, "%04d%02d%02dT%02d%02d%02dZ" % event_metadata["created"].as_tuple()[:6])
1.50 + _write("LAST-MODIFIED", {}, "%04d%02d%02dT%02d%02d%02dZ" % event_metadata["last-modified"].as_tuple()[:6])
1.51 + _write("SEQUENCE", {}, "%d" % event_metadata["sequence"])
1.52
1.53 start = event_details["start"]
1.54 end = event_details["end"]
1.55 @@ -194,26 +194,26 @@
1.56 params, value = getCalendarDateTime(start)
1.57 else:
1.58 params, value = {"VALUE" : "DATE"}, "%04d%02d%02d" % start.as_date().as_tuple()
1.59 - write("DTSTART", params, value)
1.60 + _write("DTSTART", params, value)
1.61
1.62 if isinstance(end, DateTime):
1.63 params, value = getCalendarDateTime(end)
1.64 else:
1.65 params, value = {"VALUE" : "DATE"}, "%04d%02d%02d" % end.next_day().as_date().as_tuple()
1.66 - write("DTEND", params, value)
1.67 + _write("DTEND", params, value)
1.68
1.69 - write("SUMMARY", {}, event_summary)
1.70 + _write("SUMMARY", {}, event_summary)
1.71
1.72 # Optional details.
1.73
1.74 if event_details.get("topics") or event_details.get("categories"):
1.75 - write("CATEGORIES", {}, event_details.get("topics") or event_details.get("categories"))
1.76 + _write("CATEGORIES", {}, event_details.get("topics") or event_details.get("categories"))
1.77 if event_details.has_key("location"):
1.78 - write("LOCATION", {}, event_details["location"])
1.79 + _write("LOCATION", {}, event_details["location"])
1.80 if event_details.has_key("geo"):
1.81 - write("GEO", {}, tuple([str(ref.to_degrees()) for ref in event_details["geo"]]))
1.82 + _write("GEO", {}, tuple([str(ref.to_degrees()) for ref in event_details["geo"]]))
1.83
1.84 - write("END", {}, "VEVENT")
1.85 + _write("END", {}, "VEVENT")
1.86
1.87 elif mimetype == "application/rss+xml":
1.88