Merged in ^/personal/henrik/6.129.2-django2.0 which contains an upgrade of Django from 1.11 to 2.0, with the code changes needed.

 - Legacy-Id: 17817

Author: levkowetz

ietf/dbtemplate/template.py

@@ -8,10 +8,8 @@
 from docutils.utils import SystemMessage
 import debug                            # pyflakes:ignore
 
+from django.template import Origin, TemplateDoesNotExist, Template as DjangoTemplate
 from django.template.loaders.base import Loader as BaseLoader
-from django.template.base import Template as DjangoTemplate, TemplateEncodingError # type: ignore
-from django.template.exceptions import TemplateDoesNotExist
-from django.utils.encoding import smart_text
 
 from ietf.dbtemplate.models import DBTemplate
 
@@ -20,15 +18,11 @@
 RST_TEMPLATE = os.path.join(BASE_DIR, 'resources/rst.txt')
 
 
-class Template(object):
+class Template(DjangoTemplate):
 
-    def __init__(self, template_string, origin=None, name='<Unknown Template>'):
-        try:
-            template_string = smart_text(template_string)
-        except UnicodeDecodeError:
-            raise TemplateEncodingError("Templates can only be constructed from unicode or UTF-8 strings.")
+    def __init__(self, template_string, origin=None, name='<Unknown Template>', engine=None):
+        super(Template, self).__init__(template_string, origin, name, engine)
         self.template_string = string.Template(template_string)
-        self.name = name
 
     def render(self, context):
         raise NotImplementedError
@@ -70,27 +64,43 @@ def __init__(self, engine):
         super(Loader, self).__init__(engine)
         self.is_usable = True
 
-    def load_template(self, template_name, template_dirs=None):
-        try:
-            template = DBTemplate.objects.get(path=template_name)
-            if template.type.slug == 'rst':
-                return (RSTTemplate(template.content), template)
-            elif template.type.slug == 'django':
-                return (DjangoTemplate(template.content), template)
-            return (PlainTemplate(template.content), template)
-        except DBTemplate.DoesNotExist:
-            raise TemplateDoesNotExist(template_name)
-
-
-_loader = Loader(engine='django')
-
-
-def load_template_source(template_name, template_dirs=None):
-    # For backwards compatibility
-    import warnings
-    warnings.warn(
-        "'ietf.dbtemplate.template.load_template_source' is deprecated; use 'ietf.dbtemplate.template.Loader' instead.",
-        PendingDeprecationWarning
-    )
-    return _loader.load_template_source(template_name, template_dirs)
-load_template_source.is_usable = True   # type: ignore # https://github.com/python/mypy/issues/2087
+    def get_template(self, template_name, skip=None):
+        """
+        Call self.get_template_sources() and return a Template object for
+        the first template matching template_name. If skip is provided, ignore
+        template origins in skip. This is used to avoid recursion during
+        template extending.
+        """
+        tried = []
+
+        for origin in self.get_template_sources(template_name):
+            if skip is not None and origin in skip:
+                tried.append((origin, 'Skipped'))
+                continue
+
+            try:
+                template = DBTemplate.objects.get(path=origin)
+                contents = template.content
+            except DBTemplate.DoesNotExist:
+                tried.append((origin, 'Source does not exist'))
+                continue
+            else:
+                if   template.type_id == 'rst':
+                    return RSTTemplate(contents, origin, origin.template_name, self.engine)
+                elif template.type_id == 'plain':
+                    return PlainTemplate(contents, origin, origin.template_name, self.engine)
+                elif template.type_id == 'django':
+                    return DjangoTemplate(contents, origin, origin.template_name, self.engine)
+                else:
+                    return Template(contents, origin, origin.template_name, self.engine)
+
+        raise TemplateDoesNotExist(template_name, tried=tried)
+
+    def get_template_sources(self, template_name):
+        for template in DBTemplate.objects.filter(path__endswith=template_name):
+            yield Origin(
+                name=template.path,
+                template_name=template_name,
+                loader=self,
+            )
+

ietf/group/views.py

@@ -1000,6 +1000,7 @@ def diff(attr, name):
                     changed_personnel.update(set(old)^set(new))
 
             if personnel_change_text!="":
+                changed_personnel = [ str(p) for p in changed_personnel ]
                 personnel_change_text = "%s has updated %s personnel:\n\n" % (request.user.person.plain_name(), group.acronym.upper() ) + personnel_change_text
                 email_personnel_change(request, group, personnel_change_text, changed_personnel)
 

ietf/meeting/tests_js.py

@@ -8,6 +8,7 @@
 from pyquery import PyQuery 
 from unittest import skipIf
 
+import django
 from django.urls import reverse as urlreverse
 #from django.test.utils import override_settings
 
