Skip to content

Pyshp 3.0.0 alpha the phantype menace #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JamesParrott merged 16 commits into from
Jul 28, 2025
Merged

Pyshp 3.0.0 alpha the phantype menace #337

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6454a3f
Move creation of shape record to use shapeType read for that shape., …
JamesParrott Jul 28, 2025
0e4ad17
Use the shapeType variable we just read
JamesParrott Jul 28, 2025
b2572e5
Refactor Reader.__shape into __read_shape_from_shp_file
JamesParrott Jul 28, 2025
bb75c01
Pass args of __shape to _read_shape_from_shp_file
JamesParrott Jul 28, 2025
91db4c2
Try to make fewer isinstance calls
JamesParrott Jul 28, 2025
092d2cd
Correct retvar name
JamesParrott Jul 28, 2025
aec4f52
Replace isinstance test with if ShapeClass is MultiPatch
JamesParrott Jul 28, 2025
b3cf1b8
Refactor into Shape class method
JamesParrott Jul 28, 2025
f425fe2
Restore necessary isinstance check
JamesParrott Jul 28, 2025
60a9137
Satisfy Pylint
JamesParrott Jul 28, 2025
232490f
Only call f.seek(next_shape) in _read_shape_from_shp_file
JamesParrott Jul 28, 2025
2073cb1
Don't need to set NullShape().points = [], it already is.
JamesParrott Jul 28, 2025
9201e48
Replace elif with if
JamesParrott Jul 28, 2025
b7302b6
Polymorphic! (Errors)
JamesParrott Jul 28, 2025
408c7d1
Don't overwrite user specified bbox with the one read from shp file
JamesParrott Jul 28, 2025
1b3751d
Merge pull request #11 from JamesParrott/A-little-polymorphism
JamesParrott Jul 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ load-plugins=[

# Silence warning: shapefile.py:2076:20: W0212: Access to a protected
# member _from_geojson of a client class (protected-access)
# shapefile.py:950:16: W0201: Attribute 'm' defined outside __init__ (attribute-defined-outside-init)
# 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)
Expand All @@ -133,6 +134,6 @@ load-plugins=[
# https://github.com/christopherpickering/pylint-per-file-ignores/issues/160
[tool.pylint.'messages control']
per-file-ignores = [
"/src/shapefile.py:W0212,R0902,R0903,R0904,R0911,R0912,R0913,R0914,R0915,R0917,R1732",
"/src/shapefile.py:W0212,W0201,R0902,R0903,R0904,R0911,R0912,R0913,R0914,R0915,R0917,R1732",
"test_shapefile.py:W0212,R1732",
]
Loading
Loading