Merge lp:~marco-gallotta/ibid/geonames-702810-0.1 into lp:~ibid-core/ibid/old-release-0.1-1.6

[marcog]

Log geonames status messages and catch cases when results aren't actually present and handle them gracefully.

Log geonames status messages and catch cases when results aren't actually present and handle them gracefully.

[Stefano Rivera (stefanor)]

There's no simplematch in 0.1!

review: Needs Fixing

[marcog (marco-gallotta)]

> There's no simplematch in 0.1!

Oops! r969

[lp:~marco-gallotta/ibid/geonames-702810-0.1]

968. By marcog on 2011-01-20

Merge geonames-702810

969. By marcog on 2011-01-20

There's no simplematch in 0.1, so revert those changes

[Stefano Rivera (stefanor)]

conflict!

review: Needs Fixing

Unmerged revisions

969. By marcog on 2011-01-20

There's no simplematch in 0.1, so revert those changes

968. By marcog on 2011-01-20

Merge geonames-702810

967. By marcog on 2011-01-18

Bump copyright date and add my name

966. By marcog on 2011-01-18

Use the simplified @match regex in Timezone

965. By marcog on 2011-01-18

Log geonames status messages and check for results before assuming they're there

=== modified file 'ibid/plugins/feeds.py'
=== modified file 'ibid/plugins/geography.py'
--- ibid/plugins/geography.py	2011-01-12 14:16:31 +0000
+++ ibid/plugins/geography.py	2011-01-20 11:13:12 +0000
@@ -1,4 +1,5 @@
-# Copyright (c) 2009-2010, Jonathan Hitchcock, Michael Gorven, Stefano Rivera
+# Copyright (c) 2009-2011, Jonathan Hitchcock, Michael Gorven, Stefano Rivera,
+# Marco Gallotta
 # Released under terms of the MIT/X/Expat Licence. See COPYING for details.
 
 from math import acos, sin, cos, radians
@@ -50,11 +51,19 @@
     radius_values = DictOption('radius_values', 'Radius of the earth in the units in which to specify distances', default_radius_values)
 
     def get_place_data(self, place, num):
+<<<<<<< TREE
         return json_webservice('http://ws.geonames.org/searchJSON', {'q': place, 'maxRows': num, 'username': 'ibid'})
+=======
+        js = json_webservice('http://ws.geonames.org/searchJSON', {'q': place, 'maxRows': num, 'username': 'ibid'})
+        if 'status' in js:
+            log.warning(u'Received status "%s" from geonames when searching '
+                        u'for "%s"', js['status'], place)
+        return js
+>>>>>>> MERGE-SOURCE
 
     def get_place(self, place):
         js = self.get_place_data(place, 1)
