Commit 4184d634 authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

Fixed #8680 -- Changed a couple of GEOExceptions to Python's RuntimeError so 

that help() works. Without this change, even if you didn't use the gis stuff,
just using Python 2.5's help() system would crash when searching for model
names.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8727 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent b2dd9c6f

django/contrib/gis/geos/libgeos.py

+2 −2
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ elif os.name == 'posix': 
    # *NIX libraries

    lib_names = ['geos_c']

else:

    raise GEOSException('Unsupported OS "%s"' % os.name)

    raise RuntimeError('Unsupported OS "%s"' % os.name)



# Using the ctypes `find_library` utility to find the the path to the GEOS 

# shared library.  This is better than manually specifiying each library name
@@ -47,7 +47,7 @@ if lib_names: 


# No GEOS library could be found.

if lib_path is None: 

    raise GEOSException('Could not find the GEOS library (tried "%s"). '

    raise RuntimeError('Could not find the GEOS library (tried "%s"). '

                        'Try setting GEOS_LIBRARY_PATH in your settings.' % 

                        '", "'.join(lib_names))