Use isinstance for type checking

Via `ast-grep run --pattern 'type($A) == $B' --rewrite 'isinstance($A, $B)' -iU tests`

Author: akx

tests/models_test.py

@@ -88,28 +88,30 @@ def test_insights_full(self) -> None:
         }
 
         model = geoip2.models.Insights(raw)
-        assert type(model) == geoip2.models.Insights, "geoip2.models.Insights object"
-        assert type(model.city) == geoip2.records.City, "geoip2.records.City object"
-        assert (
-            type(model.continent) == geoip2.records.Continent
+        assert isinstance(
+            model, geoip2.models.Insights
+        ), "geoip2.models.Insights object"
+        assert isinstance(model.city, geoip2.records.City), "geoip2.records.City object"
+        assert isinstance(
+            model.continent, geoip2.records.Continent
         ), "geoip2.records.Continent object"
-        assert (
-            type(model.country) == geoip2.records.Country
+        assert isinstance(
+            model.country, geoip2.records.Country
         ), "geoip2.records.Country object"
-        assert (
-            type(model.registered_country) == geoip2.records.Country
+        assert isinstance(
+            model.registered_country, geoip2.records.Country
         ), "geoip2.records.Country object"
-        assert (
-            type(model.represented_country) == geoip2.records.RepresentedCountry
+        assert isinstance(
+            model.represented_country, geoip2.records.RepresentedCountry
         ), "geoip2.records.RepresentedCountry object"
-        assert (
-            type(model.location) == geoip2.records.Location
+        assert isinstance(
+            model.location, geoip2.records.Location
         ), "geoip2.records.Location object"
-        assert (
-            type(model.subdivisions[0]) == geoip2.records.Subdivision
+        assert isinstance(
+            model.subdivisions[0], geoip2.records.Subdivision
         ), "geoip2.records.Subdivision object"
-        assert (
-            type(model.traits) == geoip2.records.Traits
+        assert isinstance(
+            model.traits, geoip2.records.Traits
         ), "geoip2.records.Traits object"
         assert model.raw == raw, "raw method returns raw input"
         assert model.subdivisions[0].iso_code == "MN", "div 1 has correct iso_code"
@@ -165,25 +167,27 @@ def test_insights_full(self) -> None:
 
     def test_insights_min(self) -> None:
         model = geoip2.models.Insights({"traits": {"ip_address": "5.6.7.8"}})
-        assert type(model) == geoip2.models.Insights, "geoip2.models.Insights object"
-        assert type(model.city) == geoip2.records.City, "geoip2.records.City object"
-        assert (
-            type(model.continent) == geoip2.records.Continent
+        assert isinstance(
+            model, geoip2.models.Insights
+        ), "geoip2.models.Insights object"
+        assert isinstance(model.city, geoip2.records.City), "geoip2.records.City object"
+        assert isinstance(
+            model.continent, geoip2.records.Continent
         ), "geoip2.records.Continent object"
-        assert (
-            type(model.country) == geoip2.records.Country
+        assert isinstance(
+            model.country, geoip2.records.Country
         ), "geoip2.records.Country object"
-        assert (
-            type(model.registered_country) == geoip2.records.Country
+        assert isinstance(
+            model.registered_country, geoip2.records.Country
         ), "geoip2.records.Country object"
-        assert (
-            type(model.location) == geoip2.records.Location
+        assert isinstance(
+            model.location, geoip2.records.Location
         ), "geoip2.records.Location object"
-        assert (
-            type(model.traits) == geoip2.records.Traits
+        assert isinstance(
+            model.traits, geoip2.records.Traits
         ), "geoip2.records.Traits object"
-        assert (
-            type(model.subdivisions.most_specific) == geoip2.records.Subdivision
+        assert isinstance(
+            model.subdivisions.most_specific, geoip2.records.Subdivision
         ), "geoip2.records.Subdivision object returned evenwhen none are available."
         assert model.subdivisions.most_specific.names == {}, "Empty names hash returned"
 
@@ -210,22 +214,22 @@ def test_city_full(self) -> None:
             },
         }
         model = geoip2.models.City(raw)
-        assert type(model) == geoip2.models.City, "geoip2.models.City object"
-        assert type(model.city) == geoip2.records.City, "geoip2.records.City object"
-        assert (
-            type(model.continent) == geoip2.records.Continent
+        assert isinstance(model, geoip2.models.City), "geoip2.models.City object"
+        assert isinstance(model.city, geoip2.records.City), "geoip2.records.City object"
+        assert isinstance(
+            model.continent, geoip2.records.Continent
         ), "geoip2.records.Continent object"
-        assert (
-            type(model.country) == geoip2.records.Country
+        assert isinstance(
+            model.country, geoip2.records.Country
         ), "geoip2.records.Country object"
-        assert (
-            type(model.registered_country) == geoip2.records.Country
+        assert isinstance(
+            model.registered_country, geoip2.records.Country
         ), "geoip2.records.Country object"
-        assert (
-            type(model.location) == geoip2.records.Location
+        assert isinstance(
+            model.location, geoip2.records.Location
         ), "geoip2.records.Location object"
-        assert (
-            type(model.traits) == geoip2.records.Traits
+        assert isinstance(
+            model.traits, geoip2.records.Traits
         ), "geoip2.records.Traits object"
         assert model.raw == raw, "raw method returns raw input"
         assert model.continent.geoname_id == 42, "continent geoname_id is 42"

tests/webservice_test.py

@@ -70,7 +70,9 @@ def test_country_ok(self):
             content_type=self._content_type("country"),
         )
         country = self.run_client(self.client.country("1.2.3.4"))
-        assert type(country) == geoip2.models.Country, "return value of client.country"
+        assert isinstance(
+            country, geoip2.models.Country
+        ), "return value of client.country"
         assert country.continent.geoname_id == 42, "continent geoname_id is 42"
         assert country.continent.code == "NA", "continent code is NA"
         assert (
@@ -104,12 +106,12 @@ def test_me(self):
             content_type=self._content_type("country"),
         )
         implicit_me = self.run_client(self.client.country())
-        assert (
-            type(implicit_me) == geoip2.models.Country
+        assert isinstance(
+            implicit_me, geoip2.models.Country
         ), "country() returns Country object"
         explicit_me = self.run_client(self.client.country())
-        assert (
-            type(explicit_me) == geoip2.models.Country
+        assert isinstance(
+            explicit_me, geoip2.models.Country
         ), "country('me') returns Country object"
 
     def test_200_error(self):
@@ -293,7 +295,7 @@ def test_city_ok(self):
             content_type=self._content_type("city"),
         )
         city = self.run_client(self.client.city("1.2.3.4"))
-        assert type(city) == geoip2.models.City, "return value of client.city"
+        assert isinstance(city, geoip2.models.City), "return value of client.city"
         assert city.traits.network == ipaddress.ip_network("1.2.3.0/24"), "network"
         assert city.traits.is_anycast
 
@@ -306,8 +308,8 @@ def test_insights_ok(self):
             content_type=self._content_type("insights"),
         )
         insights = self.run_client(self.client.insights("1.2.3.4"))
-        assert (
-            type(insights) == geoip2.models.Insights
+        assert isinstance(
+            insights, geoip2.models.Insights
         ), "return value of client.insights"
         assert insights.traits.network == ipaddress.ip_network("1.2.3.0/24"), "network"
         assert insights.traits.is_anycast