This commit is contained in:
Achilles Rasquinha 2018-01-23 14:24:29 +05:30
parent 650b692a50
commit d5e60746ff
2 changed files with 4 additions and 8 deletions

View file

@ -417,13 +417,8 @@ def get_expiry_period(device="desktop"):
def get_geo_from_ip(ip_addr):
try:
from geolite2 import geolite2
reader = geolite2.reader()
geo = reader.get(ip_addr)
return frappe._dict(geo)
geolite2.close()
from geoip import geolite2
return geolite2.lookup(ip_addr)
except ImportError:
return
except ValueError:

View file

@ -5,7 +5,8 @@ gunicorn
jinja2
markdown2
PyMySQL
maxminddb-geolite2
python-geoip
python-geoip-geolite2
python-dateutil
pytz
six