From cf7afeb2d18b22f857a35d5cb698e2c180aadd2f Mon Sep 17 00:00:00 2001 From: Florian Apolloner Date: Tue, 1 Jan 2013 12:24:02 +0100 Subject: [PATCH] Fixed a NameError in geoip/libgeoip if the GeoIP library is not found. Thx to Bouke Haarsma for the report. --- django/contrib/gis/geoip/libgeoip.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django/contrib/gis/geoip/libgeoip.py b/django/contrib/gis/geoip/libgeoip.py index 613949f8096..e9e7cd7fe97 100644 --- a/django/contrib/gis/geoip/libgeoip.py +++ b/django/contrib/gis/geoip/libgeoip.py @@ -19,8 +19,8 @@ else: # Getting the path to the GeoIP library. if lib_name: lib_path = find_library(lib_name) -if lib_path is None: raise GeoIPException('Could not find the GeoIP library (tried "%s"). ' - 'Try setting GEOIP_LIBRARY_PATH in your settings.' % lib_name) +if lib_path is None: raise RuntimeError('Could not find the GeoIP library (tried "%s"). ' + 'Try setting GEOIP_LIBRARY_PATH in your settings.' % lib_name) lgeoip = CDLL(lib_path) # Getting the C `free` for the platform.