formatted

Author: ExpDev07

app/location/__init__.py

@@ -52,11 +52,11 @@ def serialize(self):
         """
         return {
             # General info.
-            'id'                : self.id,
-            'country'           : self.country, 
-            'country_code'      : self.country_code,
-            'country_population': self.country_population,
-            'province'          : self.province,
+            "id": self.id,
+            "country": self.country,
+            "country_code": self.country_code,
+            "country_population": self.country_population,
+            "province": self.province,
             # Coordinates.
             "coordinates": self.coordinates.serialize(),
             # Last updated.

app/models/location.py

@@ -15,9 +15,9 @@ class Location(BaseModel):
     country: str
     country_code: str
     country_population: int = None
-    province: str = ''
-    county: str = ''
-    last_updated: str # TODO use datetime.datetime type.
+    province: str = ""
+    county: str = ""
+    last_updated: str  # TODO use datetime.datetime type.
     coordinates: Dict
     latest: Latest
     timelines: Timelines = {}

app/utils/countrycodes.py

@@ -377,5 +377,5 @@ def country_code(country):
         return is_3166_1[country]
 
     # Default to default_code.
-    print ("No country_code found for '" + country + "'. Using '" + default_code + "'")
+    print("No country_code found for '" + country + "'. Using '" + default_code + "'")
     return default_code

app/utils/populations.py

@@ -12,21 +12,22 @@ def fetch_populations():
     :returns: The mapping of populations.
     :rtype: dict
     """
-    print ("Fetching populations...")
+    print("Fetching populations...")
 
     # Mapping of populations
     mappings = {}
 
     # Fetch the countries.
-    countries = requests.get("http://api.geonames.org/countryInfoJSON?username=dperic").json()['geonames']
+    countries = requests.get("http://api.geonames.org/countryInfoJSON?username=dperic").json()["geonames"]
 
     # Go through all the countries and perform the mapping.
     for country in countries:
-        mappings.update({ country["countryCode"]: int(country["population"]) or None })
+        mappings.update({country["countryCode"]: int(country["population"]) or None})
 
     # Finally, return the mappings.
     return mappings
 
+
 # Mapping of alpha-2 codes country codes to population.
 populations = fetch_populations()
 
@@ -39,5 +40,3 @@ def country_population(country_code, default=None):
     :rtype: int
     """
     return populations.get(country_code, default)
-
-

tests/test_location.py

@@ -13,6 +13,7 @@ def __init__(self, latest):
 
     return TestTimeline(args[0])
 
+
 @pytest.mark.parametrize(
     "test_id, country, country_code, province, latitude, longitude, confirmed_latest, deaths_latest, recovered_latest",
     [
@@ -39,7 +40,7 @@ def test_location_class(
 
     # Timelines
     confirmed = timeline.Timeline(confirmed_latest)
-    deaths    = timeline.Timeline(deaths_latest)
+    deaths = timeline.Timeline(deaths_latest)
     recovered = timeline.Timeline(recovered_latest)
 
     # Date now.
@@ -51,4 +52,4 @@ def test_location_class(
     )
 
     assert location_obj.country_code == country_code
-    assert not location_obj.serialize() == None
+    assert not location_obj.serialize() == None