Merge lp:~keegan-csmith/ibid/weatherbug-641313 into lp:~ibid-core/ibid/old-trunk-1.6

[Keegan Carruthers-Smith]

Add "weather forecast for" syntax to weather

Fixes bug 641313

[Stefano Rivera (stefanor)]

Query: weather forecast for cape town
Response: City not found
Response: Sunday: Overcast. High: 16° C., Sunday Night: Chance of Rain. Low: 7° C., Monday: Clear. High: 17° C., Monday Night: Clear. Low: 5° C., Tuesday: Clear. High: 22° C., Tuesday Night: Clear. Low: 9° C., Wednesday: Scattered Clouds. High: 23° C., Wednesday Night: Clear. Low: 11° C., Thursday: Clear. High: 22° C., Thursday Night: Partly Cloudy. Low: 10° C., Friday: Partly Cloudy. High: 21° C., Friday Night: Chance of Rain. Low: 8° C., Saturday: Chance of Rain. High: 18° C., Saturday Night: Chance of Rain. Low: 9° C.

^ That doesn't seem right. They are both catching it.

review: Needs Fixing

[lp:~keegan-csmith/ibid/weatherbug-641313]

964. By Keegan Carruthers-Smith on 2010-09-26

Ignore "weather forecast..." in weather method.

[Stefano Rivera (stefanor)]

review: Approve

[Max Rabkin (max-rabkin)]

"Weather for Forecast, Alabama" doesn't work (though I just made up the place). There probably aren't that many places (if any) whose names start with "forecast", so I'm not going to vote on this.

[Max Rabkin (max-rabkin)]

review: Approve

=== modified file 'ibid/plugins/geography.py'
--- ibid/plugins/geography.py	2010-06-29 16:31:20 +0000
+++ ibid/plugins/geography.py	2010-09-26 20:45:55 +0000
@@ -189,8 +189,13 @@
 
         return forecasts
 
-    @match(r'^weather\s+(?:(?:for|at|in)\s+)?(.+)$')
+    @match(r'^weather (?:(?:for|at|in) )?(.+)$')
     def weather(self, event, place):
+        # The regex also matches "weather forecast..." which forecast should
+        # process. So ignore it when this happens
+        if place.lower().startswith('forecast'):
+            return
+
         try:
             values = self.remote_weather(place)
             event.addresponse(u'In %(place)s at %(time)s: %(temp)s; Humidity: %(humidity)s; Wind: %(wind)s; Conditions: %(conditions)s; Sunrise/set: %(sunrise)s/%(sunset)s; Moonrise/set: %(moonrise)s/%(moonset)s', values)
@@ -202,7 +207,7 @@
         except Weather.WeatherException, e:
             event.addresponse(unicode(e))
 
-    @match(r'^forecast\s+(?:for\s+)?(.+)$')
+    @match(r'^(?:weather )forecast (?:for )?(.+)$')
     def forecast(self, event, place):
         try:
             event.addresponse(u', '.join(self.remote_forecast(place)))