[releng] change events to use @property
- From: Olav Vitters <ovitters src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [releng] change events to use @property
- Date: Tue, 29 Jul 2014 10:37:28 +0000 (UTC)
commit d5aecc4a37b9d1190cfaa5ccec83fe96789d69cb
Author: Olav Vitters <olav vitters nl>
Date: Tue Jul 29 12:37:26 2014 +0200
change events to use @property
tools/schedule/automail.py | 8 ++++----
tools/schedule/ical.py | 2 +-
tools/schedule/libschedule.py | 3 +++
tools/schedule/wiki.py | 6 +++---
4 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/tools/schedule/automail.py b/tools/schedule/automail.py
index 314aa68..f21c2df 100755
--- a/tools/schedule/automail.py
+++ b/tools/schedule/automail.py
@@ -31,10 +31,10 @@ def mail_events(events):
tasks = [event for event in events if event.category in cat_task]
notes = [event for event in events if event.category not in cat_task]
if (tasks and not notes) or (notes and not tasks):
- subject = ', '.join([event.summary() for event in events])
+ subject = ', '.join([event.summary for event in events])
else:
# Show tasks only, even if we have notes
- subject = "%s (and more)" % ', '.join([task.summary() for task in tasks])
+ subject = "%s (and more)" % ', '.join([task.summary for task in tasks])
assignees = set(event.assignee for event in events if event.assignee)
if assignees:
@@ -43,9 +43,9 @@ def mail_events(events):
contents = StringIO.StringIO()
contents.write("Hello all,\n\n")
if len(events) > 1:
- contents.write("We would like to inform you about the following:\n* %s\n\n\n" % "\n*
".join([event.summary() for event in events]))
+ contents.write("We would like to inform you about the following:\n* %s\n\n\n" % "\n*
".join([event.summary for event in events]))
- contents.write("\n\n\n".join([textwrap.fill(event.description()) for event in events]))
+ contents.write("\n\n\n".join([textwrap.fill(event.description) for event in events]))
contents.write(string.Template(FOOTER).safe_substitute(events[0]))
diff --git a/tools/schedule/ical.py b/tools/schedule/ical.py
index 4ac2a04..927c936 100755
--- a/tools/schedule/ical.py
+++ b/tools/schedule/ical.py
@@ -34,7 +34,7 @@ for event in events:
summary.value = event.summary()
desc = vevent.add('description')
- desc.value = event.description()
+ desc.value = event.description
start = vevent.add('dtstart')
start.value = datetime.datetime(event.date.year, event.date.month, event.date.day, 23, 00, tzinfo = mytz)
diff --git a/tools/schedule/libschedule.py b/tools/schedule/libschedule.py
index 321dcd9..f7565b2 100755
--- a/tools/schedule/libschedule.py
+++ b/tools/schedule/libschedule.py
@@ -165,6 +165,7 @@ For the string freezes explained, and to see which kind of changes are not cover
v = ' ' + v
return "<%s: %s %s %s%s>" % (self.__class__, self.date, self.category, self.detail, v)
+ @property
def wiki_text(self):
text = self.make_text(self.wiki_template)
@@ -173,6 +174,7 @@ For the string freezes explained, and to see which kind of changes are not cover
else:
return text
+ @property
def summary(self):
text = self.make_text(self.summary_template)
@@ -181,6 +183,7 @@ For the string freezes explained, and to see which kind of changes are not cover
else:
return text
+ @property
def description(self):
text = self.make_text(self.description_template)
diff --git a/tools/schedule/wiki.py b/tools/schedule/wiki.py
index 74ed628..01df8d2 100755
--- a/tools/schedule/wiki.py
+++ b/tools/schedule/wiki.py
@@ -8,7 +8,7 @@ def wiki_cal_week(events, week, m):
cells = []
for day in week:
f1 = '<#c5d2c8>' if day.month == m else ''
- f2 = str(day.day) if day not in events else '[[#d%s|%s|title="%s"]]' % (day.isoformat(),
str(day.day), '; '.join((event.summary() for event in events[day])))
+ f2 = str(day.day) if day not in events else '[[#d%s|%s|title="%s"]]' % (day.isoformat(),
str(day.day), '; '.join((event.summary for event in events[day])))
cells.append('%s%s' % (f1, f2))
return cells
@@ -82,9 +82,9 @@ for month, events_month in itertools.groupby(events, by_month):
task_items = [item for item in items if item.category in cat_task]
note_items = [item for item in items if item.category not in cat_task]
- print "|| ", "<<BR>>".join([i.wiki_text() for i in task_items]),
+ print "|| ", "<<BR>>".join([i.wiki_text for i in task_items]),
if len(note_items):
- print "||<:#e0b6af> ", "<<BR>>".join([i.wiki_text() for i in note_items]),
+ print "||<:#e0b6af> ", "<<BR>>".join([i.wiki_text for i in note_items]),
else:
print "|| ",
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]