Removed all __future__ imports.

- Legacy-Id: 17391

PLAN

@@ -7,13 +7,6 @@ Updated: $Date$
 Planned work in rough order
 ===========================
 
-* Refactor the use of urlopen().  This is triggered by the transition to
-  python 3: All instances of .read() from urlopen() objects return byte
-  streams under Python 3, while the code wants to deal with str objects, which
-  are unicode under Python 3.  Instead of building our own adapter to extract
-  the charset and do the decoding, we should transition to the 'requests'
-  module, which provides decoded unicode text directly from the response.
-
 * Transition to Django 2.x (depends on Python 3.x).  Security updates to
   Django 1.11 will cease around April 2020.
 

bin/check-copyright

@@ -33,7 +33,7 @@ COPYRIGHT
         Open Source Initiative at http://opensource.org/licenses/BSD-2-Clause.
 
 """
-from __future__ import print_function
+
 
 import datetime
 import os

bin/setupenv

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from __future__ import print_function
+
 
 import os
 import subprocess

ietf/__init__.py

@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from . import checks                           # pyflakes:ignore
 
 # Don't add patch number here:

ietf/api/__init__.py

@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import datetime
 import re
 

ietf/api/management/commands/makeresources.py

@@ -1,6 +1,6 @@
-# Copyright The IETF Trust 2014-2019, All Rights Reserved
+# Copyright The IETF Trust 2014-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function, unicode_literals
+
 
 import os
 import datetime

ietf/api/serializer.py

@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import hashlib
 import json
 

ietf/api/tests.py

@@ -1,9 +1,7 @@
-# Copyright The IETF Trust 2015-2019, All Rights Reserved
+# Copyright The IETF Trust 2015-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import os
 import sys
 

ietf/api/views.py

@@ -1,6 +1,6 @@
-# Copyright The IETF Trust 2017-2019, All Rights Reserved
+# Copyright The IETF Trust 2017-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function, unicode_literals
+
 
 from jwcrypto.jwk import JWK
 

ietf/bin/list-role-holder-emails

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-from __future__ import print_function
+
 
 import os, sys
 import syslog

ietf/checks.py

@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import os
 import sys
 import time

ietf/community/admin.py

@@ -1,6 +1,6 @@
-# Copyright The IETF Trust 2017-2019, All Rights Reserved
+# Copyright The IETF Trust 2017-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function, unicode_literals
+
 
 from django.contrib import admin
 

ietf/community/forms.py

@@ -1,9 +1,7 @@
-# Copyright The IETF Trust 2012-2019, All Rights Reserved
+# Copyright The IETF Trust 2012-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django import forms
 from django.db.models import Q
 

ietf/community/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # Copyright The IETF Trust 2018-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.10 on 2018-02-20 10:52
-from __future__ import absolute_import, print_function, unicode_literals
+
 
 from typing import List, Tuple      # pyflakes:ignore
 

ietf/community/migrations/0002_auto_20180220_1052.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2018-2019, All Rights Reserved
+# Copyright The IETF Trust 2018-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.10 on 2018-02-20 10:52
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion

ietf/community/migrations/0003_add_communitylist_docs2_m2m.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-05-21 14:23
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 import ietf.utils.models

ietf/community/migrations/0004_set_document_m2m_keys.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-05-21 14:27
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import sys
 
 from tqdm import tqdm

ietf/community/migrations/0005_1_del_docs_m2m_table.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-05-22 08:15
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.db import migrations
 
 

ietf/community/migrations/0005_2_add_docs_m2m_table.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-05-22 08:15
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.db import migrations, models
 
 

ietf/community/migrations/0006_copy_docs_m2m_table.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-05-27 05:56
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.db import migrations
 
 import sys, time

ietf/community/migrations/0007_remove_docs2_m2m.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-05-30 03:06
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.db import migrations
 
 

ietf/community/models.py

@@ -1,9 +1,7 @@
-# Copyright The IETF Trust 2012-2019, All Rights Reserved
+# Copyright The IETF Trust 2012-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.contrib.auth.models import User
 from django.db import models
 from django.db.models import signals

ietf/community/tests.py

@@ -1,9 +1,7 @@
-# Copyright The IETF Trust 2016-2019, All Rights Reserved
+# Copyright The IETF Trust 2016-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from pyquery import PyQuery
 
 from django.urls import reverse as urlreverse

ietf/community/utils.py

@@ -1,9 +1,7 @@
-# Copyright The IETF Trust 2016-2019, All Rights Reserved
+# Copyright The IETF Trust 2016-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import re
 
 from django.db.models import Q

ietf/community/views.py

@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import csv
 import datetime
 import json

ietf/cookies/__init__.py

@@ -1,9 +1,7 @@
-# Copyright The IETF Trust 2010-2019, All Rights Reserved
+# Copyright The IETF Trust 2010-2020, All Rights Reserved
 # coding: latin-1
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from types import ModuleType
 
 # These people will be sent a stack trace if there's an uncaught exception in

ietf/cookies/tests.py

@@ -1,11 +1,9 @@
-# Copyright The IETF Trust 2015-2019, All Rights Reserved
+# Copyright The IETF Trust 2015-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from pyquery import PyQuery
-from six.moves.http_cookies import SimpleCookie
+from http.cookies import SimpleCookie
 
 from django.urls import reverse as urlreverse
 

ietf/cookies/views.py

@@ -1,9 +1,7 @@
-# Copyright The IETF Trust 2010-2019, All Rights Reserved
+# Copyright The IETF Trust 2010-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.shortcuts import render
 from django.conf import settings
 

ietf/dbtemplate/forms.py

@@ -1,9 +1,7 @@
-# Copyright The IETF Trust 2012-2019, All Rights Reserved
+# Copyright The IETF Trust 2012-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django import forms
 from django.core.exceptions import ValidationError
 from django.template import Context

ietf/dbtemplate/migrations/0001_initial.py

@@ -1,13 +1,9 @@
-# Copyright The IETF Trust 2018-2019, All Rights Reserved
+# Copyright The IETF Trust 2018-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.10 on 2018-02-20 10:52
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-import six
-if six.PY3:
-    from typing import List, Tuple      # pyflakes:ignore
+from typing import List, Tuple      # pyflakes:ignore
 
 from django.db import migrations, models
 

ietf/dbtemplate/migrations/0002_auto_20180220_1052.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2018-2019, All Rights Reserved
+# Copyright The IETF Trust 2018-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.10 on 2018-02-20 10:52
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.db import migrations
 import django.db.models.deletion
 import ietf.utils.models

ietf/dbtemplate/migrations/0003_adjust_review_templates.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-03-05 11:39
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.db import migrations
 
 def forward(apps, schema_editor):

ietf/dbtemplate/migrations/0004_adjust_assignment_email_summary_templates.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-03-13 13:41
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.db import migrations
 
 def forward(apps, schema_editor):

ietf/dbtemplate/migrations/0005_adjust_assignment_email_summary_templates_2526.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-03-13 13:41
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.db import migrations
 
 def forward(apps, schema_editor):

ietf/dbtemplate/migrations/0006_add_review_assigned_template.py

@@ -1,9 +1,7 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.db import migrations
 
 def forward(apps, schema_editor):

ietf/dbtemplate/migrations/0007_adjust_review_assigned.py

@@ -1,7 +1,7 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.26 on 2019-11-19 11:47
-from __future__ import unicode_literals
+
 
 from django.db import migrations
 

ietf/dbtemplate/migrations/0008_add_default_iesg_req_template.py

@@ -1,7 +1,7 @@
 # Copyright The IETF Trust 2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.27 on 2020-01-07 09:25
-from __future__ import unicode_literals
+
 
 from django.db import migrations
 

ietf/dbtemplate/models.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-# Copyright The IETF Trust 2012-2019, All Rights Reserved
-from __future__ import absolute_import, print_function, unicode_literals
+# Copyright The IETF Trust 2012-2020, All Rights Reserved
+
 
 from django.db import models
 from django.core.exceptions import ValidationError

ietf/dbtemplate/template.py

@@ -1,9 +1,7 @@
-# Copyright The IETF Trust 2012-2019, All Rights Reserved
+# Copyright The IETF Trust 2012-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import os
 import string
 from docutils.core import publish_string

ietf/doc/admin.py

@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.contrib import admin
 from django.db import models
 from django import forms

ietf/doc/expire.py

@@ -3,8 +3,6 @@
 # expiry of Internet Drafts
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.conf import settings
 
 import datetime, os, shutil, glob, re

ietf/doc/factories.py

@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import debug    # pyflakes:ignore
 import factory
 import factory.fuzzy

ietf/doc/feeds.py

@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import datetime
 
 from django.contrib.syndication.views import Feed, FeedDoesNotExist

ietf/doc/fields.py

@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import json
 
 from django.utils.html import escape

ietf/doc/forms.py

@@ -1,10 +1,7 @@
-# Copyright The IETF Trust 2013-2019, All Rights Reserved
+# Copyright The IETF Trust 2013-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-
 import datetime
 import debug #pyflakes:ignore
 from django import forms

ietf/doc/mails.py

@@ -3,8 +3,6 @@
 # generation of mails 
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import datetime
 import textwrap
 

ietf/doc/management/commands/fix_105_slides.py

@@ -1,9 +1,7 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import os
 
 from collections import Counter

ietf/doc/management/commands/generate_draft_bibxml_files.py

@@ -1,7 +1,6 @@
-# Copyright The IETF Trust 2018-2019, All Rights Reserved
+# Copyright The IETF Trust 2012-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
-from __future__ import absolute_import, print_function, unicode_literals
 
 import datetime
 import io

ietf/doc/migrations/0001_initial.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2018-2019, All Rights Reserved
+# Copyright The IETF Trust 2018-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.10 on 2018-02-20 10:52
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import datetime
 import django.core.validators
 from django.db import migrations, models

ietf/doc/migrations/0002_auto_20180220_1052.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2018-2019, All Rights Reserved
+# Copyright The IETF Trust 2018-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.10 on 2018-02-20 10:52
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 import ietf.utils.models

ietf/doc/migrations/0003_auto_20180401_1231.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2018-2019, All Rights Reserved
+# Copyright The IETF Trust 2018-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.11 on 2018-04-01 12:31
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.db import migrations, models
 
 

ietf/doc/migrations/0004_add_draft_stream_replaced_states.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2018-2019, All Rights Reserved
+# Copyright The IETF Trust 2018-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.13 on 2018-05-03 11:50
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.db import migrations
 
 def forward(apps, schema_editor):

ietf/doc/migrations/0005_fix_replaced_iab_irtf_stream_docs.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2018-2019, All Rights Reserved
+# Copyright The IETF Trust 2018-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.13 on 2018-05-03 12:16
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.db import migrations
 
 def forward(apps, schema_editor):

ietf/doc/migrations/0006_ballotpositiondocevent_send_email.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2018-2019, All Rights Reserved
+# Copyright The IETF Trust 2018-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.15 on 2018-10-03 06:39
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.db import migrations, models
 
 

ietf/doc/migrations/0007_idexists.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2018-2019, All Rights Reserved
+# Copyright The IETF Trust 2018-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.16 on 2018-11-04 10:56
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from tqdm import tqdm
 
 from django.db import migrations

ietf/doc/migrations/0008_add_uploaded_filename.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.17 on 2018-12-28 13:11
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.db import migrations, models
 
 

ietf/doc/migrations/0009_move_non_url_externalurls_to_uploaded_filename.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.17 on 2018-12-28 13:33
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.db import migrations
 from django.db.models import F
 

ietf/doc/migrations/0010_auto_20190225_1302.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-02-25 13:02
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.db import migrations, models
 
 

ietf/doc/migrations/0011_reviewassignmentdocevent.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.18 on 2019-01-11 11:22
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 import ietf.utils.models

ietf/doc/migrations/0012_add_event_type_closed_review_assignment.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-05-01 04:43
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.db import migrations, models
 
 

ietf/doc/migrations/0013_add_document_docalias_id.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-05-08 08:41
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.db import migrations, models
 
 

ietf/doc/migrations/0014_set_document_docalias_id.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-05-08 08:42
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import sys
 
 from tqdm import tqdm

ietf/doc/migrations/0015_1_add_fk_to_document_id.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-05-08 10:29
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion

ietf/doc/migrations/0015_2_add_doc_document_m2m_fields.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-05-28 12:42
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import sys, time
 
 from django.db import migrations, models

ietf/doc/migrations/0016_set_document_docalias_fk.py

@@ -3,9 +3,6 @@
 # Generated by Django 1.11.20 on 2019-05-08 14:04
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-
 import sys
 
 from tqdm import tqdm

ietf/doc/migrations/0017_make_document_id_primary_key.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-05-09 05:46
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.db import migrations, models
 
 

ietf/doc/migrations/0018_remove_old_document_field.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-05-20 09:53
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 import ietf.utils.models

ietf/doc/migrations/0019_rename_field_document2.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-05-21 05:31
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.db import migrations, models
 
 

ietf/doc/migrations/0020_copy_docs_m2m_table.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-05-21 05:31
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import sys, time
 
 from django.db import migrations

ietf/doc/migrations/0021_remove_docs2_m2m.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-05-30 03:36
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.db import migrations
 
 

ietf/doc/migrations/0022_document_primary_key_cleanup.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-06-10 03:47
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 import ietf.utils.models

ietf/doc/migrations/0023_one_to_many_docalias.py

@@ -1,10 +1,8 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-06-10 04:36
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import sys
 
 from tqdm import tqdm

ietf/doc/migrations/0024_iana_experts.py

@@ -1,7 +1,7 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.23 on 2019-08-07 12:07
-from __future__ import unicode_literals
+
 
 from django.db import migrations
 

ietf/doc/migrations/0025_ianaexpertdocevent.py

@@ -1,7 +1,7 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.23 on 2019-08-07 12:27
-from __future__ import unicode_literals
+
 
 from django.db import migrations, models
 import django.db.models.deletion

ietf/doc/migrations/0026_add_draft_rfceditor_state.py

@@ -1,7 +1,6 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
-from __future__ import absolute_import, print_function, unicode_literals
 
 from django.db import migrations
 

ietf/doc/migrations/0027_add_irsg_doc_positions.py

@@ -1,7 +1,7 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.22 on 2019-08-03 10:09
-from __future__ import unicode_literals
+
 
 from django.db import migrations
 

ietf/doc/migrations/0028_irsgballotdocevent.py

@@ -1,7 +1,7 @@
-# Copyright The IETF Trust 2019, All Rights Reserved
+# Copyright The IETF Trust 2019-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.25 on 2019-10-10 10:37
-from __future__ import unicode_literals
+
 
 from django.db import migrations, models
 import django.db.models.deletion

ietf/doc/migrations/0029_add_ipr_event_types.py

@@ -1,7 +1,7 @@
 # Copyright The IETF Trust 2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.27 on 2020-01-17 11:54
-from __future__ import unicode_literals
+
 
 from django.db import migrations, models
 

ietf/doc/models.py

@@ -1,6 +1,6 @@
 # Copyright The IETF Trust 2010-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
-from __future__ import absolute_import, print_function, unicode_literals
+
 
 import datetime
 import logging

ietf/doc/templatetags/ietf_filters.py

@@ -2,12 +2,9 @@
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import bleach
 import datetime
 import re
-import six
 
 from email.utils import parseaddr
 
@@ -118,8 +115,10 @@ def make_one_per_line(value):
     >>> make_one_per_line(None)
 
     """
