rename read_countries_file to read_json_file

Author: UmanShahzad

ipinfo/handler.py

@@ -41,14 +41,14 @@ def __init__(self, access_token=None, **kwargs):
         self.access_token = access_token
 
         # load countries file
-        self.countries = handler_utils.read_country_names(
+        self.countries = handler_utils.read_json_file(
             kwargs.get("countries_file")
             if kwargs.get("countries_file")
             else COUNTRY_FILE_DEFAULT
         )
 
         # load eu countries file
-        self.eu_countries = handler_utils.read_country_names(
+        self.eu_countries = handler_utils.read_json_file(
             kwargs.get("eu_countries_file")
             if kwargs.get("eu_countries_file")
             else COUNTRY_EU_FILE_DEFAULT

ipinfo/handler_async.py

@@ -42,14 +42,14 @@ def __init__(self, access_token=None, **kwargs):
         self.access_token = access_token
 
         # load countries file
-        self.countries = handler_utils.read_country_names(
+        self.countries = handler_utils.read_json_file(
             kwargs.get("countries_file")
             if kwargs.get("countries_file")
             else COUNTRY_FILE_DEFAULT
         )
 
         # load eu countries file
-        self.eu_countries = handler_utils.read_country_names(
+        self.eu_countries = handler_utils.read_json_file(
             kwargs.get("eu_countries_file")
             if kwargs.get("eu_countries_file")
             else COUNTRY_EU_FILE_DEFAULT

ipinfo/handler_utils.py

@@ -55,8 +55,6 @@ def get_headers(access_token):
 def format_details(details, countries, eu_countries):
     """
     Format details given a countries object.
-
-    The countries object can be retrieved from read_country_names.
     """
     details["country_name"] = countries.get(details.get("country"))
     details["isEU"] = details.get("country") in eu_countries
@@ -77,13 +75,12 @@ def read_coords(location):
     return lat, lon
 
 
-def read_country_names(countries_file):
+def read_json_file(json_file):
     """
-    Read list of countries from specified country file or
-    default file.
+    Read a list of countries from specified country file or default file.
     """
-    countries_file = os.path.join(os.path.dirname(__file__), countries_file)
-    with open(countries_file) as f:
+    json_file = os.path.join(os.path.dirname(__file__), json_file)
+    with open(json_file) as f:
         countries_json = f.read()
 
     return json.loads(countries_json)