Moved country codes to be provided by singleton

app/location/__init__.py

@@ -1,6 +1,6 @@
 """app.location"""
 from ..coordinates import Coordinates
-from ..utils import countries
+from ..utils.countries import CountryCodeProvider
 from ..utils.populations import country_population
 
 
@@ -27,6 +27,9 @@ def __init__(
         self.deaths = deaths
         self.recovered = recovered
 
+        #country data
+        self.country_code_provider = CountryCodeProvider()
+
     @property
     def country_code(self):
         """
@@ -35,7 +38,7 @@ def country_code(self):
         :returns: The country code.
         :rtype: str
         """
-        return (countries.country_code(self.country) or countries.DEFAULT_COUNTRY_CODE).upper()
+        return (self.country_code_provider.country_code(self.country) or self.country_code_provider.DEFAULT_COUNTRY_CODE).upper()
 
     @property
     def country_population(self):

app/services/location/jhu.py

@@ -12,14 +12,14 @@
 from ...coordinates import Coordinates
 from ...location import TimelinedLocation
 from ...models import Timeline
-from ...utils import countries
+from ...utils.countries import CountryCodeProvider
 from ...utils import date as date_util
 from ...utils import httputils
 from . import LocationService
 
 LOGGER = logging.getLogger("services.location.jhu")
 PID = os.getpid()
-
+country_code_provider = CountryCodeProvider()
 
 class JhuLocationService(LocationService):
     """
@@ -98,7 +98,7 @@ async def get_category(category):
                 {
                     # General info.
                     "country": country,
-                    "country_code": countries.country_code(country),
+                    "country_code": country_code_provider.country_code(country),
                     "province": item["Province/State"],
                     # Coordinates.
                     "coordinates": {"lat": item["Lat"], "long": item["Long"],},