fix datetime issues using timezone

Author: furlongm

util/templatetags/common.py

@@ -15,11 +15,12 @@
 # along with Patchman. If not, see <http://www.gnu.org/licenses/>
 
 import importlib
-from datetime import datetime, timedelta
+from datetime import timedelta
 from urllib.parse import urlencode
 
 from django.template import Library
 from django.template.loader import get_template
+from django.utils import timezone
 from django.utils.html import format_html
 from django_tables2 import RequestConfig
 from humanize import naturaltime
@@ -132,7 +133,7 @@ def reports_timedelta():
         setting_type=int,
         default=14,
     )
-    return naturaltime(datetime.now() - timedelta(days=days))
+    return naturaltime(timezone.now() - timedelta(days=days))
 
 
 @register.simple_tag

util/views.py

@@ -15,12 +15,13 @@
 # You should have received a copy of the GNU General Public License
 # along with Patchman. If not, see <http://www.gnu.org/licenses/>
 
-from datetime import datetime, timedelta
+from datetime import timedelta
 
 from django.contrib.auth.decorators import login_required
 from django.contrib.sites.models import Site
 from django.db.models import F
 from django.shortcuts import render
+from django.utils import timezone
 
 from hosts.models import Host
 from operatingsystems.models import OSRelease, OSVariant
@@ -50,7 +51,7 @@ def dashboard(request):
         setting_type=int,
         default=14,
     )
-    last_report_delta = datetime.now() - timedelta(days=days)
+    last_report_delta = timezone.now() - timedelta(days=days)
     stale_hosts = hosts.filter(lastreport__lt=last_report_delta)
     norepo_hosts = hosts.filter(repos__isnull=True, osvariant__osrelease__repos__isnull=True)  # noqa
     reboot_hosts = hosts.filter(reboot_required=True)