Convert location and location_info to property

Author: mjnaderi

CHANGELOG.md

@@ -15,6 +15,8 @@ Backward-incompatible changes:
   or you can write a custom version of
   [`SetRemoteAddrFromForwardedFor` middleware](https://github.com/django/django/blob/91f18400cc0fb37659e2dbaab5484ff2081f1f30/django/middleware/http.py#L33)
   which suits your environment.
+- `session.location` and `session.location_info` are now properties
+  instead of methods.
 - `session.device` is now a property instead of a method and returns string.
 - The device object can be accessed using the new property `session.device_info`.
 - User agent parsing is now done using `ua-parser` instead of `user-agents`.

README.md

@@ -191,14 +191,14 @@ UserAgent(family='Chrome Mobile', major='118', minor='0', patch='0', patch_minor
 ```
 
 
-And if you have configured GeoIP2, you can get location info using `.location()`
-and `.location_info()`:
+And if you have configured GeoIP2,
+you can get location info using `.location` and `.location_info`:
 
 ```python
->>> session.location()
+>>> session.location
 'Tehran, Iran'
 
->>> session.location_info()
+>>> session.location_info
 {'city': 'Tehran', 'continent_code': 'AS', 'continent_name': 'Asia', 'country_code': 'IR', 'country_name': 'Iran', 'time_zone': 'Asia/Tehran', ...}
 ```
 

qsessions/admin.py

@@ -85,11 +85,11 @@ def get_search_fields(self, request):
         )
 
     @admin.display(description=_("Is valid"), boolean=True)
-    def is_valid(self, obj):
+    def is_valid(self, obj: Session):
         return obj.expire_date > now()
 
     @admin.display(description=_("Session data"))
-    def session_data_decoded(self, obj):
+    def session_data_decoded(self, obj: Session):
         return format_html(
             '<pre style="white-space: pre-wrap; max-width: 800px; display: inline-block; direction: ltr;">{}</pre>',
             pformat(obj.get_decoded()),

qsessions/models.py

@@ -65,12 +65,14 @@ def delete(self, *args, **kwargs):
             caches[settings.SESSION_CACHE_ALIAS].delete(prefix + self.session_key)
         return super().delete(*args, **kwargs)
 
-    def location(self):
-        return geoip.ip_to_location(self.ip)
-
-    def location_info(self):
+    @cached_property
+    def location_info(self) -> dict:
         return geoip.ip_to_location_info(self.ip)
 
+    @cached_property
+    def location(self) -> str:
+        return geoip.ip_to_location(self.ip)
+
     @cached_property
     def device_info(self):
         """

tests/test_model.py

@@ -42,8 +42,8 @@ def test_very_long_ua(SessionStore):
 
 def test_location():
     session = Session(ip="89.160.20.112")
-    assert session.location() == "Linköping, Sweden"
-    loc_info = session.location_info()
+    assert session.location == "Linköping, Sweden"
+    loc_info = session.location_info
     assert loc_info["city"] == "Linköping"
     assert loc_info["country_code"] == "SE"