Merged in Django-1.10 upgrade work from ^/personal/henrik/6.43.1-django-1.10

 - Legacy-Id: 12881

Author: levkowetz

ietf/community/models.py

@@ -28,7 +28,7 @@ def get_absolute_url(self):
         if self.user:
             return urlreverse(ietf.community.views.view_list, kwargs={ 'username': self.user.username })
         elif self.group:
-            return urlreverse("group_docs", kwargs={ 'acronym': self.group.acronym })
+            return urlreverse("ietf.group.views.group_documents", kwargs={ 'acronym': self.group.acronym })
         return ""
 
 

ietf/community/urls.py

@@ -1,12 +1,14 @@
-from django.conf.urls import url
 
 
+from ietf.community import views
+from ietf.utils.urls import url
+
 urlpatterns = [
-    url(r'^personal/(?P<username>[^/]+)/$', 'ietf.community.views.view_list'),
-    url(r'^personal/(?P<username>[^/]+)/manage/$', 'ietf.community.views.manage_list'),
-    url(r'^personal/(?P<username>[^/]+)/trackdocument/(?P<name>[^/]+)/$', 'ietf.community.views.track_document'),
-    url(r'^personal/(?P<username>[^/]+)/untrackdocument/(?P<name>[^/]+)/$', 'ietf.community.views.untrack_document'),
-    url(r'^personal/(?P<username>[^/]+)/csv/$', 'ietf.community.views.export_to_csv'),
-    url(r'^personal/(?P<username>[^/]+)/feed/$', 'ietf.community.views.feed'),
-    url(r'^personal/(?P<username>[^/]+)/subscription/$', 'ietf.community.views.subscription'),
+    url(r'^personal/(?P<username>[^/]+)/$', views.view_list),
+    url(r'^personal/(?P<username>[^/]+)/manage/$', views.manage_list),
+    url(r'^personal/(?P<username>[^/]+)/trackdocument/(?P<name>[^/]+)/$', views.track_document),
+    url(r'^personal/(?P<username>[^/]+)/untrackdocument/(?P<name>[^/]+)/$', views.untrack_document),
+    url(r'^personal/(?P<username>[^/]+)/csv/$', views.export_to_csv),
+    url(r'^personal/(?P<username>[^/]+)/feed/$', views.feed),
+    url(r'^personal/(?P<username>[^/]+)/subscription/$', views.subscription),
 ]

ietf/context_processors.py

@@ -1,5 +1,7 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
+import sys
+import django
 from django.conf import settings
 from ietf import __date__, __rev__, __version__, __patch__, __id__
 
@@ -9,8 +11,20 @@ def server_mode(request):
 def rfcdiff_base_url(request):
     return {'rfcdiff_base_url': settings.RFCDIFF_BASE_URL}
 
+def python_version():
+    v = sys.version_info
+    return "%s.%s.%s" % (v.major, v.minor, v.micro, )
+
 def revision_info(request):
-    return {'revision_time': __date__[7:32], 'revision_date': __date__[7:17], 'revision_num': __rev__[6:-2], "revision_id": __id__[5:-2], "version_num": __version__+__patch__ }
+    return {
+        'revision_time': __date__[7:32],
+        'revision_date': __date__[7:17],
+        'revision_num': __rev__[6:-2],
+        'revision_id': __id__[5:-2],
+        'version_num': __version__+__patch__,
+        'django_version': django.get_version(),
+        'python_version': python_version(),
+    }
 
 def debug_mark_queries_from_view(request):
     "Marks the queries which has occurred so far as coming from a view."

ietf/cookies/urls.py

@@ -1,7 +1,7 @@
 # Copyright The IETF Trust 2010, All Rights Reserved
 
-from django.conf.urls import url
 from ietf.cookies import views
