Browse Source

Removed unused prototypes for deprecated GEOS functions.

Sergey Fedoseev 7 years ago
parent
commit
2d18c60fbb

+ 4 - 5
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

+ 0 - 10
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')