Merge pull request #754 from zeehio/patch-1

Avoid 500 server error with IPv6 addresses (GeoIP)
metashare · Oct 28, 2014 · 1512cfc · 1512cfc
2 parents 4c28d70 + eadff69
commit 1512cfc
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/metashare/stats/geoip.py b/metashare/stats/geoip.py
@@ -286,6 +286,9 @@ def getcountry_coords(countrycode):
 
 def getcountry_code(ipaddress):
     if (ipaddress != "" and not is_privateIP(ipaddress)):
-        return geoip.country_code_by_addr(ipaddress)
+        try:
+            return geoip.country_code_by_addr(ipaddress)
+        except pygeoip.GeoIPError:
+            return ""
     return ""