django-esi 5.2.0__py3-none-any.whl → 5.3.0b1__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of django-esi might be problematic. Click here for more details.

Files changed (7) hide show
  1. {django_esi-5.2.0.dist-info → django_esi-5.3.0b1.dist-info}/METADATA +1 -1
  2. {django_esi-5.2.0.dist-info → django_esi-5.3.0b1.dist-info}/RECORD +7 -7
  3. esi/__init__.py +1 -1
  4. esi/app_settings.py +1 -1
  5. esi/managers.py +19 -3
  6. {django_esi-5.2.0.dist-info → django_esi-5.3.0b1.dist-info}/LICENSE +0 -0
  7. {django_esi-5.2.0.dist-info → django_esi-5.3.0b1.dist-info}/WHEEL +0 -0
{django_esi-5.2.0.dist-info → django_esi-5.3.0b1.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: django-esi
3
- Version: 5.2.0
3
+ Version: 5.3.0b1
4
4
  Summary: Django app for accessing the EVE Swagger Interface (ESI).
5
5
  Author-email: Alliance Auth <adarnof@gmail.com>
6
6
  Requires-Python: >=3.8
{django_esi-5.2.0.dist-info → django_esi-5.3.0b1.dist-info}/RECORD RENAMED
@@ -1,12 +1,12 @@
1
- esi/__init__.py,sha256=5n3mCOnYm8mdzIJT1y6MQF6lBq9XxekR88WOIajAU_Q,155
1
+ esi/__init__.py,sha256=e2a8pk9JZ2i5PGZ9dauTYBgJCKnI8w7ldFspjYDhS30,157
2
2
  esi/admin.py,sha256=vfpTW1WOLmAxQKAAW8d_Nrkn1MvVRO9raQrHGXpW2l4,1100
3
- esi/app_settings.py,sha256=1P1yELcXhTDabKHaqTTHUA6VOYRCKdA-3sKfObq7S9w,3788
3
+ esi/app_settings.py,sha256=O8TkKonK2zdF7RjMem1vMhEMulAtjvksxKgchrI8jME,3783
4
4
  esi/apps.py,sha256=RXDeRh62DO8NcKEzpiQovOay9wmb7MoVyC1W-cc-Aqc,272
5
5
  esi/checks.py,sha256=o3ka-Ux3QqTaf0u-oFGCPxwuG7DNJ3XYXiC7_2rQ1Ic,1154
6
6
  esi/clients.py,sha256=gkkJVZ9xqcd0TOI-5VduqYLaave1LjI16ucckr3UX9o,21303
7
7
  esi/decorators.py,sha256=USqGaIrVoyMpKlUB_ddZPe7QK0fBrFqAnoZDj8MMlSI,8081
8
8
  esi/errors.py,sha256=KfFtgX8Mys4uMoQtco0n_pQeaM83yVrRSyW6StXuUjo,308
9
- esi/managers.py,sha256=JfsUhAxB7oI9msr-1TS9FklgsQfwLBjOKbBHVFTgdg4,11144
9
+ esi/managers.py,sha256=VEob7SGDq1AMn8i8Rw5zLQrHSmi_rHN9KNHq2nA-mgo,11455
10
10
  esi/models.py,sha256=fJJu8rLDMGW3ChxwFAZtFBWKB7PgMuDBatTuT06gWiA,11412
11
11
  esi/tasks.py,sha256=6wOqlANbQ83uvOt0L4_QHaLz0YZe1jtrQyr7zmxKY6g,1516
12
12
  esi/urls.py,sha256=RV_ZirfB3oEElPGXfj33m6FqwVdFRADDW9bN1WwJU2E,161
@@ -69,7 +69,7 @@ esi/tests/test_tasks.py,sha256=P3vtqSno92DywNYu38nIo-_UiSicRAbun1AAsav0EBo,2104
69
69
  esi/tests/test_templatetags.py,sha256=b68JWE3HvOlr2aUisJHsTsDS4e7IMjDeqTuzMqC7Re4,517
70
70
  esi/tests/test_views.py,sha256=Kj_f2yIpmPG0kx-lAX_sfkaHlIpgbkm02ieA1V3o-k4,13073
71
71
  esi/tests/threading_pilot.py,sha256=ax_dEdnTNibA-UQHqbZle_2dh_3jcHKRyrYSOKuE_6U,1931
72
- django_esi-5.2.0.dist-info/LICENSE,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
73
- django_esi-5.2.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
74
- django_esi-5.2.0.dist-info/METADATA,sha256=F-hrJgyoZOKui9zpRMLkvxS7amvA3Db3jE5BN2L-Vvk,4273
75
- django_esi-5.2.0.dist-info/RECORD,,
72
+ django_esi-5.3.0b1.dist-info/LICENSE,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
73
+ django_esi-5.3.0b1.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
74
+ django_esi-5.3.0b1.dist-info/METADATA,sha256=jgQw9_H0egqTGExUm43ipgEKgVcv4w_tHt7e5zWvVY4,4275
75
+ django_esi-5.3.0b1.dist-info/RECORD,,
esi/__init__.py CHANGED
@@ -2,5 +2,5 @@
2
2
 
3
3
  default_app_config = 'esi.apps.EsiConfig'
4
4
 
5
- __version__ = '5.2.0'
5
+ __version__ = '5.3.0b1'
6
6
  __title__ = 'django-esi'
esi/app_settings.py CHANGED
@@ -31,7 +31,7 @@ ESI_INFO_LOGGING_ENABLED = getattr(settings, 'ESI_INFO_LOGGING_ENABLED', False)
31
31
  ESI_LOG_LEVEL_LIBRARIES = str(getattr(settings, 'ESI_LOG_LEVEL_LIBRARIES', 'INFO'))
32
32
  """Set log level for libraries like bravado and urlib3."""
33
33
 
34
- ESI_DEBUG_RESPONSE_CONTENT_LOGGING = str(getattr(settings, 'ESI_DEBUG_RESPONSE_CONTENT_LOGGING', True))
34
+ ESI_DEBUG_RESPONSE_CONTENT_LOGGING = getattr(settings, 'ESI_DEBUG_RESPONSE_CONTENT_LOGGING', True)
35
35
  """Enable/Disable logging of ESI response contents."""
36
36
 
37
37
  ESI_USER_CONTACT_EMAIL = getattr(settings, 'ESI_USER_CONTACT_EMAIL', None)
esi/managers.py CHANGED
@@ -76,9 +76,25 @@ class TokenQueryset(models.QuerySet):
76
76
  All tokens which are still valid.
77
77
  """
78
78
  expired = self.get_expired()
79
- valid = self.exclude(pk__in=expired)
80
- valid_expired = expired.bulk_refresh()
81
- return valid_expired | valid
79
+ valid = list(
80
+ self.exclude(
81
+ pk__in=expired
82
+ ).values_list(
83
+ "pk",
84
+ flat=True
85
+ )
86
+ )
87
+ valid_expired = list(
88
+ expired.bulk_refresh(
89
+ ).values_list(
90
+ "pk",
91
+ flat=True
92
+ )
93
+ )
94
+ _qs = self.filter(
95
+ pk__in=(valid + valid_expired)
96
+ )
97
+ return _qs
82
98
 
83
99
  def require_scopes(self, scope_string: Union[str, list]) -> models.QuerySet:
84
100
  """Filter tokens which have at least a subset of given scopes.