Hopiu/django-tos
1
0
Fork 0
mirror of https://github.com/Hopiu/django-tos.git synced 2026-03-16 20:10:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moar f-strings!

Browse source
This commit is contained in:
blag 2022-12-26 22:49:22 -07:00
parent ee3d1295f3
commit bc68dbf08a
No known key found for this signature in database
GPG key ID: 30870D32F59C5F40
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tos/models.py
View file

@ -47,7 +47,7 @@ class TermsOfService(BaseModel):
active = 'inactive'
if self.active:
active = 'active'
return '{0}: {1}'.format(self.created, active)
return f'{self.created}: {active}'
def save(self, *args, **kwargs):
""" Ensure we're being saved properly """
@ -72,10 +72,7 @@ class UserAgreement(BaseModel):
user = models.ForeignKey(settings.AUTH_USER_MODEL, related_name='user_agreement', on_delete=models.CASCADE)
def __str__(self):
return '%s agreed to TOS: %s' % (
self.user.username,
self.terms_of_service,
)
return f'{self.user.username} agreed to TOS: {self.terms_of_service}'
def has_user_agreed_latest_tos(user):

2
tos/tests/test_middleware.py
View file

@ -157,7 +157,7 @@ class BumpCoverage(TestCase):
key_version = cache.get('django:tos:key_version')
cache.set('django:tos:skip_tos_check:{0}'.format(str(self.user1.id)), True, version=key_version)
cache.set(f'django:tos:skip_tos_check:{self.user1.id}', True, version=key_version)
self.client.login(username='user1', password='user1pass')
response = self.client.get(reverse('index'))

2
tos/views.py
View file

@ -64,7 +64,7 @@ def check_tos(request, template_name='tos/tos_check.html',
UserAgreement.objects.get_or_create(terms_of_service=tos, user=user)
key_version = cache.get('django:tos:key_version')
cache.delete('django:tos:agreed:{0}'.format(user.pk), version=key_version)
cache.delete(f'django:tos:agreed:{user.pk}', version=key_version)
# Log the user in
auth_login(request, user)