Commit cc971910 authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

Changed [8727] to use ImportError, which seems to actually work. Not sure what 

I was smoking when I tested this 10 minutes ago. Refs #8680. Thanks to gkelly
for cleaning up after me.


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

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 RuntimeError('Unsupported OS "%s"' % os.name)

    raise ImportError('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 RuntimeError('Could not find the GEOS library (tried "%s"). '

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

                        'Try setting GEOS_LIBRARY_PATH in your settings.' % 

                        '", "'.join(lib_names))