-        if js['totalResultsCount'] == 0:
+        if js.get('totalResultsCount', 0) == 0:
             return None
         info = js['geonames'][0]
         return {'name': "%s, %s, %s" % (info['name'], info['adminName1'], info['countryName']),
@@ -64,7 +73,7 @@
     @match(r'^(?:(?:search\s+for\s+place)|(?:place\s+search\s+for)|(?:places\s+for))\s+(\S.+?)\s*$')
     def placesearch(self, event, place):
         js = self.get_place_data(place, 10)
-        if js['totalResultsCount'] == 0:
+        if js.get('totalResultsCount', 0) == 0:
             event.addresponse(u"I don't know of anywhere even remotely like '%s'", place)
         else:
             event.addresponse(u"I can find: %s",
@@ -317,12 +326,35 @@
         raise TimezoneException(u"I don't know about the %s timezone" % (string,))
 
     def _geonames_lookup(self, place):
+<<<<<<< TREE
         search = json_webservice('http://ws.geonames.org/searchJSON', {'q': place, 'maxRows': 1, 'username': 'ibid'})
         if search['totalResultsCount'] == 0:
+=======
+        search = json_webservice('http://ws.geonames.org/searchJSON', {
+            'q': place,
+            'maxRows': 1,
+            'username': 'ibid',
+        })
+        if 'status' in search:
+            log.warning(u'Received status "%s" from geonames when searching '
+                        u'for "%s"', search['status'], place)
+        if search.get('totalResultsCount', 0) == 0:
+>>>>>>> MERGE-SOURCE
             return None
 
         city = search['geonames'][0]
+<<<<<<< TREE
         timezone = json_webservice('http://ws.geonames.org/timezoneJSON', {'lat': city['lat'], 'lng': city['lng'], 'username': 'ibid'})
+=======
+        timezone = json_webservice('http://ws.geonames.org/timezoneJSON', {
+            'lat': city['lat'],
+            'lng': city['lng'],
+            'username': 'ibid',
+        })
+        if 'status' in timezone:
+            log.warning(u'Received status "%s" from geonames when looking up '
+                        u'lat %s lng %s', search['status'], city['lat'], city['lng'])
+>>>>>>> MERGE-SOURCE
 
         if 'timezoneId' in timezone:
             return gettz(timezone['timezoneId'])
@@ -331,7 +363,7 @@
             offset = timezone['rawOffset']
             return tzoffset('UTC%s%s' % (offset>=0 and '+' or '', offset), offset*3600)
 
-    @match(r'^when\s+is\s+((?:[0-9.:/hT -]|%s)+)(?:\s+in)?(?:\s+(.+))?\s+in\s+(.+)$' % '|'.join(MONTH_SHORT+MONTH_LONG+OTHER_STUFF))
+    @match(r'^when \s+is\s+((?:[0-9.:/hT -]|%s)+)(?:\s+in)?(?:\s+(.+))?\s+in\s+(.+)$' % '|'.join(MONTH_SHORT+MONTH_LONG+OTHER_STUFF), simple=False)
     def convert(self, event, time, from_, to):
         try:
             source = time and parse(time) or datetime.now()

=== modified file 'ibid/plugins/google.py'
--- ibid/plugins/google.py	2011-01-19 19:21:58 +0000
+++ ibid/plugins/google.py	2011-01-20 11:13:12 +0000
@@ -107,6 +107,7 @@
     def calc(self, event, expression):
         tree = self._google_scrape_search(expression)
 
+<<<<<<< TREE
         nodes = [node for node in tree.findall('.//h2/b')]
         if len(nodes) == 1:
             # ElementTree doesn't support inline tags:
@@ -122,6 +123,21 @@
             node = decode_htmlentities(node)
             event.addresponse(node)
         else:
+=======
+        nodes = [node for node in tree.findall('.//h2/b')]
+        if len(nodes) == 1:
+            # ElementTree doesn't support inline tags:
+            # May return ASCII unless an encoding is specified.
+            # "utf8" will result in an xml header
+            node = ElementTree.tostring(nodes[0], encoding='utf-8')
+            node = node.decode('utf-8')
+            node = re.sub(r'^<b>(.*)</b>$', lambda x: x.group(1), node)
+            node = re.sub(r'<sup>(.*?)</sup>',
+                          lambda x: u'^' + x.group(1), node)
+            node = decode_htmlentities(node)
+            event.addresponse(node)
+        else:
+>>>>>>> MERGE-SOURCE
             event.addresponse(u'No result')
 
     @match(r'^gdefine\s+(.+)$')

=== modified file 'ibid/plugins/network.py'
--- ibid/plugins/network.py	2011-01-16 22:57:11 +0000
+++ ibid/plugins/network.py	2011-01-20 11:13:12 +0000
@@ -272,6 +272,7 @@
                 }
 
             if action.upper() == 'GET':
+<<<<<<< TREE
                 got_title = False
                 content_type = self._get_header(headers, 'content-type')
                 if content_type and (content_type.startswith('text/html') or
@@ -284,6 +285,20 @@
 
                 if not got_title and content_type:
                     reply += u' ' + content_type
+=======
+                got_title = False
+                content_type = self._get_header(headers, 'content-type')
+                if (content_type.startswith('text/html') or
+                        content_type.startswith('application/xhtml+xml')):
+                    match = re.search(r'<title>(.*)<\/title>', data,
+                                      re.I | re.DOTALL)
+                    if match:
+                        got_title = True
+                        reply += u' "%s"' % match.groups()[0].strip()
+
+                if not got_title:
+                    reply += u' ' + content_type
+>>>>>>> MERGE-SOURCE
 
             event.addresponse(reply)
 

=== modified file 'ibid/plugins/oeis.py'
=== modified file 'ibid/plugins/social.py'
--- ibid/plugins/social.py	2011-01-19 19:22:40 +0000
+++ ibid/plugins/social.py	2011-01-20 11:13:12 +0000
@@ -119,9 +119,13 @@
                 event.addresponse(u'That %s is private', service['name'])
             elif e.code == 404:
                 event.addresponse(u'No such %s', service['name'])
+<<<<<<< TREE
             else:
                 log.debug(u'%s returned HTTP code %i: %s', service['name'],
                           e.code, e.reason)
+=======
+            elif e.code == 500:
+>>>>>>> MERGE-SOURCE
                 event.addresponse(u'I can only see the Fail Whale')
 
     @handler