X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/cdd662d80c867821a9f31da59f00da6ef534f01e..492f66eae0b39b23f2ac5372468cc3e3d0d05dbd:/modules/weather.py

diff --git a/modules/weather.py b/modules/weather.py
index 0a3ce3b..5f016c0 100644
--- a/modules/weather.py
+++ b/modules/weather.py
@@ -1,4 +1,5 @@
 # Erebus IRC bot - Author: Erebus Team
+# vim: fileencoding=utf-8
 # weather module
 # This file is released into the public domain; see http://unlicense.org/
 
@@ -18,13 +19,22 @@ modstart = lib.modstart
 modstop = lib.modstop
 
 # module code
-import json, urllib, time, rfc822
+import json, time, sys
+from email.utils import parsedate
 
-def location(person, default=None): return lib.mod('userinfo')._get(person, 'location', default=None)
+if sys.version_info.major < 3:
+	from urllib import urlopen
+else:
+	from urllib.request import urlopen
+
+def location(person, default=None): return lib.mod('userinfo').get(person, 'location', default=None)
+
+def _dayofweek(dayname):
+	return ['mon','tue','wed','thu','fri','sat','sun'].index(dayname.lower())
 
 def _weather(place):
 	if place is not None:
-		weather = json.load(urllib.urlopen('http://api.wunderground.com/api/8670e6d2e69ff3c7/conditions/q/%s.json' % (place)))
+		weather = json.load(urlopen(('http://api.wunderground.com/api/8670e6d2e69ff3c7/conditions/q/%s.json' % (place)).encode('utf8')))
 		if lib.parent.cfg.getboolean('debug', 'weather'):
 			lib.parent.log('*', "?", repr(weather))
 		if 'response' in weather:
@@ -34,13 +44,19 @@ def _weather(place):
 				return "That search term is ambiguous. Please be more specific."
 
 		current = weather['current_observation']
-		measuredat = rfc822.parsedate(current['observation_time_rfc822']) # parsedate_tz returns a 10-tuple which strftime DOESN'T ACCEPT
-		measuredatTZ = current['local_tz_short']
+		try:
+			measuredat = list(parsedate(current['observation_time_rfc822'])) # we have to turn this into a list so that we can assign to it.
+			measuredat[6] = _dayofweek(current['observation_time_rfc822'][0:3])
+			measuredatTZ = current['local_tz_short']
+		except:
+			measuredat = time.gmtime()
+			measuredatTZ = '(actual time unknown)'
 		loc = current['observation_location']
-		if loc['city'] == "": loc = current['display_location']
-		return u"Weather in %(location)s: As of %(time)s %(tz)s, %(conditions)s, %(cel)s\u00B0C (%(far)s\u00B0F) (feels like %(flcel)s\u00B0C (%(flfar)s\u00B0F)). Wind %(wind)s. %(link)s" % {
+		if loc['city'] == "" or loc['state'] == "": loc = current['display_location']
+		return u"Weather in %(location)s: As of %(time)s %(tz)s, %(conditions)s, %(cel)s°C (%(far)s°F) (feels like %(flcel)s°C (%(flfar)s°F)). Wind %(wind)s. %(link)s" % {
 			'location': loc['full'],
-			'time': time.strftime("%a %H:%M", measuredat), 'tz': measuredatTZ,
+			'time': time.strftime("%a %H:%M", tuple(measuredat)), # now we have to turn it back into a tuple because Py3's time.strftime requires it.
+			'tz': measuredatTZ,
 			'conditions': current['weather'],
 			'cel': current['temp_c'], 'far': current['temp_f'],
 			'flcel': current['feelslike_c'], 'flfar': current['feelslike_f'],
@@ -48,7 +64,7 @@ def _weather(place):
 			'link': current['forecast_url'],
 		}
 	else:
-		return "I don't know where to look! Try %sSETINFO LOCATION <your location>" % (bot.parent.trigger)
+		return "I don't know where to look! Try %sSETINFO LOCATION <your location>" % (lib.parent.trigger,)
 
 @lib.hook(('weather','w'), needchan=False, wantchan=True)
 @lib.help('[<location>]', 'show weather for your location')
@@ -63,5 +79,6 @@ def weather(bot, user, chan, realtarget, *args):
 
 @lib.hook(('weatheruser','wu'))
 @lib.help('<user>', 'show weather for <user>\'s location')
+@lib.argsEQ(1)
 def wu(bot, user, chan, realtarget, *args):
 	bot.msg(chan, _weather(location(' '.join(args))))