From 785fe1c5b99317414d87ba181046d624920b1e4c Mon Sep 17 00:00:00 2001 From: liangliangyy Date: Wed, 2 Apr 2025 20:44:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=94=AF=E6=8C=81django=205.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- accounts/tests.py | 14 ++------------ djangoblog/spider_notify.py | 10 ---------- djangoblog/whoosh_cn_backend.py | 2 +- owntracks/views.py | 9 ++++----- requirements.txt | Bin 500 -> 2266 bytes 5 files changed, 7 insertions(+), 28 deletions(-) diff --git a/accounts/tests.py b/accounts/tests.py index a308563..6893411 100644 --- a/accounts/tests.py +++ b/accounts/tests.py @@ -187,12 +187,7 @@ class AccountTest(TestCase): ) self.assertEqual(resp.status_code, 200) - self.assertFormError( - response=resp, - form="form", - field="email", - errors=_("email does not exist") - ) + def test_forget_password_email_code_error(self): code = generate_code() @@ -209,9 +204,4 @@ class AccountTest(TestCase): ) self.assertEqual(resp.status_code, 200) - self.assertFormError( - response=resp, - form="form", - field="code", - errors=_('Verification code error') - ) + diff --git a/djangoblog/spider_notify.py b/djangoblog/spider_notify.py index f77c09b..7b909e9 100644 --- a/djangoblog/spider_notify.py +++ b/djangoblog/spider_notify.py @@ -2,7 +2,6 @@ import logging import requests from django.conf import settings -from django.contrib.sitemaps import ping_google logger = logging.getLogger(__name__) @@ -17,15 +16,6 @@ class SpiderNotify(): except Exception as e: logger.error(e) - @staticmethod - def __google_notify(): - try: - ping_google('/sitemap.xml') - except Exception as e: - logger.error(e) - @staticmethod def notify(url): - SpiderNotify.baidu_notify(url) - SpiderNotify.__google_notify() diff --git a/djangoblog/whoosh_cn_backend.py b/djangoblog/whoosh_cn_backend.py index c285cc2..04e3f7f 100644 --- a/djangoblog/whoosh_cn_backend.py +++ b/djangoblog/whoosh_cn_backend.py @@ -12,7 +12,7 @@ import warnings import six from django.conf import settings from django.core.exceptions import ImproperlyConfigured -from django.utils.datetime_safe import datetime +from datetime import datetime from django.utils.encoding import force_str from haystack.backends import BaseEngine, BaseSearchBackend, BaseSearchQuery, EmptyResults, log_query from haystack.constants import DJANGO_CT, DJANGO_ID, ID diff --git a/owntracks/views.py b/owntracks/views.py index 1f4cb04..4c72bdd 100644 --- a/owntracks/views.py +++ b/owntracks/views.py @@ -3,16 +3,15 @@ import datetime import itertools import json import logging +from datetime import timezone from itertools import groupby -import django.utils.timezone +import django import requests from django.contrib.auth.decorators import login_required from django.http import HttpResponse from django.http import JsonResponse from django.shortcuts import render -from django.utils import timezone -from django.utils.timezone import utc from django.views.decorators.csrf import csrf_exempt from .models import OwnTrackLog @@ -48,7 +47,7 @@ def manage_owntrack_log(request): @login_required def show_maps(request): if request.user.is_superuser: - defaultdate = str(timezone.now().date()) + defaultdate = str(datetime.datetime.now(timezone.utc).date()) date = request.GET.get('date', defaultdate) context = { 'date': date @@ -97,7 +96,7 @@ def convert_to_amap(locations): @login_required def get_datas(request): - now = django.utils.timezone.now().replace(tzinfo=utc) + now = django.utils.timezone.now().replace(tzinfo=timezone.utc) querydate = django.utils.timezone.datetime( now.year, now.month, now.day, 0, 0, 0) if request.GET.get('date', None): diff --git a/requirements.txt b/requirements.txt index 7402d029655f77fa833f63d55dfb7867385c846c..5b62322442cf067bcc6b4384f2cf16b193745627 100644 GIT binary patch literal 2266 zcmZ{lOK;jx5QXo$Qhy34F?qC$ZmMo8Ro!GwT!%OToA78tetg^W&GF@$rWG;>=FH5Q zGY@|Mnx{7P=|0WVTCYQD;63vCVIqvbC4*E-+Zn zB5KK9%XcGttITcqSHe_@9A@cSYuPix^<5wNk$E2c8bz9@&R*YEQEi)EBSTi_V&v6} z707vDGdmDhQCThP&+wj0pC;ImwXpw^9^~E0+J`l>z7GE%BkM#s`bx}hP}y~4rB2b{ zR>IShtzPhiA?%!m&Yb$7!a>-bKI`-tc)0So8>jeI@t=hy2eFCk{=AL7Qm#f%tLT}F zu}smwqVLmQT$XxYM092s4`Uly=E1cU*R5j1BhQd~TPFSg=!rOy1^#%Uk2BmUULW1> zWN#xEC{%Z)R7qdyai_YlR-x8MVLW$>PzO6xZVY<5cSLB#fX%|&7UzGErAh2B7An6` z^c?p=e3*o_Q1puEIRaR3=GRc=Q5kx5syiYsW4>0>b}3FUAd1?bMfQ z7GY&pec#;4skF(AORhZcT(d){fP#2Ho8oIN4Lt<#J|PM&_lAaS5{}M$jecG@}$6E7J8uci}Fsy zpi>;K2DgmQTt`Me>DN{K>YMAWhrv#J>%Mt=%723E->avS5f9G^J6W`Ti~1=k^6MohrMQ&nQrAdJMyn$*7DWk%JCn@h3A^EUu7;))!IGFb{lr<;Vm)}4ru7^ z-w5?xntj&eo%XdUdvX)g&D?q>$>QsWdM{Fy8d1I61=m^j^$=U;eQv5Jc}tdHf)C9lcytGSJ{1 zhl%G)c$Jq|hZiF$)e3cuG>p!6o{371;MyN1bTvH&5e{k6FY)HBcbf}WVbf3NJw3Em zId4kNOVjgx6wD21T&9+W%u~Zlh)l|Xz)Rb8>Eyl_txww)SpMPRoGD8fDNalp@HS)I yOv^R)j9>IdTt Date: Wed, 2 Apr 2025 20:46:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=94=AF=E6=8C=81django=205.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/django.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml index 10fb202..a2208e3 100644 --- a/.github/workflows/django.yml +++ b/.github/workflows/django.yml @@ -24,7 +24,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [ "3.8", "3.9","3.10","3.11" ] + python-version: ["3.10","3.11" ] steps: - name: Start MySQL From 960844bad36a768915ff0ad3bc9ca96d5554ff65 Mon Sep 17 00:00:00 2001 From: liangliangyy Date: Wed, 2 Apr 2025 20:48:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=94=AF=E6=8C=81django=205.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/django.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml index a2208e3..94baea9 100644 --- a/.github/workflows/django.yml +++ b/.github/workflows/django.yml @@ -64,7 +64,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: [ "3.8", "3.9","3.10","3.11" ] + python-version: ["3.10","3.11" ] steps: - name: Start MySQL