Permalink
Browse files

[1.6.x] Fixed #21996 -- Used proper encoding for GeoIP content

Thanks Florent Messa for the report.
Backport of fb1e343 from master.
  • Loading branch information...
1 parent e9ffe7e commit 76700c5437d4b5187f58a3f99104f45002d1524e @claudep claudep committed Feb 10, 2014
Showing with 8 additions and 3 deletions.
  1. +3 −2 django/contrib/gis/geoip/prototypes.py
  2. +2 −0 django/contrib/gis/geoip/tests.py
  3. +3 −1 docs/releases/1.6.3.txt
@@ -22,6 +22,7 @@ class GeoIPRecord(Structure):
('continent_code', c_char_p),
]
geoip_char_fields = [name for name, ctype in GeoIPRecord._fields_ if ctype is c_char_p]
+GEOIP_DEFAULT_ENCODING = 'iso-8859-1'
geoip_encodings = { 0: 'iso-8859-1',
1: 'utf8',
}
@@ -92,7 +93,7 @@ def check_string(result, func, cargs):
free(result)
else:
s = ''
- return s.decode()
+ return s.decode(GEOIP_DEFAULT_ENCODING)
GeoIP_database_info = lgeoip.GeoIP_database_info
GeoIP_database_info.restype = geoip_char_p
@@ -102,7 +103,7 @@ def check_string(result, func, cargs):
def string_output(func):
def _err_check(result, func, cargs):
if result:
- return result.decode()
+ return result.decode(GEOIP_DEFAULT_ENCODING)
return result
func.restype = c_char_p
func.errcheck = _err_check
@@ -118,3 +118,5 @@ def test05_unicode_response(self):
g = GeoIP()
d = g.city("www.osnabrueck.de")
self.assertEqual('Osnabrück', d['city'])
+ d = g.country('200.7.49.81')
+ self.assertEqual('Curaçao', d['country_name'])
@@ -7,4 +7,6 @@ Django 1.6.3 release notes
This is Django 1.6.3, a bugfix release for Django 1.6. Django 1.6.3 fixes
several bugs in 1.6.2:
-* ...
+* Content retrieved from the GeoIP library is now properly decoded from its
+ default ``iso-8859-1`` encoding
+ (`#21996 <http://code.djangoproject.com/ticket/21996>`_).

0 comments on commit 76700c5

Please sign in to comment.