-    if value and isinstance(value, (six.binary_type, six.text_type)):
+    if value and isinstance(value, str):
         return re.sub(", ?", "\n", value)
+    elif value and isinstance(value, bytes):
+        log.assertion('isinstance(value, str)')
     else:
         return value
 

ietf/doc/templatetags/managed_groups.py

@@ -1,9 +1,7 @@
-# Copyright The IETF Trust 2016-2019, All Rights Reserved
+# Copyright The IETF Trust 2016-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django import template
 
 import debug                            # pyflakes:ignore

ietf/doc/tests.py

@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import os
 import shutil
 import datetime
@@ -17,7 +15,7 @@ if sys.version_info[0] == 2 and sys.version_info[1] < 7:
 else:
     import unittest
 
-from six.moves.http_cookies import SimpleCookie
+from http.cookies import SimpleCookie
 from pyquery import PyQuery
 from urllib.parse import urlparse, parse_qs
 from tempfile import NamedTemporaryFile

ietf/doc/tests_charter.py

@@ -2,8 +2,6 @@
 # Copyright The IETF Trust 2011-2020, All Rights Reserved
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import datetime
 import io
 import os

ietf/doc/tests_conflict_review.py

@@ -1,9 +1,7 @@
-# Copyright The IETF Trust 2012-2019, All Rights Reserved
+# Copyright The IETF Trust 2012-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import io
 import os
 import shutil

