test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refs #23919 -- Updated obsolete buffer() references to memoryview(). 

Obsolete since 8cdc84726e.
This commit is contained in:
Mariusz Felisiak 2022-10-13 19:49:57 +02:00 committed by GitHub
parent da2621c3df
commit 7c884afe5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
django/contrib/gis/geos/geometry.py
View File

@ -417,7 +417,7 @@ class GEOSGeometryBase(GEOSBase):
def wkb(self): def wkb(self):
""" """
Return the WKB (Well-Known Binary) representation of this Geometry Return the WKB (Well-Known Binary) representation of this Geometry
as a Python buffer. SRID and Z values are not included, use the as a Python memoryview. SRID and Z values are not included, use the
`ewkb` property instead. `ewkb` property instead.
""" """
return wkb_w(3 if self.hasz else 2).write(self) return wkb_w(3 if self.hasz else 2).write(self)
@ -425,7 +425,7 @@ class GEOSGeometryBase(GEOSBase):
@property @property
def ewkb(self): def ewkb(self):
""" """
Return the EWKB representation of this Geometry as a Python buffer. Return the EWKB representation of this Geometry as a Python memoryview.
This is an extension of the WKB specification that includes any SRID This is an extension of the WKB specification that includes any SRID
value that are a part of this geometry. value that are a part of this geometry.
""" """
@ -535,7 +535,7 @@ class GEOSGeometryBase(GEOSBase):
self, width, quadsegs=8, end_cap_style=1, join_style=1, mitre_limit=5.0 self, width, quadsegs=8, end_cap_style=1, join_style=1, mitre_limit=5.0
): ):
""" """
Same as buffer() but allows customizing the style of the buffer. Same as buffer() but allows customizing the style of the memoryview.
End cap style can be round (1), flat (2), or square (3). End cap style can be round (1), flat (2), or square (3).
Join style can be round (1), mitre (2), or bevel (3). Join style can be round (1), mitre (2), or bevel (3).
@ -721,7 +721,7 @@ class GEOSGeometry(GEOSGeometryBase, ListMixin):
- WKT - WKT
- HEXEWKB (a PostGIS-specific canonical form) - HEXEWKB (a PostGIS-specific canonical form)
- GeoJSON (requires GDAL) - GeoJSON (requires GDAL)
* buffer: * memoryview:
- WKB - WKB
The `srid` keyword specifies the Source Reference Identifier (SRID) The `srid` keyword specifies the Source Reference Identifier (SRID)
@ -751,7 +751,7 @@ class GEOSGeometry(GEOSGeometryBase, ListMixin):
# When the input is a pointer to a geometry (GEOM_PTR). # When the input is a pointer to a geometry (GEOM_PTR).
g = geo_input g = geo_input
elif isinstance(geo_input, memoryview): elif isinstance(geo_input, memoryview):
# When the input is a buffer (WKB). # When the input is a memoryview (WKB).
g = wkb_r().read(geo_input) g = wkb_r().read(geo_input)
elif isinstance(geo_input, GEOSGeometry): elif isinstance(geo_input, GEOSGeometry):
g = capi.geom_clone(geo_input.ptr) g = capi.geom_clone(geo_input.ptr)

10
docs/ref/contrib/gis/geos.txt
View File

@ -181,7 +181,7 @@ Geometry Objects
.. class:: GEOSGeometry(geo_input, srid=None) .. class:: GEOSGeometry(geo_input, srid=None)
:param geo_input: Geometry input value (string or buffer) :param geo_input: Geometry input value (string or :class:`memoryview`)
:param srid: spatial reference identifier :param srid: spatial reference identifier
:type srid: int :type srid: int
@ -206,14 +206,14 @@ The ``srid`` parameter, if given, is set as the SRID of the created geometry if
The following input formats, along with their corresponding Python types, The following input formats, along with their corresponding Python types,
are accepted: are accepted:
======================= ========== ======================= ==============
Format Input Type Format Input Type
======================= ========== ======================= ==============
WKT / EWKT ``str`` WKT / EWKT ``str``
HEX / HEXEWKB ``str`` HEX / HEXEWKB ``str``
WKB / EWKB ``buffer`` WKB / EWKB ``memoryview``
:rfc:`GeoJSON <7946>` ``str`` :rfc:`GeoJSON <7946>` ``str``
======================= ========== ======================= ==============
For the GeoJSON format, the SRID is set based on the ``crs`` member. If ``crs`` For the GeoJSON format, the SRID is set based on the ``crs`` member. If ``crs``
isn't provided, the SRID defaults to 4326. isn't provided, the SRID defaults to 4326.