fmt

Author: rm-Umar

ipinfo/handler.py

@@ -43,11 +43,15 @@ def __init__(self, access_token=None, **kwargs):
         # load countries file
         self.countries = handler_utils.read_country_names(
             kwargs.get("countries_file")
+            if kwargs.get("countries_file")
+            else COUNTRY_FILE_DEFAULT
         )
 
         # load eu countries file
-        self.eu_countries = handler_utils.read_eu_country_names(
+        self.eu_countries = handler_utils.read_country_names(
             kwargs.get("eu_countries_file")
+            if kwargs.get("eu_countries_file")
+            else COUNTRY_EU_FILE_DEFAULT
         )
 
         # setup req opts
@@ -105,7 +109,9 @@ def getDetails(self, ip_address=None, timeout=None):
         details = response.json()
 
         # format & cache
-        handler_utils.format_details(details, self.countries,self.eu_countries)
+        handler_utils.format_details(
+            details, self.countries, self.eu_countries
+        )
         self.cache[cache_key(ip_address)] = details
 
         return Details(details)
@@ -221,7 +227,9 @@ def getBatchDetails(
             # format all
             for detail in result.values():
                 if isinstance(detail, dict):
-                    handler_utils.format_details(detail, self.countries,self.eu_countries)
+                    handler_utils.format_details(
+                        detail, self.countries, self.eu_countries
+                    )
 
         return result
 

ipinfo/handler_async.py

@@ -16,6 +16,7 @@
 from .exceptions import RequestQuotaExceededError, TimeoutExceededError
 from .handler_utils import (
     API_URL,
+    COUNTRY_EU_FILE_DEFAULT,
     COUNTRY_FILE_DEFAULT,
     BATCH_MAX_SIZE,
     CACHE_MAXSIZE,
@@ -43,11 +44,15 @@ def __init__(self, access_token=None, **kwargs):
         # load countries file
         self.countries = handler_utils.read_country_names(
             kwargs.get("countries_file")
+            if kwargs.get("countries_file")
+            else COUNTRY_FILE_DEFAULT
         )
 
         # load eu countries file
-        self.eu_countries = handler_utils.read_eu_country_names(
+        self.eu_countries = handler_utils.read_country_names(
             kwargs.get("eu_countries_file")
+            if kwargs.get("eu_countries_file")
+            else COUNTRY_EU_FILE_DEFAULT
         )
 
         # setup req opts
@@ -127,7 +132,9 @@ async def getDetails(self, ip_address=None, timeout=None):
             details = await resp.json()
 
         # format & cache
-        handler_utils.format_details(details, self.countries,self.eu_countries)
+        handler_utils.format_details(
+            details, self.countries, self.eu_countries
+        )
         self.cache[cache_key(ip_address)] = details
 
         return Details(details)
@@ -277,7 +284,9 @@ async def _do_batch_req(
         # format & fill up cache
         for ip_address, details in json_resp.items():
             if isinstance(details, dict):
-                handler_utils.format_details(details, self.countries,self.eu_countries)
+                handler_utils.format_details(
+                    details, self.countries, self.eu_countries
+                )
                 self.cache[cache_key(ip_address)] = details
 
         # merge cached results with new lookup

ipinfo/handler_utils.py

@@ -52,7 +52,7 @@ def get_headers(access_token):
     return headers
 
 
-def format_details(details, countries,eu_countries):
+def format_details(details, countries, eu_countries):
     """
     Format details given a countries object.
 
@@ -77,34 +77,17 @@ def read_coords(location):
     return lat, lon
 
 
-def read_country_names(countries_file=None):
+def read_country_names(countries_file):
     """
     Read list of countries from specified country file or
     default file.
     """
-    if not countries_file:
-        countries_file = os.path.join(
-            os.path.dirname(__file__), COUNTRY_FILE_DEFAULT
-        )
+    countries_file = os.path.join(os.path.dirname(__file__), countries_file)
     with open(countries_file) as f:
         countries_json = f.read()
 
     return json.loads(countries_json)
 
-def read_eu_country_names(eu_countries_file=None):
-    """
-    Read list of EU countries from specified country file or
-    default file.
-    """
-    if not eu_countries_file:
-        eu_countries_file = os.path.join(
-            os.path.dirname(__file__), COUNTRY_EU_FILE_DEFAULT
-        )
-    with open(eu_countries_file) as f:
-        eu_countries_json = f.read()
-
-    return json.loads(eu_countries_json)
-
 
 def return_or_fail(raise_on_fail, e, v):
     """