Browse Source

Заменил datetime.datetime на django.utils.timezone

devel
Dmitry 9 years ago
parent
commit
9478401197
  1. 2
      abonapp/models.py
  2. 4
      agent/netflow/to_mysql.py
  3. 5
      taskapp/forms.py
  4. 7
      taskapp/models.py

2
abonapp/models.py

@ -301,7 +301,7 @@ class InvoiceForPayment(models.Model):
def set_ok(self): def set_ok(self):
self.status = True self.status = True
self.date_pay = datetime.now()
self.date_pay = timezone.now()
def get_prev_invoice(self): def get_prev_invoice(self):
return self.objects.order return self.objects.order

4
agent/netflow/to_mysql.py

@ -3,7 +3,7 @@ import sys
import socket import socket
import struct import struct
from re import sub from re import sub
from datetime import datetime
from django.utils import timezone
def ip2int(strip): def ip2int(strip):
@ -32,7 +32,7 @@ def convert(query):
if __name__ == '__main__': if __name__ == '__main__':
f = sys.stdin f = sys.stdin
table_name = "flowstat_%s" % datetime.now().strftime("%d%m%Y")
table_name = "flowstat_%s" % timezone.now().strftime("%d%m%Y")
print(("CREATE TABLE IF NOT EXISTS %s (" % table_name)) print(("CREATE TABLE IF NOT EXISTS %s (" % table_name))
print("`id` int(10) AUTO_INCREMENT NOT NULL,") print("`id` int(10) AUTO_INCREMENT NOT NULL,")
print("`src_ip` INT(10) UNSIGNED NOT NULL,") print("`src_ip` INT(10) UNSIGNED NOT NULL,")

5
taskapp/forms.py

@ -1,6 +1,7 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from datetime import datetime, timedelta
from datetime import timedelta
from django import forms from django import forms
from django.utils import timezone
from .models import Task from .models import Task
@ -24,5 +25,5 @@ class TaskFrm(forms.ModelForm):
'abon': forms.Select(attrs={'class': 'form-control'}) 'abon': forms.Select(attrs={'class': 'form-control'})
} }
initials = { initials = {
'out_date': datetime.now()+timedelta(days=3)
'out_date': timezone.now()+timedelta(days=3)
} }

7
taskapp/models.py

@ -1,7 +1,8 @@
# coding=utf-8 # coding=utf-8
from datetime import datetime, timedelta
from datetime import timedelta
from django.db import models from django.db import models
from django.conf import settings from django.conf import settings
from django.utils import timezone
from abonapp.models import Abon from abonapp.models import Abon
from .handle import handle as task_handle from .handle import handle as task_handle
@ -51,7 +52,7 @@ class ChangeLog(models.Model):
def _delta_add_days(): def _delta_add_days():
return datetime.now() + timedelta(days=3)
return timezone.now() + timedelta(days=3)
class Task(models.Model): class Task(models.Model):
@ -77,7 +78,7 @@ class Task(models.Model):
def finish(self, current_user): def finish(self, current_user):
self.state = 'F' # Выполнена self.state = 'F' # Выполнена
self.out_date = datetime.now() # Время завершения
self.out_date = timezone.now() # Время завершения
ChangeLog.objects.create( ChangeLog.objects.create(
task=self, task=self,
act_type='f', act_type='f',

Loading…
Cancel
Save