1
=== modified file 'ibid/plugins/google.py'
2
--- ibid/plugins/google.py	2009-05-01 12:17:57 +0000
3
+++ ibid/plugins/google.py	2009-05-30 18:53:10 +0000
4
@@ -45,7 +45,12 @@
5
45
45
6
46
    @match(r'^google\s+(?:for\s+)?(.+?)$')
46
    @match(r'^google\s+(?:for\s+)?(.+?)$')
7
47
    def search(self, event, query):
47
    def search(self, event, query):
9
48
        items = self._google_api_search(query)
48
        try:
10
49
            items = self._google_api_search(query)
11
50
        except BadStatusLine:
12
51
            event.addresponse(u"Google appears to be broken (or more likely, my connection to it)")
13
52
            return
14
53
15
49
        results = []
54
        results = []
16
50
        for item in items["responseData"]["results"]:
55
        for item in items["responseData"]["results"]:
17
51
56
18
@@ -60,8 +65,13 @@
19
60
65
20
61
    @match(r'^(?:rank|(?:google(?:fight|compare|cmp)))\s+(?:for\s+)?(.+?)\s+and\s+(.+?)$')
66
    @match(r'^(?:rank|(?:google(?:fight|compare|cmp)))\s+(?:for\s+)?(.+?)\s+and\s+(.+?)$')
21
62
    def googlefight(self, event, term1, term2):
67
    def googlefight(self, event, term1, term2):
24
63
        count1 = int(self._google_api_search(term1, "small")["responseData"]["cursor"].get("estimatedResultCount", 0))
68
        try:
25
64
        count2 = int(self._google_api_search(term2, "small")["responseData"]["cursor"].get("estimatedResultCount", 0))
69
            count1 = int(self._google_api_search(term1, "small")["responseData"]["cursor"].get("estimatedResultCount", 0))
26
70
            count2 = int(self._google_api_search(term2, "small")["responseData"]["cursor"].get("estimatedResultCount", 0))
27
71
        except BadStatusLine:
28
72
            event.addresponse(u"Google appears to be broken (or more likely, my connection to it)")
29
73
            return
30
74
31
65
        event.addresponse(u'%(firstterm)s wins with %(firsthits)i hits, %(secondterm)s had %(secondhits)i hits',
75
        event.addresponse(u'%(firstterm)s wins with %(firsthits)i hits, %(secondterm)s had %(secondhits)i hits',
32
66
            (count1 > count2 and {
76
            (count1 > count2 and {
33
67
                'firstterm':  term1,
77
                'firstterm':  term1,
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+6910@code.launchpad.net