test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #17066 -- Prevented TypeError in GeoIP.__del__ 

When garbaging GeoIP instances, it happens that GeoIP_delete is
already None.
Thanks mitar for the report and stefanw for tests.
This commit is contained in:
Claude Paroz 2013-02-15 17:12:14 +01:00
parent b19d83fc12
commit 35185495e3
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/gis/geoip/base.py
View File

@ -125,6 +125,8 @@ class GeoIP(object):
def __del__(self): def __del__(self):
# Cleaning any GeoIP file handles lying around. # Cleaning any GeoIP file handles lying around.
if GeoIP_delete is None:
return
if self._country: GeoIP_delete(self._country) if self._country: GeoIP_delete(self._country)
if self._city: GeoIP_delete(self._city) if self._city: GeoIP_delete(self._city)