diff options
| -rw-r--r-- | django/contrib/gis/geos/prototypes/__init__.py | 9 | ||||
| -rw-r--r-- | django/contrib/gis/geos/prototypes/geom.py | 10 |
2 files changed, 4 insertions, 15 deletions
diff --git a/django/contrib/gis/geos/prototypes/__init__.py b/django/contrib/gis/geos/prototypes/__init__.py index 0357b8110e..18eae1d31a 100644 --- a/django/contrib/gis/geos/prototypes/__init__.py +++ b/django/contrib/gis/geos/prototypes/__init__.py @@ -10,11 +10,10 @@ from django.contrib.gis.geos.prototypes.coordseq import ( # NOQA ) from django.contrib.gis.geos.prototypes.geom import ( # NOQA create_collection, create_empty_polygon, create_linearring, - create_linestring, create_point, create_polygon, destroy_geom, from_hex, - from_wkb, from_wkt, geom_clone, geos_get_srid, geos_normalize, - geos_set_srid, geos_type, geos_typeid, get_dims, get_extring, get_geomn, - get_intring, get_nrings, get_num_coords, get_num_geoms, to_hex, to_wkb, - to_wkt, + create_linestring, create_point, create_polygon, destroy_geom, geom_clone, + geos_get_srid, geos_normalize, geos_set_srid, geos_type, geos_typeid, + get_dims, get_extring, get_geomn, get_intring, get_nrings, get_num_coords, + get_num_geoms, ) from django.contrib.gis.geos.prototypes.misc import * # NOQA from django.contrib.gis.geos.prototypes.predicates import ( # NOQA diff --git a/django/contrib/gis/geos/prototypes/geom.py b/django/contrib/gis/geos/prototypes/geom.py index c978cf9f6c..d90bd32cf2 100644 --- a/django/contrib/gis/geos/prototypes/geom.py +++ b/django/contrib/gis/geos/prototypes/geom.py @@ -68,16 +68,6 @@ class StringFromGeom(GEOSFuncFactory): # ### ctypes prototypes ### -# Deprecated creation routines from WKB, HEX, WKT -from_hex = BinConstructor('GEOSGeomFromHEX_buf') -from_wkb = BinConstructor('GEOSGeomFromWKB_buf') -from_wkt = GeomOutput('GEOSGeomFromWKT', [c_char_p]) - -# Deprecated output routines -to_hex = BinOutput('GEOSGeomToHEX_buf') -to_wkb = BinOutput('GEOSGeomToWKB_buf') -to_wkt = StringFromGeom('GEOSGeomToWKT') - # The GEOS geometry type, typeid, num_coordinates and number of geometries geos_normalize = IntFromGeom('GEOSNormalize') geos_type = StringFromGeom('GEOSGeomType') |