Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit a33b087

Browse files
karimbahgatkarimbahgat
committed
Fixed attribute typo in shape writing exceptions
1 parent b472337 commit a33b087

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

‎shapefile.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,7 +1129,7 @@ def __shpRecord(self, s):
11291129
try:
11301130
f.write(pack("<4d", *self.__bbox(s)))
11311131
except error:
1132-
raise ShapefileException("Failed to write bounding box for record %s. Expected floats." % recNum)
1132+
raise ShapefileException("Failed to write bounding box for record %s. Expected floats." % self.shpNum)
11331133
# Shape types with parts
11341134
if s.shapeType in (3,5,13,15,23,25,31):
11351135
# Number of parts
@@ -1151,14 +1151,14 @@ def __shpRecord(self, s):
11511151
try:
11521152
[f.write(pack("<2d", *p[:2])) for p in s.points]
11531153
except error:
1154-
raise ShapefileException("Failed to write points for record %s. Expected floats." % recNum)
1154+
raise ShapefileException("Failed to write points for record %s. Expected floats." % self.shpNum)
11551155
# Write z extremes and values
11561156
# Note: missing z values are autoset to 0, but not sure if this is ideal.
11571157
if s.shapeType in (13,15,18,31):
11581158
try:
11591159
f.write(pack("<2d", *self.__zbox(s)))
11601160
except error:
1161-
raise ShapefileException("Failed to write elevation extremes for record %s. Expected floats." % recNum)
1161+
raise ShapefileException("Failed to write elevation extremes for record %s. Expected floats." % self.shpNum)
11621162
try:
11631163
if hasattr(s,"z"):
11641164
# if z values are stored in attribute
@@ -1167,15 +1167,15 @@ def __shpRecord(self, s):
11671167
# if z values are stored as 3rd dimension
11681168
[f.write(pack("<d", p[2] if len(p) > 2 else 0)) for p in s.points]
11691169
except error:
1170-
raise ShapefileException("Failed to write elevation values for record %s. Expected floats." % recNum)
1170+
raise ShapefileException("Failed to write elevation values for record %s. Expected floats." % self.shpNum)
11711171
# Write m extremes and values
11721172
# When reading a file, pyshp converts NODATA m values to None, so here we make sure to convert them back to NODATA
11731173
# Note: missing m values are autoset to NODATA.
11741174
if s.shapeType in (13,15,18,23,25,28,31):
11751175
try:
11761176
f.write(pack("<2d", *self.__mbox(s)))
11771177
except error:
1178-
raise ShapefileException("Failed to write measure extremes for record %s. Expected floats" % recNum)
1178+
raise ShapefileException("Failed to write measure extremes for record %s. Expected floats" % self.shpNum)
11791179
try:
11801180
if hasattr(s,"m"):
11811181
# if m values are stored in attribute
@@ -1186,13 +1186,13 @@ def __shpRecord(self, s):
11861186
mpos = 3 if s.shapeType in (13,15,18,31) else 2
11871187
[f.write(pack("<d", p[mpos] if len(p) > mpos and p[mpos] is not None else NODATA)) for p in s.points]
11881188
except error:
1189-
raise ShapefileException("Failed to write measure values for record %s. Expected floats" % recNum)
1189+
raise ShapefileException("Failed to write measure values for record %s. Expected floats" % self.shpNum)
11901190
# Write a single point
11911191
if s.shapeType in (1,11,21):
11921192
try:
11931193
f.write(pack("<2d", s.points[0][0], s.points[0][1]))
11941194
except error:
1195-
raise ShapefileException("Failed to write point for record %s. Expected floats." % recNum)
1195+
raise ShapefileException("Failed to write point for record %s. Expected floats." % self.shpNum)
11961196
# Write a single Z value
11971197
# Note: missing z values are autoset to 0, but not sure if this is ideal.
11981198
if s.shapeType == 11:
@@ -1206,15 +1206,15 @@ def __shpRecord(self, s):
12061206
s.z = (0,)
12071207
f.write(pack("<d", s.z[0]))
12081208
except error:
1209-
raise ShapefileException("Failed to write elevation value for record %s. Expected floats." % recNum)
1209+
raise ShapefileException("Failed to write elevation value for record %s. Expected floats." % self.shpNum)
12101210
else:
12111211
# if z values are stored as 3rd dimension
12121212
try:
12131213
if len(s.points[0])<3:
12141214
s.points[0].append(0)
12151215
f.write(pack("<d", s.points[0][2]))
12161216
except error:
1217-
raise ShapefileException("Failed to write elevation value for record %s. Expected floats." % recNum)
1217+
raise ShapefileException("Failed to write elevation value for record %s. Expected floats." % self.shpNum)
12181218
# Write a single M value
12191219
# Note: missing m values are autoset to NODATA.
12201220
if s.shapeType in (11,21):
@@ -1228,7 +1228,7 @@ def __shpRecord(self, s):
12281228
s.m = (NODATA,)
12291229
f.write(pack("<1d", s.m[0]))
12301230
except error:
1231-
raise ShapefileException("Failed to write measure value for record %s. Expected floats." % recNum)
1231+
raise ShapefileException("Failed to write measure value for record %s. Expected floats." % self.shpNum)
12321232
else:
12331233
# if m values are stored as 3rd/4th dimension
12341234
# 0-index position of m value is 3 if z type (x,y,z,m), or 2 if m type (x,y,m)
@@ -1238,7 +1238,7 @@ def __shpRecord(self, s):
12381238
s.points[0].append(NODATA)
12391239
f.write(pack("<1d", s.points[0][mpos]))
12401240
except error:
1241-
raise ShapefileException("Failed to write measure value for record %s. Expected floats." % recNum)
1241+
raise ShapefileException("Failed to write measure value for record %s. Expected floats." % self.shpNum)
12421242
# Finalize record length as 16-bit words
12431243
finish = f.tell()
12441244
length = (finish - start) // 2

‎shapefile.pyc

-51 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)