type vs. geom_type with shapely (#488)

* resolve #487

* f-string format

* assert correction

Author: jGaboardi

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos: 
--   repo: https://github.com/psf/black
-    rev: 21.12b0
-    hooks:
-    - id: black
-      language_version: python3.9
+- repo: https://github.com/psf/black
+  rev: 22.10.0
+  hooks:
+  - id: black
+    language_version: python3

libpysal/examples/tests/test_available.py

@@ -5,49 +5,48 @@
 import unittest
 import pandas
 
-from .. import (available, get_url, load_example)
+from .. import available, get_url, load_example
 
 from ..base import get_data_home
 
 os_name = platform.system()
 
 
 class Testexamples(unittest.TestCase):
-
     def test_available(self):
         examples = available()
         self.assertEqual(type(examples), pandas.core.frame.DataFrame)
         self.assertEqual(examples.shape, (98, 3))
 
-    def test_data_home(self): 
+    def test_data_home(self):
         pth = get_data_home()
         head, tail = os.path.split(pth)
-        self.assertEqual(tail, 'pysal')
-        if os_name == 'Linux':
+        self.assertEqual(tail, "pysal")
+        if os_name == "Linux":
             heads = head.split("/")
-            self.assertEqual(heads[1], 'home')
-            self.assertEqual(heads[-1], 'share')
-            self.assertEqual(heads[-2], '.local')
-        elif os_name == 'Darwin':
+            self.assertEqual(heads[1], "home")
+            self.assertEqual(heads[-1], "share")
+            self.assertEqual(heads[-2], ".local")
+        elif os_name == "Darwin":
             heads = head.split("/")
-            self.assertEqual(heads[1], 'Users')
-            self.assertEqual(heads[-1], 'Application Support')
-            self.assertEqual(heads[-2], 'Library')
-        elif os_name == 'Windows':
+            self.assertEqual(heads[1], "Users")
+            self.assertEqual(heads[-1], "Application Support")
+            self.assertEqual(heads[-2], "Library")
+        elif os_name == "Windows":
             heads = head.split("\\")
-            self.assertEqual(heads[1], 'Users')
-            self.assertEqual(heads[-2], 'Local')
-            self.assertEqual(heads[-3], 'AppData')
+            self.assertEqual(heads[1], "Users")
+            self.assertEqual(heads[-2], "Local")
+            self.assertEqual(heads[-3], "AppData")
 
     def test_get_url(self):
-        self.assertEqual(get_url('10740'), None)
-        url = 'https://geodacenter.github.io/data-and-lab//data/baltimore.zip'
-        self.assertEqual(get_url('Baltimore'), url)
+        self.assertEqual(get_url("10740"), None)
+        url = "https://geodacenter.github.io/data-and-lab//data/baltimore.zip"
+        self.assertEqual(get_url("Baltimore"), url)
 
     def test_load_example(self):
         taz = load_example("taz")
         flist = taz.get_file_list()
-        self.assertEquals(len(flist), 4)
+        self.assertEqual(len(flist), 4)
 
 
 suite = unittest.TestLoader().loadTestsFromTestCase(Testexamples)

libpysal/weights/_contW_lists.py

@@ -20,20 +20,21 @@ def _get_boundary_points(shape):
     Recursively handle polygons vs. multipolygons to
     extract the boundary point set from each.
     """
-    if shape.type.lower() == "polygon":
+    if shape.geom_type.lower() == "polygon":
         shape = shape.boundary
         return _get_boundary_points(shape)
-    elif shape.type.lower() == "linestring":
+    elif shape.geom_type.lower() == "linestring":
         return list(map(tuple, list(zip(*shape.coords.xy))))
-    elif shape.type.lower() == "multilinestring":
+    elif shape.geom_type.lower() == "multilinestring":
         return list(it.chain(*(list(zip(*shape.coords.xy)) for shape in shape.geoms)))
-    elif shape.type.lower() == "multipolygon":
-        return list(it.chain(*(_get_boundary_points(part.boundary) for part in shape.geoms)))
+    elif shape.geom_type.lower() == "multipolygon":
+        return list(
+            it.chain(*(_get_boundary_points(part.boundary) for part in shape.geoms))
+        )
     else:
         raise TypeError(
             "Input shape must be a Polygon, Multipolygon, LineString, "
-            " or MultiLinestring and was "
-            " instead: {}".format(shape.type)
+            f" or MultiLinestring and was instead: {shape.type}"
         )
 
 
@@ -118,5 +119,5 @@ def jcontiguity(self):
                     except:
                         pass
         else:
-            raise Exception("Weight type {} Not Understood!".format(self.wttype))
+            raise Exception(f"Weight type {self.wttype} Not Understood!")
         self.w = w