Fix various "RemovedInDjango20Warning" warnings. Commit ready for merge.

- Legacy-Id: 13112

ietf/api/__init__.py

@@ -6,7 +6,7 @@ from urllib import urlencode
 from django.conf import settings
 from django.http import HttpResponse
 from django.core.exceptions import ObjectDoesNotExist
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.encoding import force_text
 
 import debug                            # pyflakes:ignore

ietf/community/models.py

@@ -1,7 +1,7 @@
 from django.contrib.auth.models import User
 from django.db import models
 from django.db.models import signals
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 
 from ietf.doc.models import Document, DocEvent, State
 from ietf.group.models import Group

ietf/community/tests.py

@@ -2,7 +2,7 @@ import json
 
 from pyquery import PyQuery
 
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 from django.contrib.auth.models import User
 
 from ietf.community.models import CommunityList, SearchRule, EmailSubscription

ietf/community/utils.py

@@ -36,7 +36,7 @@ def lookup_community_list(username=None, acronym=None):
     return clist
 
 def can_manage_community_list(user, clist):
-    if not user or not user.is_authenticated():
+    if not user or not user.is_authenticated:
         return False
 
     if clist.user:
@@ -60,7 +60,7 @@ def augment_docs_with_tracking_info(docs, user):
 
     tracked = set()
 
-    if user and user.is_authenticated():
+    if user and user.is_authenticated:
         clist = CommunityList.objects.filter(user=user).first()
         if clist:
             tracked.update(docs_tracked_by_community_list(clist).filter(pk__in=docs).values_list("pk", flat=True))

ietf/community/views.py

@@ -22,7 +22,7 @@ def view_list(request, username=None):
     docs = docs_tracked_by_community_list(clist)
     docs, meta = prepare_document_table(request, docs, request.GET)
 
