corrige la geolocalisation des adresses IPv6

zestedesavoir · Jun 3, 2014 · f339ac2 · f339ac2
1 parent 450276e
commit f339ac2
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/zds/member/models.py b/zds/member/models.py
@@ -95,11 +95,17 @@ def get_absolute_url(self):
 
     def get_city(self):
         """return physical adress by geolocalisation."""
-        gic = pygeoip.GeoIP(
-            os.path.join(
-                settings.GEOIP_PATH,
-                'GeoLiteCity.dat'))
-        geo = gic.record_by_addr(self.last_ip_address)
+        if len(self.last_ip_address) <= 16:
+            gic = pygeoip.GeoIP(
+                os.path.join(
+                    settings.GEOIP_PATH,
+                    'GeoLiteCity.dat'))
+        else:
+            gic = pygeoip.GeoIP(
+                os.path.join(
+                    settings.GEOIP_PATH,
+                    'GeoLiteCityv6.dat'))
+        geo = gic.record_by_addr(self.last_ip_address)                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
 
         return u'{0} ({1}) : {2}'.format(
             geo['city'], geo['postal_code'], geo['country_name'])