tfw: handle unknown locations properly

2011-12-04 19:43:46 -05:00
parent cd9f5ac8e2
commit 76c0feddb5
1 changed files with 4 additions and 5 deletions
--- a/modules/tfw.py
+++ b/modules/tfw.py
@@ -30,12 +30,11 @@ def tfw(phenny, input, fahrenheit=False, celsius=False):

 	doc = lxml.html.fromstring(req)

-	location = doc.find_class('small')[0].text_content()
-
-	try:
+    try:
+	    location = doc.find_class('small')[0].text_content()
 		weather = doc.get_element_by_id('content')
-	except KeyError:
-		phenny.say("Unknown location")
+	except (IndexError, KeyError):
+		phenny.say("UNKNOWN FUCKING LOCATION. Try another?")
 		return

 	main = weather.find_class('large')