Snapshot of timezone-aware datatracker code. Tests pass, and the test-crawler shows only expected differences. Trunk changes merged in up to r18768.

 - Legacy-Id: 18770

Author: levkowetz

bin/add-old-drafts-from-archive.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright The IETF Trust 2017-2019, All Rights Reserved
+# Copyright The IETF Trust 2017-2020, All Rights Reserved
 
 import datetime
 import os
@@ -140,7 +140,7 @@ def turn_into_unicode(s):
                         doc = doc,
                         rev = rev,
                         by = system,
-                        desc = "Revision added from id-archive on %s by %s"%(datetime.date.today(),sys.argv[0]),
+                        desc = "Revision added from id-archive on %s by %s"%(timezone.now().date(),sys.argv[0]),
                         time=time,
                 )
                 events.append(e)

bin/check-copyright

@@ -162,7 +162,7 @@ def get_first_commit(path):
             else:
                 pass
     except OSError:
-        rev, who, when = None, None, datetime.datetime.now()
+        rev, who, when = None, None, timezone.now()
     return { path: { 'rev': rev, 'who': who, 'date': when.strftime('%Y-%m-%d %H:%M:%S'), }, }
 
 

bin/test-crawl

@@ -17,7 +17,7 @@
 from tastypie.api import Api
 from tastypie.bundle import Bundle
 from tastypie.exceptions import ApiFieldError
-from tastypie.serializers import Serializer # pyflakes:ignore (we're re-exporting this)
+from tastypie.serializers import Serializer as TastypieSerializer
 from tastypie.fields import ApiField
 
 _api_list = []
@@ -152,3 +152,19 @@ def dehydrate(self, bundle, for_list=True):
             dehydrated = self.dehydrate_related(fk_bundle, fk_resource, for_list=for_list)
             fk_resource._meta.cache.set(cache_key, dehydrated)
         return dehydrated
+
+class Serializer(TastypieSerializer):
+
+    def format_datetime(self, data):
+        """
+        Subclassed to let tastypie produce timezone-aware serialization of
+        datetime objects.
+        """
+        from tastypie.utils.formatting import format_datetime
+        if self.datetime_formatting == 'rfc-2822':
+            return format_datetime(data)
+        if self.datetime_formatting == 'iso-8601-strict':
+            # Remove microseconds to strictly adhere to iso-8601
+            data = data - datetime.timedelta(microseconds=data.microsecond)
+        return data.isoformat()
+    

ietf/api/__init__.py

@@ -3,7 +3,6 @@
 
 
 import os
-import datetime
 import collections
 import io
 
@@ -14,6 +13,7 @@
 from django.core.management.base import AppCommand
 from django.db import models
 from django.template import Template, Context
+from django.utils import timezone
 
 from tastypie.resources import ModelResource
 
@@ -89,7 +89,7 @@ def handle_app_config(self, app, **options):
                     info = dict(
                         app=app.name,
                         app_label=app.label,
-                        date=datetime.datetime.now()
+                        date=timezone.now()
                     )
                     new_models = {}
                     for model, rclass_name in missing_resources:

ietf/api/management/commands/makeresources.py

@@ -3,7 +3,6 @@
 
 
 import json
-import html
 import os
 import shutil
 import sys
@@ -15,7 +14,7 @@
 from django.conf import settings
 from django.test import Client
 from django.urls import reverse as urlreverse
-from django.utils import timezone
+from django.utils import html, timezone
 
 from tastypie.test import ResourceTestCaseMixin
 
@@ -56,10 +55,10 @@ def test_notify_meeting_import_audio_files(self, mock_import_audio):
         # try invalid method GET
         url = urlreverse('ietf.meeting.views.api_import_recordings', kwargs={'number':meeting.number})
         r = client.get(url)
-        self.assertEqual(r.status_code, 405)
+        self.assertResponseStatus(r, 405)
         # try valid method POST
         r = client.post(url)
-        self.assertEqual(r.status_code, 201)
+        self.assertResponseStatus(r, 201)
 
     def test_api_help_page(self):
         url = urlreverse('ietf.api.views.api_help')
@@ -282,7 +281,7 @@ def test_api_v2_person_export_view(self):
 
         # working case
         r = self.client.post(url, {'apikey': apikey.hash(), 'email': secretariat.email().address, '_expand': 'user'})
-        self.assertEqual(r.status_code, 200)
+        self.assertResponseStatus(r, 200)
         jsondata = r.json()
         data = jsondata['person.person'][str(secretariat.id)]
         self.assertEqual(data['name'], secretariat.name)

ietf/api/tests.py

@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2017, All Rights Reserved
+# Copyright The IETF Trust 2017-2020, All Rights Reserved
 
 from django.conf.urls import include
 from django.views.generic import TemplateView

ietf/api/urls.py

@@ -205,7 +205,7 @@ def err(code, text):
 
 def version(request):
     dumpinfo = DumpInfo.objects.order_by('-date').first()
-    dumptime = pytz.timezone(dumpinfo.tz).localize(dumpinfo.date).strftime('%Y-%m-%d %H:%M:%S %z') if dumpinfo else None
+    dumptime = dumpinfo.date.astimezone(pytz.timezone(dumpinfo.tz)).strftime('%Y-%m-%d %H:%M:%S %z') if dumpinfo else None
     return HttpResponse(
             json.dumps({
                         'version': ietf.__version__+ietf.__patch__,

ietf/api/views.py

@@ -116,9 +116,9 @@ if __name__ == '__main__':
     import time
 
     # Year ago?
-    show_since = datetime.datetime.now() - datetime.timedelta(2*365)
+    show_since = timezone.now() - datetime.timedelta(2*365)
     # 10 years ago?
-    #show_since = datetime.datetime.now() - datetime.timedelta(10 * 365)
+    #show_since = timezone.now() - datetime.timedelta(10 * 365)
 
     date = time.strftime("%Y-%m-%d_%H:%M:%S")
     signature =  '# Generated by %s at %s\n' % (filename, date)
@@ -144,7 +144,7 @@ if __name__ == '__main__':
     for draft in interesting_drafts.distinct().iterator():
         # Omit RFCs, we care only about drafts
         if draft.docalias.filter(name__startswith='rfc'):
-            if  (datetime.datetime.now() - draft.latest_event(type='published_rfc').time) > datetime.timedelta(days= 365 * 3 ):
+            if  (timezone.now() - draft.latest_event(type='published_rfc').time) > datetime.timedelta(days= 365 * 3 ):
                 continue
 
         alias = draft.name

ietf/bin/generate-draft-aliases

@@ -44,16 +44,16 @@ if __name__ == '__main__':
     import time
 
     # Year ago?
-    #show_since = datetime.datetime.now() - datetime.timedelta(365)
+    #show_since = timezone.now() - datetime.timedelta(365)
 
     # 2 years ago?
-    #show_since = datetime.datetime.now() - datetime.timedelta(2 * 365)
+    #show_since = timezone.now() - datetime.timedelta(2 * 365)
 
     # 3 years ago?
-    #show_since = datetime.datetime.now() - datetime.timedelta(3 * 365)
+    #show_since = timezone.now() - datetime.timedelta(3 * 365)
 
     # 5 years ago?
-    show_since = datetime.datetime.now() - datetime.timedelta(5 * 365)
+    show_since = timezone.now() - datetime.timedelta(5 * 365)
 
     date = time.strftime("%Y-%m-%d_%H:%M:%S")
     signature = '# Generated by %s at %s\n' % (filename, date)