@@ -205,6 +206,7 @@ def test_edit_meeting_schedule(self):
         self.assertTrue(not s1_element.is_displayed())
 
 @skipIf(skip_selenium, skip_message)
+@skipIf(django.VERSION[0]==2, "Skipping test with race conditions under Django 2")
 class ScheduleEditTests(IetfLiveServerTestCase):
     def setUp(self):
         self.driver = start_web_driver()
@@ -228,19 +230,28 @@ def login(self):
         self.driver.find_element_by_xpath('//button[@type="submit"]').click()
 
     def testUnschedule(self):
+
         meeting = make_meeting_test_data()
         colors.fg_group_colors['FARFUT'] = 'blue'
         colors.bg_group_colors['FARFUT'] = 'white'
 
         self.assertEqual(SchedTimeSessAssignment.objects.filter(session__meeting=meeting, session__group__acronym='mars', schedule__name='test-schedule').count(),1)
 
+
+        ss = list(SchedTimeSessAssignment.objects.filter(session__meeting__number=72,session__group__acronym='mars',schedule__name='test-schedule')) # pyflakes:ignore
+
         self.login()
         url = self.absreverse('ietf.meeting.views.edit_schedule',kwargs=dict(num='72',name='test-schedule',owner='plain@example.com'))
         self.driver.get(url)
 
-        s1 = Session.objects.filter(group__acronym='mars', meeting=meeting).first()
+        # driver.get() will wait for scripts to finish, but not ajax
+        # requests.  Wait for completion of the permissions check:
+        read_only_note = self.driver.find_element_by_id('read_only')
+        WebDriverWait(self.driver, 10).until(expected_conditions.invisibility_of_element(read_only_note), "Read-only schedule")
 
-        time.sleep(0.1)
+        s1 = Session.objects.filter(group__acronym='mars', meeting=meeting).first()
+        selector = "#session_{}".format(s1.pk)
+        WebDriverWait(self.driver, 30).until(expected_conditions.presence_of_element_located((By.CSS_SELECTOR, selector)), "Did not find %s"%selector)
 
         self.assertEqual(self.driver.find_elements_by_css_selector("#sortable-list #session_{}".format(s1.pk)), [])
 
@@ -251,6 +262,7 @@ def testUnschedule(self):
         self.assertTrue(self.driver.find_elements_by_css_selector("#sortable-list #session_{}".format(s1.pk)))
 
         time.sleep(0.1) # The API that modifies the database runs async
+
         self.assertEqual(SchedTimeSessAssignment.objects.filter(session__meeting__number=72,session__group__acronym='mars',schedule__name='test-schedule').count(),0)
 
 @skipIf(skip_selenium, skip_message)

ietf/meeting/views.py

