django-esi 5.2.0__tar.gz → 5.3.0b1__tar.gz

{django_esi-5.2.0 → django_esi-5.3.0b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-esi
-Version: 5.2.0
+Version: 5.3.0b1
 Summary: Django app for accessing the EVE Swagger Interface (ESI).
 Author-email: Alliance Auth <adarnof@gmail.com>
 Requires-Python: >=3.8

{django_esi-5.2.0 → django_esi-5.3.0b1}/esi/__init__.py

@@ -2,5 +2,5 @@
 
 default_app_config = 'esi.apps.EsiConfig'
 
-__version__ = '5.2.0'
+__version__ = '5.3.0b1'
 __title__ = 'django-esi'

{django_esi-5.2.0 → django_esi-5.3.0b1}/esi/app_settings.py

@@ -31,7 +31,7 @@ ESI_INFO_LOGGING_ENABLED = getattr(settings, 'ESI_INFO_LOGGING_ENABLED', False)
 ESI_LOG_LEVEL_LIBRARIES = str(getattr(settings, 'ESI_LOG_LEVEL_LIBRARIES', 'INFO'))
 """Set log level for libraries like bravado and urlib3."""
 
-ESI_DEBUG_RESPONSE_CONTENT_LOGGING = str(getattr(settings, 'ESI_DEBUG_RESPONSE_CONTENT_LOGGING', True))
+ESI_DEBUG_RESPONSE_CONTENT_LOGGING = getattr(settings, 'ESI_DEBUG_RESPONSE_CONTENT_LOGGING', True)
 """Enable/Disable logging of ESI response contents."""
 
 ESI_USER_CONTACT_EMAIL = getattr(settings, 'ESI_USER_CONTACT_EMAIL', None)

{django_esi-5.2.0 → django_esi-5.3.0b1}/esi/managers.py

@@ -76,9 +76,25 @@ class TokenQueryset(models.QuerySet):
             All tokens which are still valid.
         """
         expired = self.get_expired()
-        valid = self.exclude(pk__in=expired)
-        valid_expired = expired.bulk_refresh()
-        return valid_expired | valid
+        valid = list(
+            self.exclude(
+                pk__in=expired
+            ).values_list(
+                "pk",
+                flat=True
+            )
+        )
+        valid_expired = list(
+            expired.bulk_refresh(
+            ).values_list(
+                "pk",
+                flat=True
+            )
+        )
+        _qs = self.filter(
+            pk__in=(valid + valid_expired)
+        )
+        return _qs
 
     def require_scopes(self, scope_string: Union[str, list]) -> models.QuerySet:
         """Filter tokens which have at least a subset of given scopes.