innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Got rid of Python 2.3 compatibility global, and thus `OGRGeomType` import wrapping with try/except no longer necessary. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12301 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Justin Bronn 2010-01-27 03:01:13 +00:00
parent 474ce51ffd
commit f9f04a49e8
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
django/contrib/gis/gdal/__init__.py
View File

@ -13,7 +13,7 @@
Envelope: A ctypes structure for bounding boxes (GDAL library Envelope: A ctypes structure for bounding boxes (GDAL library
not required). not required).
OGRGeometry: Layer for accessing OGR Geometry objects. OGRGeometry: Object for accessing OGR Geometry functionality.
OGRGeomType: A class for representing the different OGR Geometry OGRGeomType: A class for representing the different OGR Geometry
types (GDAL library not required). types (GDAL library not required).
@ -31,8 +31,6 @@
to a non-existant file location (e.g., `GDAL_LIBRARY_PATH='/null/path'`; to a non-existant file location (e.g., `GDAL_LIBRARY_PATH='/null/path'`;
setting to None/False/'' will not work as a string must be given). setting to None/False/'' will not work as a string must be given).
""" """
import sys
# Attempting to import objects that depend on the GDAL library. The # Attempting to import objects that depend on the GDAL library. The
# HAS_GDAL flag will be set to True if the library is present on # HAS_GDAL flag will be set to True if the library is present on
# the system. # the system.
@ -46,14 +44,11 @@ try:
except: except:
HAS_GDAL, GEOJSON = False, False HAS_GDAL, GEOJSON = False, False
# The envelope, error, and geomtype modules do not actually require the try:
# GDAL library, but still nead at least Python 2.4 and ctypes.
PYTHON23 = sys.version_info[0] == 2 and sys.version_info[1] == 3
if not PYTHON23:
try:
from django.contrib.gis.gdal.envelope import Envelope from django.contrib.gis.gdal.envelope import Envelope
from django.contrib.gis.gdal.error import check_err, OGRException, OGRIndexError, SRSException except ImportError:
from django.contrib.gis.gdal.geomtype import OGRGeomType
except ImportError:
# No ctypes, but don't raise an exception. # No ctypes, but don't raise an exception.
pass pass
from django.contrib.gis.gdal.error import check_err, OGRException, OGRIndexError, SRSException
from django.contrib.gis.gdal.geomtype import OGRGeomType