Commit d40a38b3 authored by Sergey Fedoseev's avatar Sergey Fedoseev Committed by Tim Graham
Browse files

Unwrapped gdal.Envelope import from try-except as fail of `import ctypes` is not expected.

parent 10427646
Loading
Loading
Loading
Loading
+2 −8
Original line number Diff line number Diff line
@@ -31,13 +31,14 @@
 to a non-existent file location (e.g., `GDAL_LIBRARY_PATH='/null/path'`;
 setting to None/False/'' will not work as a string must be given).
"""
from django.contrib.gis.gdal.envelope import Envelope
from django.contrib.gis.gdal.error import (  # NOQA
    GDALException, OGRException, OGRIndexError, SRSException, check_err,
)
from django.contrib.gis.gdal.geomtype import OGRGeomType  # NOQA

__all__ = [
    'check_err', 'GDALException', 'OGRException', 'OGRIndexError',
    'check_err', 'Envelope', 'GDALException', 'OGRException', 'OGRIndexError',
    'SRSException', 'OGRGeomType', 'HAS_GDAL',
]

@@ -59,10 +60,3 @@ try:
    ]
except GDALException:
    HAS_GDAL = False

try:
    from django.contrib.gis.gdal.envelope import Envelope
    __all__ += ['Envelope']
except ImportError:
    # No ctypes, but don't raise an exception.
    pass