Changed datetime setter to use utils.timezone instead of naive datetime stamps, as per #728.
This commit is contained in:
parent
b0c71ee924
commit
3ebc55da82
7 changed files with 20 additions and 14 deletions
|
|
@ -3,6 +3,7 @@ The managers for the custom Player object and permissions.
|
|||
"""
|
||||
|
||||
import datetime
|
||||
from django.utils import timezone
|
||||
from django.contrib.auth.models import UserManager
|
||||
#from functools import update_wrapper
|
||||
from evennia.typeclasses.managers import (returns_typeclass_list, returns_typeclass,
|
||||
|
|
@ -59,7 +60,7 @@ class PlayerDBManager(TypedObjectManager, UserManager):
|
|||
Returns a QuerySet containing the player User accounts that have been
|
||||
connected within the last <days> days.
|
||||
"""
|
||||
end_date = datetime.datetime.now()
|
||||
end_date = timezone.now()
|
||||
tdelta = datetime.timedelta(days)
|
||||
start_date = end_date - tdelta
|
||||
return self.filter(date_joined__range=(start_date, end_date))
|
||||
|
|
@ -72,7 +73,7 @@ class PlayerDBManager(TypedObjectManager, UserManager):
|
|||
|
||||
days - number of days backwards to check
|
||||
"""
|
||||
end_date = datetime.datetime.now()
|
||||
end_date = timezone.now()
|
||||
tdelta = datetime.timedelta(days)
|
||||
start_date = end_date - tdelta
|
||||
return self.filter(last_login__range=(
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ instead for most things).
|
|||
|
||||
"""
|
||||
|
||||
import datetime
|
||||
from django.conf import settings
|
||||
from django.utils import timezone
|
||||
from evennia.typeclasses.models import TypeclassBase
|
||||
from evennia.players.manager import PlayerManager
|
||||
from evennia.players.models import PlayerDB
|
||||
|
|
@ -558,7 +558,7 @@ class DefaultPlayer(PlayerDB):
|
|||
_CONNECT_CHANNEL = ChannelDB.objects.filter(db_key=settings.DEFAULT_CHANNELS[1]["key"])[0]
|
||||
except Exception:
|
||||
logger.log_trace()
|
||||
now = datetime.datetime.now()
|
||||
now = timezone.now()
|
||||
now = "%02i-%02i-%02i(%02i:%02i)" % (now.year, now.month,
|
||||
now.day, now.hour, now.minute)
|
||||
if _CONNECT_CHANNEL:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue