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
|
|
@ -13,7 +13,6 @@ import types
|
|||
import math
|
||||
import re
|
||||
import textwrap
|
||||
import datetime
|
||||
import random
|
||||
import traceback
|
||||
from importlib import import_module
|
||||
|
|
@ -21,6 +20,7 @@ from inspect import ismodule, trace
|
|||
from collections import defaultdict
|
||||
from twisted.internet import threads, defer, reactor
|
||||
from django.conf import settings
|
||||
from django.utils import timezone
|
||||
|
||||
try:
|
||||
import cPickle as pickle
|
||||
|
|
@ -279,7 +279,7 @@ def datetime_format(dtobj):
|
|||
|
||||
year, month, day = dtobj.year, dtobj.month, dtobj.day
|
||||
hour, minute, second = dtobj.hour, dtobj.minute, dtobj.second
|
||||
now = datetime.datetime.now()
|
||||
now = timezone.now()
|
||||
|
||||
if year < now.year:
|
||||
# another year
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue