Gentoo Archives: gentoo-commits

From: "Petteri Räty" <betelgeuse@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/council-webapp:master commit in: bot/ircmeeting/
Date: Tue, 05 Jul 2011 15:09:35
Message-Id: ae6e10d99051e6e8930e2a816e6545b9f9edb3fa.betelgeuse@gentoo
1 commit: ae6e10d99051e6e8930e2a816e6545b9f9edb3fa
2 Author: Joachim Filip Ignacy Bartosik <jbartosik <AT> gmail <DOT> com>
3 AuthorDate: Mon Jun 27 14:19:44 2011 +0000
4 Commit: Petteri Räty <betelgeuse <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 27 14:19:44 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/council-webapp.git;a=commit;h=ae6e10d9
7
8 Bot posts log to the website
9
10 ---
11 bot/ircmeeting/agenda.py | 5 +++--
12 bot/ircmeeting/meeting.py | 2 +-
13 2 files changed, 4 insertions(+), 3 deletions(-)
14
15 diff --git a/bot/ircmeeting/agenda.py b/bot/ircmeeting/agenda.py
16 index a77aafe..05e4a57 100644
17 --- a/bot/ircmeeting/agenda.py
18 +++ b/bot/ircmeeting/agenda.py
19 @@ -217,10 +217,11 @@ class Agenda(object):
20 result = str.format(self.timelimit_missing_msg, message)
21 return(result)
22
23 - def post_result(self):
24 + def post_result(self, lines):
25 if not self.conf.manage_agenda:
26 return('')
27 - data_dict = {'votes' : self._votes, 'agenda' : self._agenda}
28 + data_dict = {'votes' : self._votes, 'agenda' : self._agenda,
29 + 'lines' : "\n".join(lines)}
30 data = urllib.quote(json.dumps(data_dict))
31 result_url = str.format(self.conf.result_url,
32 self.conf.voting_results_user,
33
34 diff --git a/bot/ircmeeting/meeting.py b/bot/ircmeeting/meeting.py
35 index a86c782..a15b674 100644
36 --- a/bot/ircmeeting/meeting.py
37 +++ b/bot/ircmeeting/meeting.py
38 @@ -380,7 +380,7 @@ class MeetingCommands(object):
39 for messageline in message.split('\n'):
40 self.reply(messageline)
41 self._meetingIsOver = True
42 - self.config.agenda.post_result()
43 + self.config.agenda.post_result(self.lines)
44 def do_topic(self, nick, line, **kwargs):
45 """Set a new topic in the channel."""
46 if not self.isChair(nick): return