ietf/doc/tests_downref.py

@@ -1,10 +1,7 @@
-# Copyright The IETF Trust 2017-2019, All Rights Reserved
+# Copyright The IETF Trust 2017-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-
 from django.urls import reverse as urlreverse
 from pyquery import PyQuery
 

ietf/doc/tests_draft.py

@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import os
 import shutil
 import datetime

ietf/doc/tests_material.py

@@ -1,9 +1,7 @@
-# Copyright The IETF Trust 2014-2019, All Rights Reserved
+# Copyright The IETF Trust 2014-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import os
 import shutil
 import datetime

ietf/doc/tests_review.py

@@ -1,9 +1,7 @@
-# Copyright The IETF Trust 2016-2019, All Rights Reserved
+# Copyright The IETF Trust 2016-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import datetime, os, shutil
 import io
 import tarfile, tempfile, mailbox

ietf/doc/tests_status_change.py

@@ -1,9 +1,7 @@
-# Copyright The IETF Trust 2013-2019, All Rights Reserved
+# Copyright The IETF Trust 2013-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import io
 import os
 import shutil

ietf/doc/urls.py

@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2009-2019, All Rights Reserved
+# Copyright The IETF Trust 2009-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen <pasi.eronen@nokia.com>
@@ -33,8 +33,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from django.conf.urls import include
 from django.views.generic import RedirectView
 from django.conf import settings

