Merge lp:~marco-gallotta/ibid/timezone-543989 into lp:~ibid-core/ibid/old-trunk-1.6

[marcog]

Add username=ibid field for geonames ws. See http://geonames.wordpress.com/2010/03/16/ddos-part-ii/ for why this is necessary.

[lp:~marco-gallotta/ibid/timezone-543989]

914. By marcog on 2010-03-22

Add username arg to other geonames calls, even though they're not required

[Michael Gorven (mgorven)]

 review approve

review: Approve

Unmerged revisions

=== modified file 'ibid/plugins/geography.py'
--- ibid/plugins/geography.py	2010-03-10 19:32:04 +0000
+++ ibid/plugins/geography.py	2010-03-22 10:18:25 +0000
@@ -52,7 +52,7 @@
     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):
-        return json_webservice('http://ws.geonames.org/searchJSON', {'q': place, 'maxRows': num})
+        return json_webservice('http://ws.geonames.org/searchJSON', {'q': place, 'maxRows': num, 'username': 'ibid'})
 
     def get_place(self, place):
         js = self.get_place_data(place, 1)
@@ -319,12 +319,12 @@
         raise TimezoneException(u"I don't know about the %s timezone" % (string,))
 
     def _geonames_lookup(self, place):
-        search = json_webservice('http://ws.geonames.org/searchJSON', {'q': place, 'maxRows': 1})
+        search = json_webservice('http://ws.geonames.org/searchJSON', {'q': place, 'maxRows': 1, 'username': 'ibid'})
         if search['totalResultsCount'] == 0:
             return None
 
         city = search['geonames'][0]
-        timezone = json_webservice('http://ws.geonames.org/timezoneJSON', {'lat': city['lat'], 'lng': city['lng']})
+        timezone = json_webservice('http://ws.geonames.org/timezoneJSON', {'lat': city['lat'], 'lng': city['lng'], 'username': 'ibid'})
 
         if 'timezoneId' in timezone:
             return gettz(timezone['timezoneId'])