Corona: reload config, decode json

Corona/__init__.py

@@ -54,7 +54,8 @@ __url__ = 'https://github.com/oddluck/limnoria-plugins/'
 from . import config
 from . import plugin
 from imp import reload
-imp.reload(plugin) # In case we're being reloaded.
+reload(plugin)
+reload(config)
 # Add more reloads here if you add third-party modules and want them to be
 # reloaded when this plugin is reloaded.  Don't forget to import them as well!
 

Corona/plugin.py

@@ -70,9 +70,9 @@ CC = {
     "BJ": "BENIN",
     "BM": "BERMUDA",
     "BT": "BHUTAN",
-    "BO": "BOLIVIA, PLURINATIONAL STATE OF",
+    "BO": "BOLIVIA",
-    "BQ": "BONAIRE, SINT EUSTATIUS AND SABA",
+    "BQ": "BONAIRE",
-    "BA": "BOSNIA AND HERZEGOVINA",
+    "BA": "BOSNIA",
     "BW": "BOTSWANA",
     "BV": "BOUVET ISLAND",
     "BR": "BRAZIL",
@@ -95,7 +95,7 @@ CC = {
     "CO": "COLOMBIA",
     "KM": "COMOROS",
     "CG": "CONGO",
-    "CD": "CONGO, THE DEMOCRATIC REPUBLIC OF THE",
+    "CD": "CONGO",
     "CK": "COOK ISLANDS",
     "CR": "COSTA RICA",
     "CI": "CÔTE D'IVOIRE",
@@ -115,13 +115,13 @@ CC = {
     "ER": "ERITREA",
     "EE": "ESTONIA",
     "ET": "ETHIOPIA",
-    "FK": "FALKLAND ISLANDS (MALVINAS)",
+    "FK": "FALKLAND ISLANDS",
     "FO": "FAROE ISLANDS",
     "FJ": "FIJI",
     "FI": "FINLAND",
     "FR": "FRANCE",
-    "GF": "FRENCH GUIANA",
+    "GF": "GUIANA",
-    "PF": "FRENCH POLYNESIA",
+    "PF": "POLYNESIA",
     "TF": "FRENCH SOUTHERN TERRITORIES",
     "GA": "GABON",
     "GM": "GAMBIA",
@@ -141,14 +141,14 @@ CC = {
     "GY": "GUYANA",
     "HT": "HAITI",
     "HM": "HEARD ISLAND AND MCDONALD ISLANDS",
-    "VA": "HOLY SEE (VATICAN CITY STATE)",
+    "VA": "VATICAN CITY",
     "HN": "HONDURAS",
     "HK": "HONG KONG",
     "HU": "HUNGARY",
     "IS": "ICELAND",
     "IN": "INDIA",
     "ID": "INDONESIA",
-    "IR": "IRAN, ISLAMIC REPUBLIC OF",
+    "IR": "IRAN",
     "IQ": "IRAQ",
     "IE": "IRELAND",
     "IM": "ISLE OF MAN",
@@ -161,11 +161,11 @@ CC = {
     "KZ": "KAZAKHSTAN",
     "KE": "KENYA",
     "KI": "KIRIBATI",
-    "KP": "KOREA, DEMOCRATIC PEOPLE'S REPUBLIC OF",
+    "KP": "NORTH KOREA",
-    "KR": "KOREA, REPUBLIC OF",
+    "KR": "SOUTH KOREA",
     "KW": "KUWAIT",
     "KG": "KYRGYZSTAN",
-    "LA": "LAO PEOPLE'S DEMOCRATIC REPUBLIC",
+    "LA": "LAOS",
     "LV": "LATVIA",
     "LB": "LEBANON",
     "LS": "LESOTHO",
@@ -175,7 +175,7 @@ CC = {
     "LT": "LITHUANIA",
     "LU": "LUXEMBOURG",
     "MO": "MACAO",
-    "MK": "MACEDONIA, THE FORMER YUGOSLAV REPUBLIC OF",
+    "MK": "MACEDONIA",
     "MG": "MADAGASCAR",
     "MW": "MALAWI",
     "MY": "MALAYSIA",
@@ -188,8 +188,8 @@ CC = {
     "MU": "MAURITIUS",
     "YT": "MAYOTTE",
     "MX": "MEXICO",
-    "FM": "MICRONESIA, FEDERATED STATES OF",
+    "FM": "MICRONESIA",
-    "MD": "MOLDOVA, REPUBLIC OF",
+    "MD": "MOLDOVA",
     "MC": "MONACO",
     "MN": "MONGOLIA",
     "ME": "MONTENEGRO",
@@ -229,7 +229,7 @@ CC = {
     "RU": "RUSSIAN FEDERATION",
     "RW": "RWANDA",
     "BL": "SAINT BARTHÉLEMY",
-    "SH": "SAINT HELENA, ASCENSION AND TRISTAN DA CUNHA",
+    "SH": "SAINT HELENA",
     "KN": "SAINT KITTS AND NEVIS",
     "LC": "SAINT LUCIA",
     "MF": "SAINT MARTIN (FRENCH PART)",
@@ -244,13 +244,13 @@ CC = {
     "SC": "SEYCHELLES",
     "SL": "SIERRA LEONE",
     "SG": "SINGAPORE",
-    "SX": "SINT MAARTEN (DUTCH PART)",
+    "SX": "SINT MAARTEN",
     "SK": "SLOVAKIA",
     "SI": "SLOVENIA",
     "SB": "SOLOMON ISLANDS",
     "SO": "SOMALIA",
     "ZA": "SOUTH AFRICA",
-    "GS": "SOUTH GEORGIA AND THE SOUTH SANDWICH ISLANDS",
+    "GS": "SOUTH GEORGIA",
     "SS": "SOUTH SUDAN",
     "ES": "SPAIN",
     "LK": "SRI LANKA",
@@ -263,7 +263,7 @@ CC = {
     "SY": "SYRIAN ARAB REPUBLIC",
     "TW": "TAIWAN, PROVINCE OF CHINA",
     "TJ": "TAJIKISTAN",
-    "TZ": "TANZANIA, UNITED REPUBLIC OF",
+    "TZ": "TANZANIA",
     "TH": "THAILAND",
     "TL": "TIMOR-LESTE",
     "TG": "TOGO",
@@ -278,16 +278,16 @@ CC = {
     "UG": "UGANDA",
     "UA": "UKRAINE",
     "AE": "UNITED ARAB EMIRATES",
-    "GB": "UNITED KINGDOM",
+    "GB": "UK",
-    "US": "UNITED STATES",
+    "US": "US",
     "UM": "UNITED STATES MINOR OUTLYING ISLANDS",
     "UY": "URUGUAY",
     "UZ": "UZBEKISTAN",
     "VU": "VANUATU",
-    "VE": "VENEZUELA, BOLIVARIAN REPUBLIC OF",
+    "VE": "VENEZUELA",
     "VN": "VIET NAM",
-    "VG": "VIRGIN ISLANDS, BRITISH",
+    "VG": "VIRGIN ISLANDS",
-    "VI": "VIRGIN ISLANDS, U.S.",
+    "VI": "VIRGIN ISLANDS",
     "WF": "WALLIS AND FUTUNA",
     "EH": "WESTERN SAHARA",
     "YE": "YEMEN",
@@ -394,7 +394,7 @@ class Corona(callbacks.Plugin):
                 data = csv.DictReader(data.iter_lines(decode_unicode = True))
         else:
             api = True
-            data = json.loads(data.content)
+            data = json.loads(data.content.decode())
             data = data.get('features')
             if not data:
                 log.debug("Corona: Error retrieving features data from API.")