Skip to content

Commit 1bff863

Browse files
committed
datetime->timezone
1 parent 77d85d3 commit 1bff863

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

blog/context_processors.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import logging
2-
from datetime import datetime
2+
3+
from django.utils import timezone
34

45
from djangoblog.utils import cache, get_blog_setting
56
from .models import Category, Article
@@ -33,6 +34,6 @@ def seo_processor(requests):
3334
'ANALYTICS_CODE': setting.analyticscode,
3435
"BEIAN_CODE_GONGAN": setting.gongan_beiancode,
3536
"SHOW_GONGAN_CODE": setting.show_gongan_code,
36-
"CURRENT_YEAR": datetime.now().year}
37+
"CURRENT_YEAR": timezone.now().year}
3738
cache.set(key, value, 60 * 60 * 10)
3839
return value

blog/views.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import datetime
21
import logging
32
import os
43
import uuid
@@ -8,6 +7,7 @@
87
from django.http import HttpResponse, HttpResponseForbidden
98
from django.shortcuts import get_object_or_404
109
from django.shortcuts import render
10+
from django.utils import timezone
1111
from django.views.decorators.csrf import csrf_exempt
1212
from django.views.generic.detail import DetailView
1313
from django.views.generic.list import ListView
@@ -309,7 +309,7 @@ def fileupload(request):
309309
return HttpResponseForbidden()
310310
response = []
311311
for filename in request.FILES:
312-
timestr = datetime.datetime.now().strftime('%Y/%m/%d')
312+
timestr = timezone.now().strftime('%Y/%m/%d')
313313
imgextensions = ['jpg', 'png', 'jpeg', 'bmp']
314314
fname = u''.join(str(filename))
315315
isimage = len([i for i in imgextensions if fname.find(i) >= 0]) > 0

comments/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class Comment(models.Model):
2929
'是否显示', default=True, blank=False, null=False)
3030

3131
class Meta:
32-
ordering = ['id']
32+
ordering = ['-id']
3333
verbose_name = "评论"
3434
verbose_name_plural = verbose_name
3535
get_latest_by = 'id'

djangoblog/feeds.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
from datetime import datetime
2-
31
from django.contrib.auth import get_user_model
42
from django.contrib.syndication.views import Feed
3+
from django.utils import timezone
54
from django.utils.feedgenerator import Rss201rev2Feed
65

7-
from djangoblog.utils import CommonMarkdown
86
from blog.models import Article
7+
from djangoblog.utils import CommonMarkdown
98

109

1110
class DjangoBlogFeed(Feed):
@@ -31,7 +30,7 @@ def item_description(self, item):
3130
return CommonMarkdown.get_markdown(item.body)
3231

3332
def feed_copyright(self):
34-
now = datetime.now()
33+
now = timezone.now()
3534
return "Copyright© {year} 且听风吟".format(year=now.year)
3635

3736
def item_link(self, item):

oauth/views.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import datetime
21
import logging
32
# Create your views here.
43
from urllib.parse import urlparse
@@ -13,6 +12,7 @@
1312
from django.shortcuts import get_object_or_404
1413
from django.shortcuts import render
1514
from django.urls import reverse
15+
from django.utils import timezone
1616
from django.views.generic import FormView
1717

1818
from djangoblog.blog_signals import oauth_user_login_signal
@@ -73,8 +73,7 @@ def authorize(request):
7373
user = manager.get_oauth_userinfo()
7474
if user:
7575
if not user.nikename or not user.nikename.strip():
76-
import datetime
77-
user.nikename = "djangoblog" + datetime.datetime.now().strftime('%y%m%d%I%M%S')
76+
user.nikename = "djangoblog" + timezone.now().strftime('%y%m%d%I%M%S')
7877
try:
7978
temp = OAuthUser.objects.get(type=type, openid=user.openid)
8079
temp.picture = user.picture
@@ -102,7 +101,7 @@ def authorize(request):
102101
except ObjectDoesNotExist:
103102
author.username = user.nikename
104103
else:
105-
author.username = "djangoblog" + datetime.datetime.now().strftime('%y%m%d%I%M%S')
104+
author.username = "djangoblog" + timezone.now().strftime('%y%m%d%I%M%S')
106105
author.source = 'authorize'
107106
author.save()
108107

@@ -141,7 +140,7 @@ def emailconfirm(request, id, sign):
141140
if result[1]:
142141
author.source = 'emailconfirm'
143142
author.username = oauthuser.nikename.strip() if oauthuser.nikename.strip(
144-
) else "djangoblog" + datetime.datetime.now().strftime('%y%m%d%I%M%S')
143+
) else "djangoblog" + timezone.now().strftime('%y%m%d%I%M%S')
145144
author.save()
146145
oauthuser.author = author
147146
oauthuser.save()

owntracks/views.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
from django.http import HttpResponse
1111
from django.http import JsonResponse
1212
from django.shortcuts import render
13+
from django.utils import timezone
1314
from django.views.decorators.csrf import csrf_exempt
1415

1516
from .models import OwnTrackLog
@@ -45,7 +46,7 @@ def manage_owntrack_log(request):
4546
@login_required
4647
def show_maps(request):
4748
if request.user.is_superuser:
48-
defaultdate = str(datetime.datetime.now().date())
49+
defaultdate = str(timezone.now().date())
4950
date = request.GET.get('date', defaultdate)
5051
context = {
5152
'date': date

0 commit comments

Comments
 (0)