Update usage of datetime.now to Django timezone aware now()

mayan/apps/ocr/models.py

@@ -4,6 +4,7 @@ from datetime import datetime
 
 from django.db import models
 from django.core.exceptions import ObjectDoesNotExist
+from django.utils.timezone import now
 from django.utils.translation import ugettext
 from django.utils.translation import ugettext_lazy as _
 
@@ -55,7 +56,7 @@ class QueueDocument(models.Model):
         if self.state == QUEUEDOCUMENT_STATE_PROCESSING:
             raise ReQueueError
         else:
-            self.datetime_submitted = datetime.now()
+            self.datetime_submitted = now()
             self.state = QUEUEDOCUMENT_STATE_PENDING
             self.delay = False
             self.result = None

mayan/apps/ocr/tasks.py

@@ -5,6 +5,7 @@ import logging
 import platform
 
 from django.db.models import Q
+from django.utils.timezone import now
 
 from job_processor.api import process_job
 from lock_manager import Lock, LockError
@@ -51,7 +52,7 @@ def task_process_document_queues():
     # TODO: reset_orphans()
     q_pending = Q(state=QUEUEDOCUMENT_STATE_PENDING)
     q_delayed = Q(delay=True)
-    q_delay_interval = Q(datetime_submitted__lt=datetime.now() - timedelta(seconds=REPLICATION_DELAY))
+    q_delay_interval = Q(datetime_submitted__lt=now() - timedelta(seconds=REPLICATION_DELAY))
     for document_queue in DocumentQueue.objects.filter(state=DOCUMENTQUEUE_STATE_ACTIVE):
         current_local_processing_count = QueueDocument.objects.filter(
             state=QUEUEDOCUMENT_STATE_PROCESSING).filter(