Skip to content

Commit 5805073

Browse files
mrocklinjorisvandenbossche
authored andcommitted
Rename GeometryArray.parent to GeometryArray.base
This matches conventions set by NumPy
1 parent 6c40931 commit 5805073

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

geopandas/array.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ class GeometryArray(ExtensionArray):
372372
"""
373373
_dtype = GeometryDtype()
374374

375-
def __init__(self, data, parent=False):
375+
def __init__(self, data, base=False):
376376
if isinstance(data, self.__class__):
377377
data = data.data
378378
elif not isinstance(data, np.ndarray):
@@ -384,7 +384,7 @@ def __init__(self, data, parent=False):
384384
raise ValueError(
385385
"'data' should be a 1-dimensional array of geometry objects.")
386386
self.data = data
387-
self.parent = parent
387+
self.base = base
388388

389389
@property
390390
def dtype(self):
@@ -397,7 +397,7 @@ def __getitem__(self, idx):
397397
if isinstance(idx, numbers.Integral):
398398
return vectorized.get_element(self.data, idx)
399399
elif isinstance(idx, (Iterable, slice)):
400-
return GeometryArray(self.data[idx], parent=self)
400+
return GeometryArray(self.data[idx], base=self)
401401
else:
402402
raise TypeError("Index type not supported", idx)
403403

@@ -431,7 +431,7 @@ def size(self):
431431
return len(self.data)
432432

433433
def __del__(self):
434-
if self.parent is False:
434+
if self.base is False:
435435
vectorized.vec_free(self.data)
436436

437437
def copy(self, *args, **kwargs):
@@ -517,7 +517,7 @@ def __getstate__(self):
517517
def __setstate__(self, state):
518518
geoms = vectorized.deserialize(*state)
519519
self.data = geoms
520-
self.parent = None
520+
self.base = None
521521

522522
# -------------------------------------------------------------------------
523523
# Geometry related methods
@@ -589,7 +589,7 @@ def envelope(self):
589589
def exterior(self):
590590
out = vectorized.geo_unary_op('exterior', self.data)
591591
# exterior shares data with self
592-
return GeometryArray(out, parent=self)
592+
return GeometryArray(out, base=self)
593593

594594
@property
595595
def interiors(self):

0 commit comments

Comments
 (0)