@@ -2794,6 +2794,7 @@ def floor_plan(request, num=None, floor=None, ):
         except FileNotFoundError:
             raise Http404('Missing floorplan image for %s' % floor)
     return render(request, 'meeting/floor-plan.html', {
+            "meeting": meeting,
             "schedule": schedule,
             "number": num,
             "floors": floors,

ietf/person/models.py

@@ -99,6 +99,8 @@ def last_name(self):
         return name_parts(self.name)[3]
     def first_name(self):
         return name_parts(self.name)[1]
+    def aliases(self):
+        return [ str(a) for a in self.alias_set.all() ]
     def role_email(self, role_name, group=None):
         """Lookup email for role for person, optionally on group which
         may be an object or the group acronym."""

ietf/settings.py

@@ -13,26 +13,9 @@
 from typing import Any, Dict, List, Tuple # pyflakes:ignore
 
 warnings.simplefilter("always", DeprecationWarning)
+warnings.filterwarnings("ignore", message="Add the `renderer` argument to the render\(\) method of", module="bootstrap3")
+warnings.filterwarnings("ignore", message="The logout\(\) view is superseded by")
 warnings.filterwarnings("ignore", message="Report.file_reporters will no longer be available in Coverage.py 4.2", module="coverage.report")
-warnings.filterwarnings("ignore", message="The popen2 module is deprecated.  Use the subprocess module.", module="ietf.utils.pipe")
-warnings.filterwarnings("ignore", message="Usage of field.rel has been deprecated. Use field.remote_field instead.", module="tastypie.resources")
-warnings.filterwarnings("ignore", message="Importing from django.core.urlresolvers is deprecated in favor of django.urls.", module="tastypie.resources")
-warnings.filterwarnings("ignore", message="on_delete will be a required arg for OneToOneField in Django 2.0.", module="tastypie")
-warnings.filterwarnings("ignore", message=r"The load_template\(\) method is deprecated. Use get_template\(\) instead.")
-warnings.filterwarnings("ignore", message="escape isn't the last filter in")
-warnings.filterwarnings("ignore", message="Deprecated allow_tags attribute used on field")
-warnings.filterwarnings("ignore", message="You passed a bytestring as `filenames`. This will not work on Python 3.")
-warnings.filterwarnings("ignore", message="django.forms.extras is deprecated.", module="bootstrap3")
-warnings.filterwarnings("ignore", message="defusedxml.lxml is no longer supported and will be removed in a future release.", module="tastypie")
-warnings.filterwarnings("ignore", message="Duplicate index '.*' defined on the table")
-# Warnings found under Python 3.7:
-warnings.filterwarnings("ignore", message="Using or importing the ABCs from 'collections' instead of from 'collections.abc' is deprecated")
-warnings.filterwarnings("ignore", message="'U' mode is deprecated", module="docutils.io")
-warnings.filterwarnings("ignore", message="'U' mode is deprecated", module="xml2rfc")
-warnings.filterwarnings("ignore", message="'U' mode is deprecated", module="site")
-warnings.filterwarnings("ignore", message="Flags not at the start of the expression", module="genshi")
-warnings.filterwarnings("ignore", message="Flags not at the start of the expression", module="coverage")
-warnings.filterwarnings("ignore", message="encodestring\(\) is a deprecated alias since 3.1, use encodebytes\(\)")
 
 
 try:
@@ -367,7 +350,6 @@ def skip_unreadable_post(record):
     'django.middleware.common.CommonMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.http.ConditionalGetMiddleware',
     'simple_history.middleware.HistoryRequestMiddleware',
@@ -902,7 +884,6 @@ def skip_unreadable_post(record):
 SECR_PPT2PDF_COMMAND = ['/usr/bin/soffice','--headless','--convert-to','pdf:writer_globaldocument_pdf_Export','--outdir']
 STATS_REGISTRATION_ATTENDEES_JSON_URL = 'https://ietf.org/registration/attendees/{number}'
 NEW_PROCEEDINGS_START = 95
-USE_ETAGS=True
 YOUTUBE_API_KEY = ''
 YOUTUBE_API_SERVICE_NAME = 'youtube'
 YOUTUBE_API_VERSION = 'v3'
@@ -1062,7 +1043,6 @@ def skip_unreadable_post(record):
 ]
 
 CHECKS_LIBRARY_PATCHES_TO_APPLY = [
-    'patch/fix-django-unicode-comparison-bug.patch',
     'patch/fix-unidecode-argument-warning.patch',
     'patch/fix-request-profiler-streaming-length.patch',
 ]

ietf/sync/iana.py

@@ -68,7 +68,7 @@ def fetch_changes_json(url, start, end):
     # HTTP basic auth
     username = "ietfsync"
     password = settings.IANA_SYNC_PASSWORD
-    headers = { "Authorization": "Basic %s" % force_str(base64.encodestring(smart_bytes("%s:%s" % (username, password)))).replace("\n", "") }
+    headers = { "Authorization": "Basic %s" % force_str(base64.encodebytes(smart_bytes("%s:%s" % (username, password)))).replace("\n", "") }
     text = requests.get(url, headers=headers).text
     return text
 

ietf/sync/rfceditor.py

@@ -532,7 +532,7 @@ def post_approved_draft(url, name):
     headers = {
             "Content-type": "application/x-www-form-urlencoded",
             "Accept": "text/plain",
-            "Authorization": "Basic %s" % force_str(base64.encodestring(smart_bytes("%s:%s" % (username, password)))).replace("\n", ""),
+            "Authorization": "Basic %s" % force_str(base64.encodebytes(smart_bytes("%s:%s" % (username, password)))).replace("\n", ""),
         }
 
     log("Posting RFC-Editor notifcation of approved draft '%s' to '%s'" % (name, url))

ietf/templates/meeting/agenda_by_room.html

@@ -18,7 +18,7 @@
 
 {% block content %}
 
-  {% include "meeting/meeting_heading.html" with meeting=schedule.meeting updated=meeting.updated selected="by-room" title_extra="by Room" %}
+  {% include "meeting/meeting_heading.html" with updated=meeting.updated selected="by-room" title_extra="by Room" %}
 
   <ul class="daylist">
     {% for day,sessions in ss_by_day.items %}

ietf/templates/meeting/agenda_by_type.html

@@ -27,7 +27,7 @@
 {% block title %}Agenda for {{meeting}} by Session Type{% endblock %}
 
 {% block content %}
-{% include "meeting/meeting_heading.html" with meeting=schedule.meeting updated=meeting.updated selected="by-type"  title_extra="by Session Type" %}
+{% include "meeting/meeting_heading.html" with updated=meeting.updated selected="by-type"  title_extra="by Session Type" %}
 
 {% regroup assignments by session.type.slug as type_list %}
 <ul class="typelist">