1
=== modified file 'ibid/event.py'
2
--- ibid/event.py	2009-05-02 19:29:44 +0000
3
+++ ibid/event.py	2009-05-30 18:26:08 +0000
4
@@ -18,7 +18,10 @@
5
18
        self[name] = value
18
        self[name] = value
6
19
19
7
20
    def addresponse(self, response, params={}, processed=True):
20
    def addresponse(self, response, params={}, processed=True):
9
21
        if isinstance(response, basestring) and params:
21
        if response is None:
10
22
            # We want to detect this now, so we know which plugin is to blame
11
23
            raise Exception("Can't have a None response")
12
24
        elif isinstance(response, basestring) and params:
13
22
            self.responses.append(response % params)
25
            self.responses.append(response % params)
14
23
        else:
26
        else:
15
24
            self.responses.append(response)
27
            self.responses.append(response)
16
25
28
17
=== modified file 'ibid/plugins/lookup.py'
18
--- ibid/plugins/lookup.py	2009-05-12 07:13:41 +0000
19
+++ ibid/plugins/lookup.py	2009-05-30 18:29:42 +0000
20
@@ -129,6 +129,9 @@
21
129
            u"Sorry, it's broken, the FML admins must having a really bad day",
129
            u"Sorry, it's broken, the FML admins must having a really bad day",
22
130
    )
130
    )
23
131
131
24
132
    class FMLException(Exception):
25
133
        pass
26
134
27
132
    def remote_get(self, id):
135
    def remote_get(self, id):
28
133
        url = urljoin(self.api_url, 'view/%s?%s' % (
136
        url = urljoin(self.api_url, 'view/%s?%s' % (
29
134
            id.isalnum() and id + '/nocomment' or quote(id),
137
            id.isalnum() and id + '/nocomment' or quote(id),
30
@@ -137,7 +140,7 @@
31
137
        dom = parse(urlopen(url))
140
        dom = parse(urlopen(url))
32
138
141
33
139
        if dom.getElementsByTagName('error'):
142
        if dom.getElementsByTagName('error'):
35
140
            return
143
            raise FMLException(dom.getElementsByTagName('error')[0]childNodes[0].nodeValue)
36
141
144
37
142
        items = dom.getElementsByTagName('item')
145
        items = dom.getElementsByTagName('item')
38
143
        if items: 
146
        if items: 
39
@@ -162,6 +165,9 @@
40
162
    def fml(self, event, id):
165
    def fml(self, event, id):
41
163
        try:
166
        try:
42
164
            quote = self.remote_get(id)
167
            quote = self.remote_get(id)
43
168
        except FMLException:
44
169
            event.addresponse(choice(self.failure_messages) % event.sender)
45
170
            return
46
165
        except HTTPError:
171
        except HTTPError:
47
166
            event.addresponse(choice(self.failure_messages) % event.sender)
172
            event.addresponse(choice(self.failure_messages) % event.sender)
48
167
            return
173
            return
49
@@ -175,9 +181,10 @@
50
175
    def fml_default(self, event):
181
    def fml_default(self, event):
51
176
        try:
182
        try:
52
177
            event.addresponse(self.remote_get('random'))
183
            event.addresponse(self.remote_get('random'))
53
184
        except FMLException:
54
185
            event.addresponse(choice(self.failure_messages) % event.sender)
55
178
        except HTTPError:
186
        except HTTPError:
56
179
            event.addresponse(choice(self.failure_messages) % event.sender)
187
            event.addresponse(choice(self.failure_messages) % event.sender)
57
180
            return
58
181
188
59
182
    @match(r'^fml\s+categories$')
189
    @match(r'^fml\s+categories$')
60
183
    def list_categories(self, event):
190
    def list_categories(self, event):
Reviewer	Date Requested	Status
Jonathan Hitchcock		Approve on 2009-06-02
Michael Gorven	2009-05-30	Approve on 2009-05-30
Review via email: mp+6908@code.launchpad.net