Updated time management

This commit is contained in:
Spitap
2023-05-04 08:17:31 +02:00
parent e51e6451c1
commit 8cf7ec91a2
4 changed files with 4 additions and 10 deletions
-1
View File
@@ -97,7 +97,6 @@ jobs:
pip install -r mysql-requirements.txt
echo "DB=mysql" >> $GITHUB_ENV
- name: Test with pytest
if: ${{ matrix.database != 'postgres' }}
run: |
python ./tests.py
cd test_project
+2 -7
View File
@@ -14,7 +14,6 @@ import tldextract
from defusedxml.ElementTree import fromstring
from dns import resolver, reversename
import magic
import pytz.exceptions
import six
from django.db import transaction
@@ -128,11 +127,7 @@ def import_report(content):
print(f"Report skipped because of malformed data (empty {attr})")
return
value = setattr(report, "policy_{}".format(attr), node.text)
try:
report.save()
except (pytz.exceptions.AmbiguousTimeError):
print("Report skipped because of invalid date.")
return
report.save()
for record in root.findall("record"):
import_record(record, report)
@@ -223,7 +218,7 @@ def week_range(year, weeknumber):
"{}-{}-{}".format(year, weeknumber, 1), fmt)
end_week = datetime.datetime.strptime(
"{}-{}-{}".format(year, weeknumber, 0), fmt)
return tz.localize(start_week), tz.localize(end_week)
return start_week.replace(tzinfo=tz), end_week.replace(tzinfo=tz)
def insert_record(target: dict, record, name: str) -> None:
+1 -1
View File
@@ -45,7 +45,7 @@ def week_range(year, weeknumber):
"{}-{}-{}".format(year, weeknumber, 1), fmt)
end_week = datetime.datetime.strptime(
"{}-{}-{}".format(year, weeknumber, 0), fmt)
return tz.localize(start_week), tz.localize(end_week)
return start_week.replace(tzinfo=tz), end_week.replace(tzinfo=tz)
class DomainReportView(
@@ -524,7 +524,7 @@ class LogParser:
last_message = models.Maillog.objects.last()
cur_dt = datetime.fromtimestamp(self.orig_ts)
tz = timezone.get_current_timezone()
cur_dt = tz.localize(cur_dt)
cur_dt = cur_dt.replace(tzinfo=tz)
condition = (
last_message and (
cur_dt < last_message.date or