Use timezone-aware datetime objects

logicaldelete/models.py

@@ -1,19 +1,19 @@
-from datetime import datetime
 from django.db import models
+from django.utils import timezone
 
 
 class LogicalDeletedManager(models.Manager):
-    def get_query_set(self):
+    def get_queryset(self):
         if self.model:
-            return super(LogicalDeletedManager, self).get_query_set().filter(date_removed__isnull=True)
+            return super(LogicalDeletedManager, self).get_queryset().filter(date_removed__isnull=True)
 
     def everything(self):
         if self.model:
-            return super(LogicalDeletedManager, self).get_query_set()
+            return super(LogicalDeletedManager, self).get_queryset()
 
     def only_deleted(self):
         if self.model:
-            return super(LogicalDeletedManager, self).get_query_set().filter(date_removed__isnull=False)
+            return super(LogicalDeletedManager, self).get_queryset().filter(date_removed__isnull=False)
 
     def get(self, *args, **kwargs):
         ''' if a specific record was requested, return it even if it's deleted '''
@@ -23,7 +23,7 @@ def filter(self, *args, **kwargs):
         ''' if pk was specified as a kwarg, return even if it's deleted '''
         if 'pk' in kwargs:
             return self.everything().filter(*args, **kwargs)
-        return self.get_query_set().filter(*args, **kwargs)
+        return self.get_queryset().filter(*args, **kwargs)
 
 
 class LogicalDeleteModel(models.Model):
@@ -38,7 +38,7 @@ def active(self):
     active.boolean = True
 
     def delete(self):
-        self.date_removed = datetime.now()
+        self.date_removed = timezone.now()
         self.save()
 
     class Meta:
@@ -50,8 +50,8 @@ class AuditModel(models.Model):
 
     def save(self, *args, **kwargs):
         if not self.date_created:
-            self.date_created = datetime.now()
-        self.date_modified = datetime.now()
+            self.date_created = timezone.now()
+        self.date_modified = timezone.now()
         super(AuditModel, self).save(*args, **kwargs)
 
     class Meta:

requirements.txt

@@ -1 +1 @@
-django
+Django