fix error on querying states.

dasu · May 10, 2016 · b6ea82d · b6ea82d
1 parent 841b832
commit b6ea82d
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/weather2.py b/weather2.py
@@ -181,13 +181,17 @@ def get_forecast(bot,trigger,location=None):
         if type(result) is list:
             if result[0]['locality1']:
                 location = result[0]['locality1']['content'] + ", " + (result[0]['admin1']['code'].split("-")[-1] if result[0]['admin1']['code'] != '' else result[0]['country']['content'])
-            else:
+            elif result[0]['admin2']:
                 location = result[0]['admin2']['content'] + ", " + (result[0]['admin1']['code'].split("-")[-1] if result[0]['admin1']['code'] != '' else result[0]['country']['content'])
+            else:
+                location = result[0]['admin1']['content'] + ", " + result[0]['country']['content']
         else:
             if result['locality1']:
                 location = result['locality1']['content'] + ", " + (result['admin1']['code'].split("-")[-1] if result['admin1']['code'] != '' else result['country']['content'])
-            else:
+            elif result['admin2']:
                 location = result['admin2']['content'] + ", " + (result['admin1']['code'].split("-")[-1] if result['admin1']['code'] != '' else result['country']['content'])
+            else:
+                location = result['admin1']['content'] + ", " + result['country']['content']
     return location, forecast, error
 
 @commands('weather7', 'wea7')