+from ietf.utils.urls import url
 
 urlpatterns = [
     url(r'^$', views.preferences),

ietf/dbtemplate/template.py

@@ -4,7 +4,7 @@
 from docutils.utils import SystemMessage
 import debug                            # pyflakes:ignore
 
-from django.template import loaders
+from django.template.loaders.base import Loader as BaseLoader
 from django.template.base import Template as DjangoTemplate, TemplateEncodingError
 from django.template.exceptions import TemplateDoesNotExist
 from django.utils.encoding import smart_unicode
@@ -61,7 +61,7 @@ def render(self, context):
             e.args = tuple(args)
             raise e
 
-class Loader(loaders.base.Loader):
+class Loader(BaseLoader):
     def __init__(self, engine):
         super(Loader, self).__init__(engine)
         self.is_usable = True

ietf/dbtemplate/urls.py

@@ -1,7 +1,9 @@
-from django.conf.urls import url
 
 
+from ietf.dbtemplate import views
+from ietf.utils.urls import url
+
 urlpatterns = [
-    url(r'^(?P<acronym>[-a-z0-9]+)/$', 'ietf.dbtemplate.views.template_list', name='template_list'),
-    url(r'^(?P<acronym>[-a-z0-9]+)/(?P<template_id>[\d]+)/$', 'ietf.dbtemplate.views.template_edit', name='template_edit'),
+    url(r'^(?P<acronym>[-a-z0-9]+)/$', views.template_list, name='template_list'),
+    url(r'^(?P<acronym>[-a-z0-9]+)/(?P<template_id>[\d]+)/$', views.template_edit, name='template_edit'),
 ]

ietf/doc/redirect_drafts_urls.py

@@ -1,11 +1,11 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
-from django.conf.urls import url
 from django.views.generic import RedirectView
 from django.http import HttpResponsePermanentRedirect
 from django.shortcuts import get_object_or_404
 
 from ietf.group.models import Group
+from ietf.utils.urls import url
 
 urlpatterns = [
     url(r'^$', RedirectView.as_view(url='/doc/', permanent=True)),

ietf/doc/redirect_idtracker_urls.py

@@ -1,6 +1,7 @@
-from django.conf.urls import url
 from django.views.generic import RedirectView
 
+from ietf.utils.urls import url
+
 urlpatterns = [
     url(r'^help/(?:sub)?state/(?:\d+/)?$', RedirectView.as_view(url='/doc/help/state/draft-iesg/', permanent=True)),
     url(r'^help/evaluation/$', RedirectView.as_view(url='https://www.ietf.org/iesg/voting-procedures.html', permanent=True)),

ietf/doc/templatetags/ietf_filters.py

@@ -15,7 +15,6 @@
 from django.conf import settings
 from django.utils.html import escape
 from django.template.defaultfilters import truncatewords_html, linebreaksbr, stringfilter, striptags, urlize
-from django.template import resolve_variable
 from django.utils.safestring import mark_safe, SafeData
 from django.utils.html import strip_tags
 
@@ -396,17 +395,6 @@ def has_role(user, role_names):
         return False
     return has_role(user, role_names.split(','))
 
-@register.filter
-def stable_dictsort(value, arg):
-    """
-    Like dictsort, except it's stable (preserves the order of items
-    whose sort key is the same). See also bug report
-    http://code.djangoproject.com/ticket/12110
-    """
-    decorated = [(resolve_variable('var.' + arg, {'var' : item}), item) for item in value]
-    decorated.sort(lambda a, b: cmp(a[0], b[0]) if a[0] and b[0] else -1 if b[0] else 1 if a[0] else 0)
-    return [item[1] for item in decorated]
-
 @register.filter
 def ad_area(user):
     if user and user.is_authenticated():

ietf/doc/tests_charter.py

@@ -559,7 +559,7 @@ def test_approve(self):
         self.assertTrue("approved" in outbox[0]['Subject'].lower())
         self.assertTrue("iesg-secretary" in outbox[0]['To'])
         body = outbox[0].get_payload()
-        for word in ["WG",   "/wg/ames/charter/",
+        for word in ["WG",   "/wg/ames/about/",
             "Charter", "/doc/charter-ietf-ames/", ]:
             self.assertIn(word, body)
         #