-    subscribed = request.user.is_authenticated() and EmailSubscription.objects.filter(community_list=clist, email__person__user=request.user)
+    subscribed = request.user.is_authenticated and EmailSubscription.objects.filter(community_list=clist, email__person__user=request.user)
 
     return render(request, 'community/view_list.html', {
         'clist': clist,

ietf/cookies/tests.py

@@ -1,7 +1,7 @@
 from pyquery import PyQuery
 from Cookie import SimpleCookie
 
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 
 import debug                            # pyflakes:ignore
 

ietf/doc/feeds.py

@@ -4,7 +4,7 @@ import datetime
 
 from django.contrib.syndication.views import Feed, FeedDoesNotExist
 from django.utils.feedgenerator import Atom1Feed, Rss201rev2Feed
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 from django.template.defaultfilters import truncatewords, truncatewords_html, date as datefilter, linebreaks
 from django.utils.html import strip_tags
 

ietf/doc/fields.py

@@ -2,7 +2,7 @@ import json
 
 from django.utils.html import escape
 from django import forms
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 
 import debug                            # pyflakes:ignore
 

ietf/doc/mails.py

@@ -6,7 +6,7 @@ import textwrap, datetime
 from django.template.loader import render_to_string
 from django.utils.html import strip_tags
 from django.conf import settings
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 
 from ietf.utils.mail import send_mail, send_mail_text
 from ietf.ipr.utils import iprs_from_docs, related_docs

ietf/doc/management/commands/generate_draft_bibxml_files.py

@@ -34,4 +34,4 @@ class Command(BaseCommand):
             ref_rev_file_name = os.path.join(bibxmldir, 'reference.I-D.%s-%s.xml' % (doc.name, doc.rev))
             write(ref_file_name, ref_text)
             write(ref_rev_file_name, ref_text)
-                
+                

ietf/doc/models.py

@@ -7,7 +7,7 @@ import os
 from django.db import models
 from django.core import checks
 from django.core.exceptions import ValidationError
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 from django.core.validators import URLValidator
 from django.contrib.contenttypes.models import ContentType
 from django.conf import settings

ietf/doc/templatetags/ballot_icon.py

@@ -35,7 +35,7 @@ import datetime
 import debug      # pyflakes:ignore
 
 from django import template
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 from django.db.models import Q
 from django.utils.safestring import mark_safe
 

ietf/doc/templatetags/ietf_filters.py

@@ -397,7 +397,7 @@ def has_role(user, role_names):
 
 @register.filter
 def ad_area(user):
-    if user and user.is_authenticated():
+    if user and user.is_authenticated:
         from ietf.group.models import Group
         g = Group.objects.filter(role__name__in=("pre-ad", "ad"), role__person__user=user)
         if g:
@@ -428,7 +428,7 @@ def format_snippet(text, trunc_words=25):
 @register.simple_tag
 def doc_edit_button(url_name, *args, **kwargs):
     """Given URL name/args/kwargs, looks up the URL just like "url" tag and returns a properly formatted button for the document material tables."""
-    from django.core.urlresolvers import reverse as urlreverse
+    from django.urls import reverse as urlreverse
     return mark_safe(u'<a class="btn btn-default btn-xs" href="%s">Edit</a>' % (urlreverse(url_name, args=args, kwargs=kwargs)))
 
 @register.filter
@@ -447,7 +447,7 @@ def state(doc, slug):
 @register.filter
 def statehelp(state):
     "Output help icon with tooltip for state."
-    from django.core.urlresolvers import reverse as urlreverse
+    from django.urls import reverse as urlreverse
     tooltip = escape(strip_tags(state.desc))
     url = urlreverse('ietf.doc.views_help.state_help', kwargs=dict(type=state.type_id)) + "#" + state.slug
     return mark_safe('<a class="state-help-icon" href="%s" title="%s">?</a>' % (url, tooltip))

ietf/doc/templatetags/managed_groups.py

@@ -6,7 +6,7 @@ register = template.Library()
 
 @register.filter
 def managed_groups(user):
-    if not (user and hasattr(user, "is_authenticated") and user.is_authenticated()):
+    if not (user and hasattr(user, "is_authenticated") and user.is_authenticated):
         return []
 
     groups = []
@@ -26,7 +26,7 @@ def managed_groups(user):
 
 @register.filter
 def managed_review_groups(user):
-    if not (user and hasattr(user, "is_authenticated") and user.is_authenticated()):
+    if not (user and hasattr(user, "is_authenticated") and user.is_authenticated):
         return []
 
     groups = []

ietf/doc/templatetags/streams_menu.py

@@ -13,7 +13,7 @@ def streams_menu(context):
 
     user = context["request"].user if "request" in context else AnonymousUser()
 
-    if user.is_authenticated():
+    if user.is_authenticated:
         streams = StreamName.objects.exclude(slug="legacy")
 
         if has_role(user, "Secretariat"):

ietf/doc/tests.py

@@ -13,7 +13,7 @@ from pyquery import PyQuery
 from tempfile import NamedTemporaryFile
 from Cookie import SimpleCookie
 
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 from django.conf import settings
 
 from tastypie.test import ResourceTestCaseMixin

ietf/doc/tests_ballot.py

@@ -4,7 +4,7 @@ from pyquery import PyQuery
 
 import debug                            # pyflakes:ignore
 
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 
 from ietf.doc.models import ( Document, State, DocEvent, BallotDocEvent,
     BallotPositionDocEvent, LastCallDocEvent, WriteupDocEvent, TelechatDocEvent )

ietf/doc/tests_charter.py

@@ -6,7 +6,7 @@ from StringIO import StringIO
 from pyquery import PyQuery
 
 from django.conf import settings
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 
 import debug                            # pyflakes:ignore
 

ietf/doc/tests_conflict_review.py

@@ -7,7 +7,7 @@ from StringIO import StringIO
 from textwrap import wrap
 
 from django.conf import settings
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 
 from ietf.doc.models import Document, DocEvent, NewRevisionDocEvent, BallotPositionDocEvent, TelechatDocEvent, State
 from ietf.doc.utils import create_ballot_if_not_open

ietf/doc/tests_draft.py

@@ -5,7 +5,7 @@ import datetime
 import StringIO
 from pyquery import PyQuery
 
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 from django.conf import settings
 
 import debug                            # pyflakes:ignore

ietf/doc/tests_material.py

@@ -9,7 +9,7 @@ from pyquery import PyQuery
 import debug              # pyflakes:ignore
 
 from django.conf import settings
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 
 from ietf.doc.models import Document, State, DocAlias, NewRevisionDocEvent
 from ietf.group.models import Group

ietf/doc/tests_review.py

@@ -5,7 +5,7 @@ import tarfile, tempfile, mailbox
 import email.mime.multipart, email.mime.text, email.utils
 from StringIO import StringIO
 
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 from django.conf import settings
 
 from pyquery import PyQuery

ietf/doc/tests_status_change.py

@@ -7,7 +7,7 @@ from StringIO import StringIO
 from textwrap import wrap
 
 from django.conf import settings
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 
 from ietf.doc.models import ( Document, DocAlias, State, DocEvent,
     BallotPositionDocEvent, NewRevisionDocEvent, TelechatDocEvent, WriteupDocEvent )

ietf/doc/utils.py

@@ -10,7 +10,7 @@ from collections import defaultdict
 from django.conf import settings
 from django.forms import ValidationError
 from django.utils.html import escape
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 
 import debug                            # pyflakes:ignore
 
@@ -95,7 +95,7 @@ def get_tags_for_stream_id(stream_id):
         return []
 
 def can_adopt_draft(user, doc):
-    if not user.is_authenticated():
+    if not user.is_authenticated:
         return False
 
     if has_role(user, "Secretariat"):

ietf/doc/utils_charter.py

@@ -1,7 +1,7 @@
 import re, datetime, os, shutil
 
 from django.conf import settings
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 from django.template.loader import render_to_string
 from django.utils.encoding import smart_text
 

ietf/doc/views_ballot.py

@@ -5,7 +5,7 @@ import datetime, json
 
 from django.http import HttpResponseForbidden, HttpResponseRedirect, Http404
 from django.shortcuts import render, get_object_or_404, redirect
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 from django.template.loader import render_to_string
 from django import forms
 from django.conf import settings

ietf/doc/views_charter.py

@@ -2,7 +2,7 @@ import os, datetime, textwrap, json
 
 from django.http import HttpResponseRedirect, HttpResponseNotFound, HttpResponseForbidden, Http404
 from django.shortcuts import get_object_or_404, redirect, render
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 from django import forms
 from django.utils.safestring import mark_safe
 from django.conf import settings

ietf/doc/views_conflict_review.py

@@ -3,7 +3,7 @@ import datetime, os
 from django import forms
 from django.shortcuts import render, get_object_or_404, redirect
 from django.http import HttpResponseRedirect, Http404
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.template.loader import render_to_string
 from django.conf import settings
 

ietf/doc/views_doc.py

@@ -37,7 +37,7 @@ import os, datetime, urllib, json, glob, re
 from django.http import HttpResponse, Http404 , HttpResponseForbidden
 from django.shortcuts import render, get_object_or_404, redirect
 from django.template.loader import render_to_string
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 from django.conf import settings
 from django import forms
 
@@ -162,7 +162,7 @@ def document_main(request, name, rev=None):
         can_edit = has_role(request.user, ("Area Director", "Secretariat"))
         stream_slugs = StreamName.objects.values_list("slug", flat=True)
         can_change_stream = bool(can_edit or (
-                request.user.is_authenticated() and
+                request.user.is_authenticated and
                 Role.objects.filter(name__in=("chair", "secr", "auth", "delegate"),
                                     group__acronym__in=stream_slugs,
                                     person__user=request.user)))
@@ -735,7 +735,7 @@ def document_history(request, name):
     # figure out if the current user can add a comment to the history
     if doc.type_id == "draft" and doc.group != None:
         can_add_comment = bool(has_role(request.user, ("Area Director", "Secretariat", "IRTF Chair", "IANA", "RFC Editor")) or (
-            request.user.is_authenticated() and
+            request.user.is_authenticated and
             Role.objects.filter(name__in=("chair", "secr"),
                 group__acronym=doc.group.acronym,
                 person__user=request.user)))
@@ -1023,7 +1023,7 @@ def add_comment(request, name):
 
     if doc.type_id == "draft" and doc.group != None:
         can_add_comment = bool(has_role(request.user, ("Area Director", "Secretariat", "IRTF Chair", "IANA", "RFC Editor")) or (
-            request.user.is_authenticated() and
+            request.user.is_authenticated and
             Role.objects.filter(name__in=("chair", "secr"),
                 group__acronym=doc.group.acronym,
                 person__user=request.user)))
@@ -1150,7 +1150,7 @@ def email_aliases(request,name=''):
     if not name:
         # require login for the overview page, but not for the
         # document-specific pages 
-        if not request.user.is_authenticated():
+        if not request.user.is_authenticated:
                 return redirect('%s?next=%s' % (settings.LOGIN_URL, request.path))
     aliases = get_doc_email_aliases(name)
 

ietf/doc/views_draft.py

@@ -222,7 +222,7 @@ def change_stream(request, name):
         raise Http404
 
     if not (has_role(request.user, ("Area Director", "Secretariat")) or
-            (request.user.is_authenticated() and
+            (request.user.is_authenticated and
              Role.objects.filter(name="chair",
                                  group__acronym__in=StreamName.objects.values_list("slug", flat=True),
                                  person__user=request.user))):

ietf/doc/views_material.py

@@ -7,7 +7,7 @@ from django.shortcuts import render, get_object_or_404, redirect
 from django.http import HttpResponseForbidden, Http404
 from django.utils.html import mark_safe
 from django.contrib.auth.decorators import login_required
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 
 import debug                            # pyflakes:ignore
 

ietf/doc/views_review.py

@@ -9,7 +9,7 @@ from django.contrib.auth.decorators import login_required
 from django.utils.html import mark_safe
 from django.core.exceptions import ValidationError
 from django.template.loader import render_to_string, TemplateDoesNotExist
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 
 from ietf.doc.models import (Document, NewRevisionDocEvent, State, DocAlias,
                              LastCallDocEvent, ReviewRequestDocEvent, DocumentAuthor)

ietf/doc/views_search.py

@@ -36,7 +36,7 @@ import datetime
 from django import forms
 from django.conf import settings
 from django.core.cache import cache
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 from django.db.models import Q
 from django.http import Http404, HttpResponseBadRequest, HttpResponse, HttpResponseRedirect, QueryDict
 from django.shortcuts import render

ietf/doc/views_stats.py

@@ -5,7 +5,7 @@ import datetime
 
 from django.conf import settings
 from django.core.cache import cache
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 from django.db.models.aggregates import Count
 from django.http import JsonResponse, HttpResponseBadRequest
 from django.shortcuts import render

ietf/doc/views_status_change.py

@@ -3,7 +3,7 @@ import datetime, os, re
 from django import forms
 from django.shortcuts import render, get_object_or_404, redirect
 from django.http import Http404, HttpResponseRedirect
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.template.loader import render_to_string
 from django.conf import settings
 

ietf/group/feeds.py

@@ -2,7 +2,7 @@
 
 from django.contrib.syndication.views import Feed, FeedDoesNotExist
 from django.utils.feedgenerator import Atom1Feed
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 from django.utils.html import strip_tags
 from django.template.defaultfilters import truncatewords
 

ietf/group/mails.py

@@ -6,7 +6,7 @@ import re
 from django.utils.html import strip_tags
 from django.utils.text import wrap
 from django.conf import settings
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 
 from ietf.utils.mail import send_mail, send_mail_text
 from ietf.mailtrigger.utils import gather_address_lists

ietf/group/models.py

@@ -52,7 +52,7 @@ class GroupInfo(models.Model):
 
     def about_url(self):
         # bridge gap between group-type prefixed URLs and /group/ ones
-        from django.core.urlresolvers import reverse as urlreverse
+        from django.urls import reverse as urlreverse
         kwargs = { 'acronym': self.acronym }
         if self.type_id in ("wg", "rg"):
             kwargs["group_type"] = self.type_id
@@ -89,7 +89,7 @@ class Group(GroupInfo):
     def has_role(self, user, role_names):
         if isinstance(role_names, str) or isinstance(role_names, unicode):
             role_names = [role_names]
-        return user.is_authenticated() and self.role_set.filter(name__in=role_names, person__user=user).exists()
+        return user.is_authenticated and self.role_set.filter(name__in=role_names, person__user=user).exists()
 
     def is_decendant_of(self, sought_parent):
         p = self.parent

ietf/group/tests.py

@@ -4,7 +4,7 @@ from unittest import skipIf
 from pyquery import PyQuery
 
 from django.conf import settings
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 from django.db.models import Q
 from django.test import Client
 

ietf/group/tests_info.py

@@ -11,8 +11,8 @@ from tempfile import NamedTemporaryFile
 import debug                            # pyflakes:ignore
 
 from django.conf import settings
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
-from django.core.urlresolvers import NoReverseMatch
+from django.urls import NoReverseMatch
 from django.contrib.auth.models import User
 
 from django.utils.html import escape

ietf/group/tests_review.py

@@ -2,7 +2,7 @@ import datetime
 
 from pyquery import PyQuery
 
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 
 from ietf.utils.test_data import make_test_data, make_review_data
 from ietf.utils.test_utils import login_testing_unauthorized, TestCase, unicontent, reload_db_objects

ietf/group/utils.py

@@ -2,7 +2,7 @@ import os
 
 from django.shortcuts import get_object_or_404
 from django.utils.safestring import mark_safe
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 
 import debug                            # pyflakes:ignore
 

ietf/group/views.py

@@ -46,7 +46,7 @@ from django.shortcuts import render, redirect, get_object_or_404
 from django.template.loader import render_to_string
 from django.http import HttpResponse, Http404, HttpResponseRedirect
 from django.conf import settings
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 from django.views.decorators.cache import cache_page
 from django.db.models import Q
 
@@ -376,7 +376,7 @@ def group_documents(request, acronym, group_type=None):
 
     docs, meta, docs_related, meta_related = prepare_group_documents(request, group, clist)
 
-    subscribed = request.user.is_authenticated() and EmailSubscription.objects.filter(community_list=clist, email__person__user=request.user)
+    subscribed = request.user.is_authenticated and EmailSubscription.objects.filter(community_list=clist, email__person__user=request.user)
 
     context = construct_group_menu_context(request, group, "documents", group_type, {
                 'docs': docs,
@@ -772,7 +772,7 @@ def email_aliases(request, acronym=None, group_type=None):
     if not acronym:
         # require login for the overview page, but not for the group-specific
         # pages 
-        if not request.user.is_authenticated():
+        if not request.user.is_authenticated:
                 return redirect('%s?next=%s' % (settings.LOGIN_URL, request.path))
 
     aliases = get_group_email_aliases(acronym, group_type)

ietf/group/views_ajax.py

@@ -3,7 +3,7 @@ from collections import defaultdict
 
 from django.http import HttpResponse, JsonResponse
 from django.shortcuts import get_object_or_404
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 from django.utils.html import escape
 from django.views.decorators.cache import cache_page, cache_control
 

ietf/group/views_review.py

@@ -6,7 +6,7 @@ import debug    # pyflakes:ignore
 from django.shortcuts import render, redirect, get_object_or_404
 from django.http import Http404, HttpResponseForbidden, HttpResponseRedirect
 from django.contrib.auth.decorators import login_required
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 from django.db.models import Max
 from django import forms
 from django.template.loader import render_to_string

ietf/help/models.py

@@ -1 +1 @@
-# Empty
+# Empty

ietf/help/tests_views.py

@@ -1,6 +1,6 @@
 from pyquery import PyQuery
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 import debug                            # pyflakes:ignore
 

ietf/iesg/tests.py

@@ -5,7 +5,7 @@ import json
 import datetime
 
 from django.conf import settings
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 
 from pyquery import PyQuery
 

ietf/ietfauth/forms.py

@@ -7,7 +7,7 @@ from django.core.exceptions import ValidationError
 from django.db import models
 from django.contrib.auth.models import User
 from django.utils.html import mark_safe
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 
 from django_password_strength.widgets import PasswordStrengthInput, PasswordConfirmationInput
 

ietf/ietfauth/tests.py

@@ -7,7 +7,7 @@ from pyquery import PyQuery
 from unittest import skipIf
 
 import django.contrib.auth.views
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 from django.contrib.auth.models import User
 from django.conf import settings
 

ietf/ietfauth/utils.py

@@ -14,7 +14,7 @@ from ietf.person.models import Person
 
 def user_is_person(user, person):
     """Test whether user is associated with person."""
-    if not user.is_authenticated() or not person:
+    if not user.is_authenticated or not person:
         return False
 
     if person.user_id == None:
@@ -29,7 +29,7 @@ def has_role(user, role_names, *args, **kwargs):
     if isinstance(role_names, str) or isinstance(role_names, unicode):
         role_names = [ role_names ]
     
-    if not user or not user.is_authenticated():
+    if not user or not user.is_authenticated:
         return False
 
     # use cache to avoid checking the same permissions again and again
@@ -93,7 +93,7 @@ def passes_test_decorator(test_func, message):
     def decorate(view_func):
         @wraps(view_func, assigned=available_attrs(view_func))
         def inner(request, *args, **kwargs):
-            if not request.user.is_authenticated():
+            if not request.user.is_authenticated:
                 return HttpResponseRedirect('%s?%s=%s' % (settings.LOGIN_URL, REDIRECT_FIELD_NAME, urlquote(request.get_full_path())))
             elif test_func(request.user, *args, **kwargs):
                 return view_func(request, *args, **kwargs)
@@ -117,7 +117,7 @@ def is_authorized_in_doc_stream(user, doc):
     if has_role(user, ["Secretariat"]):
         return True
 
-    if not user.is_authenticated():
+    if not user.is_authenticated:
         return False
 
     # must be authorized in the stream or group

ietf/ietfauth/views.py

@@ -48,7 +48,7 @@ from django.contrib.auth.hashers import identify_hasher
 from django.contrib.auth.models import User
 from django.contrib.auth.views import login as django_login
 from django.contrib.sites.models import Site
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 from django.http import Http404, HttpResponseRedirect  #, HttpResponse, 
 from django.shortcuts import render, redirect, get_object_or_404
 
@@ -81,7 +81,7 @@ def index(request):
 
 # @login_required
 # def ietf_login(request):
-#     if not request.user.is_authenticated():
+#     if not request.user.is_authenticated:
 #         return HttpResponse("Not authenticated?", status=500)
 # 
 #     redirect_to = request.REQUEST.get(REDIRECT_FIELD_NAME, '')

ietf/ipr/feeds.py

@@ -2,7 +2,7 @@
 
 from django.contrib.syndication.views import Feed
 from django.utils.feedgenerator import Atom1Feed
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 from django.utils.safestring import mark_safe
 
 from ietf.ipr.models import IprDisclosureBase

ietf/ipr/fields.py

@@ -2,7 +2,7 @@ import json
 
 from django.utils.html import escape
 from django import forms
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 
 from ietf.ipr.models import IprDisclosureBase
 

ietf/ipr/models.py

@@ -3,7 +3,7 @@
 import datetime
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db import models
 
 from ietf.doc.models import DocAlias

ietf/ipr/tests.py

@@ -3,7 +3,7 @@ import urllib
 
 from pyquery import PyQuery
 
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 
 import debug                            # pyflakes:ignore
 

ietf/ipr/urls.py

@@ -1,7 +1,7 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
 from django.views.generic import RedirectView
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 
 from ietf.ipr import views
 from ietf.utils.urls import url

ietf/ipr/utils.py

@@ -42,4 +42,4 @@ def related_docs(alias):
             x.related = rel
             x.relation = rel.relationship.revname
         results += rel_aliases
-    return list(set(results))
+    return list(set(results))

ietf/ipr/views.py

@@ -5,7 +5,7 @@ import itertools
 
 from django.conf import settings
 from django.contrib import messages
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 from django.db.models import Q
 from django.forms.models import inlineformset_factory
 from django.forms.formsets import formset_factory

ietf/liaisons/admin.py

@@ -1,5 +1,5 @@
 from django.contrib import admin
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from ietf.liaisons.models import  ( LiaisonStatement, LiaisonStatementEvent,
     LiaisonStatementGroupContacts, RelatedLiaisonStatement, LiaisonStatementAttachment )

ietf/liaisons/feeds.py

@@ -6,7 +6,7 @@ from django.contrib.syndication.views import Feed, FeedDoesNotExist
 from django.utils.feedgenerator import Atom1Feed
 from django.template.loader import render_to_string
 from django.db.models import Q
-from django.core.urlresolvers import reverse as urlreverse, reverse_lazy
+from django.urls import reverse as urlreverse, reverse_lazy
 
 from ietf.group.models import Group
 from ietf.liaisons.models import LiaisonStatement

ietf/liaisons/fields.py

@@ -2,7 +2,7 @@ import json
 
 from django.utils.html import escape
 from django import forms
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 
 from ietf.liaisons.models import LiaisonStatement
 

ietf/liaisons/management/commands/check_liaison_deadlines.py

@@ -19,4 +19,4 @@ class Command(BaseCommand):
             if r:
                 msgs.append('Liaison %05s#: Deadline reminder sent!' % l.pk)
 
-        return '\n'.join(msgs)
+        return '\n'.join(msgs)

ietf/liaisons/management/commands/remind_update_sdo_list.py

@@ -37,4 +37,4 @@ def send_reminders_to_sdos(sdo_pk=None):
             msg = u'%05s#: %s mail sent!' % (sdo.pk, sdo.name)
         msgs.append(msg)
 
-    return msgs
+    return msgs

ietf/liaisons/migrations/0005_migrate_groups.py

@@ -789,4 +789,4 @@ DEFAULT_POC = {
     'maawg':'Mike Adkins <madkins@fb.com>,technical-chair@mailman.m3aawg.org',
     'ecma-tc39':'John Neuman <johnneumann.openstrat@gmail.com>,Istvan Sebestyen <istvan@ecma-interational.org>',
 }
-    
+    

ietf/liaisons/models.py

@@ -1,7 +1,7 @@
 # Copyright The IETF Trust 2007, All Rights Reserved
 
 from django.conf import settings
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 from django.db import models
 from django.utils.text import slugify
 

ietf/liaisons/tests.py

@@ -3,7 +3,7 @@ import json
 
 from django.conf import settings
 from django.contrib.auth.models import User
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 from django.db.models import Q
 from StringIO import StringIO
 from pyquery import PyQuery

ietf/liaisons/utils.py

@@ -34,7 +34,7 @@ def can_edit_liaison(user, liaison):
     - liaison is outgoing and user has approval authority
     - user is liaison manager of all SDOs involved
     '''
-    if not user.is_authenticated():
+    if not user.is_authenticated:
         return False
     if has_role(user, "Secretariat"):
         return True

ietf/liaisons/views.py

@@ -3,7 +3,7 @@ import json
 from email.utils import parseaddr
 
 from django.contrib import messages
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 from django.core.validators import validate_email, ValidationError
 from django.db.models import Q, Prefetch
 from django.http import HttpResponse, HttpResponseForbidden
@@ -36,7 +36,7 @@ EMAIL_ALIASES = {
 # -------------------------------------------------
 def _can_reply(liaison, user):
     '''Returns true if the user can send a reply to this liaison'''
-    if user.is_authenticated():
+    if user.is_authenticated:
         person = get_person_for_user(user)
         if has_role(user, "Secretariat"):
             return True
@@ -51,7 +51,7 @@ def _can_take_care(liaison, user):
     if not liaison.deadline or liaison.action_taken:
         return False
 
-    if user.is_authenticated():
+    if user.is_authenticated:
         if has_role(user, "Secretariat"):
             return True
         else:

ietf/liaisons/widgets.py

@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 from django.db.models.query import QuerySet
 from django.forms.widgets import Widget
 from django.utils.safestring import mark_safe

ietf/mailinglists/tests.py

@@ -1,6 +1,6 @@
 # Copyright The IETF Trust 2016, All Rights Reserved
 
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 
 from pyquery import PyQuery
 

ietf/mailtrigger/tests.py

@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 
 from ietf.utils.test_utils import TestCase, unicontent
 from ietf.utils.test_data import make_test_data

ietf/mailtrigger/urls.py

@@ -1,5 +1,5 @@
 from django.views.generic import RedirectView
-from django.core.urlresolvers import reverse_lazy
+from django.urls import reverse_lazy
 
 from ietf.mailtrigger import views
 from ietf.utils.urls import url

ietf/meeting/ajax.py

@@ -281,7 +281,7 @@ def agenda_update(request, meeting, schedule):
 
     user = request.user
 
-    if not user.is_authenticated():
+    if not user.is_authenticated:
         return HttpResponse({'error':'no permission'}, status=403)
 
     cansee,canedit,secretariat = agenda_permissions(meeting, schedule, request.user)

ietf/meeting/helpers.py

@@ -9,7 +9,7 @@ from django.http import HttpRequest, Http404
 from django.db.models import Max, Q, Prefetch, F
 from django.conf import settings
 from django.core.cache import cache
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.cache import get_cache_key
 from django.shortcuts import get_object_or_404
 from django.template.loader import render_to_string

ietf/meeting/tests_api.py

@@ -2,7 +2,7 @@ import datetime
 import json
 from urlparse import urlsplit
 
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 
 import debug                            # pyflakes:ignore
 

ietf/meeting/tests_js.py

@@ -6,7 +6,7 @@ from pyquery import PyQuery
 from unittest import skipIf
 
 from django.contrib.staticfiles.testing import StaticLiveServerTestCase
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 #from django.test.utils import override_settings
 
 import debug                            # pyflakes:ignore

ietf/meeting/tests_views.py

@@ -7,7 +7,7 @@ import random
 
 import debug           # pyflakes:ignore
 
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 from django.conf import settings
 from django.contrib.auth.models import User
 

ietf/meeting/views.py

@@ -21,7 +21,7 @@ from django.shortcuts import render, redirect, get_object_or_404
 from django.http import HttpResponse, HttpResponseRedirect, HttpResponseForbidden, Http404
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
-from django.core.urlresolvers import reverse,reverse_lazy
+from django.urls import reverse,reverse_lazy
 from django.db.models import Min, Max, Q
 from django.conf import settings
 from django.forms.models import modelform_factory, inlineformset_factory

ietf/message/tests.py

@@ -1,6 +1,6 @@
 import datetime
 
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 
 from ietf.utils.test_utils import TestCase, unicontent
 from ietf.utils.test_data import make_test_data

ietf/middleware.py

@@ -53,4 +53,4 @@ def unicode_nfkc_normalization_middleware(get_response):
         response = get_response(request)
         return response
     return unicode_nfkc_normalization
-        
+        

ietf/nomcom/decorators.py

@@ -1,6 +1,6 @@
 import functools
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import HttpResponseRedirect
 from django.utils.http import urlquote
 

ietf/nomcom/forms.py

@@ -4,7 +4,7 @@ from formtools.preview import FormPreview, AUTO_ID
 from django.shortcuts import get_object_or_404, redirect
 from django.utils.decorators import method_decorator
 from django.shortcuts import render
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.utils.html import mark_safe
 
 from ietf.dbtemplate.forms import DBTemplateForm

ietf/nomcom/tests.py

@@ -10,7 +10,7 @@ import StringIO
 from django.db import IntegrityError
 from django.db.models import Max
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.core.files import File
 from django.contrib.auth.models import User
 

ietf/nomcom/utils.py

@@ -11,7 +11,7 @@ from email import message_from_string
 from django.conf import settings
 from django.contrib.sites.models import Site
 from django.core.exceptions import ObjectDoesNotExist
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.template.loader import render_to_string
 from django.shortcuts import get_object_or_404
 from django.utils.encoding import smart_str

ietf/nomcom/views.py

@@ -6,7 +6,7 @@ from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.models import AnonymousUser
 from django.contrib import messages
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.http import Http404, HttpResponseRedirect, HttpResponseForbidden
 from django.shortcuts import render, get_object_or_404, redirect
 from django.template.loader import render_to_string

ietf/person/fields.py

@@ -6,7 +6,7 @@ from urllib import urlencode
 
 from django.utils.html import escape
 from django import forms
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 
 import debug                            # pyflakes:ignore
 

ietf/person/tests.py

@@ -4,7 +4,7 @@ from __future__ import unicode_literals
 import json
 from pyquery import PyQuery
 
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 
 import debug                            # pyflakes:ignore
 

ietf/release/tests.py

@@ -1,6 +1,6 @@
 from pyquery import PyQuery
 
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 import debug                            # pyflakes:ignore
 

ietf/review/utils.py

@@ -2,7 +2,7 @@ import datetime, re, itertools
 from collections import defaultdict, namedtuple
 
 from django.db.models import Q, Max, F
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 from django.contrib.sites.models import Site
 
 import debug                            # pyflakes:ignore
@@ -27,7 +27,7 @@ def close_review_request_states():
     return ReviewRequestStateName.objects.filter(used=True).exclude(slug__in=["requested", "accepted", "rejected", "part-completed", "completed"])
 
 def can_request_review_of_doc(user, doc):
-    if not user.is_authenticated():
+    if not user.is_authenticated:
         return False
 
     if doc.type_id == 'draft' and doc.get_state_slug() != 'active':
@@ -37,14 +37,14 @@ def can_request_review_of_doc(user, doc):
             or Role.objects.filter(person__user=user, name="secr", group__in=active_review_teams()).exists())
 
 def can_manage_review_requests_for_team(user, team, allow_personnel_outside_team=True):
-    if not user.is_authenticated():
+    if not user.is_authenticated:
         return False
 
     return (Role.objects.filter(name="secr", person__user=user, group=team).exists()
             or (allow_personnel_outside_team and has_role(user, "Secretariat")))
 
 def can_access_review_stats_for_team(user, team):
-    if not user.is_authenticated():
+    if not user.is_authenticated:
         return False
 
     return (Role.objects.filter(name__in=("secr", "reviewer"), person__user=user, group=team).exists()

ietf/secr/announcement/tests.py

@@ -1,5 +1,5 @@
 from django.db import connection
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from pyquery import PyQuery
 

ietf/secr/areas/tests.py

@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from ietf.group.models import Group, GroupEvent
 from ietf.person.models import Person

ietf/secr/drafts/reports.py

@@ -100,4 +100,4 @@ def report_progress_report(start_date,end_date):
     
     report = render_to_string('drafts/report_progress_report.txt', context)
     
-    return report
+    return report

ietf/secr/drafts/tests_views.py

@@ -3,7 +3,7 @@ import shutil
 
 from StringIO import StringIO
 from django.conf import settings
-from django.core.urlresolvers import reverse as urlreverse
+from django.urls import reverse as urlreverse
 
 import debug                            # pyflakes:ignore
 

ietf/secr/groups/tests.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from ietf.utils.test_utils import TestCase
 from ietf.group.models import Group
 from ietf.person.models import Person

ietf/secr/meetings/models.py

@@ -50,4 +50,4 @@ class NonSession(models.Model):
         db_table = 'non_session'
         verbose_name = "Meeting non-session slot"
 
-"""
+"""

ietf/secr/meetings/tests.py

@@ -7,7 +7,7 @@ from StringIO import StringIO
 import debug         # pyflakes:ignore
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from ietf.group.models import Group, GroupEvent
 from ietf.meeting.models import Meeting, Room, TimeSlot, SchedTimeSessAssignment

ietf/secr/meetings/views.py

@@ -5,7 +5,7 @@ import time
 
 from django.conf import settings
 from django.contrib import messages
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db.models import Max
 from django.forms.formsets import formset_factory
 from django.forms.models import inlineformset_factory

ietf/secr/proceedings/tests.py

@@ -3,7 +3,7 @@ import os
 import shutil
 
 from django.conf import settings
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 
 from ietf.doc.models import Document
 from ietf.group.models import Group

ietf/secr/proceedings/views.py

@@ -7,7 +7,7 @@ import debug                            # pyflakes:ignore
 
 from django.conf import settings
 from django.contrib import messages
-from django.core.urlresolvers import reverse
+from django.urls import reverse
 from django.db.models import Max
 from django.http import HttpResponseRedirect
 from django.shortcuts import render, get_object_or_404, redirect