Add a gen exp and a contains test, and suppress weird yield next() issue

Author: JamesParrott

pyproject.toml

@@ -115,14 +115,29 @@ load-plugins=[
 [tool.pylint.'MESSAGES CONTROL']
 # Silence warning: shapefile.py:2076:20: W0212: Access to a protected
 #                  member _from_geojson of a client class (protected-access)
-#
+# Silence remarks:
+# src\shapefile.py:338:0: R0914: Too many local variables (21/15) (too-many-locals)
+# src\shapefile.py:338:0: R0912: Too many branches (24/12) (too-many-branches)
+# src\shapefile.py:338:0: R0915: Too many statements (52/50) (too-many-statements)
+# src\shapefile.py:470:0: R0902: Too many instance attributes (9/7) (too-many-instance-attributes)
+# src\shapefile.py:471:4: R0913: Too many arguments (6/5) (too-many-arguments)
+# src\shapefile.py:471:4: R0917: Too many positional arguments (6/5) (too-many-positional-arguments)
+# src\shapefile.py:506:4: R0911: Too many return statements (10/6) (too-many-return-statements)
+# src\shapefile.py:878:0: R0903: Too few public methods (0/2) (too-few-public-methods)
 # Silence warnings: test_shapefile.py:{783,786,799,803,06,1195}:19:
 #                   W0212: Access to a protected member _offsets of a
 #                   client class (protected-access)
 #
 # Toml multi-line string used instead of array due to:
 # https://github.com/christopherpickering/pylint-per-file-ignores/issues/160
-per-file-ignores = """
-    shapefile.py:W0212
-    test_shapefile.py:W0212
-"""
+per-file-ignores = [
+    "src/shapefile.py:W0212",
+    "src/shapefile.py:R0902",
+    "src/shapefile.py:R0903",
+    "src/shapefile.py:R0911",
+    "src/shapefile.py:R0912",
+    "src/shapefile.py:R0914",
+    "src/shapefile.py:R0915",
+    "src/shapefile.py:R0917",
+    "test_shapefile.py:W0212",
+]

src/shapefile.py

@@ -2314,7 +2314,7 @@ def __dbfHeader(self):
             raise ShapefileException(
                 "Shapefile dbf header length exceeds maximum length."
             )
-        recordLength = sum([int(field[2]) for field in fields]) + 1
+        recordLength = sum(int(field[2]) for field in fields) + 1
         header = pack(
             "<BBBBLHH20x",
             version,
@@ -2371,7 +2371,7 @@ def __shpRecord(self, s):
         # Shape Type
         if self.shapeType is None and s.shapeType != NULL:
             self.shapeType = s.shapeType
-        if s.shapeType != NULL and s.shapeType != self.shapeType:
+        if not s.shapeType in {NULL, self.shapeType}:
             raise ShapefileException(
                 f"The shape's type ({s.shapeType}) must match "
                 f"the type of the shapefile ({self.shapeType})."
@@ -2883,7 +2883,7 @@ def _filter_network_doctests(
 
     examples_it = iter(examples)
 
-    yield next(examples_it)
+    yield next(examples_it)  # pylint: disable=stop-iteration-return
 
     for example in examples_it:
         # Track variables in doctest shell sessions defined from commands