Also work with GeoIP2 country database

Author: Bouke

docs/release-notes.rst

@@ -1,6 +1,10 @@
 Release Notes
 =============
 
+1.5.2
+-----
+* Also work with GeoIP2 country database
+
 1.5.1
 -----
 * Updated documentation for GeoIP2 library

user_sessions/templatetags/user_sessions.py

@@ -98,12 +98,16 @@ def location(value):
     """
     try:
         location = geoip() and geoip().city(value)
-        if location and location['country_name']:
-            if location['city']:
-                return '{}, {}'.format(location['city'], location['country_name'])
-            return location['country_name']
     except Exception as e:
-        warnings.warn(str(e))
+        try:
+            location = geoip() and geoip().country(value)
+        except Exception as e:
+            warnings.warn(str(e))
+            location = None
+    if location and location['country_name']:
+        if 'city' in location:
+            return '{}, {}'.format(location['city'], location['country_name'])
+        return location['country_name']
     return None