format code

Author: UmanShahzad

ipinfo/details.py

@@ -15,7 +15,9 @@ def __getattr__(self, attr):
         if attr in self.details:
             return self.details[attr]
         else:
-            raise AttributeError("{} is not a valid attribute of Details".format(attr))
+            raise AttributeError(
+                "{} is not a valid attribute of Details".format(attr)
+            )
 
     @property
     def all(self):

ipinfo/handler.py

@@ -60,7 +60,9 @@ def getBatchDetails(self, ip_addresses):
         for ip_address in ip_addresses:
             # If the supplied IP address uses the objects defined in the built-in module ipaddress
             # extract the appropriate string notation before formatting the URL
-            if isinstance(ip_address, IPv4Address) or isinstance(ip_address, IPv6Address):
+            if isinstance(ip_address, IPv4Address) or isinstance(
+                ip_address, IPv6Address
+            ):
                 ip_address = ip_address.exploded
 
             if ip_address in self.cache:
@@ -99,7 +101,9 @@ def _requestDetails(self, ip_address=None):
 
         # If the supplied IP address uses the objects defined in the built-in module ipaddress
         # extract the appropriate string notation before formatting the URL
-        if isinstance(ip_address, IPv4Address) or isinstance(ip_address, IPv6Address):
+        if isinstance(ip_address, IPv4Address) or isinstance(
+            ip_address, IPv6Address
+        ):
             ip_address = ip_address.exploded
 
         if ip_address not in self.cache:

ipinfo/handler_async.py

@@ -49,7 +49,9 @@ async def getDetails(self, ip_address=None):
         # If the supplied IP address uses the objects defined in the built-in
         # module ipaddress, extract the appropriate string notation before
         # formatting the URL.
-        if isinstance(ip_address, IPv4Address) or isinstance(ip_address, IPv6Address):
+        if isinstance(ip_address, IPv4Address) or isinstance(
+            ip_address, IPv6Address
+        ):
             ip_address = ip_address.exploded
 
         if ip_address in self.cache:
@@ -81,7 +83,9 @@ async def getBatchDetails(self, ip_addresses):
             # If the supplied IP address uses the objects defined in the
             # built-in module ipaddress extract the appropriate string notation
             # before formatting the URL.
-            if isinstance(ip_address, IPv4Address) or isinstance(ip_address, IPv6Address):
+            if isinstance(ip_address, IPv4Address) or isinstance(
+                ip_address, IPv6Address
+            ):
                 ip_address = ip_address.exploded
 
             if ip_address in self.cache:
@@ -144,7 +148,10 @@ def _read_coords(self, location):
         return lat, lon
 
     def _read_country_names(self, countries_file=None):
-        """Read list of countries from specified country file or default 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__), self.COUNTRY_FILE_DEFAULT

scripts/fmt.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+DIR=`dirname $0`
+
+# Format the project.
+
+black -l 79 $DIR/../ipinfo $DIR/../tests

setup.py

@@ -18,7 +18,7 @@
     author_email="[email protected]",
     license="Apache License 2.0",
     packages=["ipinfo", "ipinfo.cache"],
-    install_requires=["requests", "cachetools"],
+    install_requires=["requests", "cachetools", "aiohttp<=4"],
     include_package_data=True,
     zip_safe=False,
 )

tests/handler_async_test.py

@@ -5,6 +5,7 @@
 from ipinfo.handler_async import AsyncHandler
 import pytest
 
+
 @pytest.mark.asyncio
 async def test_init():
     token = "mytesttoken"
@@ -27,7 +28,7 @@ async def test_headers():
 
 @pytest.mark.asyncio
 async def test_get_details():
-    token = os.environ.get('IPINFO_TOKEN', '')
+    token = os.environ.get("IPINFO_TOKEN", "")
     handler = AsyncHandler(token)
     details = await handler.getDetails("8.8.8.8")
     assert isinstance(details, Details)
@@ -62,7 +63,10 @@ async def test_get_details():
         assert privacy["hosting"] == False
 
         abuse = details.abuse
-        assert abuse["address"] == "US, CA, Mountain View, 1600 Amphitheatre Parkway, 94043"
+        assert (
+            abuse["address"]
+            == "US, CA, Mountain View, 1600 Amphitheatre Parkway, 94043"
+        )
         assert abuse["country"] == "US"
         assert abuse["email"] == "[email protected]"
         assert abuse["name"] == "Abuse"

tests/handler_test.py

@@ -26,7 +26,7 @@ def test_headers():
 
 
 def test_get_details():
-    token = os.environ.get('IPINFO_TOKEN', '')
+    token = os.environ.get("IPINFO_TOKEN", "")
     handler = Handler(token)
     details = handler.getDetails("8.8.8.8")
     assert isinstance(details, Details)
@@ -61,7 +61,10 @@ def test_get_details():
         assert privacy["hosting"] == False
 
         abuse = details.abuse
-        assert abuse["address"] == "US, CA, Mountain View, 1600 Amphitheatre Parkway, 94043"
+        assert (
+            abuse["address"]
+            == "US, CA, Mountain View, 1600 Amphitheatre Parkway, 94043"
+        )
         assert abuse["country"] == "US"
         assert abuse["email"] == "[email protected]"
         assert abuse["name"] == "Abuse"

tests/init_test.py

@@ -7,6 +7,7 @@ def test_get_handler():
     handler = ipinfo.getHandler()
     assert isinstance(handler, Handler)
 
+
 def test_get_handler_async():
     handler = ipinfo.getHandlerAsync()
     assert isinstance(handler, AsyncHandler)