diff --git a/frappe/sessions.py b/frappe/sessions.py index dbf5f8c1cc..f35a667dc6 100644 --- a/frappe/sessions.py +++ b/frappe/sessions.py @@ -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: diff --git a/requirements.txt b/requirements.txt index d762f41d97..6dce974033 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,8 @@ gunicorn jinja2 markdown2 PyMySQL -maxminddb-geolite2 +python-geoip +python-geoip-geolite2 python-dateutil pytz six