ietf/doc/urls_conflict_review.py

@@ -1,9 +1,7 @@
-# Copyright The IETF Trust 2012-2019, All Rights Reserved
+# Copyright The IETF Trust 2012-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 from ietf.doc import views_conflict_review, views_doc
 from ietf.utils.urls import url
 

ietf/doc/utils.py

@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import datetime
 import hashlib
 import io

ietf/doc/utils_charter.py

@@ -1,9 +1,7 @@
-# Copyright The IETF Trust 2011-2019, All Rights Reserved
+# Copyright The IETF Trust 2011-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import datetime
 import io
 import os

ietf/doc/utils_search.py

@@ -1,9 +1,7 @@
-# Copyright The IETF Trust 2016-2019, All Rights Reserved
+# Copyright The IETF Trust 2016-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import datetime
 import debug                            # pyflakes:ignore
 

ietf/doc/views_ballot.py

@@ -4,8 +4,6 @@
 # Directors and Secretariat
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import datetime, json
 
 from django import forms

ietf/doc/views_charter.py

@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import datetime
 import io
 import json

ietf/doc/views_conflict_review.py

@@ -1,9 +1,7 @@
-# Copyright The IETF Trust 2012-2019, All Rights Reserved
+# Copyright The IETF Trust 2012-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import datetime
 import io
 import os

ietf/doc/views_doc.py

@@ -34,8 +34,6 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import datetime
 import glob
 import io

ietf/doc/views_downref.py

@@ -1,10 +1,7 @@
-# Copyright The IETF Trust 2017-2019, All Rights Reserved
+# Copyright The IETF Trust 2017-2020, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
-
 from django.urls import reverse as urlreverse
 from django.http import HttpResponseRedirect
 from django.shortcuts import render

ietf/doc/views_draft.py

@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 # changing state and metadata on Internet Drafts
 
 import datetime