From 1615f46fb5cac3a8535d5c5e25e5b803d203eecb Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Thu, 27 Jun 2019 12:24:48 +0000 Subject: [PATCH 001/114] Requirements after py3 first pass. - Legacy-Id: 16308 --- requirements.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index 47c5bd3a0..456a64660 100644 --- a/requirements.txt +++ b/requirements.txt @@ -34,13 +34,13 @@ jwcrypto>=0.4.0 # for signed notifications #lxml>=3.4.0 # from PyQuery; mimeparse>=0.1.3 # from TastyPie mock>=2.0.0 -MySQL-python>=1.2.5 +mysqlclient>=1.3.13 oauth2client>=4.0.0 # required by google-api-python-client, but not always pulled in patch>=1.16,<2.0 pathlib>=1.0 pathlib2>=2.3.0 Pillow>=3.0 -pip==9.0.1 # Earlier pip has issues, 9.0.2 and 9.0.3, 10.0.0b1 leaves dross when down- and up-grading packages +#pip==9.0.1 # Earlier pip has issues, 9.0.2 and 9.0.3, 10.0.0b1 leaves dross when down- and up-grading packages pyang>=1.7.2,<2.0 pyflakes>=0.9.2 pyopenssl>=17.5.0 # Used by urllib3.contrib, which is used by PyQuery but not marked as a dependency @@ -49,15 +49,15 @@ python-dateutil>=2.2 python-magic>=0.4.6 python-memcached>=1.48 # for django.core.cache.backends.memcached pytz>=2014.7 -pyzmail>=1.0.3 +#pyzmail>=1.0.3 requests!=2.12.* -rfc2html>=2.0.0 +rfc2html>=2.0.1 selenium>=2.42,<3.8.1 six>=1.9.0 sqlparse>=0.2.2 tblib>=1.3.0 tqdm>=3.7.0 -Trac>=1.0.10,<1.2 +#Trac>=1.2.3 Unidecode>=0.4.18 #wsgiref>=0.1.2 xml2rfc>=2.9.3,!=2.6.0 From d7f5c8418249a7b79741114ced0dd8ce407ff5a1 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Thu, 27 Jun 2019 14:40:54 +0000 Subject: [PATCH 002/114] Initial 2to3 patch with added copyright statement updates. - Legacy-Id: 16309 --- ietf/__init__.py | 2 +- ietf/api/__init__.py | 7 +- ietf/api/management/commands/makeresources.py | 10 +-- ietf/api/serializer.py | 17 ++-- ietf/api/tests.py | 6 +- ietf/api/views.py | 4 +- ietf/community/admin.py | 8 +- ietf/community/forms.py | 5 +- ietf/community/migrations/0001_initial.py | 3 +- .../migrations/0002_auto_20180220_1052.py | 3 +- .../0003_add_communitylist_docs2_m2m.py | 2 +- .../migrations/0004_set_document_m2m_keys.py | 4 +- .../migrations/0005_1_del_docs_m2m_table.py | 2 +- .../migrations/0005_2_add_docs_m2m_table.py | 2 +- .../migrations/0006_copy_docs_m2m_table.py | 2 +- .../migrations/0007_remove_docs2_m2m.py | 2 +- ietf/community/models.py | 3 +- ietf/community/views.py | 4 +- ietf/cookies/__init__.py | 4 +- ietf/cookies/tests.py | 63 +++++++------- ietf/cookies/views.py | 4 +- ietf/dbtemplate/forms.py | 3 +- ietf/dbtemplate/migrations/0001_initial.py | 3 +- .../migrations/0002_auto_20180220_1052.py | 3 +- .../0003_adjust_review_templates.py | 3 +- ...just_assignment_email_summary_templates.py | 3 +- ietf/dbtemplate/models.py | 4 +- ietf/dbtemplate/template.py | 3 +- ietf/doc/admin.py | 4 +- ietf/doc/expire.py | 5 +- ietf/doc/feeds.py | 8 +- ietf/doc/fields.py | 10 +-- ietf/doc/forms.py | 4 +- ietf/doc/mails.py | 27 +++--- .../commands/generate_draft_bibxml_files.py | 3 +- ietf/doc/migrations/0001_initial.py | 3 +- .../doc/migrations/0002_auto_20180220_1052.py | 3 +- .../doc/migrations/0003_auto_20180401_1231.py | 3 +- .../0004_add_draft_stream_replaced_states.py | 3 +- .../0005_fix_replaced_iab_irtf_stream_docs.py | 3 +- .../0006_ballotpositiondocevent_send_email.py | 3 +- ietf/doc/migrations/0007_idexists.py | 3 +- .../migrations/0008_add_uploaded_filename.py | 3 +- ...n_url_externalurls_to_uploaded_filename.py | 3 +- .../doc/migrations/0010_auto_20190225_1302.py | 3 +- .../0011_reviewassignmentdocevent.py | 3 +- ...add_event_type_closed_review_assignment.py | 3 +- .../0013_add_document_docalias_id.py | 2 +- .../0014_set_document_docalias_id.py | 2 +- .../0015_1_add_fk_to_document_id.py | 2 +- .../0015_2_add_doc_document_m2m_fields.py | 2 +- .../0016_set_document_docalias_fk.py | 8 +- .../0017_make_document_id_primary_key.py | 2 +- .../0018_remove_old_document_field.py | 2 +- .../migrations/0019_rename_field_document2.py | 2 +- .../migrations/0020_copy_docs_m2m_table.py | 2 +- ietf/doc/migrations/0021_remove_docs2_m2m.py | 2 +- .../0022_document_primary_key_cleanup.py | 2 +- .../migrations/0023_one_to_many_docalias.py | 2 +- ietf/doc/models.py | 26 +++--- ietf/doc/templatetags/ietf_filters.py | 22 ++--- ietf/doc/templatetags/managed_groups.py | 2 +- ietf/doc/tests.py | 60 ++++++------- ietf/doc/tests_ballot.py | 16 ++-- ietf/doc/tests_charter.py | 12 +-- ietf/doc/tests_conflict_review.py | 43 +++++----- ietf/doc/tests_downref.py | 2 +- ietf/doc/tests_draft.py | 50 +++++------ ietf/doc/tests_material.py | 4 +- ietf/doc/tests_review.py | 10 +-- ietf/doc/tests_status_change.py | 36 ++++---- ietf/doc/utils.py | 26 +++--- ietf/doc/utils_charter.py | 5 +- ietf/doc/utils_search.py | 12 +-- ietf/doc/views_ballot.py | 9 +- ietf/doc/views_charter.py | 2 +- ietf/doc/views_conflict_review.py | 4 +- ietf/doc/views_doc.py | 20 ++--- ietf/doc/views_downref.py | 4 +- ietf/doc/views_draft.py | 38 ++++---- ietf/doc/views_material.py | 10 +-- ietf/doc/views_review.py | 4 +- ietf/doc/views_status_change.py | 4 +- ietf/group/admin.py | 8 +- ietf/group/dot.py | 4 +- ietf/group/feeds.py | 6 +- ietf/group/forms.py | 4 +- ietf/group/mails.py | 15 ++-- .../commands/show_group_features.py | 2 +- ietf/group/migrations/0001_initial.py | 3 +- ...2_groupfeatures_historicalgroupfeatures.py | 3 +- .../migrations/0003_groupfeatures_data.py | 35 ++++---- .../0004_add_group_feature_fields.py | 2 +- .../0005_group_features_list_data_to_json.py | 2 +- .../0006_group_features_lists_to_jsonfield.py | 2 +- .../0007_new_group_features_data.py | 36 ++++---- .../0008_group_features_onetoone.py | 2 +- .../migrations/0009_auto_20190122_1012.py | 3 +- ietf/group/migrations/0010_add_group_types.py | 6 +- .../migrations/0011_auto_20190225_1302.py | 3 +- .../0012_add_old_nomcom_announcements.py | 5 +- .../0013_add_groupmilestone_docs2_m2m.py | 2 +- .../migrations/0014_set_document_m2m_keys.py | 4 +- .../migrations/0015_1_del_docs_m2m_table.py | 2 +- .../migrations/0015_2_add_docs_m2m_table.py | 2 +- .../migrations/0016_copy_docs_m2m_table.py | 2 +- .../group/migrations/0017_remove_docs2_m2m.py | 2 +- .../0018_remove_old_document_field.py | 2 +- .../migrations/0019_rename_field_document2.py | 2 +- ietf/group/models.py | 16 ++-- ietf/group/tests_info.py | 4 +- ietf/group/tests_review.py | 10 +-- ietf/group/utils.py | 21 ++--- ietf/group/views.py | 28 +++--- ietf/idindex/generate_all_id2_txt.py | 3 +- ietf/idindex/generate_all_id_txt.py | 3 +- ietf/idindex/generate_id_abstracts_txt.py | 3 +- ietf/idindex/generate_id_index_txt.py | 3 +- ietf/idindex/index.py | 16 ++-- ietf/idindex/tests.py | 10 +-- ietf/iesg/__init__.py | 4 +- ietf/iesg/agenda.py | 6 +- ietf/iesg/models.py | 6 +- ietf/iesg/tests.py | 30 +++---- ietf/iesg/views.py | 38 ++++---- ietf/ietfauth/forms.py | 16 ++-- .../commands/send_apikey_usage_emails.py | 4 +- ietf/ietfauth/tests.py | 30 +++---- ietf/ietfauth/utils.py | 2 +- ietf/ietfauth/views.py | 6 +- ietf/ipr/admin.py | 12 +-- ietf/ipr/feeds.py | 4 +- ietf/ipr/fields.py | 12 +-- ietf/ipr/mail.py | 3 +- ietf/ipr/management/commands/process_email.py | 3 +- ietf/ipr/migrations/0001_initial.py | 3 +- .../ipr/migrations/0002_auto_20180225_1207.py | 3 +- .../0003_add_ipdocrel_document2_fk.py | 2 +- .../0004_remove_iprdocrel_document.py | 2 +- .../migrations/0005_rename_field_document2.py | 2 +- .../0006_document_primary_key_cleanup.py | 2 +- ietf/ipr/models.py | 10 +-- ietf/ipr/templatetags/ipr_filters.py | 6 +- ietf/ipr/tests.py | 12 +-- ietf/ipr/views.py | 30 +++---- ietf/liaisons/__init__.py | 8 +- ietf/liaisons/admin.py | 5 +- ietf/liaisons/feeds.py | 14 +-- ietf/liaisons/fields.py | 12 +-- ietf/liaisons/forms.py | 25 +++--- ietf/liaisons/mails.py | 7 +- .../commands/check_liaison_deadlines.py | 3 +- .../commands/remind_update_sdo_list.py | 9 +- ietf/liaisons/migrations/0001_initial.py | 3 +- .../migrations/0002_auto_20180225_1207.py | 3 +- .../migrations/0003_liaison_document2_fk.py | 2 +- ...ove_liaisonstatementattachment_document.py | 2 +- .../migrations/0005_rename_field_document2.py | 2 +- .../0006_document_primary_key_cleanup.py | 2 +- ietf/liaisons/models.py | 22 ++--- ietf/liaisons/tests.py | 5 +- ietf/liaisons/views.py | 16 ++-- ietf/liaisons/widgets.py | 31 +++---- ietf/mailinglists/factories.py | 4 +- ietf/mailinglists/migrations/0001_initial.py | 3 +- ietf/mailinglists/tests.py | 4 +- ietf/mailtrigger/migrations/0001_initial.py | 3 +- .../migrations/0002_conflrev_changes.py | 3 +- .../migrations/0003_add_review_notify_ad.py | 3 +- ...llot_rfceditornote_changed_postapproval.py | 3 +- .../migrations/0005_slides_proposed.py | 3 +- .../migrations/0006_sub_new_wg_00.py | 2 +- ietf/mailtrigger/models.py | 4 +- ietf/meeting/admin.py | 5 +- ietf/meeting/factories.py | 5 +- ietf/meeting/feeds.py | 3 +- ietf/meeting/helpers.py | 6 +- .../commands/update_important_dates.py | 4 +- ietf/meeting/migrations/0001_initial.py | 3 +- .../migrations/0002_auto_20180225_1207.py | 3 +- .../migrations/0003_rename_modified_fields.py | 3 +- .../migrations/0004_meeting_attendees.py | 3 +- .../migrations/0005_backfill_old_meetings.py | 3 +- .../migrations/0006_backfill_attendees.py | 3 +- .../migrations/0007_auto_20180716_1337.py | 3 +- .../0008_rename_meeting_agenda_note.py | 3 +- .../migrations/0009_add_agenda_info_note.py | 3 +- .../0010_set_ietf_103_agenda_info_note.py | 3 +- .../migrations/0011_auto_20190114_0550.py | 3 +- .../migrations/0012_add_slide_submissions.py | 3 +- .../0013_make_separate_break_sessobj.py | 3 +- .../migrations/0014_auto_20190426_0305.py | 3 +- .../0015_sessionpresentation_document2_fk.py | 2 +- ...016_remove_sessionpresentation_document.py | 2 +- .../migrations/0017_rename_field_document2.py | 2 +- .../0018_document_primary_key_cleanup.py | 2 +- ietf/meeting/models.py | 46 +++++----- .../templatetags/agenda_custom_tags.py | 5 +- ietf/meeting/tests_api.py | 3 +- ietf/meeting/tests_js.py | 4 +- ietf/meeting/tests_views.py | 50 +++++------ ietf/meeting/utils.py | 7 +- ietf/meeting/views.py | 8 +- ietf/message/migrations/0001_initial.py | 3 +- .../migrations/0002_add_message_docs2_m2m.py | 2 +- .../migrations/0003_set_document_m2m_keys.py | 4 +- .../migrations/0004_1_del_docs_m2m_table.py | 2 +- .../migrations/0004_2_add_docs_m2m_table.py | 2 +- .../migrations/0005_copy_docs_m2m_table.py | 2 +- .../migrations/0006_remove_docs2_m2m.py | 2 +- ietf/message/models.py | 3 +- ietf/message/tests.py | 5 +- ietf/middleware.py | 4 +- ietf/name/migrations/0001_initial.py | 3 +- ietf/name/migrations/0002_agendatypename.py | 3 +- .../migrations/0003_agendatypename_data.py | 3 +- .../0004_add_prefix_to_doctypenames.py | 3 +- .../0005_reviewassignmentstatename.py | 3 +- .../name/migrations/0006_adjust_statenames.py | 5 +- ietf/nomcom/admin.py | 3 +- ietf/nomcom/decorators.py | 3 +- ietf/nomcom/forms.py | 5 +- .../management/commands/feedback_email.py | 5 +- .../management/commands/make_dummy_nomcom.py | 18 ++-- .../management/commands/send_reminders.py | 3 +- ietf/nomcom/migrations/0001_initial.py | 3 +- .../migrations/0002_auto_20180918_0550.py | 3 +- .../0003_nomcom_show_accepted_nominees.py | 3 +- ...pted_nominees_false_on_existing_nomcoms.py | 3 +- .../migrations/0005_auto_20181008_0602.py | 3 +- ietf/nomcom/models.py | 13 +-- ietf/nomcom/tests.py | 65 +++++++------- ietf/nomcom/utils.py | 13 +-- ietf/nomcom/views.py | 3 +- ietf/person/factories.py | 12 +-- ietf/person/fields.py | 17 ++-- ietf/person/forms.py | 4 +- .../commands/deactivate_email_addresses.py | 6 +- ietf/person/migrations/0001_initial.py | 3 +- .../migrations/0002_auto_20180330_0808.py | 3 +- .../migrations/0003_auto_20180504_1519.py | 3 +- .../migrations/0004_populate_email_origin.py | 3 +- .../0005_populate_person_name_from_draft.py | 3 +- .../migrations/0006_auto_20180910_0719.py | 3 +- .../migrations/0007_auto_20180929_1303.py | 3 +- .../migrations/0008_auto_20181014_1448.py | 3 +- .../migrations/0009_auto_20190118_0725.py | 3 +- ietf/person/models.py | 16 ++-- ietf/person/name.py | 19 ++-- ietf/person/tests.py | 27 +++--- ietf/person/utils.py | 3 +- ietf/person/views.py | 5 +- ietf/redirects/tests.py | 3 +- ietf/redirects/views.py | 6 +- ietf/release/tests.py | 4 +- ietf/release/urls.py | 4 +- ietf/release/views.py | 4 +- ietf/review/admin.py | 3 +- ietf/review/mailarch.py | 11 +-- ietf/review/migrations/0001_initial.py | 3 +- .../0002_unavailableperiod_reason.py | 3 +- .../migrations/0003_add_notify_ad_when.py | 3 +- ...0004_reviewteamsettings_secr_mail_alias.py | 3 +- .../0005_set_secdir_notify_ad_when.py | 3 +- .../0006_historicalreviewersettings.py | 3 +- .../0007_allow_notify_ad_when_to_be_blank.py | 3 +- .../0008_remove_reviewrequest_old_id.py | 3 +- .../0009_refactor_review_request.py | 3 +- .../0010_populate_review_assignments.py | 7 +- .../migrations/0011_review_document2_fk.py | 2 +- .../0012_remove_old_document_field.py | 2 +- .../migrations/0013_rename_field_document2.py | 2 +- .../0014_document_primary_key_cleanup.py | 2 +- ietf/review/models.py | 16 ++-- ietf/review/utils.py | 34 ++++---- ietf/secr/announcement/forms.py | 7 +- ietf/secr/console/tests.py | 3 +- ietf/secr/drafts/forms.py | 7 +- ietf/secr/drafts/views.py | 4 +- ietf/secr/meetings/tests.py | 3 +- .../proceedings/migrations/0001_initial.py | 3 +- ietf/secr/proceedings/proc_utils.py | 2 +- ietf/secr/proceedings/views.py | 3 +- ietf/secr/rolodex/forms.py | 4 +- ietf/secr/sreq/forms.py | 3 +- ietf/secr/sreq/tests.py | 5 +- ietf/secr/sreq/views.py | 3 +- ietf/secr/telechat/views.py | 11 +-- ietf/secr/utils/group.py | 5 +- ietf/secr/utils/test.py | 3 +- ietf/settings.py | 2 +- ietf/settings_releasetest.py | 3 +- ietf/settings_sqlitetest.py | 3 +- ietf/settings_testcrawl.py | 5 +- ietf/stats/backfill_data.py | 8 +- ietf/stats/migrations/0001_initial.py | 3 +- ietf/stats/models.py | 8 +- ietf/stats/utils.py | 11 +-- ietf/stats/views.py | 62 ++++++------- ietf/submit/checkers.py | 10 +-- ietf/submit/forms.py | 25 +++--- ietf/submit/mail.py | 4 +- .../management/commands/manualpost_email.py | 3 +- ietf/submit/migrations/0001_initial.py | 3 +- .../0002_submission_document2_fk.py | 2 +- .../0003_remove_old_document_field.py | 2 +- .../migrations/0004_rename_field_document2.py | 2 +- ietf/submit/models.py | 7 +- ietf/submit/parsers/base.py | 9 +- ietf/submit/parsers/plain_parser.py | 11 +-- ietf/submit/templatetags/submit_tags.py | 3 +- ietf/submit/tests.py | 86 +++++++++---------- ietf/submit/utils.py | 26 +++--- ietf/submit/views.py | 16 ++-- ietf/sync/iana.py | 9 +- ietf/sync/rfceditor.py | 18 ++-- ietf/sync/tests.py | 10 +-- ietf/utils/admin.py | 11 +-- ietf/utils/aliases.py | 9 +- ietf/utils/bootstrap.py | 5 +- ietf/utils/decorators.py | 4 +- ietf/utils/draft.py | 5 +- ietf/utils/fields.py | 6 +- ietf/utils/history.py | 2 +- ietf/utils/html.py | 3 +- ietf/utils/log.py | 4 +- ietf/utils/mail.py | 32 +++---- .../commands/check_referential_integrity.py | 23 ++--- .../management/commands/coverage_changes.py | 10 +-- .../management/commands/create_group_wikis.py | 3 +- ietf/utils/management/commands/dumprelated.py | 3 +- ietf/utils/management/commands/loadrelated.py | 6 +- ietf/utils/management/commands/makefixture.py | 7 +- .../commands/populate_yang_model_dirs.py | 5 +- ietf/utils/management/commands/pyflakes.py | 15 ++-- .../commands/run_yang_model_checks.py | 3 +- .../commands/send_apikey_usage_emails.py | 4 +- .../commands/send_gdpr_consent_request.py | 6 +- .../commands/update_community_list_index.py | 4 +- .../commands/update_external_command_info.py | 3 +- ietf/utils/markup_txt.py | 3 +- ietf/utils/migrations/0001_initial.py | 3 +- ietf/utils/ordereddict.py | 3 +- ietf/utils/templatetags/htmlfilters.py | 4 +- ietf/utils/templatetags/textfilters.py | 3 +- ietf/utils/test_data.py | 12 +-- ietf/utils/test_runner.py | 38 ++++---- ietf/utils/test_utils.py | 8 +- ietf/utils/tests.py | 24 +++--- ietf/utils/tests_restapi.py | 5 +- ietf/utils/texescape.py | 3 +- ietf/utils/text.py | 9 +- ietf/utils/textupload.py | 3 +- ietf/utils/validators.py | 4 +- ietf/virtualenv-manage.py | 3 +- ietf/wsgi.py | 3 +- tzparse.py | 31 +++---- 357 files changed, 1519 insertions(+), 1338 deletions(-) diff --git a/ietf/__init__.py b/ietf/__init__.py index aafb77260..2830859d2 100644 --- a/ietf/__init__.py +++ b/ietf/__init__.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2007-2019, All Rights Reserved # -*- coding: utf-8 -*- -import checks # pyflakes:ignore +from . import checks # pyflakes:ignore # Don't add patch number here: __version__ = "6.98.2.dev0" diff --git a/ietf/api/__init__.py b/ietf/api/__init__.py index ba8ad4c91..352b62888 100644 --- a/ietf/api/__init__.py +++ b/ietf/api/__init__.py @@ -1,7 +1,8 @@ +# Copyright The IETF Trust 2014-2019, All Rights Reserved import re import six import datetime -from urllib import urlencode +from urllib.parse import urlencode from django.conf import settings from django.core.exceptions import ObjectDoesNotExist @@ -129,9 +130,9 @@ class ToOneField(tastypie.fields.ToOneField): if not foreign_obj: if not self.null: if callable(self.attribute): - raise ApiFieldError(u"The related resource for resource %s could not be found." % (previous_obj)) + raise ApiFieldError("The related resource for resource %s could not be found." % (previous_obj)) else: - raise ApiFieldError(u"The model '%r' has an empty attribute '%s' and doesn't allow a null value." % (previous_obj, attr)) + raise ApiFieldError("The model '%r' has an empty attribute '%s' and doesn't allow a null value." % (previous_obj, attr)) return None fk_resource = self.get_related_resource(foreign_obj) diff --git a/ietf/api/management/commands/makeresources.py b/ietf/api/management/commands/makeresources.py index c564f36a2..03c66d64e 100644 --- a/ietf/api/management/commands/makeresources.py +++ b/ietf/api/management/commands/makeresources.py @@ -1,6 +1,6 @@ # Copyright The IETF Trust 2014-2019, All Rights Reserved # -*- coding: utf-8 -*- -from __future__ import print_function + import os import datetime @@ -66,7 +66,7 @@ class Command(AppCommand): app_resources = {} if os.path.exists(resource_file_path): resources = import_module("%s.resources" % app.name) - for n,v in resources.__dict__.items(): + for n,v in list(resources.__dict__.items()): if issubclass(type(v), type(ModelResource)): app_resources[n] = v @@ -164,7 +164,7 @@ class Command(AppCommand): fields=model._meta.fields, m2m_fields=model._meta.many_to_many, name=model_name, - imports=[ v for k,v in imports.items() ], + imports=[ v for k,v in list(imports.items()) ], foreign_keys=foreign_keys, m2m_keys=m2m_keys, resource_name=resource_name, @@ -184,7 +184,7 @@ class Command(AppCommand): while len(new_models) > 0: list_len = len(new_models) #debug.show('len(new_models)') - keys = new_models.keys() + keys = list(new_models.keys()) for model_name in keys: internal_fk_count = 0 for fk in new_models[model_name]["foreign_keys"]+new_models[model_name]["m2m_keys"]: @@ -207,7 +207,7 @@ class Command(AppCommand): internal_fk_count_limit += 1 else: print("Failed also with partial ordering, writing resource classes without ordering") - new_model_list = [ v for k,v in new_models.items() ] + new_model_list = [ v for k,v in list(new_models.items()) ] break if rfile.tell() == 0: diff --git a/ietf/api/serializer.py b/ietf/api/serializer.py index 11a61f1d3..e57c73bf1 100644 --- a/ietf/api/serializer.py +++ b/ietf/api/serializer.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved import hashlib import json @@ -16,7 +17,7 @@ import debug # pyflakes:ignore def filter_from_queryargs(request): #@debug.trace def fix_ranges(d): - for k,v in d.items(): + for k,v in list(d.items()): if v.startswith("[") and v.endswith("]"): d[k] = [ s for s in v[1:-1].split(",") if s ] elif "," in v: @@ -27,9 +28,9 @@ def filter_from_queryargs(request): def is_ascii(s): return all(ord(c) < 128 for c in s) # limit parameter keys to ascii. - params = dict( (k,v) for (k,v) in request.GET.items() if is_ascii(k) ) - filter = fix_ranges(dict([(k,params[k]) for k in params.keys() if not k.startswith("not__")])) - exclude = fix_ranges(dict([(k[5:],params[k]) for k in params.keys() if k.startswith("not__")])) + params = dict( (k,v) for (k,v) in list(request.GET.items()) if is_ascii(k) ) + filter = fix_ranges(dict([(k,params[k]) for k in list(params.keys()) if not k.startswith("not__")])) + exclude = fix_ranges(dict([(k[5:],params[k]) for k in list(params.keys()) if k.startswith("not__")])) return filter, exclude def unique_obj_name(obj): @@ -147,7 +148,7 @@ class AdminJsonSerializer(Serializer): if hasattr(field_value, "_meta"): self._current[name] = self.expand_related(field_value, name) else: - self._current[name] = unicode(field_value) + self._current[name] = str(field_value) except ObjectDoesNotExist: pass except AttributeError: @@ -224,7 +225,7 @@ class JsonExportMixin(object): def json_view(self, request, filter={}, expand=[]): qfilter, exclude = filter_from_queryargs(request) - for k in qfilter.keys(): + for k in list(qfilter.keys()): if k.startswith("_"): del qfilter[k] qfilter.update(filter) @@ -244,7 +245,7 @@ class JsonExportMixin(object): try: qs = self.get_queryset().filter(**filter).exclude(**exclude) except (FieldError, ValueError) as e: - return HttpResponse(json.dumps({u"error": str(e)}, sort_keys=True, indent=3), content_type=content_type) + return HttpResponse(json.dumps({"error": str(e)}, sort_keys=True, indent=3), content_type=content_type) try: if expand: qs = qs.select_related() @@ -252,7 +253,7 @@ class JsonExportMixin(object): items = [(getattr(o, key), serializer.serialize([o], expand=expand, query_info=query_info) ) for o in qs ] qd = dict( ( k, json.loads(v)[0] ) for k,v in items ) except (FieldError, ValueError) as e: - return HttpResponse(json.dumps({u"error": str(e)}, sort_keys=True, indent=3), content_type=content_type) + return HttpResponse(json.dumps({"error": str(e)}, sort_keys=True, indent=3), content_type=content_type) text = json.dumps({smart_text(self.model._meta): qd}, sort_keys=True, indent=3) return HttpResponse(text, content_type=content_type) diff --git a/ietf/api/tests.py b/ietf/api/tests.py index 64f7b0625..f9cf30ed4 100644 --- a/ietf/api/tests.py +++ b/ietf/api/tests.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2015-2018, All Rights Reserved +# Copyright The IETF Trust 2015-2019, All Rights Reserved import json import os @@ -218,8 +218,8 @@ class TastypieApiTestCase(ResourceTestCaseMixin, TestCase): # model_list = apps.get_app_config(name).get_models() for model in model_list: - if not model._meta.model_name in app_resources.keys(): + if not model._meta.model_name in list(app_resources.keys()): #print("There doesn't seem to be any resource for model %s.models.%s"%(app.__name__,model.__name__,)) - self.assertIn(model._meta.model_name, app_resources.keys(), + self.assertIn(model._meta.model_name, list(app_resources.keys()), "There doesn't seem to be any API resource for model %s.models.%s"%(app.__name__,model.__name__,)) diff --git a/ietf/api/views.py b/ietf/api/views.py index 027a6a8c1..8ac5db805 100644 --- a/ietf/api/views.py +++ b/ietf/api/views.py @@ -1,7 +1,7 @@ -# Copyright The IETF Trust 2017, All Rights Reserved +# Copyright The IETF Trust 2017-2019, All Rights Reserved # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from jwcrypto.jwk import JWK diff --git a/ietf/community/admin.py b/ietf/community/admin.py index e366f48df..e36ac256e 100644 --- a/ietf/community/admin.py +++ b/ietf/community/admin.py @@ -1,24 +1,24 @@ # Copyright The IETF Trust 2017-2019, All Rights Reserved # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.contrib import admin from ietf.community.models import CommunityList, SearchRule, EmailSubscription class CommunityListAdmin(admin.ModelAdmin): - list_display = [u'id', 'user', 'group'] + list_display = ['id', 'user', 'group'] raw_id_fields = ['user', 'group', 'added_docs'] admin.site.register(CommunityList, CommunityListAdmin) class SearchRuleAdmin(admin.ModelAdmin): - list_display = [u'id', 'community_list', 'rule_type', 'state', 'group', 'person', 'text'] + list_display = ['id', 'community_list', 'rule_type', 'state', 'group', 'person', 'text'] raw_id_fields = ['community_list', 'state', 'group', 'person', 'name_contains_index'] search_fields = ['person__name', 'group__acronym', 'text', ] admin.site.register(SearchRule, SearchRuleAdmin) class EmailSubscriptionAdmin(admin.ModelAdmin): - list_display = [u'id', 'community_list', 'email', 'notify_on'] + list_display = ['id', 'community_list', 'email', 'notify_on'] raw_id_fields = ['community_list', 'email'] admin.site.register(EmailSubscription, EmailSubscriptionAdmin) diff --git a/ietf/community/forms.py b/ietf/community/forms.py index d764d2307..5ad6cddaa 100644 --- a/ietf/community/forms.py +++ b/ietf/community/forms.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2012-2019, All Rights Reserved from django import forms from django.db.models import Q @@ -82,9 +83,9 @@ class SearchRuleForm(forms.ModelForm): if 'group' in self.fields: self.fields['group'].queryset = self.fields['group'].queryset.filter(state="active").order_by("acronym") - self.fields['group'].choices = [(g.pk, u"%s - %s" % (g.acronym, g.name)) for g in self.fields['group'].queryset] + self.fields['group'].choices = [(g.pk, "%s - %s" % (g.acronym, g.name)) for g in self.fields['group'].queryset] - for name, f in self.fields.iteritems(): + for name, f in self.fields.items(): f.required = True def clean_text(self): diff --git a/ietf/community/migrations/0001_initial.py b/ietf/community/migrations/0001_initial.py index 44ddb6200..18270ac3d 100644 --- a/ietf/community/migrations/0001_initial.py +++ b/ietf/community/migrations/0001_initial.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-02-20 10:52 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion diff --git a/ietf/community/migrations/0002_auto_20180220_1052.py b/ietf/community/migrations/0002_auto_20180220_1052.py index 2e3f85b17..eda75147f 100644 --- a/ietf/community/migrations/0002_auto_20180220_1052.py +++ b/ietf/community/migrations/0002_auto_20180220_1052.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-02-20 10:52 -from __future__ import unicode_literals + from django.conf import settings from django.db import migrations, models diff --git a/ietf/community/migrations/0003_add_communitylist_docs2_m2m.py b/ietf/community/migrations/0003_add_communitylist_docs2_m2m.py index 6ab7a26c7..4bd72b17c 100644 --- a/ietf/community/migrations/0003_add_communitylist_docs2_m2m.py +++ b/ietf/community/migrations/0003_add_communitylist_docs2_m2m.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-21 14:23 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion diff --git a/ietf/community/migrations/0004_set_document_m2m_keys.py b/ietf/community/migrations/0004_set_document_m2m_keys.py index 2c2db4d13..f28a44a6b 100644 --- a/ietf/community/migrations/0004_set_document_m2m_keys.py +++ b/ietf/community/migrations/0004_set_document_m2m_keys.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-21 14:27 -from __future__ import unicode_literals + import sys @@ -21,7 +21,7 @@ def forward(apps, schema_editor): # Document id fixup ------------------------------------------------------------ objs = Document.objects.in_bulk() - nameid = { o.name: o.id for id, o in objs.iteritems() } + nameid = { o.name: o.id for id, o in objs.items() } sys.stderr.write('\n') diff --git a/ietf/community/migrations/0005_1_del_docs_m2m_table.py b/ietf/community/migrations/0005_1_del_docs_m2m_table.py index 68afc2e9f..2aaaa1de9 100644 --- a/ietf/community/migrations/0005_1_del_docs_m2m_table.py +++ b/ietf/community/migrations/0005_1_del_docs_m2m_table.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-22 08:15 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/community/migrations/0005_2_add_docs_m2m_table.py b/ietf/community/migrations/0005_2_add_docs_m2m_table.py index 9e0438702..7e7d4e794 100644 --- a/ietf/community/migrations/0005_2_add_docs_m2m_table.py +++ b/ietf/community/migrations/0005_2_add_docs_m2m_table.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-22 08:15 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/community/migrations/0006_copy_docs_m2m_table.py b/ietf/community/migrations/0006_copy_docs_m2m_table.py index 7d0f76803..0390ab03d 100644 --- a/ietf/community/migrations/0006_copy_docs_m2m_table.py +++ b/ietf/community/migrations/0006_copy_docs_m2m_table.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-27 05:56 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/community/migrations/0007_remove_docs2_m2m.py b/ietf/community/migrations/0007_remove_docs2_m2m.py index 9687aa3ad..2fec92659 100644 --- a/ietf/community/migrations/0007_remove_docs2_m2m.py +++ b/ietf/community/migrations/0007_remove_docs2_m2m.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-30 03:06 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/community/models.py b/ietf/community/models.py index ec8e10f6e..e719f2315 100644 --- a/ietf/community/models.py +++ b/ietf/community/models.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2012-2019, All Rights Reserved from django.contrib.auth.models import User from django.db import models from django.db.models import signals @@ -89,7 +90,7 @@ class EmailSubscription(models.Model): notify_on = models.CharField(max_length=30, choices=NOTIFICATION_CHOICES, default="all") def __unicode__(self): - return u"%s to %s (%s changes)" % (self.email, self.community_list, self.notify_on) + return "%s to %s (%s changes)" % (self.email, self.community_list, self.notify_on) def notify_events(sender, instance, **kwargs): diff --git a/ietf/community/views.py b/ietf/community/views.py index 1ee16bd8e..b74b3e718 100644 --- a/ietf/community/views.py +++ b/ietf/community/views.py @@ -196,7 +196,7 @@ def export_to_csv(request, username=None, acronym=None, group_type=None): row.append(e.time.strftime("%Y-%m-%d") if e else "") row.append(strip_tags(doc.friendly_state())) row.append(doc.group.acronym if doc.group else "") - row.append(unicode(doc.ad) if doc.ad else "") + row.append(str(doc.ad) if doc.ad else "") e = doc.latest_event() row.append(e.time.strftime("%Y-%m-%d") if e else "") writer.writerow([v.encode("utf-8") for v in row]) @@ -222,7 +222,7 @@ def feed(request, username=None, acronym=None, group_type=None): host = request.get_host() feed_url = 'https://%s%s' % (host, request.get_full_path()) feed_id = uuid.uuid5(uuid.NAMESPACE_URL, feed_url.encode('utf-8')) - title = u'%s RSS Feed' % clist.long_name() + title = '%s RSS Feed' % clist.long_name() if significant: subtitle = 'Significant document changes' else: diff --git a/ietf/cookies/__init__.py b/ietf/cookies/__init__.py index 306c9879b..65eb4a033 100644 --- a/ietf/cookies/__init__.py +++ b/ietf/cookies/__init__.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2010, All Rights Reserved +# Copyright The IETF Trust 2010-2019, All Rights Reserved # coding: latin-1 from types import ModuleType @@ -9,7 +9,7 @@ DEBUG_EMAILS = [ ('Tero Kivinen', 'kivinen@iki.fi'), ] -for k in locals().keys(): +for k in list(locals().keys()): m = locals()[k] if isinstance(m, ModuleType): if hasattr(m, "DEBUG_EMAILS"): diff --git a/ietf/cookies/tests.py b/ietf/cookies/tests.py index dd02080c0..42ea437b2 100644 --- a/ietf/cookies/tests.py +++ b/ietf/cookies/tests.py @@ -1,5 +1,6 @@ +# Copyright The IETF Trust 2015-2019, All Rights Reserved from pyquery import PyQuery -from Cookie import SimpleCookie +from http.cookies import SimpleCookie from django.urls import reverse as urlreverse @@ -12,7 +13,7 @@ class CookieTests(TestCase): def test_settings_defaults(self): r = self.client.get(urlreverse("ietf.cookies.views.preferences")) self.assertEqual(r.status_code, 200) - self.assertListEqual([], r.cookies.keys()) + self.assertListEqual([], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/off"]').contents(), ['Off']) self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/14"]').contents(), ['14 days']) @@ -24,7 +25,7 @@ class CookieTests(TestCase): self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '7', 'expires_soon' : 7, 'left_menu': 'on', }) r = self.client.get(urlreverse("ietf.cookies.views.preferences")) self.assertEqual(r.status_code, 200) - self.assertListEqual([], r.cookies.keys()) + self.assertListEqual([], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/off"]').contents(), ['Off']) self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/7"]').contents(), ['7 days']) @@ -60,7 +61,7 @@ class CookieTests(TestCase): self.client.cookies = SimpleCookie({'full_draft': 'on', 'new_enough' : '90', 'expires_soon' : 7, 'left_menu': 'off', }) r = self.client.get(urlreverse("ietf.cookies.views.preferences")) self.assertEqual(r.status_code, 200) - self.assertListEqual([], r.cookies.keys()) + self.assertListEqual([], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/on"]').contents(), ['On']) self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/90"]').contents(), ['90 days']) @@ -74,7 +75,7 @@ class CookieTests(TestCase): self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '60', 'expires_soon' : 14, 'left_menu': 'on', }) r = self.client.get(urlreverse("ietf.cookies.views.preferences")) self.assertEqual(r.status_code, 200) - self.assertListEqual([], r.cookies.keys()) + self.assertListEqual([], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/off"]').contents(), ['Off']) self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/60"]').contents(), ['60 days']) @@ -88,7 +89,7 @@ class CookieTests(TestCase): self.client.cookies = SimpleCookie({'full_draft': 'on', 'new_enough' : '30', 'expires_soon' : 21, 'left_menu': 'off'}) r = self.client.get(urlreverse("ietf.cookies.views.preferences")) self.assertEqual(r.status_code, 200) - self.assertListEqual([], r.cookies.keys()) + self.assertListEqual([], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/on"]').contents(), ['On']) self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/30"]').contents(), ['30 days']) @@ -102,7 +103,7 @@ class CookieTests(TestCase): self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '21', 'expires_soon' : 30, 'left_menu': 'on', }) r = self.client.get(urlreverse("ietf.cookies.views.preferences")) self.assertEqual(r.status_code, 200) - self.assertListEqual([], r.cookies.keys()) + self.assertListEqual([], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/off"]').contents(), ['Off']) self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/21"]').contents(), ['21 days']) @@ -116,7 +117,7 @@ class CookieTests(TestCase): self.client.cookies = SimpleCookie({'full_draft': 'on', 'new_enough' : '14', 'expires_soon' : 60, 'left_menu': 'off', }) r = self.client.get(urlreverse("ietf.cookies.views.preferences")) self.assertEqual(r.status_code, 200) - self.assertListEqual([], r.cookies.keys()) + self.assertListEqual([], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/on"]').contents(), ['On']) self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/14"]').contents(), ['14 days']) @@ -130,7 +131,7 @@ class CookieTests(TestCase): self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '7', 'expires_soon' : 90, 'left_menu': 'on', }) r = self.client.get(urlreverse("ietf.cookies.views.preferences")) self.assertEqual(r.status_code, 200) - self.assertListEqual([], r.cookies.keys()) + self.assertListEqual([], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/off"]').contents(), ['Off']) self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/7"]').contents(), ['7 days']) @@ -145,7 +146,7 @@ class CookieTests(TestCase): r = self.client.get(urlreverse("ietf.cookies.views.full_draft")) # no value: reset self.assertEqual(r.status_code, 200) self.assertEqual(r.cookies['full_draft'].value, '') - self.assertListEqual(['full_draft'], r.cookies.keys()) + self.assertListEqual(['full_draft'], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/off"]').contents(), ['Off']) self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/14"]').contents(), ['14 days']) @@ -159,7 +160,7 @@ class CookieTests(TestCase): r = self.client.get(urlreverse("ietf.cookies.views.full_draft", kwargs=dict(enabled="on"))) self.assertEqual(r.status_code, 200) self.assertEqual(r.cookies['full_draft'].value, 'on') - self.assertListEqual(['full_draft'], r.cookies.keys()) + self.assertListEqual(['full_draft'], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/on"]').contents(), ['On']) # self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*on') @@ -169,7 +170,7 @@ class CookieTests(TestCase): r = self.client.get(urlreverse("ietf.cookies.views.full_draft", kwargs=dict(enabled="off"))) self.assertEqual(r.status_code, 200) self.assertEqual(r.cookies['full_draft'].value, 'off') - self.assertListEqual(['full_draft'], r.cookies.keys()) + self.assertListEqual(['full_draft'], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/off"]').contents(), ['Off']) # self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/14"]').contents(), ['14 days']) @@ -180,7 +181,7 @@ class CookieTests(TestCase): self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '14', 'expires_soon' : 14}) r = self.client.get(urlreverse("ietf.cookies.views.full_draft", kwargs=dict(enabled="foo"))) self.assertEqual(r.status_code, 200) - self.assertListEqual([], r.cookies.keys()) + self.assertListEqual([], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/off"]').contents(), ['Off']) # self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/14"]').contents(), ['14 days']) @@ -192,7 +193,7 @@ class CookieTests(TestCase): r = self.client.get(urlreverse("ietf.cookies.views.left_menu")) # no value: reset self.assertEqual(r.status_code, 200) self.assertEqual(r.cookies['left_menu'].value, '') - self.assertListEqual(['left_menu'], r.cookies.keys()) + self.assertListEqual(['left_menu'], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/off"]').contents(), ['Off']) self.assertEqual(q('div a.active[href="/accounts/settings/left_menu/off"]').contents(), ['Off']) @@ -204,7 +205,7 @@ class CookieTests(TestCase): r = self.client.get(urlreverse("ietf.cookies.views.left_menu", kwargs=dict(enabled="on"))) self.assertEqual(r.status_code, 200) self.assertEqual(r.cookies['left_menu'].value, 'on') - self.assertListEqual(['left_menu'], r.cookies.keys()) + self.assertListEqual(['left_menu'], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/left_menu/on"]').contents(), ['On']) @@ -213,7 +214,7 @@ class CookieTests(TestCase): r = self.client.get(urlreverse("ietf.cookies.views.left_menu", kwargs=dict(enabled="off"))) self.assertEqual(r.status_code, 200) self.assertEqual(r.cookies['left_menu'].value, 'off') - self.assertListEqual(['left_menu'], r.cookies.keys()) + self.assertListEqual(['left_menu'], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/left_menu/off"]').contents(), ['Off']) @@ -221,7 +222,7 @@ class CookieTests(TestCase): self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '14', 'expires_soon' : 14, 'left_menu': 'off', }) r = self.client.get(urlreverse("ietf.cookies.views.left_menu", kwargs=dict(enabled="foo"))) self.assertEqual(r.status_code, 200) - self.assertListEqual([], r.cookies.keys()) + self.assertListEqual([], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/left_menu/off"]').contents(), ['Off']) @@ -230,7 +231,7 @@ class CookieTests(TestCase): r = self.client.get(urlreverse("ietf.cookies.views.new_enough")) # no value: reset self.assertEqual(r.status_code, 200) self.assertEqual(r.cookies['new_enough'].value, '') - self.assertListEqual(['new_enough'], r.cookies.keys()) + self.assertListEqual(['new_enough'], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/off"]').contents(), ['Off']) self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/14"]').contents(), ['14 days']) @@ -244,7 +245,7 @@ class CookieTests(TestCase): r = self.client.get(urlreverse("ietf.cookies.views.new_enough", kwargs=dict(days="7"))) self.assertEqual(r.status_code, 200) self.assertEqual(r.cookies['new_enough'].value, '7') - self.assertListEqual(['new_enough'], r.cookies.keys()) + self.assertListEqual(['new_enough'], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/on"]').contents(), ['On']) self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/7"]').contents(), ['7 days']) @@ -258,7 +259,7 @@ class CookieTests(TestCase): r = self.client.get(urlreverse("ietf.cookies.views.new_enough", kwargs=dict(days="14"))) self.assertEqual(r.status_code, 200) self.assertEqual(r.cookies['new_enough'].value, '14') - self.assertListEqual(['new_enough'], r.cookies.keys()) + self.assertListEqual(['new_enough'], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/on"]').contents(), ['On']) self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/14"]').contents(), ['14 days']) @@ -272,7 +273,7 @@ class CookieTests(TestCase): r = self.client.get(urlreverse("ietf.cookies.views.new_enough", kwargs=dict(days="21"))) self.assertEqual(r.status_code, 200) self.assertEqual(r.cookies['new_enough'].value, '21') - self.assertListEqual(['new_enough'], r.cookies.keys()) + self.assertListEqual(['new_enough'], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/on"]').contents(), ['On']) self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/21"]').contents(), ['21 days']) @@ -286,7 +287,7 @@ class CookieTests(TestCase): r = self.client.get(urlreverse("ietf.cookies.views.new_enough", kwargs=dict(days="30"))) self.assertEqual(r.status_code, 200) self.assertEqual(r.cookies['new_enough'].value, '30') - self.assertListEqual(['new_enough'], r.cookies.keys()) + self.assertListEqual(['new_enough'], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/off"]').contents(), ['Off']) self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/30"]').contents(), ['30 days']) @@ -300,7 +301,7 @@ class CookieTests(TestCase): r = self.client.get(urlreverse("ietf.cookies.views.new_enough", kwargs=dict(days="60"))) self.assertEqual(r.status_code, 200) self.assertEqual(r.cookies['new_enough'].value, '60') - self.assertListEqual(['new_enough'], r.cookies.keys()) + self.assertListEqual(['new_enough'], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/off"]').contents(), ['Off']) self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/60"]').contents(), ['60 days']) @@ -314,7 +315,7 @@ class CookieTests(TestCase): r = self.client.get(urlreverse("ietf.cookies.views.new_enough", kwargs=dict(days="90"))) self.assertEqual(r.status_code, 200) self.assertEqual(r.cookies['new_enough'].value, '90') - self.assertListEqual(['new_enough'], r.cookies.keys()) + self.assertListEqual(['new_enough'], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/off"]').contents(), ['Off']) self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/90"]').contents(), ['90 days']) @@ -328,7 +329,7 @@ class CookieTests(TestCase): r = self.client.get(urlreverse("ietf.cookies.views.expires_soon")) # no value: reset self.assertEqual(r.status_code, 200) self.assertEqual(r.cookies['expires_soon'].value, '') - self.assertListEqual(['expires_soon'], r.cookies.keys()) + self.assertListEqual(['expires_soon'], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/off"]').contents(), ['Off']) self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/14"]').contents(), ['14 days']) @@ -342,7 +343,7 @@ class CookieTests(TestCase): r = self.client.get(urlreverse("ietf.cookies.views.expires_soon", kwargs=dict(days="7"))) self.assertEqual(r.status_code, 200) self.assertEqual(r.cookies['expires_soon'].value, '7') - self.assertListEqual(['expires_soon'], r.cookies.keys()) + self.assertListEqual(['expires_soon'], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/on"]').contents(), ['On']) self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/21"]').contents(), ['21 days']) @@ -356,7 +357,7 @@ class CookieTests(TestCase): r = self.client.get(urlreverse("ietf.cookies.views.expires_soon", kwargs=dict(days="14"))) self.assertEqual(r.status_code, 200) self.assertEqual(r.cookies['expires_soon'].value, '14') - self.assertListEqual(['expires_soon'], r.cookies.keys()) + self.assertListEqual(['expires_soon'], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/on"]').contents(), ['On']) self.assertEqual(q('div a.active[href^="/accounts/settings/new_enough/"]').contents(), []) @@ -370,7 +371,7 @@ class CookieTests(TestCase): r = self.client.get(urlreverse("ietf.cookies.views.expires_soon", kwargs=dict(days="21"))) self.assertEqual(r.status_code, 200) self.assertEqual(r.cookies['expires_soon'].value, '21') - self.assertListEqual(['expires_soon'], r.cookies.keys()) + self.assertListEqual(['expires_soon'], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/on"]').contents(), ['On']) self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/90"]').contents(), ['90 days']) @@ -384,7 +385,7 @@ class CookieTests(TestCase): r = self.client.get(urlreverse("ietf.cookies.views.expires_soon", kwargs=dict(days="30"))) self.assertEqual(r.status_code, 200) self.assertEqual(r.cookies['expires_soon'].value, '30') - self.assertListEqual(['expires_soon'], r.cookies.keys()) + self.assertListEqual(['expires_soon'], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/off"]').contents(), ['Off']) self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/7"]').contents(), ['7 days']) @@ -398,7 +399,7 @@ class CookieTests(TestCase): r = self.client.get(urlreverse("ietf.cookies.views.expires_soon", kwargs=dict(days="60"))) self.assertEqual(r.status_code, 200) self.assertEqual(r.cookies['expires_soon'].value, '60') - self.assertListEqual(['expires_soon'], r.cookies.keys()) + self.assertListEqual(['expires_soon'], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/off"]').contents(), ['Off']) self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/14"]').contents(), ['14 days']) @@ -412,7 +413,7 @@ class CookieTests(TestCase): r = self.client.get(urlreverse("ietf.cookies.views.expires_soon", kwargs=dict(days="90"))) self.assertEqual(r.status_code, 200) self.assertEqual(r.cookies['expires_soon'].value, '90') - self.assertListEqual(['expires_soon'], r.cookies.keys()) + self.assertListEqual(['expires_soon'], list(r.cookies.keys())) q = PyQuery(r.content) self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/off"]').contents(), ['Off']) self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/60"]').contents(), ['60 days']) diff --git a/ietf/cookies/views.py b/ietf/cookies/views.py index 6bc5774d9..700222b48 100644 --- a/ietf/cookies/views.py +++ b/ietf/cookies/views.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2010, All Rights Reserved +# Copyright The IETF Trust 2010-2019, All Rights Reserved from django.shortcuts import render from django.conf import settings @@ -10,7 +10,7 @@ def preferences(request, **kwargs): new_cookies = {} del_cookies = [] preferences['defaults'] = settings.USER_PREFERENCE_DEFAULTS - for key in settings.USER_PREFERENCE_DEFAULTS.keys(): + for key in list(settings.USER_PREFERENCE_DEFAULTS.keys()): if key in kwargs: if kwargs[key] == None: del_cookies += [key] diff --git a/ietf/dbtemplate/forms.py b/ietf/dbtemplate/forms.py index e26fbae65..f502249b0 100644 --- a/ietf/dbtemplate/forms.py +++ b/ietf/dbtemplate/forms.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2012-2019, All Rights Reserved from django import forms from django.core.exceptions import ValidationError from django.template import Context @@ -20,7 +21,7 @@ class DBTemplateForm(forms.ModelForm): PlainTemplate(content).render(Context({})) else: raise ValidationError("Unexpected DBTemplate.type.slug: %s" % self.type.slug) - except Exception, e: + except Exception as e: raise ValidationError(e) return content diff --git a/ietf/dbtemplate/migrations/0001_initial.py b/ietf/dbtemplate/migrations/0001_initial.py index cc8a64a0f..32fbae322 100644 --- a/ietf/dbtemplate/migrations/0001_initial.py +++ b/ietf/dbtemplate/migrations/0001_initial.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-02-20 10:52 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/dbtemplate/migrations/0002_auto_20180220_1052.py b/ietf/dbtemplate/migrations/0002_auto_20180220_1052.py index e6926053c..7545334d0 100644 --- a/ietf/dbtemplate/migrations/0002_auto_20180220_1052.py +++ b/ietf/dbtemplate/migrations/0002_auto_20180220_1052.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-02-20 10:52 -from __future__ import unicode_literals + from django.db import migrations import django.db.models.deletion diff --git a/ietf/dbtemplate/migrations/0003_adjust_review_templates.py b/ietf/dbtemplate/migrations/0003_adjust_review_templates.py index 5a5ffc48b..cd8e9d8c0 100644 --- a/ietf/dbtemplate/migrations/0003_adjust_review_templates.py +++ b/ietf/dbtemplate/migrations/0003_adjust_review_templates.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-03-05 11:39 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/dbtemplate/migrations/0004_adjust_assignment_email_summary_templates.py b/ietf/dbtemplate/migrations/0004_adjust_assignment_email_summary_templates.py index 0c4463a74..ccee5eb17 100644 --- a/ietf/dbtemplate/migrations/0004_adjust_assignment_email_summary_templates.py +++ b/ietf/dbtemplate/migrations/0004_adjust_assignment_email_summary_templates.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-03-13 13:41 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/dbtemplate/models.py b/ietf/dbtemplate/models.py index 29efd07d5..e21633ac2 100644 --- a/ietf/dbtemplate/models.py +++ b/ietf/dbtemplate/models.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Copyright The IETF Trust 2012-2019, All Rights Reserved -from __future__ import unicode_literals, print_function + from django.db import models @@ -41,6 +41,6 @@ class DBTemplate(models.Model): PlainTemplate(self.content).render(Context({})) else: raise ValidationError("Unexpected DBTemplate.type.slug: %s" % self.type.slug) - except Exception, e: + except Exception as e: raise ValidationError(e) diff --git a/ietf/dbtemplate/template.py b/ietf/dbtemplate/template.py index 32882ca2c..624aab3c9 100644 --- a/ietf/dbtemplate/template.py +++ b/ietf/dbtemplate/template.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2012-2019, All Rights Reserved import os import string from docutils.core import publish_string @@ -54,7 +55,7 @@ class RSTTemplate(PlainTemplate): 'template': RST_TEMPLATE, 'halt_level': 2, }) - except SystemMessage, e: + except SystemMessage as e: e.message = e.message.replace(':', 'line ') args = list(e.args) args[0] = args[0].replace(':', 'line ') diff --git a/ietf/doc/admin.py b/ietf/doc/admin.py index 44b0a8224..08719a6a2 100644 --- a/ietf/doc/admin.py +++ b/ietf/doc/admin.py @@ -4,7 +4,7 @@ from django.contrib import admin from django import forms -from models import (StateType, State, RelatedDocument, DocumentAuthor, Document, RelatedDocHistory, +from .models import (StateType, State, RelatedDocument, DocumentAuthor, Document, RelatedDocHistory, DocHistoryAuthor, DocHistory, DocAlias, DocReminder, DocEvent, NewRevisionDocEvent, StateDocEvent, ConsensusDocEvent, BallotType, BallotDocEvent, WriteupDocEvent, LastCallDocEvent, TelechatDocEvent, BallotPositionDocEvent, ReviewRequestDocEvent, InitialReviewDocEvent, @@ -155,7 +155,7 @@ admin.site.register(EditedAuthorsDocEvent, DocEventAdmin) class DeletedEventAdmin(admin.ModelAdmin): - list_display = [u'id', 'content_type', 'json', 'by', 'time'] + list_display = ['id', 'content_type', 'json', 'by', 'time'] list_filter = ['time'] raw_id_fields = ['content_type', 'by'] admin.site.register(DeletedEvent, DeletedEventAdmin) diff --git a/ietf/doc/expire.py b/ietf/doc/expire.py index a99e62bb4..5a060048d 100644 --- a/ietf/doc/expire.py +++ b/ietf/doc/expire.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2010-2019, All Rights Reserved # expiry of Internet Drafts from django.conf import settings @@ -92,7 +93,7 @@ def send_expire_warning_for_draft(doc): request = None if to or cc: send_mail(request, to, frm, - u"Expiration impending: %s" % doc.file_tag(), + "Expiration impending: %s" % doc.file_tag(), "doc/draft/expire_warning_email.txt", dict(doc=doc, state=state, @@ -112,7 +113,7 @@ def send_expire_notice_for_draft(doc): (to,cc) = gather_address_lists('doc_expired',doc=doc) send_mail(request, to, "I-D Expiring System ", - u"I-D was expired %s" % doc.file_tag(), + "I-D was expired %s" % doc.file_tag(), "doc/draft/id_expired_email.txt", dict(doc=doc, state=state, diff --git a/ietf/doc/feeds.py b/ietf/doc/feeds.py index 2c7f6791f..108f3112a 100644 --- a/ietf/doc/feeds.py +++ b/ietf/doc/feeds.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2007, All Rights Reserved +# Copyright The IETF Trust 2007-2019, All Rights Reserved import datetime @@ -35,7 +35,7 @@ class DocumentChangesFeed(Feed): return events def item_title(self, item): - return u"[%s] %s [rev. %s]" % (item.by, truncatewords(strip_tags(item.desc), 15), item.rev) + return "[%s] %s [rev. %s]" % (item.by, truncatewords(strip_tags(item.desc), 15), item.rev) def item_description(self, item): return truncatewords_html(format_textarea(item.desc), 20) @@ -44,7 +44,7 @@ class DocumentChangesFeed(Feed): return item.time def item_author_name(self, item): - return unicode(item.by) + return str(item.by) def item_link(self, item): return urlreverse('ietf.doc.views_doc.document_history', kwargs=dict(name=item.doc.canonical_name())) + "#history-%s" % item.pk @@ -67,7 +67,7 @@ class InLastCallFeed(Feed): return docs def item_title(self, item): - return u"%s (%s - %s)" % (item.name, + return "%s (%s - %s)" % (item.name, datefilter(item.lc_event.time, "F j"), datefilter(item.lc_event.expires, "F j, Y")) diff --git a/ietf/doc/fields.py b/ietf/doc/fields.py index a797917dc..0cdb1830d 100644 --- a/ietf/doc/fields.py +++ b/ietf/doc/fields.py @@ -53,9 +53,9 @@ class SearchableDocumentsField(forms.CharField): def prepare_value(self, value): if not value: value = "" - if isinstance(value, (int, long)): + if isinstance(value, int): value = str(value) - if isinstance(value, basestring): + if isinstance(value, str): items = self.parse_select2_value(value) # accept both names and pks here names = [ i for i in items if not i.isdigit() ] @@ -79,7 +79,7 @@ class SearchableDocumentsField(forms.CharField): "model_name": self.model.__name__.lower() }) - return u",".join(unicode(o.pk) for o in value) + return ",".join(str(o.pk) for o in value) def clean(self, value): value = super(SearchableDocumentsField, self).clean(value) @@ -90,10 +90,10 @@ class SearchableDocumentsField(forms.CharField): found_pks = [ str(o.pk) for o in objs ] failed_pks = [ x for x in pks if x not in found_pks ] if failed_pks: - raise forms.ValidationError(u"Could not recognize the following documents: {names}. You can only input documents already registered in the Datatracker.".format(names=", ".join(failed_pks))) + raise forms.ValidationError("Could not recognize the following documents: {names}. You can only input documents already registered in the Datatracker.".format(names=", ".join(failed_pks))) if self.max_entries != None and len(objs) > self.max_entries: - raise forms.ValidationError(u"You can select at most %s entries." % self.max_entries) + raise forms.ValidationError("You can select at most %s entries." % self.max_entries) return objs diff --git a/ietf/doc/forms.py b/ietf/doc/forms.py index c007d6998..a9c0e1e19 100644 --- a/ietf/doc/forms.py +++ b/ietf/doc/forms.py @@ -1,6 +1,6 @@ -# Copyright The IETF Trust 2017, All Rights Reserved +# Copyright The IETF Trust 2013-2019, All Rights Reserved + -from __future__ import unicode_literals import datetime import debug #pyflakes:ignore diff --git a/ietf/doc/mails.py b/ietf/doc/mails.py index a4a8fa6d7..b42a03a32 100644 --- a/ietf/doc/mails.py +++ b/ietf/doc/mails.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2010-2019, All Rights Reserved # generation of mails import textwrap, datetime @@ -55,7 +56,7 @@ def email_stream_changed(request, doc, old_stream, new_stream, text=""): return if not text: - text = u"Stream changed to %s from %s" % (new_stream, old_stream) + text = "Stream changed to %s from %s" % (new_stream, old_stream) text = strip_tags(text) send_mail(request, to, None, @@ -119,8 +120,8 @@ def generate_ballot_writeup(request, doc): e.by = request.user.person e.doc = doc e.rev = doc.rev - e.desc = u"Ballot writeup was generated" - e.text = unicode(render_to_string("doc/mail/ballot_writeup.txt", {'iana': iana})) + e.desc = "Ballot writeup was generated" + e.text = str(render_to_string("doc/mail/ballot_writeup.txt", {'iana': iana})) # caller is responsible for saving, if necessary return e @@ -131,8 +132,8 @@ def generate_ballot_rfceditornote(request, doc): e.by = request.user.person e.doc = doc e.rev = doc.rev - e.desc = u"RFC Editor Note for ballot was generated" - e.text = unicode(render_to_string("doc/mail/ballot_rfceditornote.txt")) + e.desc = "RFC Editor Note for ballot was generated" + e.text = str(render_to_string("doc/mail/ballot_rfceditornote.txt")) e.save() return e @@ -176,8 +177,8 @@ def generate_last_call_announcement(request, doc): e.by = request.user.person e.doc = doc e.rev = doc.rev - e.desc = u"Last call announcement was generated" - e.text = unicode(mail) + e.desc = "Last call announcement was generated" + e.text = str(mail) # caller is responsible for saving, if necessary return e @@ -196,8 +197,8 @@ def generate_approval_mail(request, doc): e.by = request.user.person e.doc = doc e.rev = doc.rev - e.desc = u"Ballot approval text was generated" - e.text = unicode(mail) + e.desc = "Ballot approval text was generated" + e.text = str(mail) # caller is responsible for saving, if necessary return e @@ -374,7 +375,7 @@ def generate_issue_ballot_mail(request, doc, ballot): last_call_has_expired=last_call_has_expired, needed_ballot_positions= needed_ballot_positions(doc, - doc.active_ballot().active_ad_positions().values() + list(doc.active_ballot().active_ad_positions().values()) ), ) ) @@ -451,7 +452,7 @@ def email_adopted(request, doc, prev_state, new_state, by, comment=""): state_type = (prev_state or new_state).type send_mail(request, to, settings.DEFAULT_FROM_EMAIL, - u'The %s %s has placed %s in state "%s"' % + 'The %s %s has placed %s in state "%s"' % (doc.group.acronym.upper(),doc.group.type_id.upper(), doc.name, new_state or "None"), 'doc/mail/doc_adopted_email.txt', dict(doc=doc, @@ -469,7 +470,7 @@ def email_stream_state_changed(request, doc, prev_state, new_state, by, comment= state_type = (prev_state or new_state).type send_mail(request, to, settings.DEFAULT_FROM_EMAIL, - u"%s changed for %s" % (state_type.label, doc.name), + "%s changed for %s" % (state_type.label, doc.name), 'doc/mail/stream_state_changed_email.txt', dict(doc=doc, url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url(), @@ -485,7 +486,7 @@ def email_stream_tags_changed(request, doc, added_tags, removed_tags, by, commen (to, cc) = gather_address_lists('doc_stream_state_edited',doc=doc) send_mail(request, to, settings.DEFAULT_FROM_EMAIL, - u"Tags changed for %s" % doc.name, + "Tags changed for %s" % doc.name, 'doc/mail/stream_tags_changed_email.txt', dict(doc=doc, url=settings.IDTRACKER_BASE_URL + doc.get_absolute_url(), diff --git a/ietf/doc/management/commands/generate_draft_bibxml_files.py b/ietf/doc/management/commands/generate_draft_bibxml_files.py index 2057cf67f..171026b67 100644 --- a/ietf/doc/management/commands/generate_draft_bibxml_files.py +++ b/ietf/doc/management/commands/generate_draft_bibxml_files.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2012-2019, All Rights Reserved import sys import os @@ -21,7 +22,7 @@ def write(fn, new): f.close() class Command(BaseCommand): - help = (u'Generate draft bibxml files, for xml2rfc references') + help = ('Generate draft bibxml files, for xml2rfc references') def handle(self, *args, **options): documents = Document.objects.filter(type__slug='draft') diff --git a/ietf/doc/migrations/0001_initial.py b/ietf/doc/migrations/0001_initial.py index ba3edeef3..71caeb27c 100644 --- a/ietf/doc/migrations/0001_initial.py +++ b/ietf/doc/migrations/0001_initial.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-02-20 10:52 -from __future__ import unicode_literals + import datetime import django.core.validators diff --git a/ietf/doc/migrations/0002_auto_20180220_1052.py b/ietf/doc/migrations/0002_auto_20180220_1052.py index 6cce3e312..47e409a96 100644 --- a/ietf/doc/migrations/0002_auto_20180220_1052.py +++ b/ietf/doc/migrations/0002_auto_20180220_1052.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-02-20 10:52 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion diff --git a/ietf/doc/migrations/0003_auto_20180401_1231.py b/ietf/doc/migrations/0003_auto_20180401_1231.py index f277b40df..a6bc98fb2 100644 --- a/ietf/doc/migrations/0003_auto_20180401_1231.py +++ b/ietf/doc/migrations/0003_auto_20180401_1231.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2018-04-01 12:31 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/doc/migrations/0004_add_draft_stream_replaced_states.py b/ietf/doc/migrations/0004_add_draft_stream_replaced_states.py index 155596f50..7d09d7ea2 100644 --- a/ietf/doc/migrations/0004_add_draft_stream_replaced_states.py +++ b/ietf/doc/migrations/0004_add_draft_stream_replaced_states.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.13 on 2018-05-03 11:50 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/doc/migrations/0005_fix_replaced_iab_irtf_stream_docs.py b/ietf/doc/migrations/0005_fix_replaced_iab_irtf_stream_docs.py index 3b339094f..18840a621 100644 --- a/ietf/doc/migrations/0005_fix_replaced_iab_irtf_stream_docs.py +++ b/ietf/doc/migrations/0005_fix_replaced_iab_irtf_stream_docs.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.13 on 2018-05-03 12:16 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/doc/migrations/0006_ballotpositiondocevent_send_email.py b/ietf/doc/migrations/0006_ballotpositiondocevent_send_email.py index fbae0042a..7da218deb 100644 --- a/ietf/doc/migrations/0006_ballotpositiondocevent_send_email.py +++ b/ietf/doc/migrations/0006_ballotpositiondocevent_send_email.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2018-10-03 06:39 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/doc/migrations/0007_idexists.py b/ietf/doc/migrations/0007_idexists.py index edba831de..f943a380a 100644 --- a/ietf/doc/migrations/0007_idexists.py +++ b/ietf/doc/migrations/0007_idexists.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.16 on 2018-11-04 10:56 -from __future__ import unicode_literals + from tqdm import tqdm diff --git a/ietf/doc/migrations/0008_add_uploaded_filename.py b/ietf/doc/migrations/0008_add_uploaded_filename.py index 769139f42..97c149bb3 100644 --- a/ietf/doc/migrations/0008_add_uploaded_filename.py +++ b/ietf/doc/migrations/0008_add_uploaded_filename.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.17 on 2018-12-28 13:11 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/doc/migrations/0009_move_non_url_externalurls_to_uploaded_filename.py b/ietf/doc/migrations/0009_move_non_url_externalurls_to_uploaded_filename.py index f8a6fd083..c05baa5d6 100644 --- a/ietf/doc/migrations/0009_move_non_url_externalurls_to_uploaded_filename.py +++ b/ietf/doc/migrations/0009_move_non_url_externalurls_to_uploaded_filename.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.17 on 2018-12-28 13:33 -from __future__ import unicode_literals + from django.db import migrations from django.db.models import F diff --git a/ietf/doc/migrations/0010_auto_20190225_1302.py b/ietf/doc/migrations/0010_auto_20190225_1302.py index 74c3b3bd4..dcad974fb 100644 --- a/ietf/doc/migrations/0010_auto_20190225_1302.py +++ b/ietf/doc/migrations/0010_auto_20190225_1302.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-02-25 13:02 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/doc/migrations/0011_reviewassignmentdocevent.py b/ietf/doc/migrations/0011_reviewassignmentdocevent.py index 63df9a962..ac04a7577 100644 --- a/ietf/doc/migrations/0011_reviewassignmentdocevent.py +++ b/ietf/doc/migrations/0011_reviewassignmentdocevent.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.18 on 2019-01-11 11:22 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion diff --git a/ietf/doc/migrations/0012_add_event_type_closed_review_assignment.py b/ietf/doc/migrations/0012_add_event_type_closed_review_assignment.py index 7b1e55970..c946e3e12 100644 --- a/ietf/doc/migrations/0012_add_event_type_closed_review_assignment.py +++ b/ietf/doc/migrations/0012_add_event_type_closed_review_assignment.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-01 04:43 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/doc/migrations/0013_add_document_docalias_id.py b/ietf/doc/migrations/0013_add_document_docalias_id.py index e86c4270b..75700530c 100644 --- a/ietf/doc/migrations/0013_add_document_docalias_id.py +++ b/ietf/doc/migrations/0013_add_document_docalias_id.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-08 08:41 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/doc/migrations/0014_set_document_docalias_id.py b/ietf/doc/migrations/0014_set_document_docalias_id.py index 06ff9b89e..5c97c81e5 100644 --- a/ietf/doc/migrations/0014_set_document_docalias_id.py +++ b/ietf/doc/migrations/0014_set_document_docalias_id.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-08 08:42 -from __future__ import unicode_literals + import sys diff --git a/ietf/doc/migrations/0015_1_add_fk_to_document_id.py b/ietf/doc/migrations/0015_1_add_fk_to_document_id.py index a60d9864f..fff0c56af 100644 --- a/ietf/doc/migrations/0015_1_add_fk_to_document_id.py +++ b/ietf/doc/migrations/0015_1_add_fk_to_document_id.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-08 10:29 -from __future__ import unicode_literals + import django.core.validators from django.db import migrations, models diff --git a/ietf/doc/migrations/0015_2_add_doc_document_m2m_fields.py b/ietf/doc/migrations/0015_2_add_doc_document_m2m_fields.py index 5e62dbf26..8b426b77d 100644 --- a/ietf/doc/migrations/0015_2_add_doc_document_m2m_fields.py +++ b/ietf/doc/migrations/0015_2_add_doc_document_m2m_fields.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-28 12:42 -from __future__ import unicode_literals + import sys, time diff --git a/ietf/doc/migrations/0016_set_document_docalias_fk.py b/ietf/doc/migrations/0016_set_document_docalias_fk.py index ac1376b76..31b244591 100644 --- a/ietf/doc/migrations/0016_set_document_docalias_fk.py +++ b/ietf/doc/migrations/0016_set_document_docalias_fk.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-08 14:04 -from __future__ import unicode_literals + import sys @@ -15,7 +15,7 @@ def forward(apps, schema_editor): n = getattr(o, a+'_id') if n: i = nameid[n] - if not isinstance(i, (int, long)): + if not isinstance(i, int): raise ValueError("Inappropriate value: %s: nameid[%s]: %s" % (o.__class__.__name__, n, i)) if getattr(o, a+'2_id') != i: setattr(o, a+'2_id', i) @@ -44,7 +44,7 @@ def forward(apps, schema_editor): # Document id fixup ------------------------------------------------------------ objs = Document.objects.in_bulk() - nameid = { o.name: o.id for id, o in objs.iteritems() } + nameid = { o.name: o.id for id, o in objs.items() } sys.stderr.write('\n') @@ -78,7 +78,7 @@ def forward(apps, schema_editor): sys.stderr.write('\n') objs = DocAlias.objects.in_bulk() - nameid = { o.name: o.id for id, o in objs.iteritems() } + nameid = { o.name: o.id for id, o in objs.items() } sys.stderr.write('Setting DocAlias FKs:\n') diff --git a/ietf/doc/migrations/0017_make_document_id_primary_key.py b/ietf/doc/migrations/0017_make_document_id_primary_key.py index 851b2dbeb..57fd2e379 100644 --- a/ietf/doc/migrations/0017_make_document_id_primary_key.py +++ b/ietf/doc/migrations/0017_make_document_id_primary_key.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-09 05:46 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/doc/migrations/0018_remove_old_document_field.py b/ietf/doc/migrations/0018_remove_old_document_field.py index 146317da2..19a323309 100644 --- a/ietf/doc/migrations/0018_remove_old_document_field.py +++ b/ietf/doc/migrations/0018_remove_old_document_field.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-20 09:53 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion diff --git a/ietf/doc/migrations/0019_rename_field_document2.py b/ietf/doc/migrations/0019_rename_field_document2.py index 5b4504d01..f97fd7e52 100644 --- a/ietf/doc/migrations/0019_rename_field_document2.py +++ b/ietf/doc/migrations/0019_rename_field_document2.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-21 05:31 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/doc/migrations/0020_copy_docs_m2m_table.py b/ietf/doc/migrations/0020_copy_docs_m2m_table.py index 4a6555c71..0817ca716 100644 --- a/ietf/doc/migrations/0020_copy_docs_m2m_table.py +++ b/ietf/doc/migrations/0020_copy_docs_m2m_table.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-21 05:31 -from __future__ import unicode_literals + import sys, time diff --git a/ietf/doc/migrations/0021_remove_docs2_m2m.py b/ietf/doc/migrations/0021_remove_docs2_m2m.py index c11464cdc..b89aba803 100644 --- a/ietf/doc/migrations/0021_remove_docs2_m2m.py +++ b/ietf/doc/migrations/0021_remove_docs2_m2m.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-30 03:36 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/doc/migrations/0022_document_primary_key_cleanup.py b/ietf/doc/migrations/0022_document_primary_key_cleanup.py index 23d74f13a..3700228fc 100644 --- a/ietf/doc/migrations/0022_document_primary_key_cleanup.py +++ b/ietf/doc/migrations/0022_document_primary_key_cleanup.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-06-10 03:47 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion diff --git a/ietf/doc/migrations/0023_one_to_many_docalias.py b/ietf/doc/migrations/0023_one_to_many_docalias.py index 90b88bcd8..9e0d3de26 100644 --- a/ietf/doc/migrations/0023_one_to_many_docalias.py +++ b/ietf/doc/migrations/0023_one_to_many_docalias.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-06-10 04:36 -from __future__ import unicode_literals + import sys diff --git a/ietf/doc/models.py b/ietf/doc/models.py index fdc015bc2..58cbed06e 100644 --- a/ietf/doc/models.py +++ b/ietf/doc/models.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2007-2019, All Rights Reserved +# Copyright The IETF Trust 2010-2019, All Rights Reserved # -*- coding: utf-8 -*- import datetime @@ -372,7 +372,7 @@ class DocumentInfo(models.Model): return self.rfc_number() def author_list(self): - return u", ".join(author.email_id for author in self.documentauthor_set.all() if author.email_id) + return ", ".join(author.email_id for author in self.documentauthor_set.all() if author.email_id) def authors(self): return [ a.person for a in self.documentauthor_set.all() ] @@ -531,7 +531,7 @@ class RelatedDocument(models.Model): def action(self): return self.relationship.name def __unicode__(self): - return u"%s %s %s" % (self.source.name, self.relationship.name.lower(), self.target.name) + return "%s %s %s" % (self.source.name, self.relationship.name.lower(), self.target.name) def is_downref(self): @@ -601,7 +601,7 @@ class DocumentAuthor(DocumentAuthorInfo): document = ForeignKey('Document') def __unicode__(self): - return u"%s %s (%s)" % (self.document.name, self.person, self.order) + return "%s %s (%s)" % (self.document.name, self.person, self.order) validate_docname = RegexValidator( @@ -641,10 +641,10 @@ class Document(DocumentInfo): return self._cached_absolute_url def file_tag(self): - return u"<%s>" % self.filename_with_rev() + return "<%s>" % self.filename_with_rev() def filename_with_rev(self): - return u"%s-%s.txt" % (self.name, self.rev) + return "%s-%s.txt" % (self.name, self.rev) def latest_event(self, *args, **filter_args): """Get latest event of optional Python type and with filter @@ -850,7 +850,7 @@ class RelatedDocHistory(models.Model): target = ForeignKey('DocAlias', related_name="reversely_related_document_history_set") relationship = ForeignKey(DocRelationshipName) def __unicode__(self): - return u"%s %s %s" % (self.source.doc.name, self.relationship.name.lower(), self.target.name) + return "%s %s %s" % (self.source.doc.name, self.relationship.name.lower(), self.target.name) class DocHistoryAuthor(DocumentAuthorInfo): # use same naming convention as non-history version to make it a bit @@ -858,7 +858,7 @@ class DocHistoryAuthor(DocumentAuthorInfo): document = ForeignKey('DocHistory', related_name="documentauthor_set") def __unicode__(self): - return u"%s %s (%s)" % (self.document.doc.name, self.person, self.order) + return "%s %s (%s)" % (self.document.doc.name, self.person, self.order) class DocHistory(DocumentInfo): doc = ForeignKey(Document, related_name="history_set") @@ -869,7 +869,7 @@ class DocHistory(DocumentInfo): name = models.CharField(max_length=255) def __unicode__(self): - return unicode(self.doc.name) + return str(self.doc.name) def canonical_name(self): if hasattr(self, '_canonical_name'): @@ -918,7 +918,7 @@ class DocAlias(models.Model): return self.docs.first() def __unicode__(self): - return "%s-->%s" % (self.name, ','.join([unicode(d.name) for d in self.docs.all() if isinstance(d, Document) ])) + return "%s-->%s" % (self.name, ','.join([str(d.name) for d in self.docs.all() if isinstance(d, Document) ])) document_link = admin_link("document") class Meta: verbose_name = "document alias" @@ -1024,7 +1024,7 @@ class DocEvent(models.Model): return DocHistory.objects.filter(time__lte=self.time,doc__name=self.doc.name).order_by('-time', '-pk').first() def __unicode__(self): - return u"%s %s by %s at %s" % (self.doc.name, self.get_type_display().lower(), self.by.plain_name(), self.time) + return "%s %s by %s at %s" % (self.doc.name, self.get_type_display().lower(), self.by.plain_name(), self.time) def save(self, *args, **kwargs): super(DocEvent, self).save(*args, **kwargs) @@ -1057,7 +1057,7 @@ class BallotType(models.Model): positions = models.ManyToManyField(BallotPositionName, blank=True) def __unicode__(self): - return u"%s: %s" % (self.name, self.doc_type.name) + return "%s: %s" % (self.name, self.doc_type.name) class Meta: ordering = ['order'] @@ -1184,7 +1184,7 @@ class DeletedEvent(models.Model): time = models.DateTimeField(default=datetime.datetime.now) def __unicode__(self): - return u"%s by %s %s" % (self.content_type, self.by, self.time) + return "%s by %s %s" % (self.content_type, self.by, self.time) class EditedAuthorsDocEvent(DocEvent): """ Capture the reasoning or authority for changing a document author list. diff --git a/ietf/doc/templatetags/ietf_filters.py b/ietf/doc/templatetags/ietf_filters.py index 66f0e82ac..0ab6d4452 100644 --- a/ietf/doc/templatetags/ietf_filters.py +++ b/ietf/doc/templatetags/ietf_filters.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2007, All Rights Reserved +# Copyright The IETF Trust 2007-2019, All Rights Reserved import bleach import datetime @@ -64,7 +64,7 @@ def parse_email_list(value): """ - if value and isinstance(value, (types.StringType,types.UnicodeType)): # testing for 'value' being true isn't necessary; it's a fast-out route + if value and isinstance(value, (bytes,str)): # testing for 'value' being true isn't necessary; it's a fast-out route addrs = re.split(", ?", value) ret = [] for addr in addrs: @@ -109,7 +109,7 @@ def make_one_per_line(value): >>> make_one_per_line(None) """ - if value and isinstance(value, (types.StringType,types.UnicodeType)): + if value and isinstance(value, (bytes,str)): return re.sub(", ?", "\n", value) else: return value @@ -145,7 +145,7 @@ def sanitize(value): @register.filter(name='bracket') def square_brackets(value): """Adds square brackets around text.""" - if isinstance(value, (types.StringType,types.UnicodeType)): + if isinstance(value, (bytes,str)): if value == "": value = " " return "[ %s ]" % value @@ -195,7 +195,7 @@ def rfcnospace(string): @register.filter def prettystdname(string): from ietf.doc.utils import prettify_std_name - return prettify_std_name(unicode(string or "")) + return prettify_std_name(str(string or "")) @register.filter(name='rfcurl') def rfclink(string): @@ -338,7 +338,7 @@ def expires_soon(x,request): @register.filter(name='startswith') def startswith(x, y): - return unicode(x).startswith(y) + return str(x).startswith(y) @register.filter def has_role(user, role_names): @@ -377,14 +377,14 @@ def format_snippet(text, trunc_words=25): full = keep_spacing(collapsebr(linebreaksbr(mark_safe(sanitize_fragment(text))))) snippet = truncatewords_html(full, trunc_words) if snippet != full: - return mark_safe(u'
%s
' % (snippet, full)) + return mark_safe('
%s
' % (snippet, full)) return full @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.urls import reverse as urlreverse - return mark_safe(u'Edit' % (urlreverse(url_name, args=args, kwargs=kwargs))) + return mark_safe('Edit' % (urlreverse(url_name, args=args, kwargs=kwargs))) @register.filter def textify(text): @@ -419,7 +419,7 @@ if __name__ == "__main__": _test() @register.filter -def plural(text, seq, arg=u's'): +def plural(text, seq, arg='s'): "Similar to pluralize, but looks at the text, too" from django.template.defaultfilters import pluralize if text.endswith('s'): @@ -505,9 +505,9 @@ def nbsp(value): @register.filter() def comma_separated_list(seq, end_word="and"): if len(seq) < 2: - return u"".join(seq) + return "".join(seq) else: - return u", ".join(seq[:-1]) + u" %s %s"%(end_word, seq[-1]) + return ", ".join(seq[:-1]) + " %s %s"%(end_word, seq[-1]) @register.filter() def zaptmp(s): diff --git a/ietf/doc/templatetags/managed_groups.py b/ietf/doc/templatetags/managed_groups.py index 225d892d4..c971d21c6 100644 --- a/ietf/doc/templatetags/managed_groups.py +++ b/ietf/doc/templatetags/managed_groups.py @@ -1,6 +1,6 @@ # Copyright The IETF Trust 2016-2019, All Rights Reserved # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django import template diff --git a/ietf/doc/tests.py b/ietf/doc/tests.py index dfe565cc6..66f038e98 100644 --- a/ietf/doc/tests.py +++ b/ietf/doc/tests.py @@ -6,7 +6,7 @@ import shutil import datetime import json import sys -import urlparse +import urllib.parse import bibtexparser if sys.version_info[0] == 2 and sys.version_info[1] < 7: import unittest2 as unittest @@ -14,7 +14,7 @@ else: import unittest from pyquery import PyQuery from tempfile import NamedTemporaryFile -from Cookie import SimpleCookie +from http.cookies import SimpleCookie from django.urls import reverse as urlreverse from django.conf import settings @@ -142,71 +142,71 @@ class SearchTests(TestCase): # exact match r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name=draft.name))) self.assertEqual(r.status_code, 302) - self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name))) + self.assertEqual(urllib.parse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name))) # prefix match r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(draft.name.split("-")[:-1])))) self.assertEqual(r.status_code, 302) - self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name))) + self.assertEqual(urllib.parse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name))) # non-prefix match r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(draft.name.split("-")[1:])))) self.assertEqual(r.status_code, 302) - self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name))) + self.assertEqual(urllib.parse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name))) # other doctypes than drafts doc = Document.objects.get(name='charter-ietf-mars') r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name='charter-ietf-ma'))) self.assertEqual(r.status_code, 302) - self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name))) + self.assertEqual(urllib.parse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name))) doc = Document.objects.filter(name__startswith='conflict-review-').first() r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(doc.name.split("-")[:-1])))) self.assertEqual(r.status_code, 302) - self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name))) + self.assertEqual(urllib.parse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name))) doc = Document.objects.filter(name__startswith='status-change-').first() r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(doc.name.split("-")[:-1])))) self.assertEqual(r.status_code, 302) - self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name))) + self.assertEqual(urllib.parse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name))) doc = Document.objects.filter(name__startswith='agenda-').first() r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(doc.name.split("-")[:-1])))) self.assertEqual(r.status_code, 302) - self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name))) + self.assertEqual(urllib.parse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name))) doc = Document.objects.filter(name__startswith='minutes-').first() r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(doc.name.split("-")[:-1])))) self.assertEqual(r.status_code, 302) - self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name))) + self.assertEqual(urllib.parse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name))) doc = Document.objects.filter(name__startswith='slides-').first() r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(doc.name.split("-")[:-1])))) self.assertEqual(r.status_code, 302) - self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name))) + self.assertEqual(urllib.parse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name))) # match with revision r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name=draft.name + "-" + prev_rev))) self.assertEqual(r.status_code, 302) - self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name, rev=prev_rev))) + self.assertEqual(urllib.parse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name, rev=prev_rev))) # match with non-existing revision r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name=draft.name + "-09"))) self.assertEqual(r.status_code, 302) - self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name))) + self.assertEqual(urllib.parse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name))) # match with revision and extension r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name=draft.name + "-" + prev_rev + ".txt"))) self.assertEqual(r.status_code, 302) - self.assertEqual(urlparse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name, rev=prev_rev))) + self.assertEqual(urllib.parse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name, rev=prev_rev))) # no match r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="draft-ietf-doesnotexist-42"))) self.assertEqual(r.status_code, 302) - parsed = urlparse.urlparse(r["Location"]) + parsed = urllib.parse.urlparse(r["Location"]) self.assertEqual(parsed.path, urlreverse('ietf.doc.views_search.search')) - self.assertEqual(urlparse.parse_qs(parsed.query)["name"][0], "draft-ietf-doesnotexist-42") + self.assertEqual(urllib.parse.parse_qs(parsed.query)["name"][0], "draft-ietf-doesnotexist-42") def test_frontpage(self): r = self.client.get("/") @@ -919,11 +919,11 @@ class DocTestCase(TestCase): url = urlreverse('ietf.doc.views_doc.document_bibtex', kwargs=dict(name=rfc.name)) r = self.client.get(url) entry = bibtexparser.loads(r.content).get_entry_dict()["rfc%s"%num] - self.assertEqual(entry['series'], u'Request for Comments') + self.assertEqual(entry['series'], 'Request for Comments') self.assertEqual(entry['number'], num) - self.assertEqual(entry['doi'], u'10.17487/RFC%s'%num) - self.assertEqual(entry['year'], u'2010') - self.assertEqual(entry['month'], u'oct') + self.assertEqual(entry['doi'], '10.17487/RFC%s'%num) + self.assertEqual(entry['year'], '2010') + self.assertEqual(entry['month'], 'oct') # self.assertNotIn('day', entry) @@ -931,7 +931,7 @@ class DocTestCase(TestCase): stream_id = 'rse', states = [('draft','rfc'),('draft-iesg','pub')], std_level_id = 'ind', - time = datetime.datetime(1990,04,01), + time = datetime.datetime(1990,0o4,0o1), ) num = april1.rfc_number() DocEventFactory.create(doc=april1, type='published_rfc', time = '1990-04-01') @@ -939,20 +939,20 @@ class DocTestCase(TestCase): url = urlreverse('ietf.doc.views_doc.document_bibtex', kwargs=dict(name=april1.name)) r = self.client.get(url) entry = bibtexparser.loads(r.content).get_entry_dict()['rfc%s'%num] - self.assertEqual(entry['series'], u'Request for Comments') + self.assertEqual(entry['series'], 'Request for Comments') self.assertEqual(entry['number'], num) - self.assertEqual(entry['doi'], u'10.17487/RFC%s'%num) - self.assertEqual(entry['year'], u'1990') - self.assertEqual(entry['month'], u'apr') - self.assertEqual(entry['day'], u'1') + self.assertEqual(entry['doi'], '10.17487/RFC%s'%num) + self.assertEqual(entry['year'], '1990') + self.assertEqual(entry['month'], 'apr') + self.assertEqual(entry['day'], '1') draft = IndividualDraftFactory.create() - docname = u'%s-%s' % (draft.name, draft.rev) + docname = '%s-%s' % (draft.name, draft.rev) bibname = docname[6:] # drop the 'draft-' prefix url = urlreverse('ietf.doc.views_doc.document_bibtex', kwargs=dict(name=draft.name)) r = self.client.get(url) entry = bibtexparser.loads(r.content).get_entry_dict()[bibname] - self.assertEqual(entry['note'], u'Work in Progress') + self.assertEqual(entry['note'], 'Work in Progress') self.assertEqual(entry['number'], docname) self.assertEqual(entry['year'], str(draft.pub_date().year)) self.assertEqual(entry['month'], draft.pub_date().strftime('%b').lower()) @@ -1012,11 +1012,11 @@ class ReferencesTest(TestCase): RelatedDocument.objects.get_or_create(source=doc1,target=doc2,relationship=DocRelationshipName.objects.get(slug='refnorm')) url = urlreverse('ietf.doc.views_doc.document_references', kwargs=dict(name=doc1.name)) r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) self.assertTrue(doc2.name in unicontent(r)) url = urlreverse('ietf.doc.views_doc.document_referenced_by', kwargs=dict(name=doc2.name)) r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) self.assertTrue(doc1.name in unicontent(r)) diff --git a/ietf/doc/tests_ballot.py b/ietf/doc/tests_ballot.py index de43c58d1..59e195dfb 100644 --- a/ietf/doc/tests_ballot.py +++ b/ietf/doc/tests_ballot.py @@ -540,8 +540,8 @@ class BallotWriteupsTests(TestCase): e.by = Person.objects.get(name="(System)") e.doc = draft e.rev = draft.rev - e.desc = u"Ballot approval text was generated" - e.text = u"Test approval text." + e.desc = "Ballot approval text was generated" + e.text = "Test approval text." e.save() events.append(e) @@ -550,8 +550,8 @@ class BallotWriteupsTests(TestCase): e.by = Person.objects.get(name="(System)") e.doc = draft e.rev = draft.rev - e.desc = u"Ballot writeup was generated" - e.text = u"Test ballot writeup text." + e.desc = "Ballot writeup was generated" + e.text = "Test ballot writeup text." e.save() events.append(e) @@ -560,8 +560,8 @@ class BallotWriteupsTests(TestCase): e.by = Person.objects.get(name="(System)") e.doc = draft e.rev = draft.rev - e.desc = u"RFC Editor Note for ballot was generated" - e.text = u"Test note to the RFC Editor text." + e.desc = "RFC Editor Note for ballot was generated" + e.text = "Test note to the RFC Editor text." e.save() events.append(e) @@ -588,7 +588,7 @@ class BallotWriteupsTests(TestCase): # RFC Editor Notes for documents in the IRTF Stream e = DocEvent(doc=draft, rev=draft.rev, by=Person.objects.get(name="(System)"), type='changed_stream') - e.desc = u"Changed stream to %s" % 'irtf' + e.desc = "Changed stream to %s" % 'irtf' e.save() draft.stream_id = 'irtf' @@ -603,7 +603,7 @@ class BallotWriteupsTests(TestCase): # RFC Editor Notes for documents in the IAB Stream e = DocEvent(doc=draft, rev=draft.rev, by=Person.objects.get(name="(System)"), type='changed_stream') - e.desc = u"Changed stream to %s" % 'ise' + e.desc = "Changed stream to %s" % 'ise' e.save() draft.stream_id = 'ise' diff --git a/ietf/doc/tests_charter.py b/ietf/doc/tests_charter.py index 30f08dd4b..e30211e78 100644 --- a/ietf/doc/tests_charter.py +++ b/ietf/doc/tests_charter.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Copyright The IETF Trust 2011, All Rights Reserved +# Copyright The IETF Trust 2011-2019, All Rights Reserved import os, shutil, datetime -from StringIO import StringIO +from io import StringIO from pyquery import PyQuery from django.conf import settings @@ -70,8 +70,8 @@ class EditCharterTests(TestCase): ames = GroupFactory(acronym='ames',state_id='proposed',list_email='ames-wg@ietf.org',parent=area) RoleFactory(name_id='ad',group=ames,person=Person.objects.get(user__username='ad')) - RoleFactory(name_id='chair',group=ames,person__name=u'Ames Man',person__user__email='ameschairman@example.org') - RoleFactory(name_id='secr',group=ames,person__name=u'Secretary',person__user__email='amessecretary@example.org') + RoleFactory(name_id='chair',group=ames,person__name='Ames Man',person__user__email='ameschairman@example.org') + RoleFactory(name_id='secr',group=ames,person__name='Secretary',person__user__email='amessecretary@example.org') CharterFactory(group=ames) mars = GroupFactory(acronym='mars',parent=area) @@ -591,8 +591,8 @@ class EditCharterTests(TestCase): RoleFactory(name_id='ad',group=area,person=Person.objects.get(user__username='ad')) charter = CharterFactory(group__acronym='ames',group__list_email='ames-wg@ietf.org',group__parent=area,group__state_id='bof') group = charter.group - RoleFactory(name_id='chair',group=group,person__name=u'Ames Man',person__user__email='ameschairman@example.org') - RoleFactory(name_id='secr',group=group,person__name=u'Secretary',person__user__email='amessecretary@example.org') + RoleFactory(name_id='chair',group=group,person__name='Ames Man',person__user__email='ameschairman@example.org') + RoleFactory(name_id='secr',group=group,person__name='Secretary',person__user__email='amessecretary@example.org') url = urlreverse('ietf.doc.views_charter.approve', kwargs=dict(name=charter.name)) login_testing_unauthorized(self, "secretary", url) diff --git a/ietf/doc/tests_conflict_review.py b/ietf/doc/tests_conflict_review.py index fc0c2aa27..7dcb33410 100644 --- a/ietf/doc/tests_conflict_review.py +++ b/ietf/doc/tests_conflict_review.py @@ -1,10 +1,11 @@ +# Copyright The IETF Trust 2012-2019, All Rights Reserved # -*- coding: utf-8 -*- import debug # pyflakes:ignore import os import shutil from pyquery import PyQuery -from StringIO import StringIO +from io import StringIO from textwrap import wrap from django.conf import settings @@ -63,9 +64,9 @@ class ConflictReviewTests(TestCase): self.assertEqual(r.status_code, 302) review_doc = Document.objects.get(name='conflict-review-imaginary-independent-submission') self.assertEqual(review_doc.get_state('conflrev').slug,'needshep') - self.assertEqual(review_doc.rev,u'00') - self.assertEqual(review_doc.ad.name,u'Areað Irector') - self.assertEqual(review_doc.notify,u'ipu@ietf.org') + self.assertEqual(review_doc.rev,'00') + self.assertEqual(review_doc.ad.name,'Areað Irector') + self.assertEqual(review_doc.notify,'ipu@ietf.org') doc = Document.objects.get(name='draft-imaginary-independent-submission') self.assertTrue(doc in [x.target.document for x in review_doc.relateddocument_set.filter(relationship__slug='conflrev')]) @@ -87,34 +88,34 @@ class ConflictReviewTests(TestCase): # can't start conflict reviews on documents not in a stream r = self.client.get(url) - self.assertEquals(r.status_code, 404) + self.assertEqual(r.status_code, 404) # can't start conflict reviews on documents in some other stream doc.stream = StreamName.objects.get(slug='irtf') doc.save_with_history([DocEvent.objects.create(doc=doc, rev=doc.rev, type="changed_stream", by=Person.objects.get(user__username="secretary"), desc="Test")]) r = self.client.get(url) - self.assertEquals(r.status_code, 404) + self.assertEqual(r.status_code, 404) # successful get doc.stream = StreamName.objects.get(slug='ise') doc.save_with_history([DocEvent.objects.create(doc=doc, rev=doc.rev, type="changed_stream", by=Person.objects.get(user__username="secretary"), desc="Test")]) r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('form input[name=notify]')),1) - self.assertEquals(len(q('form select[name=ad]')),0) + self.assertEqual(len(q('form input[name=notify]')),1) + self.assertEqual(len(q('form select[name=ad]')),0) # successfully starts a review, and notifies the secretariat messages_before = len(outbox) r = self.client.post(url,dict(notify='ipu@ietf.org')) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) review_doc = Document.objects.get(name='conflict-review-imaginary-independent-submission') - self.assertEquals(review_doc.get_state('conflrev').slug,'needshep') - self.assertEquals(review_doc.rev,u'00') - self.assertEquals(review_doc.telechat_date(),None) - self.assertEquals(review_doc.ad.name,u'Ietf Chair') - self.assertEquals(review_doc.notify,u'ipu@ietf.org') + self.assertEqual(review_doc.get_state('conflrev').slug,'needshep') + self.assertEqual(review_doc.rev,'00') + self.assertEqual(review_doc.telechat_date(),None) + self.assertEqual(review_doc.ad.name,'Ietf Chair') + self.assertEqual(review_doc.notify,'ipu@ietf.org') doc = Document.objects.get(name='draft-imaginary-independent-submission') self.assertTrue(doc in [x.target.document for x in review_doc.relateddocument_set.filter(relationship__slug='conflrev')]) @@ -297,9 +298,9 @@ class ConflictReviewTests(TestCase): self.assertIn('ietf-announce@', outbox[0]['Cc']) self.assertIn('iana@', outbox[0]['Cc']) if approve_type == 'appr-noprob': - self.assertIn( 'IESG has no problem', ''.join(wrap(unicode(outbox[0]),2**16))) + self.assertIn( 'IESG has no problem', ''.join(wrap(str(outbox[0]),2**16))) else: - self.assertIn( 'NOT be published', ''.join(wrap(unicode(outbox[0]),2**16))) + self.assertIn( 'NOT be published', ''.join(wrap(str(outbox[0]),2**16))) def test_approve_reqnopub(self): @@ -330,12 +331,12 @@ class ConflictReviewSubmitTests(TestCase): # sane post using textbox path = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev)) - self.assertEqual(doc.rev,u'00') + self.assertEqual(doc.rev,'00') self.assertFalse(os.path.exists(path)) r = self.client.post(url,dict(content="Some initial review text\n",submit_response="1")) self.assertEqual(r.status_code,302) doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission') - self.assertEqual(doc.rev,u'00') + self.assertEqual(doc.rev,'00') with open(path) as f: self.assertEqual(f.read(),"Some initial review text\n") f.close() @@ -348,7 +349,7 @@ class ConflictReviewSubmitTests(TestCase): # A little additional setup # doc.rev is u'00' per the test setup - double-checking that here - if it fails, the breakage is in setUp - self.assertEqual(doc.rev,u'00') + self.assertEqual(doc.rev,'00') path = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev)) with open(path,'w') as f: f.write('This is the old proposal.') @@ -375,7 +376,7 @@ class ConflictReviewSubmitTests(TestCase): r = self.client.post(url,dict(txt=test_file,submit_response="1")) self.assertEqual(r.status_code, 302) doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission') - self.assertEqual(doc.rev,u'01') + self.assertEqual(doc.rev,'01') path = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev)) with open(path) as f: self.assertEqual(f.read(),"This is a new proposal.") diff --git a/ietf/doc/tests_downref.py b/ietf/doc/tests_downref.py index d0f4b43fc..e2c6b7652 100644 --- a/ietf/doc/tests_downref.py +++ b/ietf/doc/tests_downref.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2017-2019, All Rights Reserved # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.urls import reverse as urlreverse from pyquery import PyQuery diff --git a/ietf/doc/tests_draft.py b/ietf/doc/tests_draft.py index 61f371c2d..b063c0260 100644 --- a/ietf/doc/tests_draft.py +++ b/ietf/doc/tests_draft.py @@ -4,7 +4,7 @@ import os import shutil import datetime -import StringIO +import io from pyquery import PyQuery from collections import Counter @@ -458,7 +458,7 @@ class EditInfoTests(TestCase): # reset e = DocEvent(doc=draft, rev=draft.rev, by=Person.objects.get(name="(System)"), type='changed_document') - e.desc = u"Intended Status changed to %s from %s"% (draft.intended_std_level_id, 'bcp') + e.desc = "Intended Status changed to %s from %s"% (draft.intended_std_level_id, 'bcp') e.save() draft.intended_std_level_id = 'bcp' @@ -467,7 +467,7 @@ class EditInfoTests(TestCase): self.assertEqual(r.status_code, 403) # BCPs must have a consensus e = DocEvent(doc=draft, rev=draft.rev, by=Person.objects.get(name="(System)"), type='changed_document') - e.desc = u"Intended Status changed to %s from %s"% (draft.intended_std_level_id, 'inf') + e.desc = "Intended Status changed to %s from %s"% (draft.intended_std_level_id, 'inf') e.save() draft.intended_std_level_id = 'inf' @@ -774,7 +774,7 @@ class ExpireLastCallTests(TestCase): class IndividualInfoFormsTests(TestCase): def setUp(self): - doc = WgDraftFactory(group__acronym='mars',shepherd=PersonFactory(user__username='plain',name=u'Plain Man').email_set.first()) + doc = WgDraftFactory(group__acronym='mars',shepherd=PersonFactory(user__username='plain',name='Plain Man').email_set.first()) self.docname = doc.name def test_doc_change_stream(self): @@ -1056,7 +1056,7 @@ class IndividualInfoFormsTests(TestCase): self.assertTrue(doc.latest_event(WriteupDocEvent,type="changed_protocol_writeup").text.startswith('here is a new writeup')) # file upload - test_file = StringIO.StringIO("This is a different writeup.") + test_file = io.StringIO("This is a different writeup.") test_file.name = "unnamed" r = self.client.post(url,dict(txt=test_file,submit_response="1")) self.assertEqual(r.status_code, 302) @@ -1362,7 +1362,7 @@ class AdoptDraftTests(TestCase): class ChangeStreamStateTests(TestCase): def test_set_tags(self): - role = RoleFactory(name_id='chair',group__acronym='mars',group__list_email='mars-wg@ietf.org',person__user__username='marschairman',person__name=u'WG Cháir Man') + role = RoleFactory(name_id='chair',group__acronym='mars',group__list_email='mars-wg@ietf.org',person__user__username='marschairman',person__name='WG Cháir Man') RoleFactory(name_id='delegate',group=role.group,person__user__email='marsdelegate@example.org') draft = WgDraftFactory(group=role.group,shepherd=PersonFactory(user__username='plain',user__email='plain@example.com').email_set.first()) draft.tags.set(DocTagName.objects.filter(slug="w-expert")) @@ -1399,12 +1399,12 @@ class ChangeStreamStateTests(TestCase): self.assertEqual(draft.docevent_set.count() - events_before, 2) self.assertEqual(len(outbox), mailbox_before + 1) self.assertTrue("tags changed" in outbox[-1]["Subject"].lower()) - self.assertTrue("mars-chairs@ietf.org" in unicode(outbox[-1])) - self.assertTrue("marsdelegate@example.org" in unicode(outbox[-1])) - self.assertTrue("plain@example.com" in unicode(outbox[-1])) + self.assertTrue("mars-chairs@ietf.org" in str(outbox[-1])) + self.assertTrue("marsdelegate@example.org" in str(outbox[-1])) + self.assertTrue("plain@example.com" in str(outbox[-1])) def test_set_initial_state(self): - role = RoleFactory(name_id='chair',group__acronym='mars',group__list_email='mars-wg@ietf.org',person__user__username='marschairman',person__name=u'WG Cháir Man') + role = RoleFactory(name_id='chair',group__acronym='mars',group__list_email='mars-wg@ietf.org',person__user__username='marschairman',person__name='WG Cháir Man') RoleFactory(name_id='delegate',group=role.group,person__user__email='marsdelegate@ietf.org') draft = WgDraftFactory(group=role.group) draft.states.all().delete() @@ -1436,11 +1436,11 @@ class ChangeStreamStateTests(TestCase): self.assertTrue(due - datetime.timedelta(days=1) <= reminder[0].due <= due + datetime.timedelta(days=1)) self.assertEqual(len(outbox), 1) self.assertTrue("state changed" in outbox[0]["Subject"].lower()) - self.assertTrue("mars-chairs@ietf.org" in unicode(outbox[0])) - self.assertTrue("marsdelegate@ietf.org" in unicode(outbox[0])) + self.assertTrue("mars-chairs@ietf.org" in str(outbox[0])) + self.assertTrue("marsdelegate@ietf.org" in str(outbox[0])) def test_set_state(self): - role = RoleFactory(name_id='chair',group__acronym='mars',group__list_email='mars-wg@ietf.org',person__user__username='marschairman',person__name=u'WG Cháir Man') + role = RoleFactory(name_id='chair',group__acronym='mars',group__list_email='mars-wg@ietf.org',person__user__username='marschairman',person__name='WG Cháir Man') RoleFactory(name_id='delegate',group=role.group,person__user__email='marsdelegate@ietf.org') draft = WgDraftFactory(group=role.group) @@ -1481,11 +1481,11 @@ class ChangeStreamStateTests(TestCase): self.assertTrue(due - datetime.timedelta(days=1) <= reminder[0].due <= due + datetime.timedelta(days=1)) self.assertEqual(len(outbox), 1) self.assertTrue("state changed" in outbox[0]["Subject"].lower()) - self.assertTrue("mars-chairs@ietf.org" in unicode(outbox[0])) - self.assertTrue("marsdelegate@ietf.org" in unicode(outbox[0])) + self.assertTrue("mars-chairs@ietf.org" in str(outbox[0])) + self.assertTrue("marsdelegate@ietf.org" in str(outbox[0])) def test_pubreq_validation(self): - role = RoleFactory(name_id='chair',group__acronym='mars',group__list_email='mars-wg@ietf.org',person__user__username='marschairman',person__name=u'WG Cháir Man') + role = RoleFactory(name_id='chair',group__acronym='mars',group__list_email='mars-wg@ietf.org',person__user__username='marschairman',person__name='WG Cháir Man') RoleFactory(name_id='delegate',group=role.group,person__user__email='marsdelegate@ietf.org') draft = WgDraftFactory(group=role.group) @@ -1509,7 +1509,7 @@ class ChangeStreamStateTests(TestCase): class ChangeReplacesTests(TestCase): def setUp(self): - role = RoleFactory(name_id='chair',group__acronym='mars',group__list_email='mars-wg@ietf.org',person__user__username='marschairman',person__name=u'WG Cháir Man') + role = RoleFactory(name_id='chair',group__acronym='mars',group__list_email='mars-wg@ietf.org',person__user__username='marschairman',person__name='WG Cháir Man') RoleFactory(name_id='delegate',group=role.group,person__user__email='marsdelegate@ietf.org') #draft = WgDraftFactory(group=role.group) @@ -1520,7 +1520,7 @@ class ChangeReplacesTests(TestCase): title="Base A", group=mars_wg, ) - p = PersonFactory(name=u"basea_author") + p = PersonFactory(name="basea_author") e = Email.objects.create(address="basea_author@example.com", person=p, origin=p.user.username) self.basea.documentauthor_set.create(person=p, email=e, order=1) @@ -1530,7 +1530,7 @@ class ChangeReplacesTests(TestCase): group=mars_wg, expires = datetime.datetime.now() - datetime.timedelta(days = 365 - settings.INTERNET_DRAFT_DAYS_TO_EXPIRE), ) - p = PersonFactory(name=u"baseb_author") + p = PersonFactory(name="baseb_author") e = Email.objects.create(address="baseb_author@example.com", person=p, origin=p.user.username) self.baseb.documentauthor_set.create(person=p, email=e, order=1) @@ -1539,7 +1539,7 @@ class ChangeReplacesTests(TestCase): title="Replace Base A", group=mars_wg, ) - p = PersonFactory(name=u"replacea_author") + p = PersonFactory(name="replacea_author") e = Email.objects.create(address="replacea_author@example.com", person=p, origin=p.user.username) self.replacea.documentauthor_set.create(person=p, email=e, order=1) @@ -1548,7 +1548,7 @@ class ChangeReplacesTests(TestCase): title="Replace Base A and Base B", group=mars_wg, ) - p = PersonFactory(name=u"replaceboth_author") + p = PersonFactory(name="replaceboth_author") e = Email.objects.create(address="replaceboth_author@example.com", person=p, origin=p.user.username) self.replaceboth.documentauthor_set.create(person=p, email=e, order=1) @@ -1627,15 +1627,15 @@ class ChangeReplacesTests(TestCase): login_testing_unauthorized(self, "secretary", url) r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('form[name=review-suggested-replaces]')), 1) + self.assertEqual(len(q('form[name=review-suggested-replaces]')), 1) r = self.client.post(url, dict(replaces=[replaced.pk])) - self.assertEquals(r.status_code, 302) + self.assertEqual(r.status_code, 302) self.assertTrue(not self.replacea.related_that_doc("possibly-replaces")) self.assertEqual(len(self.replacea.related_that_doc("replaces")), 1) - self.assertEquals(Document.objects.get(pk=self.basea.pk).get_state().slug, 'repl') + self.assertEqual(Document.objects.get(pk=self.basea.pk).get_state().slug, 'repl') class MoreReplacesTests(TestCase): diff --git a/ietf/doc/tests_material.py b/ietf/doc/tests_material.py index c2d857d70..b6028b4c8 100644 --- a/ietf/doc/tests_material.py +++ b/ietf/doc/tests_material.py @@ -1,10 +1,10 @@ -# Copyright The IETF Trust 2011-2019, All Rights Reserved +# Copyright The IETF Trust 2014-2019, All Rights Reserved # -*- coding: utf-8 -*- import os import shutil import datetime -from StringIO import StringIO +from io import StringIO from pyquery import PyQuery import debug # pyflakes:ignore diff --git a/ietf/doc/tests_review.py b/ietf/doc/tests_review.py index 40fe8da5f..49dd19bd6 100644 --- a/ietf/doc/tests_review.py +++ b/ietf/doc/tests_review.py @@ -5,7 +5,7 @@ import datetime, os, shutil, json import tarfile, tempfile, mailbox import email.mime.multipart, email.mime.text, email.utils -from StringIO import StringIO +from io import StringIO from mock import patch from requests import Response @@ -311,8 +311,8 @@ class ReviewTests(TestCase): def test_assign_reviewer(self): doc = WgDraftFactory(pages=2) review_team = ReviewTeamFactory(acronym="reviewteam", name="Review Team", type_id="review", list_email="reviewteam@ietf.org", parent=Group.objects.get(acronym="farfut")) - rev_role = RoleFactory(group=review_team,person__user__username='reviewer',person__user__email='reviewer@example.com',person__name=u'Some Reviewer',name_id='reviewer') - RoleFactory(group=review_team,person__user__username='marschairman',person__name=u'WG Cháir Man',name_id='reviewer') + rev_role = RoleFactory(group=review_team,person__user__username='reviewer',person__user__email='reviewer@example.com',person__name='Some Reviewer',name_id='reviewer') + RoleFactory(group=review_team,person__user__username='marschairman',person__name='WG Cháir Man',name_id='reviewer') RoleFactory(group=review_team,person__user__username='reviewsecretary',person__user__email='reviewsecretary@example.com',name_id='secr') ReviewerSettings.objects.create(team=review_team, person=rev_role.person, min_interval=14, skip_next=0) @@ -353,7 +353,7 @@ class ReviewTests(TestCase): reviewer_settings.save() # Need one more person in review team one so we can test incrementing skip_count without immediately decrementing it - another_reviewer = PersonFactory.create(name = u"Extra TestReviewer") # needs to be lexically greater than the existing one + another_reviewer = PersonFactory.create(name = "Extra TestReviewer") # needs to be lexically greater than the existing one another_reviewer.role_set.create(name_id='reviewer', email=another_reviewer.email(), group=review_req.team) UnavailablePeriod.objects.create( @@ -462,7 +462,7 @@ class ReviewTests(TestCase): login_testing_unauthorized(self, "reviewsecretary", reject_url) r = self.client.get(reject_url) self.assertEqual(r.status_code, 200) - self.assertTrue(unicode(assignment.reviewer.person) in unicontent(r)) + self.assertTrue(str(assignment.reviewer.person) in unicontent(r)) # reject empty_outbox() diff --git a/ietf/doc/tests_status_change.py b/ietf/doc/tests_status_change.py index 36d3415bb..4807b3f5c 100644 --- a/ietf/doc/tests_status_change.py +++ b/ietf/doc/tests_status_change.py @@ -7,7 +7,7 @@ import shutil import debug # pyflakes:ignore from pyquery import PyQuery -from StringIO import StringIO +from io import StringIO from textwrap import wrap from django.conf import settings @@ -73,9 +73,9 @@ class StatusChangeTests(TestCase): self.assertEqual(r.status_code, 302) status_change = Document.objects.get(name='status-change-imaginary-new') self.assertEqual(status_change.get_state('statchg').slug,'adrev') - self.assertEqual(status_change.rev,u'00') - self.assertEqual(status_change.ad.name,u'Areað Irector') - self.assertEqual(status_change.notify,u'ipu@ietf.org') + self.assertEqual(status_change.rev,'00') + self.assertEqual(status_change.ad.name,'Areað Irector') + self.assertEqual(status_change.notify,'ipu@ietf.org') self.assertTrue(status_change.relateddocument_set.filter(relationship__slug='tois',target__docs__name='draft-ietf-random-thing')) def test_change_state(self): @@ -112,10 +112,10 @@ class StatusChangeTests(TestCase): doc.save_with_history([DocEvent.objects.create(doc=doc, rev=doc.rev, type="changed_document", by=Person.objects.get(user__username="secretary"), desc="Test")]) lc_req_pk = str(State.objects.get(slug='lc-req',type__slug='statchg').pk) r = self.client.post(url,dict(new_state=lc_req_pk)) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) doc = Document.objects.get(name='status-change-imaginary-mid-review') - self.assertEquals(doc.get_state('statchg').slug,'lc-req') - self.assertEquals(len(outbox), messages_before + 1) + self.assertEqual(doc.get_state('statchg').slug,'lc-req') + self.assertEqual(len(outbox), messages_before + 1) self.assertTrue('Last Call:' in outbox[-1]['Subject']) # successful change to IESG Evaluation @@ -171,15 +171,15 @@ class StatusChangeTests(TestCase): # normal get r = self.client.get(url) - self.assertEquals(r.status_code, 200) + self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertEquals(len(q('input[name=title]')),1) + self.assertEqual(len(q('input[name=title]')),1) # change title r = self.client.post(url,dict(title='New title')) - self.assertEquals(r.status_code,302) + self.assertEqual(r.status_code,302) doc = Document.objects.get(name='status-change-imaginary-mid-review') - self.assertEquals(doc.title,'New title') + self.assertEqual(doc.title,'New title') self.assertTrue(doc.latest_event(DocEvent,type="added_comment").desc.startswith('Title changed')) def test_edit_ad(self): @@ -288,7 +288,7 @@ class StatusChangeTests(TestCase): self.assertTrue( 'Last call requested' in ''.join(wrap(r.content,2**16))) self.assertEqual(len(outbox), messages_before + 1) self.assertTrue('Last Call:' in outbox[-1]['Subject']) - self.assertTrue('Last Call Request has been submitted' in ''.join(wrap(unicode(outbox[-1]),2**16))) + self.assertTrue('Last Call Request has been submitted' in ''.join(wrap(str(outbox[-1]),2**16))) def test_approve(self): @@ -328,8 +328,8 @@ class StatusChangeTests(TestCase): self.assertTrue('Action:' in outbox[-1]['Subject']) self.assertTrue('ietf-announce' in outbox[-1]['To']) self.assertTrue('rfc-editor' in outbox[-1]['Cc']) - self.assertTrue('(rfc9998) to Historic' in ''.join(wrap(unicode(outbox[-1])+unicode(outbox[-2]),2**16))) - self.assertTrue('(rfc9999) to Internet Standard' in ''.join(wrap(unicode(outbox[-1])+unicode(outbox[-2]),2**16))) + self.assertTrue('(rfc9998) to Historic' in ''.join(wrap(str(outbox[-1])+str(outbox[-2]),2**16))) + self.assertTrue('(rfc9999) to Internet Standard' in ''.join(wrap(str(outbox[-1])+str(outbox[-2]),2**16))) self.assertTrue(doc.latest_event(DocEvent,type="added_comment").desc.startswith('The following approval message was sent')) @@ -415,12 +415,12 @@ class StatusChangeSubmitTests(TestCase): # sane post using textbox path = os.path.join(settings.STATUS_CHANGE_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev)) - self.assertEqual(doc.rev,u'00') + self.assertEqual(doc.rev,'00') self.assertFalse(os.path.exists(path)) r = self.client.post(url,dict(content="Some initial review text\n",submit_response="1")) self.assertEqual(r.status_code,302) doc = Document.objects.get(name='status-change-imaginary-mid-review') - self.assertEqual(doc.rev,u'00') + self.assertEqual(doc.rev,'00') with open(path) as f: self.assertEqual(f.read(),"Some initial review text\n") self.assertTrue( "mid-review-00" in doc.latest_event(NewRevisionDocEvent).desc) @@ -432,7 +432,7 @@ class StatusChangeSubmitTests(TestCase): # A little additional setup # doc.rev is u'00' per the test setup - double-checking that here - if it fails, the breakage is in setUp - self.assertEqual(doc.rev,u'00') + self.assertEqual(doc.rev,'00') path = os.path.join(settings.STATUS_CHANGE_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev)) with open(path,'w') as f: f.write('This is the old proposal.') @@ -464,7 +464,7 @@ class StatusChangeSubmitTests(TestCase): r = self.client.post(url,dict(txt=test_file,submit_response="1")) self.assertEqual(r.status_code, 302) doc = Document.objects.get(name='status-change-imaginary-mid-review') - self.assertEqual(doc.rev,u'01') + self.assertEqual(doc.rev,'01') path = os.path.join(settings.STATUS_CHANGE_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev)) with open(path) as f: self.assertEqual(f.read(),"This is a new proposal.") diff --git a/ietf/doc/utils.py b/ietf/doc/utils.py index d38d00e43..6e5a755fe 100644 --- a/ietf/doc/utils.py +++ b/ietf/doc/utils.py @@ -3,7 +3,7 @@ import os import re -import urllib +import urllib.request, urllib.parse, urllib.error import math import datetime import hashlib @@ -56,7 +56,7 @@ def save_document_in_history(doc): def transfer_fields(obj, HistModel): mfields = get_model_fields_as_dict(item) # map doc -> dochist - for k, v in mfields.iteritems(): + for k, v in mfields.items(): if v == doc: mfields[k] = dochist HistModel.objects.create(**mfields) @@ -209,7 +209,7 @@ def create_ballot(request, doc, by, ballot_slug, time=None): else: e = BallotDocEvent(type="created_ballot", by=by, doc=doc, rev=doc.rev) e.ballot_type = BallotType.objects.get(doc_type=doc.type, slug=ballot_slug) - e.desc = u'Created "%s" ballot' % e.ballot_type.name + e.desc = 'Created "%s" ballot' % e.ballot_type.name e.save() def create_ballot_if_not_open(request, doc, by, ballot_slug, time=None): @@ -220,7 +220,7 @@ def create_ballot_if_not_open(request, doc, by, ballot_slug, time=None): else: e = BallotDocEvent(type="created_ballot", by=by, doc=doc, rev=doc.rev) e.ballot_type = ballot_type - e.desc = u'Created "%s" ballot' % e.ballot_type.name + e.desc = 'Created "%s" ballot' % e.ballot_type.name e.save() return e else: @@ -313,7 +313,7 @@ def add_links_in_new_revision_events(doc, events, diff_revisions): links += "" if prev != None: - links += ' (diff from previous)' % (settings.RFCDIFF_BASE_URL, urllib.quote(prev, safe="~"), urllib.quote(diff_url, safe="~")) + links += ' (diff from previous)' % (settings.RFCDIFF_BASE_URL, urllib.parse.quote(prev, safe="~"), urllib.parse.quote(diff_url, safe="~")) # replace the bold filename part e.desc = re.sub(r"(.+-[0-9][0-9].txt)", links, e.desc) @@ -363,7 +363,7 @@ def get_document_content(key, filename, split=True, markup=True): return text.decode(raw_content) def tags_suffix(tags): - return (u"::" + u"::".join(t.name for t in tags)) if tags else u"" + return ("::" + "::".join(t.name for t in tags)) if tags else "" def add_state_change_event(doc, by, prev_state, new_state, prev_tags=[], new_tags=[], timestamp=None): """Add doc event to explain that state change just happened.""" @@ -551,7 +551,7 @@ def rebuild_reference_relations(doc,filename=None): warnings = [] errors = [] unfound = set() - for ( ref, refType ) in refs.iteritems(): + for ( ref, refType ) in refs.items(): refdoc = DocAlias.objects.filter( name=ref ) count = refdoc.count() if count == 0: @@ -587,9 +587,9 @@ def set_replaces_for_document(request, doc, new_replaces, by, email_subject, com events = [] e = DocEvent(doc=doc, rev=doc.rev, by=by, type='changed_document') - new_replaces_names = u", ".join(d.name for d in new_replaces) or u"None" - old_replaces_names = u", ".join(d.name for d in old_replaces) or u"None" - e.desc = u"This document now replaces %s instead of %s" % (new_replaces_names, old_replaces_names) + new_replaces_names = ", ".join(d.name for d in new_replaces) or "None" + old_replaces_names = ", ".join(d.name for d in old_replaces) or "None" + e.desc = "This document now replaces %s instead of %s" % (new_replaces_names, old_replaces_names) e.save() events.append(e) @@ -661,7 +661,7 @@ def get_initial_notify(doc,extra=None): receivers = [] if extra: - if isinstance(extra,basestring): + if isinstance(extra,str): extra = extra.split(', ') receivers.extend(extra) @@ -759,14 +759,14 @@ def make_rev_history(doc): } if hasattr(e, 'newrevisiondocevent') and doc.history_set.filter(rev=e.newrevisiondocevent.rev).exists(): history[url]['pages'] = doc.history_set.filter(rev=e.newrevisiondocevent.rev).first().pages - history = history.values() + history = list(history.values()) return sorted(history, key=lambda x: x['published']) def get_search_cache_key(params): from ietf.doc.views_search import SearchForm fields = set(SearchForm.base_fields) - set(['sort',]) - kwargs = dict([ (k,v) for (k,v) in params.items() if k in fields ]) + kwargs = dict([ (k,v) for (k,v) in list(params.items()) if k in fields ]) key = "doc:document:search:" + hashlib.sha512(json.dumps(kwargs, sort_keys=True)).hexdigest() return key diff --git a/ietf/doc/utils_charter.py b/ietf/doc/utils_charter.py index 731f234c9..beb96864e 100644 --- a/ietf/doc/utils_charter.py +++ b/ietf/doc/utils_charter.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2011-2019, All Rights Reserved import re, datetime, os, shutil from django.conf import settings @@ -140,8 +141,8 @@ def generate_ballot_writeup(request, doc): e.by = request.user.person e.doc = doc e.rev = doc.rev, - e.desc = u"Ballot writeup was generated" - e.text = unicode(render_to_string("doc/charter/ballot_writeup.txt")) + e.desc = "Ballot writeup was generated" + e.text = str(render_to_string("doc/charter/ballot_writeup.txt")) # caller is responsible for saving, if necessary return e diff --git a/ietf/doc/utils_search.py b/ietf/doc/utils_search.py index ae25bef31..90093b6ef 100644 --- a/ietf/doc/utils_search.py +++ b/ietf/doc/utils_search.py @@ -16,9 +16,9 @@ def wrap_value(v): def fill_in_telechat_date(docs, doc_dict=None, doc_ids=None): if doc_dict is None: doc_dict = dict((d.pk, d) for d in docs) - doc_ids = doc_dict.keys() + doc_ids = list(doc_dict.keys()) if doc_ids is None: - doc_ids = doc_dict.keys() + doc_ids = list(doc_dict.keys()) seen = set() for e in TelechatDocEvent.objects.filter(doc__id__in=doc_ids, type="scheduled_for_telechat").order_by('-time'): @@ -36,7 +36,7 @@ def fill_in_document_sessions(docs, doc_dict, doc_ids): # get presentations presentations = SessionPresentation.objects.filter(session_id__in=[ s.id for s in sessions ]) session_list = [ (p.document_id, p.session) for p in presentations ] - for d in doc_dict.values(): + for d in list(doc_dict.values()): d.sessions = [] for (i, s) in session_list: if i in doc_ids: @@ -48,7 +48,7 @@ def fill_in_document_table_attributes(docs, have_telechat_date=False): # TODO - this function evolved from something that assumed it was handling only drafts. It still has places where it assumes all docs are drafts where that is not a correct assumption doc_dict = dict((d.pk, d) for d in docs) - doc_ids = doc_dict.keys() + doc_ids = list(doc_dict.keys()) rfc_aliases = dict([ (a.document.id, a.name) for a in DocAlias.objects.filter(name__startswith="rfc", docs__id__in=doc_ids) ]) @@ -112,7 +112,7 @@ def fill_in_document_table_attributes(docs, have_telechat_date=False): # RFCs # errata - erratas = set(Document.objects.filter(tags="errata", name__in=rfc_aliases.keys()).distinct().values_list("name", flat=True)) + erratas = set(Document.objects.filter(tags="errata", name__in=list(rfc_aliases.keys())).distinct().values_list("name", flat=True)) for d in docs: d.has_errata = d.name in erratas @@ -122,7 +122,7 @@ def fill_in_document_table_attributes(docs, have_telechat_date=False): d.obsoleted_by_list = [] d.updated_by_list = [] - xed_by = RelatedDocument.objects.filter(target__name__in=rfc_aliases.values(), + xed_by = RelatedDocument.objects.filter(target__name__in=list(rfc_aliases.values()), relationship__in=("obs", "updates")).select_related('target') rel_rfc_aliases = dict([ (a.document.id, a.name) for a in DocAlias.objects.filter(name__startswith="rfc", docs__id__in=[rel.source_id for rel in xed_by]) ]) for rel in xed_by: diff --git a/ietf/doc/views_ballot.py b/ietf/doc/views_ballot.py index da6db8dfe..85d533442 100644 --- a/ietf/doc/views_ballot.py +++ b/ietf/doc/views_ballot.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2010-2019, All Rights Reserved # ballot management (voting, commenting, writeups, ...) for Area # Directors and Secretariat @@ -162,17 +163,17 @@ def save_position(form, doc, ballot, ad, login=None, send_email=False): # figure out a description if not old_pos and pos.pos.slug != "norecord": - pos.desc = u"[Ballot Position Update] New position, %s, has been recorded for %s" % (pos.pos.name, pos.ad.plain_name()) + pos.desc = "[Ballot Position Update] New position, %s, has been recorded for %s" % (pos.pos.name, pos.ad.plain_name()) elif old_pos and pos.pos != old_pos.pos: pos.desc = "[Ballot Position Update] Position for %s has been changed to %s from %s" % (pos.ad.plain_name(), pos.pos.name, old_pos.pos.name) if not pos.desc and changes: - pos.desc = u"Ballot %s text updated for %s" % (u" and ".join(changes), ad.plain_name()) + pos.desc = "Ballot %s text updated for %s" % (" and ".join(changes), ad.plain_name()) # only add new event if we actually got a change if pos.desc: if login != ad: - pos.desc += u" by %s" % login.plain_name() + pos.desc += " by %s" % login.plain_name() pos.save() @@ -362,7 +363,7 @@ def send_ballot_comment(request, name, ballot_id): if extra_cc: cc.extend(extra_cc) - send_mail_text(request, addrs.to, frm, subject, body, cc=u", ".join(cc)) + send_mail_text(request, addrs.to, frm, subject, body, cc=", ".join(cc)) return HttpResponseRedirect(return_to_url) diff --git a/ietf/doc/views_charter.py b/ietf/doc/views_charter.py index 2f6f36e19..0ad038f54 100644 --- a/ietf/doc/views_charter.py +++ b/ietf/doc/views_charter.py @@ -808,7 +808,7 @@ def charter_with_milestones_txt(request, name, rev): try: with open(os.path.join(settings.CHARTER_PATH, filename), 'r') as f: - charter_text = unicode(f.read(), errors='ignore') + charter_text = str(f.read(), errors='ignore') except IOError: charter_text = "Error reading charter text %s" % filename diff --git a/ietf/doc/views_conflict_review.py b/ietf/doc/views_conflict_review.py index 03d06235b..e8f53f899 100644 --- a/ietf/doc/views_conflict_review.py +++ b/ietf/doc/views_conflict_review.py @@ -468,7 +468,7 @@ def start_review_as_secretariat(request, name): notify_addresses = build_notify_addresses(doc_to_review) init = { "ad" : Role.objects.filter(group__acronym='ietf',name='chair')[0].person.id, - "notify" : u', '.join(notify_addresses), + "notify" : ', '.join(notify_addresses), } form = StartReviewForm(initial=init) @@ -502,7 +502,7 @@ def start_review_as_stream_owner(request, name): notify_addresses = build_notify_addresses(doc_to_review) init = { - "notify" : u', '.join(notify_addresses), + "notify" : ', '.join(notify_addresses), } form = SimpleStartReviewForm(initial=init) diff --git a/ietf/doc/views_doc.py b/ietf/doc/views_doc.py index 343d6e1f4..73df69018 100644 --- a/ietf/doc/views_doc.py +++ b/ietf/doc/views_doc.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2016-2019, All Rights Reserved +# Copyright The IETF Trust 2009-2019, All Rights Reserved # -*- coding: utf-8 -*- # Parts Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). @@ -33,7 +33,7 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -import os, datetime, urllib, json, glob, re +import os, datetime, urllib.request, urllib.parse, urllib.error, json, glob, re from django.http import HttpResponse, Http404 , HttpResponseForbidden from django.shortcuts import render, get_object_or_404, redirect @@ -251,7 +251,7 @@ def document_main(request, name, rev=None): if iesg_state and iesg_state.slug in IESG_BALLOT_ACTIVE_STATES: active_ballot = doc.active_ballot() if active_ballot: - ballot_summary = needed_ballot_positions(doc, active_ballot.active_ad_positions().values()) + ballot_summary = needed_ballot_positions(doc, list(active_ballot.active_ad_positions().values())) # submission submission = "" @@ -312,7 +312,7 @@ def document_main(request, name, rev=None): if doc.stream_id == "ietf" and group.type_id == "wg" and group.list_archive: search_archive = group.list_archive - search_archive = urllib.quote(search_archive, safe="~") + search_archive = urllib.parse.quote(search_archive, safe="~") # conflict reviews conflict_reviews = [d.document.name for d in doc.related_that("conflrev")] @@ -458,7 +458,7 @@ def document_main(request, name, rev=None): if doc.get_state_slug() in ("intrev", "iesgrev"): active_ballot = doc.active_ballot() if active_ballot: - ballot_summary = needed_ballot_positions(doc, active_ballot.active_ad_positions().values()) + ballot_summary = needed_ballot_positions(doc, list(active_ballot.active_ad_positions().values())) else: ballot_summary = "No active ballot found." @@ -493,14 +493,14 @@ def document_main(request, name, rev=None): if doc.rev == "00" and not os.path.isfile(pathname): # This could move to a template - content = u"A conflict review response has not yet been proposed." + content = "A conflict review response has not yet been proposed." else: content = doc.text_or_error() # pyflakes:ignore content = markup_txt.markup(content) ballot_summary = None if doc.get_state_slug() in ("iesgeval") and doc.active_ballot(): - ballot_summary = needed_ballot_positions(doc, doc.active_ballot().active_ad_positions().values()) + ballot_summary = needed_ballot_positions(doc, list(doc.active_ballot().active_ad_positions().values())) return render(request, "doc/document_conflict_review.html", dict(doc=doc, @@ -521,13 +521,13 @@ def document_main(request, name, rev=None): if doc.rev == "00" and not os.path.isfile(pathname): # This could move to a template - content = u"Status change text has not yet been proposed." + content = "Status change text has not yet been proposed." else: content = doc.text_or_error() # pyflakes:ignore ballot_summary = None if doc.get_state_slug() in ("iesgeval"): - ballot_summary = needed_ballot_positions(doc, doc.active_ballot().active_ad_positions().values()) + ballot_summary = needed_ballot_positions(doc, list(doc.active_ballot().active_ad_positions().values())) if isinstance(doc,Document): sorted_relations=doc.relateddocument_set.all().order_by('relationship__name') @@ -1263,7 +1263,7 @@ def add_sessionpresentation(request,name): if doc.group: sessions = sorted(sessions,key=lambda x:0 if x.group==doc.group else 1) - session_choices = [(s.pk,unicode(s)) for s in sessions] + session_choices = [(s.pk,str(s)) for s in sessions] if request.method == 'POST': version_form = VersionForm(request.POST,choices=version_choices) diff --git a/ietf/doc/views_downref.py b/ietf/doc/views_downref.py index 91cf88253..662fe87b0 100644 --- a/ietf/doc/views_downref.py +++ b/ietf/doc/views_downref.py @@ -1,6 +1,6 @@ -# Copyright The IETF Trust 2017, All Rights Reserved +# Copyright The IETF Trust 2017-2019, All Rights Reserved + -from __future__ import unicode_literals from django.urls import reverse as urlreverse from django.http import HttpResponseRedirect diff --git a/ietf/doc/views_draft.py b/ietf/doc/views_draft.py index fc586a452..bb4b4456d 100644 --- a/ietf/doc/views_draft.py +++ b/ietf/doc/views_draft.py @@ -65,10 +65,10 @@ class ChangeStateForm(forms.Form): prev_tag = prev_tag[0] if prev_tag else None if state == prev and tag == prev_tag: - self._errors['comment'] = ErrorList([u'State not changed. Comments entered will be lost with no state change. Please go back and use the Add Comment feature on the history tab to add comments without changing state.']) + self._errors['comment'] = ErrorList(['State not changed. Comments entered will be lost with no state change. Please go back and use the Add Comment feature on the history tab to add comments without changing state.']) if state != '(None)' and state.slug == 'idexists' and tag: - self._errors['substate'] = ErrorList([u'Clear substate before setting the document to the idexists state.']) + self._errors['substate'] = ErrorList(['Clear substate before setting the document to the idexists state.']) return retclean @@ -268,7 +268,7 @@ def change_stream(request, name): events = [] e = DocEvent(doc=doc, rev=doc.rev, by=login, type='changed_document') - e.desc = u"Stream changed to %s from %s"% (new_stream, old_stream or "None") + e.desc = "Stream changed to %s from %s"% (new_stream, old_stream or "None") e.save() events.append(e) @@ -281,7 +281,7 @@ def change_stream(request, name): doc.save_with_history(events) - msg = u"\n".join(e.desc for e in events) + msg = "\n".join(e.desc for e in events) email_stream_changed(request, doc, old_stream, new_stream, msg) @@ -437,7 +437,7 @@ def change_intention(request, name): events = [] e = DocEvent(doc=doc, rev=doc.rev, by=login, type='changed_document') - e.desc = u"Intended Status changed to %s from %s"% (new_level,old_level) + e.desc = "Intended Status changed to %s from %s"% (new_level,old_level) e.save() events.append(e) @@ -459,7 +459,7 @@ def change_intention(request, name): doc.save_with_history(events) - msg = u"\n".join(e.desc for e in events) + msg = "\n".join(e.desc for e in events) email_intended_status_changed(request, doc, msg) @@ -719,9 +719,9 @@ def edit_info(request, name): if r["area"] != doc.group: if r["area"].type_id == "area": - changes.append(u"Assigned to %s" % r["area"].name) + changes.append("Assigned to %s" % r["area"].name) else: - changes.append(u"No longer assigned to any area") + changes.append("No longer assigned to any area") doc.group = r["area"] for c in changes: @@ -1160,9 +1160,9 @@ def edit_document_urls(request, name): res = [] for u in urls: if u.desc: - res.append(u"%s %s (%s)" % (u.tag.slug, u.url, u.desc.strip('()'))) + res.append("%s %s (%s)" % (u.tag.slug, u.url, u.desc.strip('()'))) else: - res.append(u"%s %s" % (u.tag.slug, u.url)) + res.append("%s %s" % (u.tag.slug, u.url)) return fs.join(res) doc = get_object_or_404(Document, name=name) @@ -1376,9 +1376,9 @@ def adopt_draft(request, name): # stream if doc.stream != new_stream: e = DocEvent(type="changed_stream", doc=doc, rev=doc.rev, by=by) - e.desc = u"Changed stream to %s" % new_stream.name + e.desc = "Changed stream to %s" % new_stream.name if doc.stream: - e.desc += u" from %s" % doc.stream.name + e.desc += " from %s" % doc.stream.name e.save() events.append(e) old_stream = doc.stream @@ -1389,7 +1389,7 @@ def adopt_draft(request, name): # group if group != doc.group: e = DocEvent(type="changed_group", doc=doc, rev=doc.rev, by=by) - e.desc = u"Changed group to %s (%s)" % (group.name, group.acronym.upper()) + e.desc = "Changed group to %s (%s)" % (group.name, group.acronym.upper()) if doc.group.type_id != "individ": e.desc += " from %s (%s)" % (doc.group.name, doc.group.acronym.upper()) e.save() @@ -1461,7 +1461,7 @@ def release_draft(request, name): doc.tags.clear() e = DocEvent(type="changed_document", doc=doc, rev=doc.rev, by=by) l = [] - l.append(u"Tag%s %s cleared." % (pluralize(existing_tags), ", ".join(t.name for t in existing_tags))) + l.append("Tag%s %s cleared." % (pluralize(existing_tags), ", ".join(t.name for t in existing_tags))) e.desc = " ".join(l) e.save() events.append(e) @@ -1487,7 +1487,7 @@ def release_draft(request, name): if doc.stream: e = DocEvent(type="changed_stream", doc=doc, rev=doc.rev, by=by) - e.desc = u"Changed stream to None from %s" % doc.stream.name + e.desc = "Changed stream to None from %s" % doc.stream.name e.save() events.append(e) old_stream = doc.stream @@ -1529,9 +1529,9 @@ class ChangeStreamStateForm(forms.Form): f.label = state_type.label if self.stream.slug == 'ietf': if self.can_set_sub_pub: - f.help_text = u"Only select 'Submitted to IESG for Publication' to correct errors. Use the document's main page to request publication." + f.help_text = "Only select 'Submitted to IESG for Publication' to correct errors. Use the document's main page to request publication." else: - f.help_text = u"You may not set the 'Submitted to IESG for Publication' using this form - Use the document's main page to request publication." + f.help_text = "You may not set the 'Submitted to IESG for Publication' using this form - Use the document's main page to request publication." f = self.fields['tags'] f.queryset = f.queryset.filter(slug__in=get_tags_for_stream_id(doc.stream_id)) @@ -1620,9 +1620,9 @@ def change_stream_state(request, name, state_type): removed_tags = existing_tags - new_tags l = [] if added_tags: - l.append(u"Tag%s %s set." % (pluralize(added_tags), ", ".join(t.name for t in added_tags))) + l.append("Tag%s %s set." % (pluralize(added_tags), ", ".join(t.name for t in added_tags))) if removed_tags: - l.append(u"Tag%s %s cleared." % (pluralize(removed_tags), ", ".join(t.name for t in removed_tags))) + l.append("Tag%s %s cleared." % (pluralize(removed_tags), ", ".join(t.name for t in removed_tags))) e.desc = " ".join(l) e.save() events.append(e) diff --git a/ietf/doc/views_material.py b/ietf/doc/views_material.py index 5cc5609cb..fdd7ab705 100644 --- a/ietf/doc/views_material.py +++ b/ietf/doc/views_material.py @@ -51,7 +51,7 @@ class UploadMaterialForm(forms.Form): self.fields["state"].widget = forms.HiddenInput() self.fields["state"].queryset = self.fields["state"].queryset.filter(slug="active") self.fields["state"].initial = self.fields["state"].queryset[0].pk - self.fields["name"].initial = u"%s-%s-" % (doc_type.slug, group.acronym) + self.fields["name"].initial = "%s-%s-" % (doc_type.slug, group.acronym) else: del self.fields["name"] @@ -157,17 +157,17 @@ def edit_material(request, name=None, acronym=None, action=None, doc_type=None): if prev_title != doc.title: e = DocEvent(doc=doc, rev=doc.rev, by=request.user.person, type='changed_document') - e.desc = u"Changed title to %s" % doc.title + e.desc = "Changed title to %s" % doc.title if prev_title: - e.desc += u" from %s" % prev_title + e.desc += " from %s" % prev_title e.save() events.append(e) if prev_abstract != doc.abstract: e = DocEvent(doc=doc, rev=doc.rev, by=request.user.person, type='changed_document') - e.desc = u"Changed abstract to %s" % doc.abstract + e.desc = "Changed abstract to %s" % doc.abstract if prev_abstract: - e.desc += u" from %s" % prev_abstract + e.desc += " from %s" % prev_abstract e.save() events.append(e) diff --git a/ietf/doc/views_review.py b/ietf/doc/views_review.py index cec4fbfbc..f641ebd28 100644 --- a/ietf/doc/views_review.py +++ b/ietf/doc/views_review.py @@ -1,6 +1,6 @@ # Copyright The IETF Trust 2016-2019, All Rights Reserved # -*- coding: utf-8 -*- -from __future__ import unicode_literals, print_function + import os import datetime @@ -771,7 +771,7 @@ def search_mail_archive(request, name, assignment_id): except KeyError as e: res["error"] = "No results found" except Exception as e: - res["error"] = "Retrieval from mail archive failed: %s" % unicode(e) + res["error"] = "Retrieval from mail archive failed: %s" % str(e) # raise # useful when debugging return JsonResponse(res) diff --git a/ietf/doc/views_status_change.py b/ietf/doc/views_status_change.py index d62319fad..2df24b419 100644 --- a/ietf/doc/views_status_change.py +++ b/ietf/doc/views_status_change.py @@ -392,7 +392,7 @@ def clean_helper(form, formtype): new_relations = {} rfc_fields = {} status_fields={} - for k in sorted(form.data.iterkeys()): + for k in sorted(form.data.keys()): v = form.data[k] if k.startswith('new_relation_row'): if re.match('\d{1,4}',v): @@ -634,7 +634,7 @@ def generate_last_call_text(request, doc): e.doc = doc e.rev = doc.rev e.desc = 'Last call announcement was generated' - e.text = unicode(new_text) + e.text = str(new_text) e.save() return e diff --git a/ietf/group/admin.py b/ietf/group/admin.py index ad3056ce1..0073808af 100644 --- a/ietf/group/admin.py +++ b/ietf/group/admin.py @@ -38,7 +38,7 @@ class GroupAdmin(admin.ModelAdmin): roles = Role.objects.filter(group=obj).order_by("name", "person__name").select_related('person') res = [] for r in roles: - res.append(u'%s (%s)' % (r.person.pk, escape(r.person.plain_name()), r.pk, r.name.name)) + res.append('%s (%s)' % (r.person.pk, escape(r.person.plain_name()), r.pk, r.name.name)) return ", ".join(res) role_list.short_description = "Persons" role_list.allow_tags = True @@ -144,7 +144,7 @@ class GroupHistoryAdmin(admin.ModelAdmin): admin.site.register(GroupHistory, GroupHistoryAdmin) class GroupURLAdmin(admin.ModelAdmin): - list_display = [u'id', 'group', 'name', 'url'] + list_display = ['id', 'group', 'name', 'url'] raw_id_fields = ['group'] search_fields = ['name'] admin.site.register(GroupURL, GroupURLAdmin) @@ -157,7 +157,7 @@ admin.site.register(GroupMilestone, GroupMilestoneAdmin) admin.site.register(GroupMilestoneHistory, GroupMilestoneAdmin) class GroupStateTransitionsAdmin(admin.ModelAdmin): - list_display = [u'id', 'group', 'state'] + list_display = ['id', 'group', 'state'] raw_id_fields = ['group', 'state'] admin.site.register(GroupStateTransitions, GroupStateTransitionsAdmin) @@ -183,7 +183,7 @@ class ChangeStateGroupEventAdmin(admin.ModelAdmin): admin.site.register(ChangeStateGroupEvent, ChangeStateGroupEventAdmin) class MilestoneGroupEventAdmin(admin.ModelAdmin): - list_display = [u'id', 'group', 'time', 'type', 'by', 'desc', 'milestone'] + list_display = ['id', 'group', 'time', 'type', 'by', 'desc', 'milestone'] list_filter = ['time'] raw_id_fields = ['group', 'by', 'milestone'] admin.site.register(MilestoneGroupEvent, MilestoneGroupEventAdmin) diff --git a/ietf/group/dot.py b/ietf/group/dot.py index abb5c4efe..a29a509e3 100644 --- a/ietf/group/dot.py +++ b/ietf/group/dot.py @@ -1,6 +1,6 @@ -# Copyright The IETF Trust 2007-2019, All Rights Reserved +# Copyright The IETF Trust 2017-2019, All Rights Reserved # -*- check-flake8 -*- -from __future__ import unicode_literals, print_function + from django.db.models import Q from django.template.loader import render_to_string diff --git a/ietf/group/feeds.py b/ietf/group/feeds.py index c41b2ada2..aaf8097b7 100644 --- a/ietf/group/feeds.py +++ b/ietf/group/feeds.py @@ -18,7 +18,7 @@ class GroupChangesFeed(Feed): return Group.objects.get(acronym=acronym) def title(self, obj): - return u"Changes for %s %s" % (obj.acronym, obj.type) + return "Changes for %s %s" % (obj.acronym, obj.type) def link(self, obj): if not obj: @@ -47,8 +47,8 @@ class GroupChangesFeed(Feed): return obj.time def item_title(self, obj): - title = u"%s - %s" % (truncatewords(strip_tags(obj.desc), 10), obj.by) + title = "%s - %s" % (truncatewords(strip_tags(obj.desc), 10), obj.by) if isinstance(obj, DocEvent): - title = u"Chartering: %s" % title + title = "Chartering: %s" % title return title diff --git a/ietf/group/forms.py b/ietf/group/forms.py index 81dab5aea..1c4bc550d 100644 --- a/ietf/group/forms.py +++ b/ietf/group/forms.py @@ -1,6 +1,6 @@ -# Copyright The IETF Trust 2007-2019, All Rights Reserved +# Copyright The IETF Trust 2017-2019, All Rights Reserved # -*- coding: utf-8 -*- -from __future__ import unicode_literals, print_function + # Stdlib imports import re diff --git a/ietf/group/mails.py b/ietf/group/mails.py index 3db25f464..e4f1042fc 100644 --- a/ietf/group/mails.py +++ b/ietf/group/mails.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2012-2019, All Rights Reserved # generation of mails import re @@ -13,7 +14,7 @@ from ietf.mailtrigger.utils import gather_address_lists def email_admin_re_charter(request, group, subject, text, mailtrigger): (to,cc) = gather_address_lists(mailtrigger,group=group) - full_subject = u"Regarding %s %s: %s" % (group.type.name, group.acronym, subject) + full_subject = "Regarding %s %s: %s" % (group.type.name, group.acronym, subject) text = strip_tags(text) send_mail(request, to, None, full_subject, @@ -28,32 +29,32 @@ def email_admin_re_charter(request, group, subject, text, mailtrigger): def email_personnel_change(request, group, text, changed_personnel): (to, cc) = gather_address_lists('group_personnel_change',group=group,changed_personnel=changed_personnel) - full_subject = u"Personnel change for %s %s" % (group.acronym,group.type.name) + full_subject = "Personnel change for %s %s" % (group.acronym,group.type.name) send_mail_text(request, to, None, full_subject, text, cc=cc) def email_milestones_changed(request, group, changes, states): def wrap_up_email(addrs, text): - subject = u"Milestones changed for %s %s" % (group.acronym, group.type.name) + subject = "Milestones changed for %s %s" % (group.acronym, group.type.name) if re.search("Added .* for review, due",text): - subject = u"Review Required - " + subject + subject = "Review Required - " + subject text = wordwrap(strip_tags(text), 78) text += "\n\n" - text += u"URL: %s" % (settings.IDTRACKER_BASE_URL + group.about_url()) + text += "URL: %s" % (settings.IDTRACKER_BASE_URL + group.about_url()) send_mail_text(request, addrs.to, None, subject, text, cc=addrs.cc) # first send to those who should see any edits (such as management and chairs) addrs = gather_address_lists('group_milestones_edited',group=group) if addrs.to or addrs.cc: - wrap_up_email(addrs, u"\n\n".join(c + "." for c in changes)) + wrap_up_email(addrs, "\n\n".join(c + "." for c in changes)) # then send only the approved milestones to those who shouldn't be # bothered with milestones pending approval addrs = gather_address_lists('group_approved_milestones_edited',group=group) - msg = u"\n\n".join(c + "." for c,s in zip(changes,states) if not s == "review") + msg = "\n\n".join(c + "." for c,s in zip(changes,states) if not s == "review") if (addrs.to or addrs.cc) and msg: wrap_up_email(addrs, msg) diff --git a/ietf/group/management/commands/show_group_features.py b/ietf/group/management/commands/show_group_features.py index cdbf5e2d4..e63b7fd66 100644 --- a/ietf/group/management/commands/show_group_features.py +++ b/ietf/group/management/commands/show_group_features.py @@ -1,6 +1,6 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- -from __future__ import unicode_literals, print_function + import collections diff --git a/ietf/group/migrations/0001_initial.py b/ietf/group/migrations/0001_initial.py index 2f45322c1..a0593af8c 100644 --- a/ietf/group/migrations/0001_initial.py +++ b/ietf/group/migrations/0001_initial.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-02-20 10:52 -from __future__ import unicode_literals + import datetime from django.db import migrations, models diff --git a/ietf/group/migrations/0002_groupfeatures_historicalgroupfeatures.py b/ietf/group/migrations/0002_groupfeatures_historicalgroupfeatures.py index d3efd2a42..ac3bf887b 100644 --- a/ietf/group/migrations/0002_groupfeatures_historicalgroupfeatures.py +++ b/ietf/group/migrations/0002_groupfeatures_historicalgroupfeatures.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.13 on 2018-07-10 15:58 -from __future__ import unicode_literals + import django.core.validators import django.db.models.deletion diff --git a/ietf/group/migrations/0003_groupfeatures_data.py b/ietf/group/migrations/0003_groupfeatures_data.py index 55b700840..7d971c8b3 100644 --- a/ietf/group/migrations/0003_groupfeatures_data.py +++ b/ietf/group/migrations/0003_groupfeatures_data.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.13 on 2018-07-10 15:58 -from __future__ import unicode_literals + from django.conf import settings from django.db import migrations @@ -10,7 +11,7 @@ import debug # pyflakes:ignore from ietf.review.utils import active_review_teams group_type_features = { - u'ag': { + 'ag': { 'about_page': 'ietf.group.views.group_about', 'admin_roles': 'chair', 'agenda_type': 'ietf', @@ -25,7 +26,7 @@ group_type_features = { 'has_milestones': False, 'has_reviews': False, 'material_types': 'slides'}, - u'area': { + 'area': { 'about_page': 'ietf.group.views.group_about', 'admin_roles': 'chair', 'agenda_type': 'ietf', @@ -40,7 +41,7 @@ group_type_features = { 'has_milestones': False, 'has_reviews': False, 'material_types': 'slides'}, - u'dir': { + 'dir': { 'about_page': 'ietf.group.views.group_about', 'admin_roles': 'chair,secr', 'agenda_type': None, @@ -55,7 +56,7 @@ group_type_features = { 'has_milestones': False, 'has_reviews': False, 'material_types': 'slides'}, - u'review': { + 'review': { 'about_page': 'ietf.group.views.group_about', 'admin_roles': 'chair,secr', 'agenda_type': None, @@ -70,7 +71,7 @@ group_type_features = { 'has_milestones': False, 'has_reviews': True, 'material_types': 'slides'}, - u'iab': { + 'iab': { 'about_page': 'ietf.group.views.group_about', 'admin_roles': 'chair', 'agenda_type': 'ietf', @@ -85,7 +86,7 @@ group_type_features = { 'has_milestones': False, 'has_reviews': False, 'material_types': 'slides'}, - u'ietf': { + 'ietf': { 'about_page': 'ietf.group.views.group_about', 'admin_roles': 'chair', 'agenda_type': 'ietf', @@ -100,7 +101,7 @@ group_type_features = { 'has_milestones': False, 'has_reviews': False, 'material_types': 'slides'}, - u'individ': { + 'individ': { 'about_page': 'ietf.group.views.group_about', 'admin_roles': 'chair', 'agenda_type': None, @@ -115,7 +116,7 @@ group_type_features = { 'has_milestones': False, 'has_reviews': False, 'material_types': 'slides'}, - u'irtf': { + 'irtf': { 'about_page': 'ietf.group.views.group_about', 'admin_roles': 'chair', 'agenda_type': 'ietf', @@ -130,7 +131,7 @@ group_type_features = { 'has_milestones': False, 'has_reviews': False, 'material_types': 'slides'}, - u'isoc': { + 'isoc': { 'about_page': 'ietf.group.views.group_about', 'admin_roles': 'chair', 'agenda_type': None, @@ -145,7 +146,7 @@ group_type_features = { 'has_milestones': False, 'has_reviews': False, 'material_types': 'slides'}, - u'nomcom': { + 'nomcom': { 'about_page': 'ietf.group.views.group_about', 'admin_roles': 'chair', 'agenda_type': 'side', @@ -160,7 +161,7 @@ group_type_features = { 'has_milestones': False, 'has_reviews': False, 'material_types': 'slides'}, - u'program': { + 'program': { 'about_page': 'ietf.group.views.group_about', 'admin_roles': 'lead', 'agenda_type': None, @@ -175,7 +176,7 @@ group_type_features = { 'has_milestones': True, 'has_reviews': False, 'material_types': 'slides'}, - u'rfcedtyp': { + 'rfcedtyp': { 'about_page': 'ietf.group.views.group_about', 'admin_roles': 'chair', 'agenda_type': 'side', @@ -190,7 +191,7 @@ group_type_features = { 'has_milestones': False, 'has_reviews': False, 'material_types': 'slides'}, - u'rg': { + 'rg': { 'about_page': 'ietf.group.views.group_about', 'admin_roles': 'chair', 'agenda_type': 'ietf', @@ -205,7 +206,7 @@ group_type_features = { 'has_milestones': True, 'has_reviews': False, 'material_types': 'slides'}, - u'sdo': { + 'sdo': { 'about_page': 'ietf.group.views.group_about', 'admin_roles': 'chair', 'agenda_type': None, @@ -220,7 +221,7 @@ group_type_features = { 'has_milestones': False, 'has_reviews': False, 'material_types': 'slides'}, - u'team': { + 'team': { 'about_page': 'ietf.group.views.group_about', 'admin_roles': 'chair', 'agenda_type': 'ietf', @@ -235,7 +236,7 @@ group_type_features = { 'has_milestones': False, 'has_reviews': False, 'material_types': 'slides'}, - u'wg': { + 'wg': { 'about_page': 'ietf.group.views.group_about', 'admin_roles': 'chair', 'agenda_type': 'ietf', diff --git a/ietf/group/migrations/0004_add_group_feature_fields.py b/ietf/group/migrations/0004_add_group_feature_fields.py index 6547e6405..8897d7530 100644 --- a/ietf/group/migrations/0004_add_group_feature_fields.py +++ b/ietf/group/migrations/0004_add_group_feature_fields.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.16 on 2019-01-10 07:51 -from __future__ import unicode_literals + import django.core.validators from django.db import migrations, models diff --git a/ietf/group/migrations/0005_group_features_list_data_to_json.py b/ietf/group/migrations/0005_group_features_list_data_to_json.py index 67e6f9512..9a2309226 100644 --- a/ietf/group/migrations/0005_group_features_list_data_to_json.py +++ b/ietf/group/migrations/0005_group_features_list_data_to_json.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.16 on 2019-01-09 09:02 -from __future__ import unicode_literals + import json import re diff --git a/ietf/group/migrations/0006_group_features_lists_to_jsonfield.py b/ietf/group/migrations/0006_group_features_lists_to_jsonfield.py index 0cc82763e..26d5cccdd 100644 --- a/ietf/group/migrations/0006_group_features_lists_to_jsonfield.py +++ b/ietf/group/migrations/0006_group_features_lists_to_jsonfield.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.16 on 2019-01-16 05:53 -from __future__ import unicode_literals + from django.db import migrations, models import jsonfield.fields diff --git a/ietf/group/migrations/0007_new_group_features_data.py b/ietf/group/migrations/0007_new_group_features_data.py index b93e60041..dabdb1d5f 100644 --- a/ietf/group/migrations/0007_new_group_features_data.py +++ b/ietf/group/migrations/0007_new_group_features_data.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.16 on 2019-01-09 09:02 -from __future__ import unicode_literals + from django.db import migrations @@ -9,7 +9,7 @@ from django.db import migrations import debug # pyflakes:ignore group_type_features = { - u'ag': { + 'ag': { 'custom_group_roles': True, 'has_session_materials': True, 'acts_like_wg': True, @@ -22,7 +22,7 @@ group_type_features = { 'matman_roles': ['ad', 'chair', 'delegate', 'secr'], 'role_order': ['chair', 'secr'], }, - u'area': { + 'area': { 'custom_group_roles': True, 'has_session_materials': False, 'acts_like_wg': False, @@ -35,7 +35,7 @@ group_type_features = { 'matman_roles': ['ad', 'chair', 'delegate', 'secr'], 'role_order': ['chair', 'secr'], }, - u'dir': { + 'dir': { 'custom_group_roles': True, 'has_session_materials': False, 'acts_like_wg': False, @@ -48,7 +48,7 @@ group_type_features = { 'matman_roles': ['ad', 'chair', 'delegate', 'secr'], 'role_order': ['chair', 'secr'], }, - u'review': { + 'review': { 'custom_group_roles': True, 'has_session_materials': False, 'acts_like_wg': False, @@ -61,7 +61,7 @@ group_type_features = { 'matman_roles': ['ad', 'secr'], 'role_order': ['chair', 'secr'], }, - u'iab': { + 'iab': { 'custom_group_roles': True, 'has_session_materials': False, 'acts_like_wg': False, @@ -74,7 +74,7 @@ group_type_features = { 'matman_roles': ['chair', 'delegate'], 'role_order': ['chair', 'secr'], }, - u'ietf': { + 'ietf': { 'custom_group_roles': True, 'has_session_materials': True, 'acts_like_wg': False, @@ -87,7 +87,7 @@ group_type_features = { 'matman_roles': ['chair', 'delegate'], 'role_order': ['chair', 'secr'], }, - u'individ': { + 'individ': { 'custom_group_roles': True, 'has_session_materials': False, 'acts_like_wg': False, @@ -100,7 +100,7 @@ group_type_features = { 'matman_roles': [], 'role_order': ['chair', 'secr'], }, - u'irtf': { + 'irtf': { 'custom_group_roles': True, 'has_session_materials': False, 'acts_like_wg': False, @@ -113,7 +113,7 @@ group_type_features = { 'matman_roles': ['chair', 'delegate', 'secr'], 'role_order': ['chair', 'secr'], }, - u'isoc': { + 'isoc': { 'custom_group_roles': True, 'has_session_materials': False, 'acts_like_wg': False, @@ -126,7 +126,7 @@ group_type_features = { 'matman_roles': ['chair', 'secr'], 'role_order': ['chair', 'secr'], }, - u'nomcom': { + 'nomcom': { 'custom_group_roles': True, 'has_session_materials': False, 'acts_like_wg': False, @@ -139,7 +139,7 @@ group_type_features = { 'matman_roles': ['chair'], 'role_order': ['chair', 'member', 'advisor'], }, - u'program': { + 'program': { 'custom_group_roles': True, 'has_session_materials': False, 'acts_like_wg': False, @@ -152,7 +152,7 @@ group_type_features = { 'matman_roles': ['chair', 'secr'], 'role_order': ['chair', 'secr'], }, - u'rfcedtyp': { + 'rfcedtyp': { 'custom_group_roles': True, 'has_session_materials': False, 'acts_like_wg': False, @@ -165,7 +165,7 @@ group_type_features = { 'matman_roles': [], 'role_order': ['chair', 'secr'], }, - u'rg': { + 'rg': { 'custom_group_roles': False, 'has_session_materials': True, 'acts_like_wg': True, @@ -178,7 +178,7 @@ group_type_features = { 'matman_roles': ['chair', 'secr'], 'role_order': ['chair', 'secr'], }, - u'sdo': { + 'sdo': { 'custom_group_roles': True, 'has_session_materials': False, 'acts_like_wg': False, @@ -191,7 +191,7 @@ group_type_features = { 'matman_roles': [], 'role_order': ['liaiman'], }, - u'team': { + 'team': { 'custom_group_roles': True, 'has_session_materials': False, 'acts_like_wg': False, @@ -204,7 +204,7 @@ group_type_features = { 'matman_roles': [], 'role_order': ['chair', 'member', 'matman'], }, - u'wg': { + 'wg': { 'custom_group_roles': False, 'has_session_materials': True, 'acts_like_wg': True, @@ -224,7 +224,7 @@ def forward(apps, schema_editor): for type in group_type_features: features = group_type_features[type] gf = GroupFeatures.objects.get(type=type) - for k,v in features.items(): + for k,v in list(features.items()): setattr(gf, k, v) gf.save() # This migration does not remove or change any previous fields, and executes diff --git a/ietf/group/migrations/0008_group_features_onetoone.py b/ietf/group/migrations/0008_group_features_onetoone.py index f010e77d4..3daed25f2 100644 --- a/ietf/group/migrations/0008_group_features_onetoone.py +++ b/ietf/group/migrations/0008_group_features_onetoone.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.16 on 2019-01-19 10:08 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion diff --git a/ietf/group/migrations/0009_auto_20190122_1012.py b/ietf/group/migrations/0009_auto_20190122_1012.py index 44df99f2b..7b556dd5d 100644 --- a/ietf/group/migrations/0009_auto_20190122_1012.py +++ b/ietf/group/migrations/0009_auto_20190122_1012.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.18 on 2019-01-22 10:12 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion diff --git a/ietf/group/migrations/0010_add_group_types.py b/ietf/group/migrations/0010_add_group_types.py index bcc480b5d..98a8a6010 100644 --- a/ietf/group/migrations/0010_add_group_types.py +++ b/ietf/group/migrations/0010_add_group_types.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.16 on 2019-01-09 09:02 -from __future__ import unicode_literals + from django.db import migrations @@ -128,13 +128,13 @@ def forward(apps, schema_editor): for slug in group_type_features: typename = group_type_features[slug]['grouptypename'] gt, _ = GroupTypeName.objects.get_or_create(slug=slug) - for k,v in typename.items(): + for k,v in list(typename.items()): setattr(gt, k, v) gt.save() # features = group_type_features[slug]['groupfeatures'] gf, _ = GroupFeatures.objects.get_or_create(type_id=slug) - for k,v in features.items(): + for k,v in list(features.items()): setattr(gf, k, v) gf.save() diff --git a/ietf/group/migrations/0011_auto_20190225_1302.py b/ietf/group/migrations/0011_auto_20190225_1302.py index f0349ad9d..5c11c9574 100644 --- a/ietf/group/migrations/0011_auto_20190225_1302.py +++ b/ietf/group/migrations/0011_auto_20190225_1302.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-02-25 13:02 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/group/migrations/0012_add_old_nomcom_announcements.py b/ietf/group/migrations/0012_add_old_nomcom_announcements.py index c13ff9570..8647b3dc5 100644 --- a/ietf/group/migrations/0012_add_old_nomcom_announcements.py +++ b/ietf/group/migrations/0012_add_old_nomcom_announcements.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-03-23 17:50 -from __future__ import unicode_literals + from django.db import migrations @@ -342,7 +343,7 @@ also serves as a non-voting liaison. """) - n.message_set.create(by=p, subject="Announcement of IESG and IAB Nominations Requests", time=datetime(2002,11,05), + n.message_set.create(by=p, subject="Announcement of IESG and IAB Nominations Requests", time=datetime(2002,11,0o5), frm="Phil Roberts ", to="IETF Announcement list ", body=""" The 2002-2003 Nominations Committee is now soliciting nominations for the open diff --git a/ietf/group/migrations/0013_add_groupmilestone_docs2_m2m.py b/ietf/group/migrations/0013_add_groupmilestone_docs2_m2m.py index 1ccca9b13..b980f5d0c 100644 --- a/ietf/group/migrations/0013_add_groupmilestone_docs2_m2m.py +++ b/ietf/group/migrations/0013_add_groupmilestone_docs2_m2m.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-02-25 13:02 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion diff --git a/ietf/group/migrations/0014_set_document_m2m_keys.py b/ietf/group/migrations/0014_set_document_m2m_keys.py index e8324f625..520c15e8a 100644 --- a/ietf/group/migrations/0014_set_document_m2m_keys.py +++ b/ietf/group/migrations/0014_set_document_m2m_keys.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-10 06:48 -from __future__ import unicode_literals + import sys @@ -21,7 +21,7 @@ def forward(apps, schema_editor): # Document id fixup ------------------------------------------------------------ objs = Document.objects.in_bulk() - nameid = { o.name: o.id for id, o in objs.iteritems() } + nameid = { o.name: o.id for id, o in objs.items() } sys.stderr.write('\n') diff --git a/ietf/group/migrations/0015_1_del_docs_m2m_table.py b/ietf/group/migrations/0015_1_del_docs_m2m_table.py index 5b2462ce4..1e5e856b3 100644 --- a/ietf/group/migrations/0015_1_del_docs_m2m_table.py +++ b/ietf/group/migrations/0015_1_del_docs_m2m_table.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-22 08:00 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/group/migrations/0015_2_add_docs_m2m_table.py b/ietf/group/migrations/0015_2_add_docs_m2m_table.py index cf01621d8..d66087372 100644 --- a/ietf/group/migrations/0015_2_add_docs_m2m_table.py +++ b/ietf/group/migrations/0015_2_add_docs_m2m_table.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-22 08:00 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/group/migrations/0016_copy_docs_m2m_table.py b/ietf/group/migrations/0016_copy_docs_m2m_table.py index 4eef2b618..9a380f601 100644 --- a/ietf/group/migrations/0016_copy_docs_m2m_table.py +++ b/ietf/group/migrations/0016_copy_docs_m2m_table.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-27 05:57 -from __future__ import unicode_literals + import sys, time diff --git a/ietf/group/migrations/0017_remove_docs2_m2m.py b/ietf/group/migrations/0017_remove_docs2_m2m.py index 26b5784fe..4f67ac8d3 100644 --- a/ietf/group/migrations/0017_remove_docs2_m2m.py +++ b/ietf/group/migrations/0017_remove_docs2_m2m.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-30 03:23 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/group/migrations/0018_remove_old_document_field.py b/ietf/group/migrations/0018_remove_old_document_field.py index 02f85b6d3..0ee29de38 100644 --- a/ietf/group/migrations/0018_remove_old_document_field.py +++ b/ietf/group/migrations/0018_remove_old_document_field.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-25 06:51 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/group/migrations/0019_rename_field_document2.py b/ietf/group/migrations/0019_rename_field_document2.py index c4d25d3e5..2bd82f5bc 100644 --- a/ietf/group/migrations/0019_rename_field_document2.py +++ b/ietf/group/migrations/0019_rename_field_document2.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-25 06:52 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/group/models.py b/ietf/group/models.py index 6b58e36bf..2069d6ca9 100644 --- a/ietf/group/models.py +++ b/ietf/group/models.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2007-2019, All Rights Reserved +# Copyright The IETF Trust 2010-2019, All Rights Reserved # -*- coding: utf-8 -*- import datetime @@ -7,7 +7,7 @@ import jsonfield import os import re -from urlparse import urljoin +from urllib.parse import urljoin from django.conf import settings from django.core.validators import RegexValidator @@ -91,7 +91,7 @@ class Group(GroupInfo): return e[0] if e else None def has_role(self, user, role_names): - if isinstance(role_names, str) or isinstance(role_names, unicode): + if isinstance(role_names, str) or isinstance(role_names, str): role_names = [role_names] return user.is_authenticated and self.role_set.filter(name__in=role_names, person__user=user).exists() @@ -253,7 +253,7 @@ class GroupURL(models.Model): url = models.URLField() def __unicode__(self): - return u"%s (%s)" % (self.url, self.name) + return "%s (%s)" % (self.url, self.name) class GroupMilestoneInfo(models.Model): group = ForeignKey(Group) @@ -289,7 +289,7 @@ class GroupStateTransitions(models.Model): next_states = models.ManyToManyField('doc.State', related_name='previous_groupstatetransitions_states') def __unicode__(self): - return u'%s "%s" -> %s' % (self.group.acronym, self.state.name, [s.name for s in self.next_states.all()]) + return '%s "%s" -> %s' % (self.group.acronym, self.state.name, [s.name for s in self.next_states.all()]) GROUP_EVENT_CHOICES = [ ("changed_state", "Changed state"), @@ -310,7 +310,7 @@ class GroupEvent(models.Model): desc = models.TextField() def __unicode__(self): - return u"%s %s at %s" % (self.by.plain_name(), self.get_type_display().lower(), self.time) + return "%s %s at %s" % (self.by.plain_name(), self.get_type_display().lower(), self.time) class Meta: ordering = ['-time', 'id'] @@ -327,7 +327,7 @@ class Role(models.Model): person = ForeignKey(Person) email = ForeignKey(Email, help_text="Email address used by person for this role.") def __unicode__(self): - return u"%s is %s in %s" % (self.person.plain_name(), self.name.name, self.group.acronym or self.group.name) + return "%s is %s in %s" % (self.person.plain_name(), self.name.name, self.group.acronym or self.group.name) def formatted_ascii_email(self): return email.utils.formataddr((self.person.plain_ascii(), self.email.address)) @@ -348,7 +348,7 @@ class RoleHistory(models.Model): person = ForeignKey(Person) email = ForeignKey(Email, help_text="Email address used by person for this role.") def __unicode__(self): - return u"%s is %s in %s" % (self.person.plain_name(), self.name.name, self.group.acronym) + return "%s is %s in %s" % (self.person.plain_name(), self.name.name, self.group.acronym) class Meta: verbose_name_plural = "role histories" diff --git a/ietf/group/tests_info.py b/ietf/group/tests_info.py index 04d2cc21f..d4f347911 100644 --- a/ietf/group/tests_info.py +++ b/ietf/group/tests_info.py @@ -6,7 +6,7 @@ import shutil import calendar import datetime import json -import StringIO +import io import bleach import six @@ -1293,7 +1293,7 @@ class StatusUpdateTests(TestCase): self.assertEqual(response.status_code, 302) self.assertEqual(chair.group.latest_event(type='status_update').desc,'Direct content typed into form') - test_file = StringIO.StringIO("This came from a file.") + test_file = io.StringIO("This came from a file.") test_file.name = "unnamed" response = self.client.post(url,dict(txt=test_file,submit_response="1")) self.assertEqual(response.status_code, 302) diff --git a/ietf/group/tests_review.py b/ietf/group/tests_review.py index 36243d598..fa689dfe7 100644 --- a/ietf/group/tests_review.py +++ b/ietf/group/tests_review.py @@ -151,7 +151,7 @@ class ReviewTests(TestCase): urlreverse(ietf.group.views.reviewer_overview, kwargs={ 'acronym': group.acronym, 'group_type': group.type_id })]: r = self.client.get(url) self.assertEqual(r.status_code, 200) - self.assertIn(unicode(reviewer), unicontent(r)) + self.assertIn(str(reviewer), unicontent(r)) self.assertIn(review_req1.doc.name, unicontent(r)) # without a login, reason for being unavailable should not be seen self.assertNotIn("Availability", unicontent(r)) @@ -178,7 +178,7 @@ class ReviewTests(TestCase): def test_manage_review_requests(self): group = ReviewTeamFactory() RoleFactory(name_id='reviewer',group=group,person__user__username='reviewer').person - marsperson = RoleFactory(name_id='reviewer',group=group,person=PersonFactory(name=u"Mars Anders Chairman",user__username='marschairman')).person + marsperson = RoleFactory(name_id='reviewer',group=group,person=PersonFactory(name="Mars Anders Chairman",user__username='marschairman')).person review_req1 = ReviewRequestFactory(doc__pages=2,doc__shepherd=marsperson.email(),team=group) review_req2 = ReviewRequestFactory(team=group) review_req3 = ReviewRequestFactory(team=group) @@ -188,10 +188,10 @@ class ReviewTests(TestCase): login_testing_unauthorized(self, "secretary", unassigned_url) # Need one more person in review team one so we can test incrementing skip_count without immediately decrementing it - another_reviewer = PersonFactory.create(name = u"Extra TestReviewer") # needs to be lexically greater than the exsting one + another_reviewer = PersonFactory.create(name = "Extra TestReviewer") # needs to be lexically greater than the exsting one another_reviewer.role_set.create(name_id='reviewer', email=another_reviewer.email(), group=review_req1.team) ReviewerSettingsFactory(team=review_req3.team, person = another_reviewer) - yet_another_reviewer = PersonFactory.create(name = u"YetAnotherExtra TestReviewer") # needs to be lexically greater than the exsting one + yet_another_reviewer = PersonFactory.create(name = "YetAnotherExtra TestReviewer") # needs to be lexically greater than the exsting one yet_another_reviewer.role_set.create(name_id='reviewer', email=yet_another_reviewer.email(), group=review_req1.team) ReviewerSettingsFactory(team=review_req3.team, person = yet_another_reviewer) @@ -262,7 +262,7 @@ class ReviewTests(TestCase): q = PyQuery(r.content) generated_text = q("[name=body]").text() self.assertTrue(review_req1.doc.name in generated_text) - self.assertTrue(unicode(Person.objects.get(user__username="marschairman")) in generated_text) + self.assertTrue(str(Person.objects.get(user__username="marschairman")) in generated_text) empty_outbox() r = self.client.post(url, { diff --git a/ietf/group/utils.py b/ietf/group/utils.py index 5c501435d..2a6003de3 100644 --- a/ietf/group/utils.py +++ b/ietf/group/utils.py @@ -20,6 +20,7 @@ from ietf.person.models import Email from ietf.review.utils import can_manage_review_requests_for_team from ietf.utils import log from ietf.utils.history import get_history_object_for, copy_many_to_many_for_history +from functools import reduce def save_group_in_history(group): """This should be called before saving changes to a Group instance, @@ -62,7 +63,7 @@ def get_group_role_emails(group, roles): if not group or not group.acronym or group.acronym == 'none': return set() emails = Email.objects.filter(role__group=group, role__name__in=roles) - return set(filter(None, [e.email_address() for e in emails])) + return set([_f for _f in [e.email_address() for e in emails] if _f]) def get_child_group_role_emails(parent, roles, group_type='wg'): """Get a list of email addresses for a given set of @@ -207,35 +208,35 @@ def construct_group_menu_context(request, group, selected, group_type, others): if group.features.has_milestones: if group.state_id != "proposed" and can_manage: - actions.append((u"Edit milestones", urlreverse('ietf.group.milestones.edit_milestones;current', kwargs=kwargs))) + actions.append(("Edit milestones", urlreverse('ietf.group.milestones.edit_milestones;current', kwargs=kwargs))) if group.features.has_documents: clist = CommunityList.objects.filter(group=group).first() if clist and can_manage_community_list(request.user, clist): import ietf.community.views - actions.append((u'Manage document list', urlreverse(ietf.community.views.manage_list, kwargs=kwargs))) + actions.append(('Manage document list', urlreverse(ietf.community.views.manage_list, kwargs=kwargs))) if group.features.has_nonsession_materials and can_manage_materials(request.user, group): - actions.append((u"Upload material", urlreverse("ietf.doc.views_material.choose_material_type", kwargs=kwargs))) + actions.append(("Upload material", urlreverse("ietf.doc.views_material.choose_material_type", kwargs=kwargs))) if group.features.has_reviews and can_manage_review_requests_for_team(request.user, group): import ietf.group.views - actions.append((u"Manage unassigned reviews", urlreverse(ietf.group.views.manage_review_requests, kwargs=dict(assignment_status="unassigned", **kwargs)))) + actions.append(("Manage unassigned reviews", urlreverse(ietf.group.views.manage_review_requests, kwargs=dict(assignment_status="unassigned", **kwargs)))) #actions.append((u"Manage assigned reviews", urlreverse(ietf.group.views.manage_review_requests, kwargs=dict(assignment_status="assigned", **kwargs)))) if Role.objects.filter(name="secr", group=group, person__user=request.user).exists(): - actions.append((u"Secretary settings", urlreverse(ietf.group.views.change_review_secretary_settings, kwargs=kwargs))) - actions.append((u"Email open assignments summary", urlreverse(ietf.group.views.email_open_review_assignments, kwargs=dict(acronym=group.acronym, group_type=group.type_id)))) + actions.append(("Secretary settings", urlreverse(ietf.group.views.change_review_secretary_settings, kwargs=kwargs))) + actions.append(("Email open assignments summary", urlreverse(ietf.group.views.email_open_review_assignments, kwargs=dict(acronym=group.acronym, group_type=group.type_id)))) if group.state_id != "conclude" and can_manage: can_edit_group = True - actions.append((u"Edit group", urlreverse("ietf.group.views.edit", kwargs=dict(kwargs, action="edit")))) + actions.append(("Edit group", urlreverse("ietf.group.views.edit", kwargs=dict(kwargs, action="edit")))) if group.features.customize_workflow and can_manage: - actions.append((u"Customize workflow", urlreverse("ietf.group.views.customize_workflow", kwargs=kwargs))) + actions.append(("Customize workflow", urlreverse("ietf.group.views.customize_workflow", kwargs=kwargs))) if group.state_id in ("active", "dormant") and not group.type_id in ["sdo", "rfcedtyp", "isoc", ] and can_manage_group_type(request.user, group): - actions.append((u"Request closing group", urlreverse("ietf.group.views.conclude", kwargs=kwargs))) + actions.append(("Request closing group", urlreverse("ietf.group.views.conclude", kwargs=kwargs))) d = { "group": group, diff --git a/ietf/group/views.py b/ietf/group/views.py index 9dd5c523b..0a89d33d9 100644 --- a/ietf/group/views.py +++ b/ietf/group/views.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright The IETF Trust 2007-2019, All Rights Reserved -from __future__ import unicode_literals, print_function +# Copyright The IETF Trust 2009-2019, All Rights Reserved + # Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. Contact: Pasi Eronen @@ -150,7 +150,7 @@ def fill_in_charter_info(group, include_drafts=False): personnel["ad"] = ad_roles group.personnel = [] - for role_name_slug, roles in personnel.iteritems(): + for role_name_slug, roles in personnel.items(): label = roles[0].name.name if len(roles) > 1: if label.endswith("y"): @@ -168,7 +168,7 @@ def fill_in_charter_info(group, include_drafts=False): if group.charter: group.charter_text = get_charter_text(group) else: - group.charter_text = u"Not chartered yet." + group.charter_text = "Not chartered yet." def extract_last_name(role): return role.person.name_parts()[3] @@ -268,7 +268,7 @@ def wg_charters_by_acronym(request, group_type): raise Http404 areas = dict((a.id, a) for a in Group.objects.filter(type="area", state="active").order_by("name")) - for area in areas.itervalues(): + for area in areas.values(): area.ads = sorted(roles(area, "ad"), key=extract_last_name) groups = Group.objects.filter(type="wg", state="active").exclude(parent=None).order_by("acronym") @@ -414,7 +414,7 @@ def concluded_groups(request): sections['Review teams'] = Group.objects.filter(type='review', state="conclude").select_related("state", "charter").order_by("parent__name","acronym") sections['Teams'] = Group.objects.filter(type='team', state="conclude").select_related("state", "charter").order_by("parent__name","acronym") - for name, groups in sections.items(): + for name, groups in list(sections.items()): # add start/conclusion date d = dict((g.pk, g) for g in groups) @@ -496,7 +496,7 @@ def group_documents_txt(request, acronym, group_type=None): d.prefix = d.get_state().name for d in docs_related: - d.prefix = u"Related %s" % d.get_state().name + d.prefix = "Related %s" % d.get_state().name rows = [] for d in itertools.chain(docs, docs_related): @@ -506,9 +506,9 @@ def group_documents_txt(request, acronym, group_type=None): else: name = "%s-%s" % (d.name, d.rev) - rows.append(u"\t".join((d.prefix, name, clean_whitespace(d.title)))) + rows.append("\t".join((d.prefix, name, clean_whitespace(d.title)))) - return HttpResponse(u"\n".join(rows), content_type='text/plain; charset=UTF-8') + return HttpResponse("\n".join(rows), content_type='text/plain; charset=UTF-8') def group_about(request, acronym, group_type=None): group = get_group_or_404(acronym, group_type) @@ -679,7 +679,7 @@ def materials(request, acronym, group_type=None): return render(request, 'group/materials.html', construct_group_menu_context(request, group, "materials", group_type, { - "doc_types": doc_types.items(), + "doc_types": list(doc_types.items()), "can_manage_materials": can_manage_materials(request.user, group) })) @@ -853,7 +853,7 @@ def edit(request, group_type=None, acronym=None, action="edit", field=None): res = [] for u in urls: if u.name: - res.append(u"%s (%s)" % (u.url, u.name)) + res.append("%s (%s)" % (u.url, u.name)) else: res.append(u.url) return fs.join(res) @@ -930,7 +930,7 @@ def edit(request, group_type=None, acronym=None, action="edit", field=None): personnel_change_text="" changed_personnel = set() # update roles - for attr, f in form.fields.iteritems(): + for attr, f in form.fields.items(): if not (attr.endswith("_roles") or attr == "ad"): continue @@ -1443,9 +1443,9 @@ def manage_review_requests(request, acronym, group_type=None, assignment_status= saving = form_action.startswith("save") # check for conflicts - review_requests_dict = { unicode(r.pk): r for r in review_requests } + review_requests_dict = { str(r.pk): r for r in review_requests } posted_reqs = set(request.POST.getlist("reviewrequest", [])) - current_reqs = set(review_requests_dict.iterkeys()) + current_reqs = set(review_requests_dict.keys()) closed_reqs = posted_reqs - current_reqs newly_closed = len(closed_reqs) diff --git a/ietf/idindex/generate_all_id2_txt.py b/ietf/idindex/generate_all_id2_txt.py index 10e66b171..edaf12ab4 100755 --- a/ietf/idindex/generate_all_id2_txt.py +++ b/ietf/idindex/generate_all_id2_txt.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2010-2019, All Rights Reserved #!/usr/bin/env python # Portions Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. Contact: Pasi Eronen @@ -38,4 +39,4 @@ import django django.setup() from ietf.idindex.index import all_id2_txt -print all_id2_txt().encode('utf-8'), +print(all_id2_txt().encode('utf-8'), end=' ') diff --git a/ietf/idindex/generate_all_id_txt.py b/ietf/idindex/generate_all_id_txt.py index 8bef4a9f7..e9d5f8cf5 100755 --- a/ietf/idindex/generate_all_id_txt.py +++ b/ietf/idindex/generate_all_id_txt.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2009-2019, All Rights Reserved #!/usr/bin/env python # Portions Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. Contact: Pasi Eronen @@ -38,4 +39,4 @@ import django django.setup() from ietf.idindex.index import all_id_txt -print all_id_txt().encode("utf-8"), +print(all_id_txt().encode("utf-8"), end=' ') diff --git a/ietf/idindex/generate_id_abstracts_txt.py b/ietf/idindex/generate_id_abstracts_txt.py index c295991e3..e21a96303 100755 --- a/ietf/idindex/generate_id_abstracts_txt.py +++ b/ietf/idindex/generate_id_abstracts_txt.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2009-2019, All Rights Reserved #!/usr/bin/env python # Portions Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. Contact: Pasi Eronen @@ -38,4 +39,4 @@ import django django.setup() from ietf.idindex.index import id_index_txt -print id_index_txt(with_abstracts=True).encode('utf-8'), +print(id_index_txt(with_abstracts=True).encode('utf-8'), end=' ') diff --git a/ietf/idindex/generate_id_index_txt.py b/ietf/idindex/generate_id_index_txt.py index f213614fb..7fe969a45 100755 --- a/ietf/idindex/generate_id_index_txt.py +++ b/ietf/idindex/generate_id_index_txt.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2009-2019, All Rights Reserved #!/usr/bin/env python # Portions Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. Contact: Pasi Eronen @@ -38,4 +39,4 @@ import django django.setup() from ietf.idindex.index import id_index_txt -print id_index_txt().encode('utf-8'), +print(id_index_txt().encode('utf-8'), end=' ') diff --git a/ietf/idindex/index.py b/ietf/idindex/index.py index 547dd6787..0291eda09 100644 --- a/ietf/idindex/index.py +++ b/ietf/idindex/index.py @@ -89,7 +89,7 @@ def all_id_txt(): last_field, ) - return u"\n".join(res) + "\n" + return "\n".join(res) + "\n" def file_types_for_drafts(): """Look in the draft directory and return file types found as dict (name + rev -> [t1, t2, ...]).""" @@ -129,7 +129,7 @@ def all_id2_txt(): else: l = authors[a.document.name] if a.email: - l.append(u'%s <%s>' % (a.person.plain_name().replace("@", ""), a.email.address.replace(",", ""))) + l.append('%s <%s>' % (a.person.plain_name().replace("@", ""), a.email.address.replace(",", ""))) else: l.append(a.person.plain_name()) @@ -191,7 +191,7 @@ def all_id2_txt(): area = d.group.parent.acronym fields.append(area) # 9 responsible AD name - fields.append(unicode(d.ad) if d.ad else "") + fields.append(str(d.ad) if d.ad else "") # 10 fields.append(d.intended_std_level.name if d.intended_std_level else "") # 11 @@ -208,16 +208,16 @@ def all_id2_txt(): # 13 fields.append(clean_whitespace(d.title)) # FIXME: we should make sure this is okay in the database and in submit # 14 - fields.append(u", ".join(authors.get(d.name, []))) + fields.append(", ".join(authors.get(d.name, []))) # 15 fields.append(shepherds.get(d.shepherd_id, "")) # 16 Responsible AD name and email fields.append(ads.get(d.ad_id, "")) # - res.append(u"\t".join(fields)) + res.append("\t".join(fields)) - return render_to_string("idindex/all_id2.txt", {'data': u"\n".join(res) }) + return render_to_string("idindex/all_id2.txt", {'data': "\n".join(res) }) def active_drafts_index_by_group(extra_values=()): """Return active drafts grouped into their corresponding @@ -258,7 +258,7 @@ def active_drafts_index_by_group(extra_values=()): d["authors"].append(a.person.plain_ascii()) # This should probably change to .plain_name() when non-ascii names are permitted # put docs into groups - for d in docs_dict.itervalues(): + for d in docs_dict.values(): group = groups_dict.get(d["group_id"]) if not group: continue @@ -268,7 +268,7 @@ def active_drafts_index_by_group(extra_values=()): group.active_drafts.append(d) - groups = [g for g in groups_dict.itervalues() if hasattr(g, "active_drafts")] + groups = [g for g in groups_dict.values() if hasattr(g, "active_drafts")] groups.sort(key=lambda g: g.acronym) fallback_time = datetime.datetime(1950, 1, 1) diff --git a/ietf/idindex/tests.py b/ietf/idindex/tests.py index b4817d24f..10144d42c 100644 --- a/ietf/idindex/tests.py +++ b/ietf/idindex/tests.py @@ -70,7 +70,7 @@ class IndexTests(TestCase): draft = WgDraftFactory( states=[('draft','active'),('draft-iesg','review-e')], ad=PersonFactory(), - shepherd=EmailFactory(address='shepherd@example.com',person__name=u'Draft δραφτυ Shepherd'), + shepherd=EmailFactory(address='shepherd@example.com',person__name='Draft δραφτυ Shepherd'), group__parent=GroupFactory(type_id='area'), intended_std_level_id = 'ps', authors=[EmailFactory().person] @@ -97,15 +97,15 @@ class IndexTests(TestCase): self.assertEqual(t[6], draft.latest_event(type="new_revision").time.strftime("%Y-%m-%d")) self.assertEqual(t[7], draft.group.acronym) self.assertEqual(t[8], draft.group.parent.acronym) - self.assertEqual(t[9], unicode(draft.ad)) + self.assertEqual(t[9], str(draft.ad)) self.assertEqual(t[10], draft.intended_std_level.name) self.assertEqual(t[11], "") self.assertEqual(t[12], ".pdf,.txt") self.assertEqual(t[13], draft.title) author = draft.documentauthor_set.order_by("order").get() - self.assertEqual(t[14], u"%s <%s>" % (author.person.name, author.email.address)) - self.assertEqual(t[15], u"%s <%s>" % (draft.shepherd.person.plain_ascii(), draft.shepherd.address)) - self.assertEqual(t[16], u"%s <%s>" % (draft.ad.plain_ascii(), draft.ad.email_address())) + self.assertEqual(t[14], "%s <%s>" % (author.person.name, author.email.address)) + self.assertEqual(t[15], "%s <%s>" % (draft.shepherd.person.plain_ascii(), draft.shepherd.address)) + self.assertEqual(t[16], "%s <%s>" % (draft.ad.plain_ascii(), draft.ad.email_address())) # test RFC diff --git a/ietf/iesg/__init__.py b/ietf/iesg/__init__.py index 0dc251ae6..4473dca5e 100644 --- a/ietf/iesg/__init__.py +++ b/ietf/iesg/__init__.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2007, All Rights Reserved +# Copyright The IETF Trust 2007-2019, All Rights Reserved # coding: latin-1 from types import ModuleType @@ -9,7 +9,7 @@ DEBUG_EMAILS = [ ('Ole Laursen', 'olau@iola.dk'), ] -for k in locals().keys(): +for k in list(locals().keys()): m = locals()[k] if isinstance(m, ModuleType): if hasattr(m, "DEBUG_EMAILS"): diff --git a/ietf/iesg/agenda.py b/ietf/iesg/agenda.py index 0b43ef374..15f9b0f5f 100644 --- a/ietf/iesg/agenda.py +++ b/ietf/iesg/agenda.py @@ -149,7 +149,7 @@ def fill_in_agenda_administrivia(date, sections): with codecs.open(filename, 'r', 'utf-8', 'replace') as f: t = f.read().strip() except IOError: - t = u"(Error reading %s)" % filename + t = "(Error reading %s)" % filename sections[s]["text"] = t @@ -196,13 +196,13 @@ def fill_in_agenda_docs(date, sections, docs=None): sections[number]["docs"].append(doc) # prune empty "For action" sections - empty_for_action = [n for n, section in sections.iteritems() + empty_for_action = [n for n, section in sections.items() if section["title"] == "For action" and not section["docs"]] for num in empty_for_action: del sections[num] # Be careful to keep this the same as what's used in agenda_documents - for s in sections.itervalues(): + for s in sections.values(): if "docs" in s: s["docs"].sort(key=lambda d: d.balloting_started) diff --git a/ietf/iesg/models.py b/ietf/iesg/models.py index 3b43f1cb5..40444a203 100644 --- a/ietf/iesg/models.py +++ b/ietf/iesg/models.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2007, All Rights Reserved +# Copyright The IETF Trust 2007-2019, All Rights Reserved # Portion Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. Contact: Pasi Eronen @@ -51,7 +51,7 @@ class TelechatAgendaItem(models.Model): def __unicode__(self): type_name = self.TYPE_CHOICES_DICT.get(self.type, str(self.type)) - return u'%s: %s' % (type_name, self.title or "") + return '%s: %s' % (type_name, self.title or "") class Telechat(models.Model): telechat_id = models.IntegerField(primary_key=True) @@ -64,7 +64,7 @@ class Telechat(models.Model): mi_frozen = models.IntegerField(null=True, blank=True) class Meta: - db_table = u'telechat' + db_table = 'telechat' def next_telechat_date(): diff --git a/ietf/iesg/tests.py b/ietf/iesg/tests.py index cf1f0e3b9..a7a008cd0 100644 --- a/ietf/iesg/tests.py +++ b/ietf/iesg/tests.py @@ -119,7 +119,7 @@ class IESGAgendaTests(TestCase): self.saved_internet_draft_path = settings.INTERNET_DRAFT_PATH settings.INTERNET_DRAFT_PATH = self.draft_dir - for d in self.telechat_docs.values(): + for d in list(self.telechat_docs.values()): TelechatDocEvent.objects.create(type="scheduled_for_telechat", doc=d, rev=d.rev, @@ -304,7 +304,7 @@ class IESGAgendaTests(TestCase): r = self.client.get("/feed/iesg-agenda/") self.assertEqual(r.status_code, 200) - for d in self.telechat_docs.values(): + for d in list(self.telechat_docs.values()): self.assertTrue(d.name in unicontent(r)) self.assertTrue(d.title in unicontent(r)) @@ -312,7 +312,7 @@ class IESGAgendaTests(TestCase): r = self.client.get(urlreverse("ietf.iesg.views.agenda_json")) self.assertEqual(r.status_code, 200) - for k, d in self.telechat_docs.iteritems(): + for k, d in self.telechat_docs.items(): if d.type_id == "charter": self.assertTrue(d.group.name in unicontent(r), "%s '%s' not in response" % (k, d.group.name)) self.assertTrue(d.group.acronym in unicontent(r), "%s '%s' acronym not in response" % (k, d.group.acronym)) @@ -326,7 +326,7 @@ class IESGAgendaTests(TestCase): r = self.client.get(urlreverse("ietf.iesg.views.agenda")) self.assertEqual(r.status_code, 200) - for k, d in self.telechat_docs.iteritems(): + for k, d in self.telechat_docs.items(): if d.type_id == "charter": self.assertTrue(d.group.name in unicontent(r), "%s '%s' not in response" % (k, d.group.name)) self.assertTrue(d.group.acronym in unicontent(r), "%s '%s' acronym not in response" % (k, d.group.acronym)) @@ -338,7 +338,7 @@ class IESGAgendaTests(TestCase): r = self.client.get(urlreverse("ietf.iesg.views.agenda_txt")) self.assertEqual(r.status_code, 200) - for k, d in self.telechat_docs.iteritems(): + for k, d in self.telechat_docs.items(): if d.type_id == "charter": self.assertTrue(d.group.name in unicontent(r), "%s '%s' not in response" % (k, d.group.name)) self.assertTrue(d.group.acronym in unicontent(r), "%s '%s' acronym not in response" % (k, d.group.acronym)) @@ -350,7 +350,7 @@ class IESGAgendaTests(TestCase): r = self.client.get(urlreverse("ietf.iesg.views.agenda_scribe_template")) self.assertEqual(r.status_code, 200) - for k, d in self.telechat_docs.iteritems(): + for k, d in self.telechat_docs.items(): if d.type_id == "charter": continue # scribe template doesn't contain chartering info @@ -363,7 +363,7 @@ class IESGAgendaTests(TestCase): r = self.client.get(url) self.assertEqual(r.status_code, 200) - for k, d in self.telechat_docs.iteritems(): + for k, d in self.telechat_docs.items(): if d.type_id == "charter": self.assertTrue(d.group.name in unicontent(r), "%s '%s' not in response" % (k, d.group.name)) self.assertTrue(d.group.acronym in unicontent(r), "%s '%s' acronym not in response" % (k, d.group.acronym)) @@ -383,7 +383,7 @@ class IESGAgendaTests(TestCase): r = self.client.get(url) self.assertEqual(r.status_code, 200) - for k, d in self.telechat_docs.iteritems(): + for k, d in self.telechat_docs.items(): if d.type_id == "charter": self.assertTrue(d.group.name in unicontent(r), "%s '%s' not in response" % (k, d.group.name, )) self.assertTrue(d.group.acronym in unicontent(r), "%s '%s' acronym not in response" % (k, d.group.acronym, )) @@ -396,7 +396,7 @@ class IESGAgendaTests(TestCase): r = self.client.get(url) self.assertEqual(r.status_code, 200) - for k, d in self.telechat_docs.iteritems(): + for k, d in self.telechat_docs.items(): self.assertTrue(d.name in unicontent(r), "%s '%s' not in response" % (k, d.name, )) def test_agenda_documents(self): @@ -404,7 +404,7 @@ class IESGAgendaTests(TestCase): r = self.client.get(url) self.assertEqual(r.status_code, 200) - for k, d in self.telechat_docs.iteritems(): + for k, d in self.telechat_docs.items(): self.assertTrue(d.name in unicontent(r), "%s '%s' not in response" % (k, d.name, )) self.assertTrue(d.title in unicontent(r), "%s '%s' title not in response" % (k, d.title, )) @@ -413,7 +413,7 @@ class IESGAgendaTests(TestCase): # We haven't put any documents on past telechats, so this should be empty r = self.client.get(url) self.assertEqual(r.status_code, 200) - for k, d in self.telechat_docs.iteritems(): + for k, d in self.telechat_docs.items(): self.assertNotIn(d.name, unicontent(r)) self.assertNotIn(d.title, unicontent(r)) # Add the documents to a past telechat @@ -421,7 +421,7 @@ class IESGAgendaTests(TestCase): date = datetime.date.today() - datetime.timedelta(days=14) approved = State.objects.get(type='draft-iesg', slug='approved') iesg_eval = State.objects.get(type='draft-iesg', slug='iesg-eva') - for d in self.telechat_docs.values(): + for d in list(self.telechat_docs.values()): if d.type_id in ['draft', 'charter']: create_ballot_if_not_open(None, d, by, 'approve') TelechatDocEvent.objects.create(type="scheduled_for_telechat", @@ -435,7 +435,7 @@ class IESGAgendaTests(TestCase): # Now check that they are present on the past documents page r = self.client.get(url) self.assertEqual(r.status_code, 200) - for k, d in self.telechat_docs.iteritems(): + for k, d in self.telechat_docs.items(): if d.states.get(type='draft-iesg').slug in ['approved', 'iesg-eva', ]: self.assertIn(d.name, unicontent(r)) else: @@ -455,9 +455,9 @@ class IESGAgendaTests(TestCase): r = self.client.get(url) self.assertEqual(r.status_code, 200) - import tarfile, StringIO + import tarfile, io - tar = tarfile.open(None, fileobj=StringIO.StringIO(r.content)) + tar = tarfile.open(None, fileobj=io.StringIO(r.content)) names = tar.getnames() self.assertIn(d1_filename, names) self.assertNotIn(d2_filename, names) diff --git a/ietf/iesg/views.py b/ietf/iesg/views.py index 415f71925..029e33d59 100644 --- a/ietf/iesg/views.py +++ b/ietf/iesg/views.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2007, All Rights Reserved +# Copyright The IETF Trust 2007-2019, All Rights Reserved # Portion Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. Contact: Pasi Eronen @@ -35,7 +35,7 @@ import os import datetime import tarfile -import StringIO +import io import time import itertools import json @@ -80,7 +80,7 @@ def review_decisions(request, year=None): #proto_levels = ["bcp", "ds", "ps", "std"] #doc_levels = ["exp", "inf"] - timeframe = u"%s" % year if year else u"the past 6 months" + timeframe = "%s" % year if year else "the past 6 months" return render(request, 'iesg/review_decisions.html', dict(events=events, @@ -99,7 +99,7 @@ def agenda_json(request, date=None): "sections": {}, } - for num, section in data["sections"].iteritems(): + for num, section in data["sections"].items(): s = res["sections"][num] = { "title": section["title"], } @@ -198,7 +198,7 @@ def agenda(request, date=None): request.session['ballot_edit_return_point'] = request.path_info return render(request, "iesg/agenda.html", { "date": data["date"], - "sections": sorted(data["sections"].iteritems()), + "sections": sorted(data["sections"].items()), "settings": settings, } ) @@ -206,13 +206,13 @@ def agenda_txt(request, date=None): data = agenda_data(date) return render(request, "iesg/agenda.txt", { "date": data["date"], - "sections": sorted(data["sections"].iteritems()), + "sections": sorted(data["sections"].items()), "domain": Site.objects.get_current().domain, }, content_type="text/plain; charset=%s"%settings.DEFAULT_CHARSET) def agenda_scribe_template(request, date=None): data = agenda_data(date) - sections = sorted((num, section) for num, section in data["sections"].iteritems() if "2" <= num < "4") + sections = sorted((num, section) for num, section in data["sections"].items() if "2" <= num < "4") appendix_docs = [] for num, section in sections: if "docs" in section: @@ -237,7 +237,7 @@ def agenda_moderator_package(request, date=None): or (num == "6" and "6.1" not in data["sections"])) # sort and prune non-leaf headlines - sections = sorted((num, section) for num, section in data["sections"].iteritems() + sections = sorted((num, section) for num, section in data["sections"].items() if leaf_section(num, section)) # add parents field to each section @@ -245,7 +245,7 @@ def agenda_moderator_package(request, date=None): s["parents"] = [] split = num.split(".") - for i in xrange(num.count(".")): + for i in range(num.count(".")): parent_num = ".".join(split[:i + 1]) parent = data["sections"].get(parent_num) if parent: @@ -281,12 +281,12 @@ def agenda_package(request, date=None): data = agenda_data(date) return render(request, "iesg/agenda_package.txt", { "date": data["date"], - "sections": sorted(data["sections"].iteritems()), + "sections": sorted(data["sections"].items()), "roll_call": data["sections"]["1.1"]["text"], "roll_call_url": settings.IESG_ROLL_CALL_URL, "minutes": data["sections"]["1.3"]["text"], "minutes_url": settings.IESG_MINUTES_URL, - "management_items": [(num, section) for num, section in data["sections"].iteritems() if "6" < num < "7"], + "management_items": [(num, section) for num, section in data["sections"].items() if "6" < num < "7"], }, content_type='text/plain') @@ -311,14 +311,14 @@ def agenda_documents_txt(request): row = ( d.computed_telechat_date.isoformat(), d.name, - unicode(d.intended_std_level), + str(d.intended_std_level), "1" if d.stream_id in ("ise", "irtf") else "0", - unicode(d.area_acronym()).lower(), + str(d.area_acronym()).lower(), d.ad.plain_name() if d.ad else "None Assigned", d.rev, ) rows.append("\t".join(row)) - return HttpResponse(u"\n".join(rows), content_type='text/plain') + return HttpResponse("\n".join(rows), content_type='text/plain') class RescheduleForm(forms.Form): telechat_date = forms.TypedChoiceField(coerce=lambda x: datetime.datetime.strptime(x, '%Y-%m-%d').date(), empty_value=None, required=False) @@ -378,7 +378,7 @@ def agenda_documents(request): reschedule_status = { "changed": False } - for i in itertools.chain(*docs_by_date.values()): + for i in itertools.chain(*list(docs_by_date.values())): i.reschedule_form = handle_reschedule_form(request, i, dates, reschedule_status) if reschedule_status["changed"]: @@ -397,7 +397,7 @@ def agenda_documents(request): telechats.append({ "date": date, "pages": pages, - "sections": sorted((num, section) for num, section in sections.iteritems() + "sections": sorted((num, section) for num, section in sections.items() if "2" <= num < "5") }) request.session['ballot_edit_return_point'] = request.path_info @@ -454,7 +454,7 @@ def telechat_docs_tarfile(request, date): tarstream = tarfile.open('', 'w:gz', response) - manifest = StringIO.StringIO() + manifest = io.StringIO() for doc in docs: doc_path = os.path.join(doc.get_file_path(), doc.name + "-" + doc.rev + ".txt") @@ -524,10 +524,10 @@ def milestones_needing_review(request): milestones.append(m) ad_list = [] - for ad, groups in ads.iteritems(): + for ad, groups in ads.items(): ad_list.append(ad) ad.groups_needing_review = sorted(groups, key=lambda g: g.acronym) - for g, milestones in groups.iteritems(): + for g, milestones in groups.items(): g.milestones_needing_review = sorted(milestones, key=lambda m: m.due) return render(request, 'iesg/milestones_needing_review.html', diff --git a/ietf/ietfauth/forms.py b/ietf/ietfauth/forms.py index 65bad7dfe..ab550a52a 100644 --- a/ietf/ietfauth/forms.py +++ b/ietf/ietfauth/forms.py @@ -1,6 +1,6 @@ -# Copyright The IETF Trust 2016, All Rights Reserved +# Copyright The IETF Trust 2011-2019, All Rights Reserved # -*- coding: utf-8 -*- -from __future__ import unicode_literals, print_function + import re from unidecode import unidecode @@ -126,7 +126,7 @@ def get_person_form(*args, **kwargs): self.unidecoded_ascii = name != reconstructed_name def clean_name(self): - name = self.cleaned_data.get("name") or u"" + name = self.cleaned_data.get("name") or "" prevent_at_symbol(name) prevent_system_name(name) return name @@ -135,13 +135,13 @@ def get_person_form(*args, **kwargs): if self.unidecoded_ascii: raise forms.ValidationError("Name contained non-ASCII characters, and was automatically reconstructed using only Latin characters. Check the result - if you are happy, just hit Submit again.") - name = self.cleaned_data.get("ascii") or u"" + name = self.cleaned_data.get("ascii") or "" prevent_at_symbol(name) prevent_system_name(name) return ascii_cleaner(name) def clean_ascii_short(self): - name = self.cleaned_data.get("ascii_short") or u"" + name = self.cleaned_data.get("ascii_short") or "" prevent_at_symbol(name) prevent_system_name(name) return ascii_cleaner(name) @@ -184,11 +184,11 @@ class RoleEmailForm(forms.Form): super(RoleEmailForm, self).__init__(*args, **kwargs) f = self.fields["email"] - f.label = u"%s in %s" % (role.name, role.group.acronym.upper()) - f.help_text = u"Email to use for %s role in %s" % (role.name, role.group.name) + f.label = "%s in %s" % (role.name, role.group.acronym.upper()) + f.help_text = "Email to use for %s role in %s" % (role.name, role.group.name) f.queryset = f.queryset.filter(models.Q(person=role.person_id) | models.Q(role=role)).distinct() f.initial = role.email_id - f.choices = [(e.pk, e.address if e.active else u"({})".format(e.address)) for e in f.queryset] + f.choices = [(e.pk, e.address if e.active else "({})".format(e.address)) for e in f.queryset] class ResetPasswordForm(forms.Form): diff --git a/ietf/ietfauth/management/commands/send_apikey_usage_emails.py b/ietf/ietfauth/management/commands/send_apikey_usage_emails.py index 2718ef02a..ead143e92 100644 --- a/ietf/ietfauth/management/commands/send_apikey_usage_emails.py +++ b/ietf/ietfauth/management/commands/send_apikey_usage_emails.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# Copyright The IETF Trust 2017, All Rights Reserved -from __future__ import print_function, unicode_literals +# Copyright The IETF Trust 2017-2019, All Rights Reserved + import datetime diff --git a/ietf/ietfauth/tests.py b/ietf/ietfauth/tests.py index e01952734..03cbe9ef5 100644 --- a/ietf/ietfauth/tests.py +++ b/ietf/ietfauth/tests.py @@ -1,9 +1,9 @@ -# Copyright The IETF Trust 2017-2019, All Rights Reserved +# Copyright The IETF Trust 2009-2019, All Rights Reserved # -*- coding: utf-8 -*- -from __future__ import unicode_literals, print_function + import os, shutil, time, datetime -from urlparse import urlsplit +from urllib.parse import urlsplit from pyquery import PyQuery from unittest import skipIf @@ -216,9 +216,9 @@ class IetfAuthTests(TestCase): self.assertEqual(len(q('[name="active_emails"][value="%s"][checked]' % email_address)), 1) base_data = { - "name": u"Test Nãme", - "ascii": u"Test Name", - "ascii_short": u"T. Name", + "name": "Test Nãme", + "ascii": "Test Name", + "ascii_short": "T. Name", "affiliation": "Test Org", "active_emails": email_address, "consent": True, @@ -226,7 +226,7 @@ class IetfAuthTests(TestCase): # edit details - faulty ASCII faulty_ascii = base_data.copy() - faulty_ascii["ascii"] = u"Test Nãme" + faulty_ascii["ascii"] = "Test Nãme" r = self.client.post(url, faulty_ascii) self.assertEqual(r.status_code, 200) q = PyQuery(r.content) @@ -234,7 +234,7 @@ class IetfAuthTests(TestCase): # edit details - blank ASCII blank_ascii = base_data.copy() - blank_ascii["ascii"] = u"" + blank_ascii["ascii"] = "" r = self.client.post(url, blank_ascii) self.assertEqual(r.status_code, 200) q = PyQuery(r.content) @@ -245,14 +245,14 @@ class IetfAuthTests(TestCase): r = self.client.post(url, base_data) self.assertEqual(r.status_code, 200) person = Person.objects.get(user__username=username) - self.assertEqual(person.name, u"Test Nãme") - self.assertEqual(person.ascii, u"Test Name") - self.assertEqual(Person.objects.filter(alias__name=u"Test Name", user__username=username).count(), 1) - self.assertEqual(Person.objects.filter(alias__name=u"Test Nãme", user__username=username).count(), 1) + self.assertEqual(person.name, "Test Nãme") + self.assertEqual(person.ascii, "Test Name") + self.assertEqual(Person.objects.filter(alias__name="Test Name", user__username=username).count(), 1) + self.assertEqual(Person.objects.filter(alias__name="Test Nãme", user__username=username).count(), 1) self.assertEqual(Email.objects.filter(address=email_address, person__user__username=username, active=True).count(), 1) # deactivate address - without_email_address = { k: v for k, v in base_data.iteritems() if k != "active_emails" } + without_email_address = { k: v for k, v in base_data.items() if k != "active_emails" } r = self.client.post(url, without_email_address) self.assertEqual(r.status_code, 200) @@ -460,7 +460,7 @@ class IetfAuthTests(TestCase): self.assertRedirects(r, prof_url) # refresh user object user = User.objects.get(username="someone@example.com") - self.assertTrue(user.check_password(u'foobar')) + self.assertTrue(user.check_password('foobar')) def test_change_username(self): @@ -508,7 +508,7 @@ class IetfAuthTests(TestCase): prev = user user = User.objects.get(username="othername@example.org") self.assertEqual(prev, user) - self.assertTrue(user.check_password(u'password')) + self.assertTrue(user.check_password('password')) def test_apikey_management(self): person = PersonFactory() diff --git a/ietf/ietfauth/utils.py b/ietf/ietfauth/utils.py index 010f3fbd2..d6e1bd80a 100644 --- a/ietf/ietfauth/utils.py +++ b/ietf/ietfauth/utils.py @@ -30,7 +30,7 @@ def has_role(user, role_names, *args, **kwargs): """Determines whether user has any of the given standard roles given. Role names must be a list or, in case of a single value, a string.""" - if isinstance(role_names, str) or isinstance(role_names, unicode): + if isinstance(role_names, str) or isinstance(role_names, str): role_names = [ role_names ] if not user or not user.is_authenticated: diff --git a/ietf/ietfauth/views.py b/ietf/ietfauth/views.py index 4fe2e1349..21c4e11a3 100644 --- a/ietf/ietfauth/views.py +++ b/ietf/ietfauth/views.py @@ -1,3 +1,5 @@ +# Copyright The IETF Trust 2007-2019, All Rights Reserved + # Portions Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. Contact: Pasi Eronen # @@ -30,8 +32,6 @@ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Copyright The IETF Trust 2007, All Rights Reserved - import importlib from datetime import datetime as DateTime, timedelta as TimeDelta, date as Date @@ -228,7 +228,7 @@ def profile(request): auth = django.core.signing.dumps([person.user.username, to_email], salt="add_email") domain = Site.objects.get_current().domain - subject = u'Confirm email address for %s' % person.name + subject = 'Confirm email address for %s' % person.name from_email = settings.DEFAULT_FROM_EMAIL send_mail(request, to_email, from_email, subject, 'registration/add_email_email.txt', { diff --git a/ietf/ipr/admin.py b/ietf/ipr/admin.py index e47f20679..72201b726 100644 --- a/ietf/ipr/admin.py +++ b/ietf/ipr/admin.py @@ -43,7 +43,7 @@ class IprDisclosureBaseAdmin(admin.ModelAdmin): inlines = [IprDocRelInline,RelatedIprInline] def related_docs(self, obj): - return u", ".join(a.formatted_name() for a in IprDocRel.objects.filter(disclosure=obj).order_by("id").select_related("document")) + return ", ".join(a.formatted_name() for a in IprDocRel.objects.filter(disclosure=obj).order_by("id").select_related("document")) admin.site.register(IprDisclosureBase, IprDisclosureBaseAdmin) @@ -53,7 +53,7 @@ class HolderIprDisclosureAdmin(admin.ModelAdmin): inlines = [IprDocRelInline,RelatedIprInline] def related_docs(self, obj): - return u", ".join(a.formatted_name() for a in IprDocRel.objects.filter(disclosure=obj).order_by("id").select_related("document")) + return ", ".join(a.formatted_name() for a in IprDocRel.objects.filter(disclosure=obj).order_by("id").select_related("document")) admin.site.register(HolderIprDisclosure, HolderIprDisclosureAdmin) @@ -63,7 +63,7 @@ class ThirdPartyIprDisclosureAdmin(admin.ModelAdmin): inlines = [IprDocRelInline,RelatedIprInline] def related_docs(self, obj): - return u", ".join(a.formatted_name() for a in IprDocRel.objects.filter(disclosure=obj).order_by("id").select_related("document")) + return ", ".join(a.formatted_name() for a in IprDocRel.objects.filter(disclosure=obj).order_by("id").select_related("document")) admin.site.register(ThirdPartyIprDisclosure, ThirdPartyIprDisclosureAdmin) @@ -73,7 +73,7 @@ class GenericIprDisclosureAdmin(admin.ModelAdmin): inlines = [RelatedIprInline] def related_docs(self, obj): - return u", ".join(a.formatted_name() for a in IprDocRel.objects.filter(disclosure=obj).order_by("id").select_related("document")) + return ", ".join(a.formatted_name() for a in IprDocRel.objects.filter(disclosure=obj).order_by("id").select_related("document")) admin.site.register(GenericIprDisclosure, GenericIprDisclosureAdmin) @@ -83,7 +83,7 @@ class NonDocSpecificIprDisclosureAdmin(admin.ModelAdmin): inlines = [RelatedIprInline] def related_docs(self, obj): - return u", ".join(a.formatted_name() for a in IprDocRel.objects.filter(disclosure=obj).order_by("id").select_related("document")) + return ", ".join(a.formatted_name() for a in IprDocRel.objects.filter(disclosure=obj).order_by("id").select_related("document")) admin.site.register(NonDocSpecificIprDisclosure, NonDocSpecificIprDisclosureAdmin) @@ -105,7 +105,7 @@ class IprEventAdmin(admin.ModelAdmin): admin.site.register(IprEvent, IprEventAdmin) class LegacyMigrationIprEventAdmin(admin.ModelAdmin): - list_display = [u'id', 'time', 'type', 'by', 'disclosure', 'desc', 'message', 'in_reply_to', 'response_due'] + list_display = ['id', 'time', 'type', 'by', 'disclosure', 'desc', 'message', 'in_reply_to', 'response_due'] list_filter = ['time', 'type', 'response_due'] raw_id_fields = ['by', 'disclosure', 'message', 'in_reply_to'] admin.site.register(LegacyMigrationIprEvent, LegacyMigrationIprEventAdmin) diff --git a/ietf/ipr/feeds.py b/ietf/ipr/feeds.py index 0da26c542..7d1c8ac81 100644 --- a/ietf/ipr/feeds.py +++ b/ietf/ipr/feeds.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2007, All Rights Reserved +# Copyright The IETF Trust 2007-2019, All Rights Reserved from django.contrib.syndication.views import Feed from django.utils.feedgenerator import Atom1Feed @@ -22,7 +22,7 @@ class LatestIprDisclosuresFeed(Feed): return mark_safe(item.title) def item_description(self, item): - return unicode(item.title) + return str(item.title) def item_pubdate(self, item): return item.time diff --git a/ietf/ipr/fields.py b/ietf/ipr/fields.py index e6c61d3b6..775205772 100644 --- a/ietf/ipr/fields.py +++ b/ietf/ipr/fields.py @@ -10,7 +10,7 @@ from django.urls import reverse as urlreverse from ietf.ipr.models import IprDisclosureBase def select2_id_ipr_title_json(value): - return json.dumps([{ "id": o.pk, "text": escape(u"%s <%s>" % (o.title, o.time.date().isoformat())) } for o in value]) + return json.dumps([{ "id": o.pk, "text": escape("%s <%s>" % (o.title, o.time.date().isoformat())) } for o in value]) class SearchableIprDisclosuresField(forms.CharField): """Server-based multi-select field for choosing documents using @@ -48,7 +48,7 @@ class SearchableIprDisclosuresField(forms.CharField): def prepare_value(self, value): if not value: value = "" - if isinstance(value, basestring): + if isinstance(value, str): pks = self.parse_select2_value(value) # if the user posted a non integer value we need to remove it for key in pks: @@ -64,23 +64,23 @@ class SearchableIprDisclosuresField(forms.CharField): # patterns may not have been fully constructed there yet self.widget.attrs["data-ajax-url"] = urlreverse('ietf.ipr.views.ajax_search') - return u",".join(unicode(e.pk) for e in value) + return ",".join(str(e.pk) for e in value) def clean(self, value): value = super(SearchableIprDisclosuresField, self).clean(value) pks = self.check_pks(self.parse_select2_value(value)) if not all([ key.isdigit() for key in pks ]): - raise forms.ValidationError(u'You must enter IPR ID(s) as integers') + raise forms.ValidationError('You must enter IPR ID(s) as integers') objs = self.model.objects.filter(pk__in=pks) found_pks = [str(o.pk) for o in objs] failed_pks = [x for x in pks if x not in found_pks] if failed_pks: - raise forms.ValidationError(u"Could not recognize the following {model_name}s: {pks}. You can only input {model_name}s already registered in the Datatracker.".format(pks=", ".join(failed_pks), model_name=self.model.__name__.lower())) + raise forms.ValidationError("Could not recognize the following {model_name}s: {pks}. You can only input {model_name}s already registered in the Datatracker.".format(pks=", ".join(failed_pks), model_name=self.model.__name__.lower())) if self.max_entries != None and len(objs) > self.max_entries: - raise forms.ValidationError(u"You can select at most %s entries only." % self.max_entries) + raise forms.ValidationError("You can select at most %s entries only." % self.max_entries) return objs diff --git a/ietf/ipr/mail.py b/ietf/ipr/mail.py index f37552f51..809af13e8 100644 --- a/ietf/ipr/mail.py +++ b/ietf/ipr/mail.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2014-2019, All Rights Reserved import base64 import email import datetime @@ -194,5 +195,5 @@ def process_response_email(msg): in_reply_to = to_message ) - log(u"Received IPR email from %s" % ietf_message.frm) + log("Received IPR email from %s" % ietf_message.frm) return ietf_message diff --git a/ietf/ipr/management/commands/process_email.py b/ietf/ipr/management/commands/process_email.py index 2ca42ddfb..c307ebc8f 100644 --- a/ietf/ipr/management/commands/process_email.py +++ b/ietf/ipr/management/commands/process_email.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2014-2019, All Rights Reserved import sys from django.core.management.base import BaseCommand, CommandError @@ -7,7 +8,7 @@ from ietf.ipr.mail import process_response_email import debug # pyflakes:ignore class Command(BaseCommand): - help = (u"Process incoming email responses to ipr mail") + help = ("Process incoming email responses to ipr mail") def add_arguments(self, parser): parser.add_argument('--email-file', dest='email', help='File containing email (default: stdin)') diff --git a/ietf/ipr/migrations/0001_initial.py b/ietf/ipr/migrations/0001_initial.py index 369cd2deb..96225f7d2 100644 --- a/ietf/ipr/migrations/0001_initial.py +++ b/ietf/ipr/migrations/0001_initial.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-02-20 10:52 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion diff --git a/ietf/ipr/migrations/0002_auto_20180225_1207.py b/ietf/ipr/migrations/0002_auto_20180225_1207.py index 42983867e..31c1a23fe 100644 --- a/ietf/ipr/migrations/0002_auto_20180225_1207.py +++ b/ietf/ipr/migrations/0002_auto_20180225_1207.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-02-25 12:07 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/ipr/migrations/0003_add_ipdocrel_document2_fk.py b/ietf/ipr/migrations/0003_add_ipdocrel_document2_fk.py index a29cede7d..bd1542c61 100644 --- a/ietf/ipr/migrations/0003_add_ipdocrel_document2_fk.py +++ b/ietf/ipr/migrations/0003_add_ipdocrel_document2_fk.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-08 11:58 -from __future__ import unicode_literals + from django.db import migrations import django.db.models.deletion diff --git a/ietf/ipr/migrations/0004_remove_iprdocrel_document.py b/ietf/ipr/migrations/0004_remove_iprdocrel_document.py index 313973632..d5c538cfb 100644 --- a/ietf/ipr/migrations/0004_remove_iprdocrel_document.py +++ b/ietf/ipr/migrations/0004_remove_iprdocrel_document.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-20 09:53 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/ipr/migrations/0005_rename_field_document2.py b/ietf/ipr/migrations/0005_rename_field_document2.py index 374e6806e..8c55ba473 100644 --- a/ietf/ipr/migrations/0005_rename_field_document2.py +++ b/ietf/ipr/migrations/0005_rename_field_document2.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-21 05:31 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/ipr/migrations/0006_document_primary_key_cleanup.py b/ietf/ipr/migrations/0006_document_primary_key_cleanup.py index fb31a1b78..caa193771 100644 --- a/ietf/ipr/migrations/0006_document_primary_key_cleanup.py +++ b/ietf/ipr/migrations/0006_document_primary_key_cleanup.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-06-10 03:42 -from __future__ import unicode_literals + from django.db import migrations import django.db.models.deletion diff --git a/ietf/ipr/models.py b/ietf/ipr/models.py index 70fa386d1..6e69b5b3e 100644 --- a/ietf/ipr/models.py +++ b/ietf/ipr/models.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2007, All Rights Reserved +# Copyright The IETF Trust 2007-2019, All Rights Reserved import datetime @@ -174,9 +174,9 @@ class IprDocRel(models.Model): def __unicode__(self): if self.revisions: - return u"%s which applies to %s-%s" % (self.disclosure, self.document.name, self.revisions) + return "%s which applies to %s-%s" % (self.disclosure, self.document.name, self.revisions) else: - return u"%s which applies to %s" % (self.disclosure, self.document.name) + return "%s which applies to %s" % (self.disclosure, self.document.name) class RelatedIpr(models.Model): source = ForeignKey(IprDisclosureBase,related_name='relatedipr_source_set') @@ -184,7 +184,7 @@ class RelatedIpr(models.Model): relationship = ForeignKey(DocRelationshipName) # Re-use; change to a dedicated RelName if needed def __unicode__(self): - return u"%s %s %s" % (self.source.title, self.relationship.name.lower(), self.target.title) + return "%s %s %s" % (self.source.title, self.relationship.name.lower(), self.target.title) class IprEvent(models.Model): time = models.DateTimeField(auto_now_add=True) @@ -197,7 +197,7 @@ class IprEvent(models.Model): response_due= models.DateTimeField(blank=True,null=True) def __unicode__(self): - return u"%s %s by %s at %s" % (self.disclosure.title, self.type.name.lower(), self.by.plain_name(), self.time) + return "%s %s by %s at %s" % (self.disclosure.title, self.type.name.lower(), self.by.plain_name(), self.time) def response_past_due(self): """Returns true if it's beyond the response_due date and no response has been diff --git a/ietf/ipr/templatetags/ipr_filters.py b/ietf/ipr/templatetags/ipr_filters.py index 146fbff7e..424726baa 100644 --- a/ietf/ipr/templatetags/ipr_filters.py +++ b/ietf/ipr/templatetags/ipr_filters.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2014, All Rights Reserved +# Copyright The IETF Trust 2014-2019, All Rights Reserved from django import template from django.utils.html import format_html @@ -11,10 +11,10 @@ def render_message_for_history(msg): """Format message for display in history. Suppress the 'To' line for incoming responses """ if msg.to.startswith('ietf-ipr+'): - return format_html(u'Date: {}
From: {}
Subject: {}
Cc: {}

{}', + return format_html('Date: {}
From: {}
Subject: {}
Cc: {}

{}', msg.time,msg.frm,msg.subject,msg.cc,msg.body) else: - return format_html(u'Date: {}
From: {}
To: {}
Subject: {}
Cc: {}

{}', + return format_html('Date: {}
From: {}
To: {}
Subject: {}
Cc: {}

{}', msg.time,msg.frm,msg.to,msg.subject,msg.cc,msg.body) diff --git a/ietf/ipr/tests.py b/ietf/ipr/tests.py index 9598d7855..557a6a9ac 100644 --- a/ietf/ipr/tests.py +++ b/ietf/ipr/tests.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- import datetime -import urllib +import urllib.request, urllib.parse, urllib.error from pyquery import PyQuery @@ -187,12 +187,12 @@ class IprTests(TestCase): self.assertTrue(ipr.title in unicontent(r)) # find by doc title - r = self.client.get(url + "?submit=doctitle&doctitle=%s" % urllib.quote(draft.title)) + r = self.client.get(url + "?submit=doctitle&doctitle=%s" % urllib.parse.quote(draft.title)) self.assertEqual(r.status_code, 200) self.assertTrue(ipr.title in unicontent(r)) # find by ipr title - r = self.client.get(url + "?submit=iprtitle&iprtitle=%s" % urllib.quote(ipr.title)) + r = self.client.get(url + "?submit=iprtitle&iprtitle=%s" % urllib.parse.quote(ipr.title)) self.assertEqual(r.status_code, 200) self.assertTrue(ipr.title in unicontent(r)) @@ -283,7 +283,7 @@ class IprTests(TestCase): ipr = iprs[0] self.assertEqual(ipr.holder_legal_name, "Test Legal") self.assertEqual(ipr.state.slug, 'pending') - for item in [u'SE12345678901','A method of transfering bits','2000-01-01']: + for item in ['SE12345678901','A method of transfering bits','2000-01-01']: self.assertIn(item, ipr.get_child().patent_info) self.assertTrue(isinstance(ipr.get_child(),HolderIprDisclosure)) self.assertEqual(len(outbox),1) @@ -326,7 +326,7 @@ class IprTests(TestCase): ipr = iprs[0] self.assertEqual(ipr.holder_legal_name, "Test Legal") self.assertEqual(ipr.state.slug, "pending") - for item in [u'SE12345678901','A method of transfering bits','2000-01-01' ]: + for item in ['SE12345678901','A method of transfering bits','2000-01-01' ]: self.assertIn(item, ipr.get_child().patent_info) self.assertTrue(isinstance(ipr.get_child(),ThirdPartyIprDisclosure)) self.assertEqual(len(outbox),1) @@ -374,7 +374,7 @@ class IprTests(TestCase): self.assertEqual(len(iprs), 1) ipr = iprs[0].get_child() self.assertEqual(ipr.holder_legal_name, "Test Legal") - patent_info_dict = dict( (k.replace('patent_','').capitalize(), v) for k, v in post_data.items() if k.startswith('patent_') ) + patent_info_dict = dict( (k.replace('patent_','').capitalize(), v) for k, v in list(post_data.items()) if k.startswith('patent_') ) self.assertEqual(text_to_dict(ipr.patent_info), patent_info_dict) self.assertEqual(ipr.state.slug, 'posted') diff --git a/ietf/ipr/views.py b/ietf/ipr/views.py index 2a2a8d139..32f9bc4cd 100644 --- a/ietf/ipr/views.py +++ b/ietf/ipr/views.py @@ -342,11 +342,11 @@ def edit(request, id, updates=None): else: initial = model_to_dict(ipr) - patent_info = text_to_dict(initial.get('patent_info', u'')) - if patent_info.keys(): - patent_dict = dict([ ('patent_'+k.lower(), v) for k,v in patent_info.items() ]) + patent_info = text_to_dict(initial.get('patent_info', '')) + if list(patent_info.keys()): + patent_dict = dict([ ('patent_'+k.lower(), v) for k,v in list(patent_info.items()) ]) else: - patent_dict = {'patent_notes': initial.get('patent_info', u'')} + patent_dict = {'patent_notes': initial.get('patent_info', '')} initial.update(patent_dict) if ipr.updates: initial.update({'updates':[ x.target for x in ipr.updates ]}) @@ -408,7 +408,7 @@ def email(request, id): 'to': addrs.to, 'cc': addrs.cc, 'frm': settings.IPR_EMAIL_FROM, - 'subject': u'Regarding {}'.format(ipr.title), + 'subject': 'Regarding {}'.format(ipr.title), 'reply_to': reply_to, } form = MessageModelForm(initial=initial) @@ -450,9 +450,9 @@ def by_draft_txt(request): docipr[name].append(o.disclosure_id) - lines = [ u"# Machine-readable list of IPR disclosures by draft name" ] - for name, iprs in docipr.iteritems(): - lines.append(name + "\t" + "\t".join(unicode(ipr_id) for ipr_id in sorted(iprs))) + lines = [ "# Machine-readable list of IPR disclosures by draft name" ] + for name, iprs in docipr.items(): + lines.append(name + "\t" + "\t".join(str(ipr_id) for ipr_id in sorted(iprs))) return HttpResponse("\n".join(lines), content_type="text/plain; charset=%s"%settings.DEFAULT_CHARSET) @@ -472,9 +472,9 @@ def by_draft_recursive_txt(request): docipr[name] = [] docipr[name].append(o.disclosure_id) - lines = [ u"# Machine-readable list of IPR disclosures by draft name" ] - for name, iprs in docipr.iteritems(): - lines.append(name + "\t" + "\t".join(unicode(ipr_id) for ipr_id in sorted(iprs))) + lines = [ "# Machine-readable list of IPR disclosures by draft name" ] + for name, iprs in docipr.items(): + lines.append(name + "\t" + "\t".join(str(ipr_id) for ipr_id in sorted(iprs))) return HttpResponse("\n".join(lines), content_type="text/plain; charset=%s"%settings.DEFAULT_CHARSET) @@ -546,11 +546,11 @@ def new(request, type, updates=None): original = IprDisclosureBase(id=updates).get_child() initial = model_to_dict(original) initial.update({'updates':str(updates), }) - patent_info = text_to_dict(initial.get('patent_info', u'')) - if patent_info.keys(): - patent_dict = dict([ ('patent_'+k.lower(), v) for k,v in patent_info.items() ]) + patent_info = text_to_dict(initial.get('patent_info', '')) + if list(patent_info.keys()): + patent_dict = dict([ ('patent_'+k.lower(), v) for k,v in list(patent_info.items()) ]) else: - patent_dict = {'patent_notes': initial.get('patent_info', u'')} + patent_dict = {'patent_notes': initial.get('patent_info', '')} initial.update(patent_dict) form = ipr_form_mapping[type](initial=initial) else: diff --git a/ietf/liaisons/__init__.py b/ietf/liaisons/__init__.py index a285c3e43..e4d3e43e0 100644 --- a/ietf/liaisons/__init__.py +++ b/ietf/liaisons/__init__.py @@ -1,15 +1,15 @@ -# Copyright The IETF Trust 2007, All Rights Reserved -# coding: latin-1 +# Copyright The IETF Trust 2007-2019, All Rights Reserved +# -*- coding: utf-8 -*- from types import ModuleType # These people will be sent a stack trace if there's an uncaught exception in # code any of the modules imported above: DEBUG_EMAILS = [ - ('Emilio A. Snchez', 'esanchez@yaco.es'), + ('Emilio A. Sánchez', 'esanchez@yaco.es'), ] -for k in locals().keys(): +for k in list(locals().keys()): m = locals()[k] if isinstance(m, ModuleType): if hasattr(m, "DEBUG_EMAILS"): diff --git a/ietf/liaisons/admin.py b/ietf/liaisons/admin.py index 4fdf7e406..8983cafbf 100644 --- a/ietf/liaisons/admin.py +++ b/ietf/liaisons/admin.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2010-2019, All Rights Reserved from django.contrib import admin from django.urls import reverse @@ -29,13 +30,13 @@ class LiaisonStatementAdmin(admin.ModelAdmin): related_to.allow_tags = True class LiaisonStatementAttachmentAdmin(admin.ModelAdmin): - list_display = [u'id', 'statement', 'document', 'removed'] + list_display = ['id', 'statement', 'document', 'removed'] list_filter = ['removed'] raw_id_fields = ['statement', 'document'] admin.site.register(LiaisonStatementAttachment, LiaisonStatementAttachmentAdmin) class RelatedLiaisonStatementAdmin(admin.ModelAdmin): - list_display = [u'id', 'source', 'target', 'relationship'] + list_display = ['id', 'source', 'target', 'relationship'] list_filter = ['relationship'] raw_id_fields = ['source', 'target'] admin.site.register(RelatedLiaisonStatement, RelatedLiaisonStatementAdmin) diff --git a/ietf/liaisons/feeds.py b/ietf/liaisons/feeds.py index adbde6c40..b6ee64e46 100644 --- a/ietf/liaisons/feeds.py +++ b/ietf/liaisons/feeds.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2007, All Rights Reserved +# Copyright The IETF Trust 2007-2019, All Rights Reserved import re @@ -33,7 +33,7 @@ class LiaisonStatementsFeed(Feed): try: group = Group.objects.get(acronym=search) obj['filter'] = { 'from_groups': group } - obj['title'] = u'Liaison Statements from %s' % group.name + obj['title'] = 'Liaison Statements from %s' % group.name return obj except Group.DoesNotExist: # turn all-nonword characters into one-character @@ -46,7 +46,7 @@ class LiaisonStatementsFeed(Feed): name = statement.from_groups.first().name obj['filter'] = { 'from_name': name } - obj['title'] = u'Liaison Statements from %s' % name + obj['title'] = 'Liaison Statements from %s' % name return obj if kind == 'to': @@ -55,7 +55,7 @@ class LiaisonStatementsFeed(Feed): group = Group.objects.get(acronym=search) obj['filter'] = { 'to_groups': group } - obj['title'] = u'Liaison Statements to %s' % group.name + obj['title'] = 'Liaison Statements to %s' % group.name return obj if kind == 'subject': @@ -70,11 +70,11 @@ class LiaisonStatementsFeed(Feed): def items(self, obj): qs = LiaisonStatement.objects.all().order_by("-id") - if obj.has_key('q'): + if 'q' in obj: qs = qs.filter(*obj['q']) - if obj.has_key('filter'): + if 'filter' in obj: qs = qs.filter(**obj['filter']) - if obj.has_key('limit'): + if 'limit' in obj: qs = qs[:obj['limit']] qs = qs.prefetch_related("attachments") diff --git a/ietf/liaisons/fields.py b/ietf/liaisons/fields.py index 382afdfaa..94f58bff9 100644 --- a/ietf/liaisons/fields.py +++ b/ietf/liaisons/fields.py @@ -10,7 +10,7 @@ from django.urls import reverse as urlreverse from ietf.liaisons.models import LiaisonStatement def select2_id_liaison_json(objs): - return json.dumps([{ "id": o.pk, "text":u"[{}] {}".format(o.pk, escape(o.title)) } for o in objs]) + return json.dumps([{ "id": o.pk, "text":"[{}] {}".format(o.pk, escape(o.title)) } for o in objs]) def select2_id_group_json(objs): return json.dumps([{ "id": o.pk, "text": escape(o.acronym) } for o in objs]) @@ -47,9 +47,9 @@ class SearchableLiaisonStatementsField(forms.CharField): def prepare_value(self, value): if not value: value = "" - if isinstance(value, (int, long)): + if isinstance(value, int): value = str(value) - if isinstance(value, basestring): + if isinstance(value, str): pks = self.parse_select2_value(value) value = self.model.objects.filter(pk__in=pks) if isinstance(value, LiaisonStatement): @@ -61,7 +61,7 @@ class SearchableLiaisonStatementsField(forms.CharField): # patterns may not have been fully constructed there yet self.widget.attrs["data-ajax-url"] = urlreverse("ietf.liaisons.views.ajax_select2_search_liaison_statements") - return u",".join(unicode(o.pk) for o in value) + return ",".join(str(o.pk) for o in value) def clean(self, value): value = super(SearchableLiaisonStatementsField, self).clean(value) @@ -72,9 +72,9 @@ class SearchableLiaisonStatementsField(forms.CharField): found_pks = [str(o.pk) for o in objs] failed_pks = [x for x in pks if x not in found_pks] if failed_pks: - raise forms.ValidationError(u"Could not recognize the following groups: {pks}.".format(pks=", ".join(failed_pks))) + raise forms.ValidationError("Could not recognize the following groups: {pks}.".format(pks=", ".join(failed_pks))) if self.max_entries != None and len(objs) > self.max_entries: - raise forms.ValidationError(u"You can select at most %s entries only." % self.max_entries) + raise forms.ValidationError("You can select at most %s entries only." % self.max_entries) return objs diff --git a/ietf/liaisons/forms.py b/ietf/liaisons/forms.py index c465c1280..23879ba7e 100644 --- a/ietf/liaisons/forms.py +++ b/ietf/liaisons/forms.py @@ -30,6 +30,7 @@ from ietf.person.models import Email from ietf.person.fields import SearchableEmailField from ietf.doc.models import Document, DocAlias from ietf.utils.fields import DatepickerDateField +from functools import reduce ''' NOTES: @@ -209,12 +210,12 @@ class LiaisonModelForm(BetterModelForm): NOTE: from_groups and to_groups are marked as not required because select2 has a problem with validating ''' - from_groups = forms.ModelMultipleChoiceField(queryset=Group.objects.all(),label=u'Groups',required=False) + from_groups = forms.ModelMultipleChoiceField(queryset=Group.objects.all(),label='Groups',required=False) from_contact = forms.EmailField() to_contacts = forms.CharField(label="Contacts", widget=forms.Textarea(attrs={'rows':'3', }), strip=False) - to_groups = forms.ModelMultipleChoiceField(queryset=Group.objects,label=u'Groups',required=False) + to_groups = forms.ModelMultipleChoiceField(queryset=Group.objects,label='Groups',required=False) deadline = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={"autoclose": "1" }, label='Deadline', required=True) - related_to = SearchableLiaisonStatementsField(label=u'Related Liaison Statement', required=False) + related_to = SearchableLiaisonStatementsField(label='Related Liaison Statement', required=False) submitted_date = DatepickerDateField(date_format="yyyy-mm-dd", picker_settings={"autoclose": "1" }, label='Submission date', required=True, initial=datetime.date.today()) attachments = CustomModelMultipleChoiceField(queryset=Document.objects,label='Attachments', widget=ShowAttachmentsWidget, required=False) attach_title = forms.CharField(label='Title', required=False) @@ -298,13 +299,13 @@ class LiaisonModelForm(BetterModelForm): def clean(self): if not self.cleaned_data.get('body', None) and not self.has_attachments(): - self._errors['body'] = ErrorList([u'You must provide a body or attachment files']) - self._errors['attachments'] = ErrorList([u'You must provide a body or attachment files']) + self._errors['body'] = ErrorList(['You must provide a body or attachment files']) + self._errors['attachments'] = ErrorList(['You must provide a body or attachment files']) # if purpose=response there must be a related statement purpose = LiaisonStatementPurposeName.objects.get(slug='response') if self.cleaned_data.get('purpose') == purpose and not self.cleaned_data.get('related_to'): - self._errors['related_to'] = ErrorList([u'You must provide a related statement when purpose is In Response']) + self._errors['related_to'] = ErrorList(['You must provide a related statement when purpose is In Response']) return self.cleaned_data def full_clean(self): @@ -313,8 +314,8 @@ class LiaisonModelForm(BetterModelForm): self.reset_required_fields() def has_attachments(self): - for key in self.files.keys(): - if key.startswith('attach_file_') and key.replace('file', 'title') in self.data.keys(): + for key in list(self.files.keys()): + if key.startswith('attach_file_') and key.replace('file', 'title') in list(self.data.keys()): return True return False @@ -351,10 +352,10 @@ class LiaisonModelForm(BetterModelForm): request.POST[attach_title_N] ''' written = self.instance.attachments.all().count() - for key in self.files.keys(): + for key in list(self.files.keys()): title_key = key.replace('file', 'title') attachment_title = self.data.get(title_key) - if not key.startswith('attach_file_') or not title_key in self.data.keys(): + if not key.startswith('attach_file_') or not title_key in list(self.data.keys()): continue attached_file = self.files.get(key) extension=attached_file.name.rsplit('.', 1) @@ -422,7 +423,7 @@ class LiaisonModelForm(BetterModelForm): class IncomingLiaisonForm(LiaisonModelForm): def clean(self): - if 'send' in self.data.keys() and self.get_post_only(): + if 'send' in list(self.data.keys()) and self.get_post_only(): raise forms.ValidationError('As an IETF Liaison Manager you can not send incoming liaison statements, you only can post them') return super(IncomingLiaisonForm, self).clean() @@ -446,7 +447,7 @@ class IncomingLiaisonForm(LiaisonModelForm): self.fields['from_contact'].initial = self.person.role_set.filter(group=queryset[0]).first().email.address self.fields['from_contact'].widget.attrs['readonly'] = True self.fields['from_groups'].queryset = queryset - self.fields['from_groups'].widget.submitter = unicode(self.person) + self.fields['from_groups'].widget.submitter = str(self.person) # if there's only one possibility make it the default if len(queryset) == 1: diff --git a/ietf/liaisons/mails.py b/ietf/liaisons/mails.py index 413a429d4..0c13f51c1 100644 --- a/ietf/liaisons/mails.py +++ b/ietf/liaisons/mails.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2011-2019, All Rights Reserved import datetime from django.conf import settings @@ -8,7 +9,7 @@ from ietf.group.models import Role from ietf.mailtrigger.utils import gather_address_lists def send_liaison_by_email(request, liaison): - subject = u'New Liaison Statement, "%s"' % (liaison.title) + subject = 'New Liaison Statement, "%s"' % (liaison.title) from_email = settings.LIAISON_UNIVERSAL_FROM (to_email, cc) = gather_address_lists('liaison_statement_posted',liaison=liaison) bcc = ['statements@ietf.org'] @@ -20,7 +21,7 @@ def notify_pending_by_email(request, liaison): '''Send mail requesting approval of pending liaison statement. Send mail to the intersection of approvers for all from_groups ''' - subject = u'New Liaison Statement, "%s" needs your approval' % (liaison.title) + subject = 'New Liaison Statement, "%s" needs your approval' % (liaison.title) from_email = settings.LIAISON_UNIVERSAL_FROM (to, cc) = gather_address_lists('liaison_approval_requested',liaison=liaison) body = render_to_string('liaisons/pending_liaison_mail.txt', dict(liaison=liaison)) @@ -58,7 +59,7 @@ def possibly_send_deadline_reminder(liaison): } days_to_go = (liaison.deadline - datetime.date.today()).days - if not (days_to_go < 0 or days_to_go in PREVIOUS_DAYS.keys()): + if not (days_to_go < 0 or days_to_go in list(PREVIOUS_DAYS.keys())): return None # no reminder if days_to_go < 0: diff --git a/ietf/liaisons/management/commands/check_liaison_deadlines.py b/ietf/liaisons/management/commands/check_liaison_deadlines.py index aebadb46f..10cbc4291 100644 --- a/ietf/liaisons/management/commands/check_liaison_deadlines.py +++ b/ietf/liaisons/management/commands/check_liaison_deadlines.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2010-2019, All Rights Reserved import datetime from django.core.management.base import BaseCommand @@ -7,7 +8,7 @@ from ietf.liaisons.mails import possibly_send_deadline_reminder class Command(BaseCommand): - help = (u"Check liaison deadlines and send a reminder if we are close to a deadline") + help = ("Check liaison deadlines and send a reminder if we are close to a deadline") def handle(self, *args, **options): today = datetime.date.today() diff --git a/ietf/liaisons/management/commands/remind_update_sdo_list.py b/ietf/liaisons/management/commands/remind_update_sdo_list.py index a33b069b4..5eae4acd2 100644 --- a/ietf/liaisons/management/commands/remind_update_sdo_list.py +++ b/ietf/liaisons/management/commands/remind_update_sdo_list.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2010-2019, All Rights Reserved from django.core.management.base import BaseCommand @@ -6,7 +7,7 @@ from ietf.liaisons.mails import send_sdo_reminder class Command(BaseCommand): - help = (u"Send a remind to each SDO Liaison Manager to update the list of persons authorized to send liaison statements on behalf of his SDO") + help = ("Send a remind to each SDO Liaison Manager to update the list of persons authorized to send liaison statements on behalf of his SDO") def add_arguments(self, parser): parser.add_argument('-s', '--sdo-pk', dest='sdo_pk', @@ -25,16 +26,16 @@ def send_reminders_to_sdos(sdo_pk=None): sdos = sdos.filter(pk=sdo_pk) if not sdos: - print "No SDOs found!" + print("No SDOs found!") msgs = [] for sdo in sdos: body = send_sdo_reminder(sdo) if not body: - msg = u'%05s#: %s has no liaison manager' % (sdo.pk, sdo.name) + msg = '%05s#: %s has no liaison manager' % (sdo.pk, sdo.name) else: - msg = u'%05s#: %s mail sent!' % (sdo.pk, sdo.name) + msg = '%05s#: %s mail sent!' % (sdo.pk, sdo.name) msgs.append(msg) return msgs \ No newline at end of file diff --git a/ietf/liaisons/migrations/0001_initial.py b/ietf/liaisons/migrations/0001_initial.py index cfba2a61f..5d8e78d7a 100644 --- a/ietf/liaisons/migrations/0001_initial.py +++ b/ietf/liaisons/migrations/0001_initial.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-02-20 10:52 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion diff --git a/ietf/liaisons/migrations/0002_auto_20180225_1207.py b/ietf/liaisons/migrations/0002_auto_20180225_1207.py index 94f2fd2b1..c3f679ca9 100644 --- a/ietf/liaisons/migrations/0002_auto_20180225_1207.py +++ b/ietf/liaisons/migrations/0002_auto_20180225_1207.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-02-25 12:07 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/liaisons/migrations/0003_liaison_document2_fk.py b/ietf/liaisons/migrations/0003_liaison_document2_fk.py index 659899d4f..5105bdf3f 100644 --- a/ietf/liaisons/migrations/0003_liaison_document2_fk.py +++ b/ietf/liaisons/migrations/0003_liaison_document2_fk.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-08 11:58 -from __future__ import unicode_literals + from django.db import migrations import django.db.models.deletion diff --git a/ietf/liaisons/migrations/0004_remove_liaisonstatementattachment_document.py b/ietf/liaisons/migrations/0004_remove_liaisonstatementattachment_document.py index b5438e6b7..52bcd462e 100644 --- a/ietf/liaisons/migrations/0004_remove_liaisonstatementattachment_document.py +++ b/ietf/liaisons/migrations/0004_remove_liaisonstatementattachment_document.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-20 09:53 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/liaisons/migrations/0005_rename_field_document2.py b/ietf/liaisons/migrations/0005_rename_field_document2.py index e5df89916..f6a2b0e1e 100644 --- a/ietf/liaisons/migrations/0005_rename_field_document2.py +++ b/ietf/liaisons/migrations/0005_rename_field_document2.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-21 05:31 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/liaisons/migrations/0006_document_primary_key_cleanup.py b/ietf/liaisons/migrations/0006_document_primary_key_cleanup.py index c61220811..4fc689698 100644 --- a/ietf/liaisons/migrations/0006_document_primary_key_cleanup.py +++ b/ietf/liaisons/migrations/0006_document_primary_key_cleanup.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-06-10 03:47 -from __future__ import unicode_literals + from django.db import migrations import django.db.models.deletion diff --git a/ietf/liaisons/models.py b/ietf/liaisons/models.py index b42d72044..7af82a5ed 100644 --- a/ietf/liaisons/models.py +++ b/ietf/liaisons/models.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2007, All Rights Reserved +# Copyright The IETF Trust 2007-2019, All Rights Reserved from django.conf import settings from django.urls import reverse as urlreverse @@ -15,12 +15,12 @@ from ietf.utils.models import ForeignKey # maps (previous state id, new state id) to event type id STATE_EVENT_MAPPING = { - (u'pending','approved'):'approved', - (u'pending','dead'):'killed', - (u'pending','posted'):'posted', - (u'approved','posted'):'posted', - (u'dead','pending'):'resurrected', - (u'pending','pending'):'submitted' + ('pending','approved'):'approved', + ('pending','dead'):'killed', + ('pending','posted'):'posted', + ('approved','posted'):'posted', + ('dead','pending'):'resurrected', + ('pending','pending'):'submitted' } @@ -50,7 +50,7 @@ class LiaisonStatement(models.Model): def __unicode__(self): - return self.title or u"" + return self.title or "" def change_state(self,state_id=None,person=None): '''Helper function to change state of liaison statement and create appropriate @@ -213,7 +213,7 @@ class RelatedLiaisonStatement(models.Model): relationship = ForeignKey(DocRelationshipName) def __unicode__(self): - return u"%s %s %s" % (self.source.title, self.relationship.name.lower(), self.target.title) + return "%s %s %s" % (self.source.title, self.relationship.name.lower(), self.target.title) class LiaisonStatementGroupContacts(models.Model): @@ -222,7 +222,7 @@ class LiaisonStatementGroupContacts(models.Model): cc_contacts = models.CharField(max_length=255,blank=True) def __unicode__(self): - return u"%s" % self.group.name + return "%s" % self.group.name class LiaisonStatementEvent(models.Model): @@ -233,7 +233,7 @@ class LiaisonStatementEvent(models.Model): desc = models.TextField() def __unicode__(self): - return u"%s %s by %s at %s" % (self.statement.title, self.type.slug, self.by.plain_name(), self.time) + return "%s %s by %s at %s" % (self.statement.title, self.type.slug, self.by.plain_name(), self.time) class Meta: ordering = ['-time', '-id'] diff --git a/ietf/liaisons/tests.py b/ietf/liaisons/tests.py index fa2a1bfb2..22cef5911 100644 --- a/ietf/liaisons/tests.py +++ b/ietf/liaisons/tests.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2009-2019, All Rights Reserved import datetime, os, shutil import json @@ -7,7 +8,7 @@ from django.conf import settings from django.contrib.auth.models import User from django.urls import reverse as urlreverse from django.db.models import Q -from StringIO import StringIO +from io import StringIO from pyquery import PyQuery from ietf.utils.test_utils import TestCase, login_testing_unauthorized, unicontent @@ -205,7 +206,7 @@ class AjaxTests(TestCase): r = self.client.get(url) self.assertEqual(r.status_code, 200) data = json.loads(r.content) - self.assertEqual(data["to_contacts"],[u'test@example.com']) + self.assertEqual(data["to_contacts"],['test@example.com']) def test_ajax_select2_search_liaison_statements(self): liaison = LiaisonStatementFactory() diff --git a/ietf/liaisons/views.py b/ietf/liaisons/views.py index d8931d4f1..2f2412ee4 100644 --- a/ietf/liaisons/views.py +++ b/ietf/liaisons/views.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2007, All Rights Reserved +# Copyright The IETF Trust 2007-2019, All Rights Reserved import json from email.utils import parseaddr @@ -86,7 +86,7 @@ def _find_person_in_emails(liaison, person): def contacts_from_roles(roles): '''Returns contact string for given roles''' - emails = [ u'{} <{}>'.format(r.person.plain_name(),r.email.address) for r in roles ] + emails = [ '{} <{}>'.format(r.person.plain_name(),r.email.address) for r in roles ] return ','.join(emails) def get_cc(group): @@ -106,17 +106,17 @@ def get_cc(group): elif group.type_id == 'area': emails.append(EMAIL_ALIASES['IETFCHAIR']) ad_roles = group.role_set.filter(name='ad') - emails.extend([ u'{} <{}>'.format(r.person.plain_name(),r.email.address) for r in ad_roles ]) + emails.extend([ '{} <{}>'.format(r.person.plain_name(),r.email.address) for r in ad_roles ]) elif group.type_id == 'wg': ad_roles = group.parent.role_set.filter(name='ad') - emails.extend([ u'{} <{}>'.format(r.person.plain_name(),r.email.address) for r in ad_roles ]) + emails.extend([ '{} <{}>'.format(r.person.plain_name(),r.email.address) for r in ad_roles ]) chair_roles = group.role_set.filter(name='chair') - emails.extend([ u'{} <{}>'.format(r.person.plain_name(),r.email.address) for r in chair_roles ]) + emails.extend([ '{} <{}>'.format(r.person.plain_name(),r.email.address) for r in chair_roles ]) if group.list_email: - emails.append(u'{} Discussion List <{}>'.format(group.name,group.list_email)) + emails.append('{} Discussion List <{}>'.format(group.name,group.list_email)) elif group.type_id == 'sdo': liaiman_roles = group.role_set.filter(name='liaiman') - emails.extend([ u'{} <{}>'.format(r.person.plain_name(),r.email.address) for r in liaiman_roles ]) + emails.extend([ '{} <{}>'.format(r.person.plain_name(),r.email.address) for r in liaiman_roles ]) # explicit CCs if group.liaisonstatementgroupcontacts_set.exists() and group.liaisonstatementgroupcontacts_set.first().cc_contacts: @@ -274,7 +274,7 @@ def ajax_select2_search_liaison_statements(request): def redirect_add(request): """Redirects old add urls""" - if 'incoming' in request.GET.keys(): + if 'incoming' in list(request.GET.keys()): return redirect('ietf.liaisons.views.liaison_add', type='incoming') else: return redirect('ietf.liaisons.views.liaison_add', type='outgoing') diff --git a/ietf/liaisons/widgets.py b/ietf/liaisons/widgets.py index ea281cc40..ef4074390 100644 --- a/ietf/liaisons/widgets.py +++ b/ietf/liaisons/widgets.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2010-2019, All Rights Reserved from django.urls import reverse as urlreverse from django.db.models.query import QuerySet from django.forms.widgets import Widget @@ -14,29 +15,29 @@ class ButtonWidget(Widget): super(ButtonWidget, self).__init__(*args, **kwargs) def render(self, name, value, attrs=None): - html = u'' % conditional_escape(self.show_on) - html += u'' % conditional_escape(self.label) + html = '' % conditional_escape(self.show_on) + html += '' % conditional_escape(self.label) if self.require: for i in self.require: - html += u'' % conditional_escape(i) - required_str = u'Please fill in %s to attach a new file' % conditional_escape(self.required_label) - html += u'' % conditional_escape(required_str) - html += u'' % conditional_escape(self.label) + html += '' % conditional_escape(i) + required_str = 'Please fill in %s to attach a new file' % conditional_escape(self.required_label) + html += '' % conditional_escape(required_str) + html += '' % conditional_escape(self.label) return mark_safe(html) class ShowAttachmentsWidget(Widget): def render(self, name, value, attrs=None): - html = u'
' % name - html += u'' - html += u'
' + html = '
' % name + html += '' + html += '
' if value and isinstance(value, QuerySet): for attachment in value: - html += u'%s ' % (conditional_escape(attachment.document.href()), conditional_escape(attachment.document.title)) - html += u'Edit '.format(urlreverse("ietf.liaisons.views.liaison_edit_attachment", kwargs={'object_id':attachment.statement.pk,'doc_id':attachment.document.pk})) - html += u'Delete '.format(urlreverse("ietf.liaisons.views.liaison_delete_attachment", kwargs={'object_id':attachment.statement.pk,'attach_id':attachment.pk})) - html += u'
' + html += '%s ' % (conditional_escape(attachment.document.href()), conditional_escape(attachment.document.title)) + html += 'Edit '.format(urlreverse("ietf.liaisons.views.liaison_edit_attachment", kwargs={'object_id':attachment.statement.pk,'doc_id':attachment.document.pk})) + html += 'Delete '.format(urlreverse("ietf.liaisons.views.liaison_delete_attachment", kwargs={'object_id':attachment.statement.pk,'attach_id':attachment.pk})) + html += '
' else: - html += u'No files attached' - html += u'
' + html += 'No files attached' + html += '
' return mark_safe(html) diff --git a/ietf/mailinglists/factories.py b/ietf/mailinglists/factories.py index c2942fdbd..10f41c8da 100644 --- a/ietf/mailinglists/factories.py +++ b/ietf/mailinglists/factories.py @@ -1,6 +1,6 @@ -# Copyright The IETF Trust 2018, All Rights Reserved +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- -from __future__ import unicode_literals, print_function + import factory import random diff --git a/ietf/mailinglists/migrations/0001_initial.py b/ietf/mailinglists/migrations/0001_initial.py index 9efd709e9..f53f00a9f 100644 --- a/ietf/mailinglists/migrations/0001_initial.py +++ b/ietf/mailinglists/migrations/0001_initial.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-02-20 10:52 -from __future__ import unicode_literals + import django.core.validators from django.db import migrations, models diff --git a/ietf/mailinglists/tests.py b/ietf/mailinglists/tests.py index 82629d1b2..29cd06518 100644 --- a/ietf/mailinglists/tests.py +++ b/ietf/mailinglists/tests.py @@ -1,6 +1,6 @@ -# Copyright The IETF Trust 2016, All Rights Reserved +# Copyright The IETF Trust 2009-2019, All Rights Reserved # -*- coding: utf-8 -*- -from __future__ import unicode_literals, print_function + from pyquery import PyQuery diff --git a/ietf/mailtrigger/migrations/0001_initial.py b/ietf/mailtrigger/migrations/0001_initial.py index a563fa2e3..1b41575fc 100644 --- a/ietf/mailtrigger/migrations/0001_initial.py +++ b/ietf/mailtrigger/migrations/0001_initial.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-02-20 10:52 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/mailtrigger/migrations/0002_conflrev_changes.py b/ietf/mailtrigger/migrations/0002_conflrev_changes.py index 8fc3090b9..c801f6fe9 100644 --- a/ietf/mailtrigger/migrations/0002_conflrev_changes.py +++ b/ietf/mailtrigger/migrations/0002_conflrev_changes.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.13 on 2018-05-21 12:07 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/mailtrigger/migrations/0003_add_review_notify_ad.py b/ietf/mailtrigger/migrations/0003_add_review_notify_ad.py index fbcf0ca1f..3389d050d 100644 --- a/ietf/mailtrigger/migrations/0003_add_review_notify_ad.py +++ b/ietf/mailtrigger/migrations/0003_add_review_notify_ad.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.16 on 2018-11-02 11:34 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/mailtrigger/migrations/0004_ballot_rfceditornote_changed_postapproval.py b/ietf/mailtrigger/migrations/0004_ballot_rfceditornote_changed_postapproval.py index 592afe92b..097ebd6a3 100644 --- a/ietf/mailtrigger/migrations/0004_ballot_rfceditornote_changed_postapproval.py +++ b/ietf/mailtrigger/migrations/0004_ballot_rfceditornote_changed_postapproval.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.16 on 2018-11-03 00:24 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/mailtrigger/migrations/0005_slides_proposed.py b/ietf/mailtrigger/migrations/0005_slides_proposed.py index f701b81d2..8c1e71f8d 100644 --- a/ietf/mailtrigger/migrations/0005_slides_proposed.py +++ b/ietf/mailtrigger/migrations/0005_slides_proposed.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-03-25 06:11 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/mailtrigger/migrations/0006_sub_new_wg_00.py b/ietf/mailtrigger/migrations/0006_sub_new_wg_00.py index 0169c456b..712803015 100644 --- a/ietf/mailtrigger/migrations/0006_sub_new_wg_00.py +++ b/ietf/mailtrigger/migrations/0006_sub_new_wg_00.py @@ -1,6 +1,6 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/mailtrigger/models.py b/ietf/mailtrigger/models.py index 3e3a6e373..6f5abaffb 100644 --- a/ietf/mailtrigger/models.py +++ b/ietf/mailtrigger/models.py @@ -18,7 +18,7 @@ def clean_duplicates(addrlist): # name from the last one: address_info[addr] = (name, a) addresses = [] - for addr, info in address_info.items(): + for addr, info in list(address_info.items()): name, a = info if (name,addr)==('',''): addresses.append(a) @@ -265,7 +265,7 @@ class Recipient(models.Model): doc = kwargs['doc'] active_ballot = doc.active_ballot() if active_ballot: - for ad, pos in active_ballot.active_ad_positions().iteritems(): + for ad, pos in active_ballot.active_ad_positions().items(): if pos and pos.pos_id == "discuss": addrs.append(ad.role_email("ad").address) return addrs diff --git a/ietf/meeting/admin.py b/ietf/meeting/admin.py index 1713d0215..d6ea3a5ee 100644 --- a/ietf/meeting/admin.py +++ b/ietf/meeting/admin.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2012-2019, All Rights Reserved from django.contrib import admin from ietf.meeting.models import (Meeting, Room, Session, TimeSlot, Constraint, Schedule, @@ -37,7 +38,7 @@ class MeetingAdmin(admin.ModelAdmin): if instance.country: loc.append(instance.get_country_display()) - return u", ".join(loc) + return ", ".join(loc) admin.site.register(Meeting, MeetingAdmin) @@ -53,7 +54,7 @@ class TimeSlotAdmin(admin.ModelAdmin): if instance.session.name: return instance.session.name elif instance.session.group: - return u"%s (%s)" % (instance.session.group.name, instance.session.group.acronym) + return "%s (%s)" % (instance.session.group.name, instance.session.group.acronym) return "" session_desc.short_description = "session" diff --git a/ietf/meeting/factories.py b/ietf/meeting/factories.py index 44f8e4145..9eb6d6b56 100644 --- a/ietf/meeting/factories.py +++ b/ietf/meeting/factories.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2016-2019, All Rights Reserved import factory import random import datetime @@ -146,8 +147,8 @@ class FloorPlanFactory(factory.DjangoModelFactory): class Meta: model = FloorPlan - name = factory.Sequence(lambda n: u'Venue Floor %d' % n) - short = factory.Sequence(lambda n: u'%d' % n) + name = factory.Sequence(lambda n: 'Venue Floor %d' % n) + short = factory.Sequence(lambda n: '%d' % n) meeting = factory.SubFactory(MeetingFactory) order = factory.Sequence(lambda n: n) image = factory.LazyAttribute( diff --git a/ietf/meeting/feeds.py b/ietf/meeting/feeds.py index a2780065d..bc9fa4ecd 100644 --- a/ietf/meeting/feeds.py +++ b/ietf/meeting/feeds.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2007-2019, All Rights Reserved import os from django.contrib.syndication.views import Feed @@ -33,7 +34,7 @@ class LatestMeetingMaterialFeed(Feed): return "Meeting Materials Activity" def item_title(self, item): - return u"%s: %s" % (item["group_acronym"], escape(item["title"])) + return "%s: %s" % (item["group_acronym"], escape(item["title"])) def item_description(self, item): return "" diff --git a/ietf/meeting/helpers.py b/ietf/meeting/helpers.py index ee6b5cff7..6d8300e45 100644 --- a/ietf/meeting/helpers.py +++ b/ietf/meeting/helpers.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2007, All Rights Reserved +# Copyright The IETF Trust 2013-2019, All Rights Reserved import datetime import os @@ -288,13 +288,13 @@ def agenda_permissions(meeting, schedule, user): return cansee, canedit, secretariat def session_constraint_expire(request,session): - from ajax import session_constraints + from .ajax import session_constraints path = reverse(session_constraints, args=[session.meeting.number, session.pk]) temp_request = HttpRequest() temp_request.path = path temp_request.META['HTTP_HOST'] = request.META['HTTP_HOST'] key = get_cache_key(temp_request) - if key is not None and cache.has_key(key): + if key is not None and key in cache: cache.delete(key) # ------------------------------------------------- diff --git a/ietf/meeting/management/commands/update_important_dates.py b/ietf/meeting/management/commands/update_important_dates.py index d5668c1b4..656cbdb02 100644 --- a/ietf/meeting/management/commands/update_important_dates.py +++ b/ietf/meeting/management/commands/update_important_dates.py @@ -1,5 +1,5 @@ -# Copyright The IETF Trust 2018, All Rights Reserved -from __future__ import unicode_literals +# Copyright The IETF Trust 2018-2019, All Rights Reserved + import datetime diff --git a/ietf/meeting/migrations/0001_initial.py b/ietf/meeting/migrations/0001_initial.py index ce77e14d6..e71b0ae90 100644 --- a/ietf/meeting/migrations/0001_initial.py +++ b/ietf/meeting/migrations/0001_initial.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-02-20 10:52 -from __future__ import unicode_literals + import datetime import django.core.validators diff --git a/ietf/meeting/migrations/0002_auto_20180225_1207.py b/ietf/meeting/migrations/0002_auto_20180225_1207.py index d6082a214..6f5aab8af 100644 --- a/ietf/meeting/migrations/0002_auto_20180225_1207.py +++ b/ietf/meeting/migrations/0002_auto_20180225_1207.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-02-25 12:07 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/meeting/migrations/0003_rename_modified_fields.py b/ietf/meeting/migrations/0003_rename_modified_fields.py index 98d3f66e3..dea714019 100644 --- a/ietf/meeting/migrations/0003_rename_modified_fields.py +++ b/ietf/meeting/migrations/0003_rename_modified_fields.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-03-02 14:33 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/meeting/migrations/0004_meeting_attendees.py b/ietf/meeting/migrations/0004_meeting_attendees.py index 7eca3c2e3..ea7546a5b 100644 --- a/ietf/meeting/migrations/0004_meeting_attendees.py +++ b/ietf/meeting/migrations/0004_meeting_attendees.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2018-03-20 09:17 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/meeting/migrations/0005_backfill_old_meetings.py b/ietf/meeting/migrations/0005_backfill_old_meetings.py index 0335adc4e..f56fc33ca 100644 --- a/ietf/meeting/migrations/0005_backfill_old_meetings.py +++ b/ietf/meeting/migrations/0005_backfill_old_meetings.py @@ -1,5 +1,6 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/meeting/migrations/0006_backfill_attendees.py b/ietf/meeting/migrations/0006_backfill_attendees.py index 05dfe4457..5b6a70958 100644 --- a/ietf/meeting/migrations/0006_backfill_attendees.py +++ b/ietf/meeting/migrations/0006_backfill_attendees.py @@ -1,5 +1,6 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/meeting/migrations/0007_auto_20180716_1337.py b/ietf/meeting/migrations/0007_auto_20180716_1337.py index 0521ca185..2fcf4804c 100644 --- a/ietf/meeting/migrations/0007_auto_20180716_1337.py +++ b/ietf/meeting/migrations/0007_auto_20180716_1337.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.14 on 2018-07-16 13:37 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/meeting/migrations/0008_rename_meeting_agenda_note.py b/ietf/meeting/migrations/0008_rename_meeting_agenda_note.py index cda62e1ac..1cef45068 100644 --- a/ietf/meeting/migrations/0008_rename_meeting_agenda_note.py +++ b/ietf/meeting/migrations/0008_rename_meeting_agenda_note.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2018-10-09 13:09 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/meeting/migrations/0009_add_agenda_info_note.py b/ietf/meeting/migrations/0009_add_agenda_info_note.py index ae1f32676..e9136158f 100644 --- a/ietf/meeting/migrations/0009_add_agenda_info_note.py +++ b/ietf/meeting/migrations/0009_add_agenda_info_note.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.16 on 2018-10-09 14:07 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/meeting/migrations/0010_set_ietf_103_agenda_info_note.py b/ietf/meeting/migrations/0010_set_ietf_103_agenda_info_note.py index f1ae68251..14d68538f 100644 --- a/ietf/meeting/migrations/0010_set_ietf_103_agenda_info_note.py +++ b/ietf/meeting/migrations/0010_set_ietf_103_agenda_info_note.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.16 on 2018-10-09 14:23 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/meeting/migrations/0011_auto_20190114_0550.py b/ietf/meeting/migrations/0011_auto_20190114_0550.py index 066ece556..bc9a076fa 100644 --- a/ietf/meeting/migrations/0011_auto_20190114_0550.py +++ b/ietf/meeting/migrations/0011_auto_20190114_0550.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.18 on 2019-01-14 05:50 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/meeting/migrations/0012_add_slide_submissions.py b/ietf/meeting/migrations/0012_add_slide_submissions.py index 9ae818c08..659b8f475 100644 --- a/ietf/meeting/migrations/0012_add_slide_submissions.py +++ b/ietf/meeting/migrations/0012_add_slide_submissions.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-03-23 07:41 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion diff --git a/ietf/meeting/migrations/0013_make_separate_break_sessobj.py b/ietf/meeting/migrations/0013_make_separate_break_sessobj.py index 3d2e77c64..c7af0cf0b 100644 --- a/ietf/meeting/migrations/0013_make_separate_break_sessobj.py +++ b/ietf/meeting/migrations/0013_make_separate_break_sessobj.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-03-23 06:11 -from __future__ import unicode_literals + import datetime from django.db import migrations diff --git a/ietf/meeting/migrations/0014_auto_20190426_0305.py b/ietf/meeting/migrations/0014_auto_20190426_0305.py index c83544689..84f4dc4fc 100644 --- a/ietf/meeting/migrations/0014_auto_20190426_0305.py +++ b/ietf/meeting/migrations/0014_auto_20190426_0305.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-04-26 03:05 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/meeting/migrations/0015_sessionpresentation_document2_fk.py b/ietf/meeting/migrations/0015_sessionpresentation_document2_fk.py index bd13536ea..8897f0b44 100644 --- a/ietf/meeting/migrations/0015_sessionpresentation_document2_fk.py +++ b/ietf/meeting/migrations/0015_sessionpresentation_document2_fk.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-08 11:58 -from __future__ import unicode_literals + from django.db import migrations import django.db.models.deletion diff --git a/ietf/meeting/migrations/0016_remove_sessionpresentation_document.py b/ietf/meeting/migrations/0016_remove_sessionpresentation_document.py index 228c63ed2..741153eb5 100644 --- a/ietf/meeting/migrations/0016_remove_sessionpresentation_document.py +++ b/ietf/meeting/migrations/0016_remove_sessionpresentation_document.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-21 03:57 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/meeting/migrations/0017_rename_field_document2.py b/ietf/meeting/migrations/0017_rename_field_document2.py index a857a074f..672112a91 100644 --- a/ietf/meeting/migrations/0017_rename_field_document2.py +++ b/ietf/meeting/migrations/0017_rename_field_document2.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-21 05:31 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/meeting/migrations/0018_document_primary_key_cleanup.py b/ietf/meeting/migrations/0018_document_primary_key_cleanup.py index 491a34f93..08b1f5ab0 100644 --- a/ietf/meeting/migrations/0018_document_primary_key_cleanup.py +++ b/ietf/meeting/migrations/0018_document_primary_key_cleanup.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-06-10 03:47 -from __future__ import unicode_literals + from django.db import migrations import django.db.models.deletion diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py index 5b3478cae..145e0935f 100644 --- a/ietf/meeting/models.py +++ b/ietf/meeting/models.py @@ -5,7 +5,7 @@ import pytz import datetime -from urlparse import urljoin +from urllib.parse import urljoin import os import re import string @@ -33,7 +33,7 @@ from ietf.utils.text import xslugify from ietf.utils.timezone import date2datetime from ietf.utils.models import ForeignKey -countries = pytz.country_names.items() +countries = list(pytz.country_names.items()) countries.sort(lambda x,y: cmp(x[1], y[1])) timezones = [] @@ -100,12 +100,12 @@ class Meeting(models.Model): agenda_warning_note = models.TextField(blank=True, help_text="Text in this field will be placed more prominently at the top of the html agenda page for the meeting. HTML can be used, but will not be validated.") agenda = ForeignKey('Schedule',null=True,blank=True, related_name='+') session_request_lock_message = models.CharField(blank=True,max_length=255) # locked if not empty - proceedings_final = models.BooleanField(default=False, help_text=u"Are the proceedings for this meeting complete?") + proceedings_final = models.BooleanField(default=False, help_text="Are the proceedings for this meeting complete?") acknowledgements = models.TextField(blank=True, help_text="Acknowledgements for use in meeting proceedings. Use ReStructuredText markup.") overview = ForeignKey(DBTemplate, related_name='overview', null=True, editable=False) show_important_dates = models.BooleanField(default=False) attendees = models.IntegerField(blank=True, null=True, default=None, - help_text=u"Number of Attendees for backfilled meetings, leave it blank for new meetings, and then it is calculated from the registrations") + help_text="Number of Attendees for backfilled meetings, leave it blank for new meetings, and then it is calculated from the registrations") def __unicode__(self): if self.type_id == "ietf": @@ -413,7 +413,7 @@ class UrlResource(models.Model): def floorplan_path(instance, filename): root, ext = os.path.splitext(filename) - return u"%s/floorplan-%s-%s%s" % (settings.FLOORPLAN_MEDIA_DIR, instance.meeting.number, xslugify(instance.name), ext) + return "%s/floorplan-%s-%s%s" % (settings.FLOORPLAN_MEDIA_DIR, instance.meeting.number, xslugify(instance.name), ext) class FloorPlan(models.Model): name = models.CharField(max_length=255) @@ -444,7 +444,7 @@ class TimeSlot(models.Model): duration = models.DurationField(default=datetime.timedelta(0)) location = ForeignKey(Room, blank=True, null=True) show_location = models.BooleanField(default=True, help_text="Show location in agenda.") - sessions = models.ManyToManyField('Session', related_name='slots', through='SchedTimeSessAssignment', blank=True, help_text=u"Scheduled session, if any.") + sessions = models.ManyToManyField('Session', related_name='slots', through='SchedTimeSessAssignment', blank=True, help_text="Scheduled session, if any.") modified = models.DateTimeField(auto_now=True) # @@ -456,7 +456,7 @@ class TimeSlot(models.Model): @property def time_desc(self): - return u"%s-%s" % (self.time.strftime("%H%M"), (self.time + self.duration).strftime("%H%M")) + return "%s-%s" % (self.time.strftime("%H%M"), (self.time + self.duration).strftime("%H%M")) def meeting_date(self): return self.time.date() @@ -477,7 +477,7 @@ class TimeSlot(models.Model): if not location: location = "(no location)" - return u"%s: %s-%s %s, %s" % (self.meeting.number, self.time.strftime("%m-%d %H:%M"), (self.time + self.duration).strftime("%H:%M"), self.name, location) + return "%s: %s-%s %s, %s" % (self.meeting.number, self.time.strftime("%m-%d %H:%M"), (self.time + self.duration).strftime("%H:%M"), self.name, location) def end_time(self): return self.time + self.duration @@ -611,13 +611,13 @@ class Schedule(models.Model): meeting = ForeignKey(Meeting, null=True) name = models.CharField(max_length=16, blank=False) owner = ForeignKey(Person) - visible = models.BooleanField(default=True, help_text=u"Make this agenda available to those who know about it.") - public = models.BooleanField(default=True, help_text=u"Make this agenda publically available.") + visible = models.BooleanField(default=True, help_text="Make this agenda available to those who know about it.") + public = models.BooleanField(default=True, help_text="Make this agenda publically available.") badness = models.IntegerField(null=True, blank=True) # considering copiedFrom = ForeignKey('Schedule', blank=True, null=True) def __unicode__(self): - return u"%s:%s(%s)" % (self.meeting, self.name, self.owner) + return "%s:%s(%s)" % (self.meeting, self.name, self.owner) def base_url(self): return "/meeting/%s/agenda/%s/%s" % (self.meeting.number, self.owner_email(), self.name) @@ -714,9 +714,9 @@ class SchedTimeSessAssignment(models.Model): a specific person/user. """ timeslot = ForeignKey('TimeSlot', null=False, blank=False, related_name='sessionassignments') - session = ForeignKey('Session', null=True, default=None, related_name='timeslotassignments', help_text=u"Scheduled session.") + session = ForeignKey('Session', null=True, default=None, related_name='timeslotassignments', help_text="Scheduled session.") schedule = ForeignKey('Schedule', null=False, blank=False, related_name='assignments') - extendedfrom = ForeignKey('self', null=True, default=None, help_text=u"Timeslot this session is an extension of.") + extendedfrom = ForeignKey('self', null=True, default=None, help_text="Timeslot this session is an extension of.") modified = models.DateTimeField(auto_now=True) notes = models.TextField(blank=True) badness = models.IntegerField(default=0, blank=True, null=True) @@ -726,7 +726,7 @@ class SchedTimeSessAssignment(models.Model): ordering = ["timeslot__time", "timeslot__type__slug", "session__group__parent__name", "session__group__acronym", "session__name", ] def __unicode__(self): - return u"%s [%s<->%s]" % (self.schedule, self.session, self.timeslot) + return "%s [%s<->%s]" % (self.schedule, self.session, self.timeslot) @property def room_name(self): @@ -807,7 +807,7 @@ class SchedTimeSessAssignment(models.Model): components.append(g.acronym) - return u"-".join(components).lower() + return "-".join(components).lower() class Constraint(models.Model): """ @@ -829,15 +829,15 @@ class Constraint(models.Model): active_status = None def __unicode__(self): - return u"%s %s target=%s person=%s" % (self.source, self.name.name.lower(), self.target, self.person) + return "%s %s target=%s person=%s" % (self.source, self.name.name.lower(), self.target, self.person) def brief_display(self): if self.target and self.person: - return u"%s ; %s" % (self.target.acronym, self.person) + return "%s ; %s" % (self.target.acronym, self.person) elif self.target and not self.person: - return u"%s " % (self.target.acronym) + return "%s " % (self.target.acronym) elif not self.target and self.person: - return u"%s " % (self.person) + return "%s " % (self.person) def json_url(self): return "/meeting/%s/constraint/%s.json" % (self.meeting.number, self.id) @@ -869,7 +869,7 @@ class SessionPresentation(models.Model): unique_together = (('session', 'document'),) def __unicode__(self): - return u"%s -> %s-%s" % (self.session, self.document.name, self.rev) + return "%s -> %s-%s" % (self.session, self.document.name, self.rev) constraint_cache_uses = 0 constraint_cache_initials = 0 @@ -1018,7 +1018,7 @@ class Session(models.Model): ss = self.timeslotassignments.filter(schedule=self.meeting.agenda).order_by('timeslot__time') if ss: ss0name = ','.join([x.timeslot.time.strftime("%a-%H%M") for x in ss]) - return u"%s: %s %s %s" % (self.meeting, self.group.acronym, self.name, ss0name) + return "%s: %s %s %s" % (self.meeting, self.group.acronym, self.name, ss0name) @property def short_name(self): @@ -1028,7 +1028,7 @@ class Session(models.Model): return self.short if self.group: return self.group.acronym - return u"req#%u" % (id) + return "req#%u" % (id) @property def special_request_token(self): @@ -1155,7 +1155,7 @@ class ImportantDate(models.Model): ordering = ["-meeting_id","date", ] def __unicode__(self): - return u'%s : %s : %s' % ( self.meeting, self.name, self.date ) + return '%s : %s : %s' % ( self.meeting, self.name, self.date ) class SlideSubmission(models.Model): session = ForeignKey(Session) diff --git a/ietf/meeting/templatetags/agenda_custom_tags.py b/ietf/meeting/templatetags/agenda_custom_tags.py index b6e17aa1a..5adeb314c 100644 --- a/ietf/meeting/templatetags/agenda_custom_tags.py +++ b/ietf/meeting/templatetags/agenda_custom_tags.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2013-2019, All Rights Reserved from django import template register = template.Library() @@ -42,7 +43,7 @@ def durationFormat(inp): def callMethod(obj, methodName): method = getattr(obj, methodName) - if obj.__dict__.has_key("__callArg"): + if "__callArg" in obj.__dict__: ret = method(*obj.__callArg) del obj.__callArg return ret @@ -50,7 +51,7 @@ def callMethod(obj, methodName): @register.filter(name="args") def args(obj, arg): - if not obj.__dict__.has_key("__callArg"): + if "__callArg" not in obj.__dict__: obj.__callArg = [] obj.__callArg += [arg] diff --git a/ietf/meeting/tests_api.py b/ietf/meeting/tests_api.py index 0bf6da2e7..bc746bdfb 100644 --- a/ietf/meeting/tests_api.py +++ b/ietf/meeting/tests_api.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2013-2019, All Rights Reserved import datetime import json -from urlparse import urlsplit +from urllib.parse import urlsplit from django.urls import reverse as urlreverse diff --git a/ietf/meeting/tests_js.py b/ietf/meeting/tests_js.py index 230c960f9..914833f78 100644 --- a/ietf/meeting/tests_js.py +++ b/ietf/meeting/tests_js.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2016, All Rights Reserved +# Copyright The IETF Trust 2014-2019, All Rights Reserved import sys import time @@ -148,7 +148,7 @@ class SlideReorderTests(StaticLiveServerTestCase): time.sleep(0.1) # The API that modifies the database runs async names=self.session.sessionpresentation_set.values_list('document__name',flat=True) - self.assertEqual(list(names),[u'one',u'three',u'two']) + self.assertEqual(list(names),['one','three','two']) # The following are useful debugging tools diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py index bf01e458b..6b67f4009 100644 --- a/ietf/meeting/tests_views.py +++ b/ietf/meeting/tests_views.py @@ -5,7 +5,7 @@ import json import os import shutil import datetime -import urlparse +import urllib.parse import random from unittest import skipIf @@ -17,7 +17,7 @@ from django.contrib.auth.models import User from mock import patch from pyquery import PyQuery -from StringIO import StringIO +from io import StringIO from bs4 import BeautifulSoup from ietf.doc.models import Document @@ -134,7 +134,7 @@ class MeetingTests(TestCase): # future meeting, no agenda r = self.client.get(urlreverse("ietf.meeting.views.agenda", kwargs=dict(num=future_meeting.number))) self.assertEqual(r.status_code, 200) - self.assertContains(r, u"There is no agenda available yet.") + self.assertContains(r, "There is no agenda available yet.") self.assertTemplateUsed(r, 'meeting/no-agenda.html') # text @@ -618,7 +618,7 @@ class EditTests(TestCase): }) self.assertEqual(r.status_code, 302) # Verify that we actually got redirected to a new place. - self.assertNotEqual(urlparse.urlparse(r.url).path, url) + self.assertNotEqual(urllib.parse.urlparse(r.url).path, url) # get schedule = meeting.get_schedule_by_name("foo") @@ -664,7 +664,7 @@ class EditTests(TestCase): 'saveas': "saveas", }) self.assertEqual(r.status_code, 302) - self.assertEqual(urlparse.urlparse(r.url).path, url) + self.assertEqual(urllib.parse.urlparse(r.url).path, url) # TODO: Verify that an error message was in fact returned. r = self.client.post(url, { @@ -673,16 +673,16 @@ class EditTests(TestCase): }) # TODO: Verify that an error message was in fact returned. self.assertEqual(r.status_code, 302) - self.assertEqual(urlparse.urlparse(r.url).path, url) + self.assertEqual(urllib.parse.urlparse(r.url).path, url) # Non-ASCII alphanumeric characters r = self.client.post(url, { - 'savename': u"f\u00E9ling", + 'savename': "f\u00E9ling", 'saveas': "saveas", }) # TODO: Verify that an error message was in fact returned. self.assertEqual(r.status_code, 302) - self.assertEqual(urlparse.urlparse(r.url).path, url) + self.assertEqual(urllib.parse.urlparse(r.url).path, url) def test_edit_timeslots(self): @@ -1749,7 +1749,7 @@ class MaterialsTests(TestCase): soup = BeautifulSoup(page, 'html.parser') for a in soup('a'): href = a.get('href') - path = urlparse.urlparse(href).path + path = urllib.parse.urlparse(href).path if (path and path not in seen and path.startswith(top)): follow(path) follow(url) @@ -1761,7 +1761,7 @@ class MaterialsTests(TestCase): r = self.client.get(url) self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertTrue('Upload' in unicode(q("title"))) + self.assertTrue('Upload' in str(q("title"))) self.assertFalse(session.sessionpresentation_set.exists()) test_file = StringIO(b'%PDF-1.4\n%âãÏÓ\nthis is some text for a test') test_file.name = "not_really.pdf" @@ -1772,7 +1772,7 @@ class MaterialsTests(TestCase): r = self.client.get(url) self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertTrue('Revise' in unicode(q("title"))) + self.assertTrue('Revise' in str(q("title"))) test_file = StringIO('%PDF-1.4\n%âãÏÓ\nthis is some different text for a test') test_file.name = "also_not_really.pdf" r = self.client.post(url,dict(file=test_file)) @@ -1796,7 +1796,7 @@ class MaterialsTests(TestCase): r = self.client.get(url) self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertTrue('Upload' in unicode(q("title"))) + self.assertTrue('Upload' in str(q("title"))) self.assertFalse(session.sessionpresentation_set.exists()) test_file = StringIO(b'%PDF-1.4\n%âãÏÓ\nthis is some text for a test') test_file.name = "not_really.pdf" @@ -1814,7 +1814,7 @@ class MaterialsTests(TestCase): r = self.client.get(url) self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertTrue('Upload' in unicode(q("title"))) + self.assertTrue('Upload' in str(q("title"))) def test_upload_minutes_agenda(self): @@ -1829,7 +1829,7 @@ class MaterialsTests(TestCase): r = self.client.get(url) self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertTrue('Upload' in unicode(q("Title"))) + self.assertTrue('Upload' in str(q("Title"))) self.assertFalse(session.sessionpresentation_set.exists()) self.assertFalse(q('form input[type="checkbox"]')) @@ -1872,7 +1872,7 @@ class MaterialsTests(TestCase): self.assertNotIn('
', text) self.assertIn('charset="utf-8"', text) - test_file = StringIO(u'This is some text for a test, with the word\nvirtual at the beginning of a line.') + test_file = StringIO('This is some text for a test, with the word\nvirtual at the beginning of a line.') test_file.name = "not_really.txt" r = self.client.post(url,dict(file=test_file,apply_to_all=False)) self.assertEqual(r.status_code, 302) @@ -1883,7 +1883,7 @@ class MaterialsTests(TestCase): r = self.client.get(url) self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertTrue('Revise' in unicode(q("Title"))) + self.assertTrue('Revise' in str(q("Title"))) test_file = StringIO('this is some different text for a test') test_file.name = "also_not_really.txt" r = self.client.post(url,dict(file=test_file,apply_to_all=True)) @@ -1893,7 +1893,7 @@ class MaterialsTests(TestCase): self.assertTrue(session2.sessionpresentation_set.filter(document__type_id=doctype)) # Test bad encoding - test_file = StringIO(u'

Title

Some\x93text
'.encode('latin1')) + test_file = StringIO('

Title

Some\x93text
'.encode('latin1')) test_file.name = "some.html" r = self.client.post(url,dict(file=test_file)) self.assertContains(r, 'Could not identify the file encoding') @@ -1917,7 +1917,7 @@ class MaterialsTests(TestCase): r = self.client.get(url) self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertTrue('Upload' in unicode(q("Title"))) + self.assertTrue('Upload' in str(q("Title"))) self.assertFalse(session.sessionpresentation_set.exists()) self.assertFalse(q('form input[type="checkbox"]')) @@ -1938,7 +1938,7 @@ class MaterialsTests(TestCase): r = self.client.get(url) self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertTrue('Upload' in unicode(q("title"))) + self.assertTrue('Upload' in str(q("title"))) self.assertFalse(session.sessionpresentation_set.filter(document__type_id=doctype)) test_file = StringIO('this is some text for a test') test_file.name = "not_really.txt" @@ -1961,7 +1961,7 @@ class MaterialsTests(TestCase): r = self.client.get(url) self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertTrue('Upload' in unicode(q("title"))) + self.assertTrue('Upload' in str(q("title"))) self.assertFalse(session1.sessionpresentation_set.filter(document__type_id='slides')) test_file = StringIO('this is not really a slide') test_file.name = 'not_really.txt' @@ -1982,14 +1982,14 @@ class MaterialsTests(TestCase): self.assertEqual(session2.sessionpresentation_set.count(),2) sp = session2.sessionpresentation_set.get(document__name__endswith='-a-different-slide-file') self.assertEqual(sp.order,2) - self.assertEqual(sp.rev,u'00') - self.assertEqual(sp.document.rev,u'00') + self.assertEqual(sp.rev,'00') + self.assertEqual(sp.document.rev,'00') url = urlreverse('ietf.meeting.views.upload_session_slides',kwargs={'num':session2.meeting.number,'session_id':session2.id,'name':session2.sessionpresentation_set.get(order=2).document.name}) r = self.client.get(url) self.assertTrue(r.status_code, 200) q = PyQuery(r.content) - self.assertTrue('Revise' in unicode(q("title"))) + self.assertTrue('Revise' in str(q("title"))) test_file = StringIO('new content for the second slide deck') test_file.name = 'doesnotmatter.txt' r = self.client.post(url,dict(file=test_file,title='rename the presentation',apply_to_all=False)) @@ -1997,8 +1997,8 @@ class MaterialsTests(TestCase): self.assertEqual(session1.sessionpresentation_set.count(),1) self.assertEqual(session2.sessionpresentation_set.count(),2) sp = session2.sessionpresentation_set.get(order=2) - self.assertEqual(sp.rev,u'01') - self.assertEqual(sp.document.rev,u'01') + self.assertEqual(sp.rev,'01') + self.assertEqual(sp.document.rev,'01') def test_remove_sessionpresentation(self): session = SessionFactory(meeting__type_id='ietf') diff --git a/ietf/meeting/utils.py b/ietf/meeting/utils.py index f57d3b625..296e9ac08 100644 --- a/ietf/meeting/utils.py +++ b/ietf/meeting/utils.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2016-2019, All Rights Reserved import datetime import json -import urllib2 +import urllib.request, urllib.error, urllib.parse from django.conf import settings from django.template.loader import render_to_string @@ -87,8 +88,8 @@ def create_proceedings_templates(meeting): # Get meeting attendees from registration system url = settings.STATS_REGISTRATION_ATTENDEES_JSON_URL.format(number=meeting.number) try: - attendees = json.load(urllib2.urlopen(url)) - except (ValueError, urllib2.HTTPError): + attendees = json.load(urllib.request.urlopen(url)) + except (ValueError, urllib.error.HTTPError): attendees = [] if attendees: diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py index 585dba5a5..95a444340 100644 --- a/ietf/meeting/views.py +++ b/ietf/meeting/views.py @@ -9,7 +9,7 @@ import os import pytz import re import tarfile -import urllib +import urllib.request, urllib.parse, urllib.error from calendar import timegm from collections import OrderedDict, Counter, deque @@ -523,7 +523,7 @@ def agenda_csv(schedule, filtered_assignments): headings = ["Date", "Start", "End", "Session", "Room", "Area", "Acronym", "Type", "Description", "Session ID", "Agenda", "Slides"] def write_row(row): - encoded_row = [v.encode('utf-8') if isinstance(v, unicode) else v for v in row] + encoded_row = [v.encode('utf-8') if isinstance(v, str) else v for v in row] while len(encoded_row) < len(headings): encoded_row.append(None) # produce empty entries at the end as necessary @@ -693,7 +693,7 @@ def session_draft_tarfile(request, num, acronym): try: tarstream.add(pdf_path, str(doc_name + ".pdf")) manifest.write("Included: "+pdf_path+"\n") - except Exception, e: + except Exception as e: manifest.write(("Failed (%s): "%e)+pdf_path+"\n") else: manifest.write("Not found: "+pdf_path+"\n") @@ -873,7 +873,7 @@ def ical_agenda(request, num=None, name=None, acronym=None, session_id=None): raise Http404 q = request.META.get('QUERY_STRING','') or "" - filter = set(urllib.unquote(q).lower().split(',')) + filter = set(urllib.parse.unquote(q).lower().split(',')) include = [ i for i in filter if not (i.startswith('-') or i.startswith('~')) ] include_types = set(["plenary","other"]) exclude = [] diff --git a/ietf/message/migrations/0001_initial.py b/ietf/message/migrations/0001_initial.py index 6a004fd87..dad23f182 100644 --- a/ietf/message/migrations/0001_initial.py +++ b/ietf/message/migrations/0001_initial.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-02-20 10:52 -from __future__ import unicode_literals + import datetime from django.db import migrations, models diff --git a/ietf/message/migrations/0002_add_message_docs2_m2m.py b/ietf/message/migrations/0002_add_message_docs2_m2m.py index 6cb7f27a0..9f65c4a84 100644 --- a/ietf/message/migrations/0002_add_message_docs2_m2m.py +++ b/ietf/message/migrations/0002_add_message_docs2_m2m.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-21 14:23 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion diff --git a/ietf/message/migrations/0003_set_document_m2m_keys.py b/ietf/message/migrations/0003_set_document_m2m_keys.py index a6da567d4..70d1b08fa 100644 --- a/ietf/message/migrations/0003_set_document_m2m_keys.py +++ b/ietf/message/migrations/0003_set_document_m2m_keys.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-21 14:27 -from __future__ import unicode_literals + import sys @@ -20,7 +20,7 @@ def forward(apps, schema_editor): # Document id fixup ------------------------------------------------------------ objs = Document.objects.in_bulk() - nameid = { o.name: o.id for id, o in objs.iteritems() } + nameid = { o.name: o.id for id, o in objs.items() } sys.stderr.write('\n') diff --git a/ietf/message/migrations/0004_1_del_docs_m2m_table.py b/ietf/message/migrations/0004_1_del_docs_m2m_table.py index 328b6cdcf..38e160a91 100644 --- a/ietf/message/migrations/0004_1_del_docs_m2m_table.py +++ b/ietf/message/migrations/0004_1_del_docs_m2m_table.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-22 08:01 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/message/migrations/0004_2_add_docs_m2m_table.py b/ietf/message/migrations/0004_2_add_docs_m2m_table.py index 064b2e085..8fc173e5a 100644 --- a/ietf/message/migrations/0004_2_add_docs_m2m_table.py +++ b/ietf/message/migrations/0004_2_add_docs_m2m_table.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-22 08:01 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/message/migrations/0005_copy_docs_m2m_table.py b/ietf/message/migrations/0005_copy_docs_m2m_table.py index 7959d0365..4a52e9096 100644 --- a/ietf/message/migrations/0005_copy_docs_m2m_table.py +++ b/ietf/message/migrations/0005_copy_docs_m2m_table.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-27 05:56 -from __future__ import unicode_literals + import sys, time diff --git a/ietf/message/migrations/0006_remove_docs2_m2m.py b/ietf/message/migrations/0006_remove_docs2_m2m.py index 527eb5595..c3e54f232 100644 --- a/ietf/message/migrations/0006_remove_docs2_m2m.py +++ b/ietf/message/migrations/0006_remove_docs2_m2m.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-30 03:32 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/message/models.py b/ietf/message/models.py index 6fc243dc0..3e06e7da4 100644 --- a/ietf/message/models.py +++ b/ietf/message/models.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2012-2019, All Rights Reserved import datetime import email.utils @@ -67,7 +68,7 @@ class SendQueue(models.Model): ordering = ['time'] def __unicode__(self): - return u"'%s' %s -> %s (sent at %s)" % (self.message.subject, self.message.frm, self.message.to, self.sent_at or "") + return "'%s' %s -> %s (sent at %s)" % (self.message.subject, self.message.frm, self.message.to, self.sent_at or "") class AnnouncementFrom(models.Model): diff --git a/ietf/message/tests.py b/ietf/message/tests.py index 5a69b3cd8..a9ca78b67 100644 --- a/ietf/message/tests.py +++ b/ietf/message/tests.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2013-2019, All Rights Reserved import datetime from django.urls import reverse as urlreverse @@ -40,7 +41,7 @@ class SendScheduledAnnouncementsTests(TestCase): frm="testmonkey@example.com", cc="cc.a@example.com, cc.b@example.com", bcc="bcc@example.com", - body=u"Hello World!", + body="Hello World!", content_type="", ) @@ -66,7 +67,7 @@ class SendScheduledAnnouncementsTests(TestCase): frm="testmonkey@example.com", cc="cc.a@example.com, cc.b@example.com", bcc="bcc@example.com", - body=u'--NextPart\r\n\r\nA New Internet-Draft is available from the on-line Internet-Drafts directories.\r\n--NextPart\r\nContent-Type: Message/External-body;\r\n\tname="draft-huang-behave-bih-01.txt";\r\n\tsite="ftp.ietf.org";\r\n\taccess-type="anon-ftp";\r\n\tdirectory="internet-drafts"\r\n\r\nContent-Type: text/plain\r\nContent-ID: <2010-07-30001541.I-D@ietf.org>\r\n\r\n--NextPart--', + body='--NextPart\r\n\r\nA New Internet-Draft is available from the on-line Internet-Drafts directories.\r\n--NextPart\r\nContent-Type: Message/External-body;\r\n\tname="draft-huang-behave-bih-01.txt";\r\n\tsite="ftp.ietf.org";\r\n\taccess-type="anon-ftp";\r\n\tdirectory="internet-drafts"\r\n\r\nContent-Type: text/plain\r\nContent-ID: <2010-07-30001541.I-D@ietf.org>\r\n\r\n--NextPart--', content_type='Multipart/Mixed; Boundary="NextPart"', ) diff --git a/ietf/middleware.py b/ietf/middleware.py index b8098d2df..fcb7687c4 100644 --- a/ietf/middleware.py +++ b/ietf/middleware.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2007, All Rights Reserved +# Copyright The IETF Trust 2007-2019, All Rights Reserved from django.db import connection from django.db.utils import OperationalError @@ -58,7 +58,7 @@ def unicode_nfkc_normalization_middleware(get_response): def unicode_nfkc_normalization(request): """Do Unicode NFKC normalization to turn ligatures into individual characters. This was prompted by somebody actually requesting an url for /wg/ipfix/charter - where the 'fi' was composed of an \ufb01 ligature... + where the 'fi' was composed of an \\ufb01 ligature... There are probably other elements of a request which may need this normalization too, but let's put that in as it comes up, rather than guess ahead. diff --git a/ietf/name/migrations/0001_initial.py b/ietf/name/migrations/0001_initial.py index fab75d062..b7e31cf98 100644 --- a/ietf/name/migrations/0001_initial.py +++ b/ietf/name/migrations/0001_initial.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-02-20 10:52 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion diff --git a/ietf/name/migrations/0002_agendatypename.py b/ietf/name/migrations/0002_agendatypename.py index 11fd824df..4089f9b73 100644 --- a/ietf/name/migrations/0002_agendatypename.py +++ b/ietf/name/migrations/0002_agendatypename.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.13 on 2018-07-10 13:47 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/name/migrations/0003_agendatypename_data.py b/ietf/name/migrations/0003_agendatypename_data.py index 175ffb66e..c5d224bab 100644 --- a/ietf/name/migrations/0003_agendatypename_data.py +++ b/ietf/name/migrations/0003_agendatypename_data.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.13 on 2018-07-10 13:47 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/name/migrations/0004_add_prefix_to_doctypenames.py b/ietf/name/migrations/0004_add_prefix_to_doctypenames.py index 2749f561f..31a3d60cc 100644 --- a/ietf/name/migrations/0004_add_prefix_to_doctypenames.py +++ b/ietf/name/migrations/0004_add_prefix_to_doctypenames.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.16 on 2018-10-19 11:34 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/name/migrations/0005_reviewassignmentstatename.py b/ietf/name/migrations/0005_reviewassignmentstatename.py index dbf253e51..9b2567e0c 100644 --- a/ietf/name/migrations/0005_reviewassignmentstatename.py +++ b/ietf/name/migrations/0005_reviewassignmentstatename.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.18 on 2019-01-04 13:59 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/name/migrations/0006_adjust_statenames.py b/ietf/name/migrations/0006_adjust_statenames.py index f3954906d..763034d76 100644 --- a/ietf/name/migrations/0006_adjust_statenames.py +++ b/ietf/name/migrations/0006_adjust_statenames.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.18 on 2019-01-04 14:02 -from __future__ import unicode_literals + from django.db import migrations @@ -78,7 +79,7 @@ def forward(apps, schema_editor): for entry in assignment_states: name, created = ReviewAssignmentStateName.objects.get_or_create(slug=entry['slug']) if created: - for k, v in entry.items(): + for k, v in list(entry.items()): setattr(name, k, v) name.save() diff --git a/ietf/nomcom/admin.py b/ietf/nomcom/admin.py index d6e0170d9..6e25736e0 100644 --- a/ietf/nomcom/admin.py +++ b/ietf/nomcom/admin.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2012-2019, All Rights Reserved from django.contrib import admin from ietf.nomcom.models import ( ReminderDates, NomCom, Nomination, Nominee, NomineePosition, @@ -43,7 +44,7 @@ admin.site.register(Position, PositionAdmin) class FeedbackAdmin(admin.ModelAdmin): def nominee(self, obj): - return u", ".join(n.person.ascii for n in obj.nominees.all()) + return ", ".join(n.person.ascii for n in obj.nominees.all()) nominee.admin_order_field = 'nominees__person__ascii' list_display = ['id', 'nomcom', 'author', 'nominee', 'subject', 'type', 'user', 'time'] diff --git a/ietf/nomcom/decorators.py b/ietf/nomcom/decorators.py index 231661799..99d85d487 100644 --- a/ietf/nomcom/decorators.py +++ b/ietf/nomcom/decorators.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2012-2019, All Rights Reserved import functools from django.urls import reverse @@ -9,7 +10,7 @@ def nomcom_private_key_required(view_func): def inner(request, *args, **kwargs): year = kwargs.get('year', None) if not year: - raise Exception, 'View decorated with nomcom_private_key_required must receive a year argument' + raise Exception('View decorated with nomcom_private_key_required must receive a year argument') if not 'NOMCOM_PRIVATE_KEY_%s' % year in request.session: return HttpResponseRedirect('%s?back_to=%s' % (reverse('ietf.nomcom.views.private_key', None, args=(year, )), urlquote(request.get_full_path()))) else: diff --git a/ietf/nomcom/forms.py b/ietf/nomcom/forms.py index e7791f12e..c343c5d11 100644 --- a/ietf/nomcom/forms.py +++ b/ietf/nomcom/forms.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2012-2019, All Rights Reserved from django.conf import settings from django import forms from django.urls import reverse @@ -32,12 +33,12 @@ class PositionNomineeField(forms.ChoiceField): results = [] for position in positions: accepted_nominees = [np.nominee for np in NomineePosition.objects.filter(position=position,state='accepted').exclude(nominee__duplicated__isnull=False)] - nominees = [('%s_%s' % (position.id, i.id), unicode(i)) for i in accepted_nominees] + nominees = [('%s_%s' % (position.id, i.id), str(i)) for i in accepted_nominees] if nominees: results.append((position.name+" (Accepted)", nominees)) for position in positions: other_nominees = [np.nominee for np in NomineePosition.objects.filter(position=position).exclude(state='accepted').exclude(nominee__duplicated__isnull=False)] - nominees = [('%s_%s' % (position.id, i.id), unicode(i)) for i in other_nominees] + nominees = [('%s_%s' % (position.id, i.id), str(i)) for i in other_nominees] if nominees: results.append((position.name+" (Declined or Pending)", nominees)) kwargs['choices'] = results diff --git a/ietf/nomcom/management/commands/feedback_email.py b/ietf/nomcom/management/commands/feedback_email.py index 99a003bd9..3c4ae9f96 100644 --- a/ietf/nomcom/management/commands/feedback_email.py +++ b/ietf/nomcom/management/commands/feedback_email.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2013-2019, All Rights Reserved import sys from django.core.management.base import BaseCommand, CommandError @@ -10,7 +11,7 @@ from ietf.nomcom.fields import EncryptedException import debug # pyflakes:ignore class Command(BaseCommand): - help = (u"Receive nomcom email, encrypt and save it.") + help = ("Receive nomcom email, encrypt and save it.") def add_arguments(self, parser): parser.add_argument('--nomcom-year', dest='year', help='NomCom year') @@ -40,6 +41,6 @@ class Command(BaseCommand): try: feedback = create_feedback_email(nomcom, msg) - log(u"Received nomcom email from %s" % feedback.author) + log("Received nomcom email from %s" % feedback.author) except (EncryptedException, ValueError) as e: raise CommandError(e) diff --git a/ietf/nomcom/management/commands/make_dummy_nomcom.py b/ietf/nomcom/management/commands/make_dummy_nomcom.py index a6724a326..bb55ba9f2 100644 --- a/ietf/nomcom/management/commands/make_dummy_nomcom.py +++ b/ietf/nomcom/management/commands/make_dummy_nomcom.py @@ -1,6 +1,6 @@ -# Copyright The IETF Trust 2016, All Rights Reserved +# Copyright The IETF Trust 2017-2019, All Rights Reserved # -*- coding: utf-8 -*- -from __future__ import unicode_literals, print_function + import socket @@ -14,7 +14,7 @@ from ietf.group.models import Group from ietf.person.models import User class Command(BaseCommand): - help = (u"Create (or delete) a dummy nomcom for test and development purposes.") + help = ("Create (or delete) a dummy nomcom for test and development purposes.") def add_arguments(self, parser): parser.add_argument('--delete', dest='delete', action='store_true', help='Delete the test and development dummy nomcom') @@ -39,22 +39,22 @@ class Command(BaseCommand): populate_personnel=False, populate_positions=False)) - e = EmailFactory(person__name=u'Dummy Chair', address=u'dummychair@example.com', person__user__username=u'dummychair', person__default_emails=False, origin='dummychair') + e = EmailFactory(person__name='Dummy Chair', address='dummychair@example.com', person__user__username='dummychair', person__default_emails=False, origin='dummychair') e.person.user.set_password('password') e.person.user.save() - nc.group.role_set.create(name_id=u'chair',person=e.person,email=e) + nc.group.role_set.create(name_id='chair',person=e.person,email=e) - e = EmailFactory(person__name=u'Dummy Member', address=u'dummymember@example.com', person__user__username=u'dummymember', person__default_emails=False, origin='dummymember') + e = EmailFactory(person__name='Dummy Member', address='dummymember@example.com', person__user__username='dummymember', person__default_emails=False, origin='dummymember') e.person.user.set_password('password') e.person.user.save() - nc.group.role_set.create(name_id=u'member',person=e.person,email=e) + nc.group.role_set.create(name_id='member',person=e.person,email=e) - e = EmailFactory(person__name=u'Dummy Candidate', address=u'dummycandidate@example.com', person__user__username=u'dummycandidate', person__default_emails=False, origin='dummycandidate') + e = EmailFactory(person__name='Dummy Candidate', address='dummycandidate@example.com', person__user__username='dummycandidate', person__default_emails=False, origin='dummycandidate') e.person.user.set_password('password') e.person.user.save() NomineePositionFactory(nominee__nomcom=nc, nominee__person=e.person, - position__nomcom=nc, position__name=u'Dummy Area Director', + position__nomcom=nc, position__name='Dummy Area Director', ) self.stdout.write("%s\n" % key) diff --git a/ietf/nomcom/management/commands/send_reminders.py b/ietf/nomcom/management/commands/send_reminders.py index b8e83fd09..85318df60 100644 --- a/ietf/nomcom/management/commands/send_reminders.py +++ b/ietf/nomcom/management/commands/send_reminders.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2013-2019, All Rights Reserved import datetime import syslog @@ -17,7 +18,7 @@ def is_time_to_send(nomcom,send_date,nomination_date): return bool(nomcom.reminderdates_set.filter(date=send_date)) class Command(BaseCommand): - help = (u"Send acceptance and questionnaire reminders to nominees") + help = ("Send acceptance and questionnaire reminders to nominees") def handle(self, *args, **options): for nomcom in NomCom.objects.filter(group__state__slug='active'): diff --git a/ietf/nomcom/migrations/0001_initial.py b/ietf/nomcom/migrations/0001_initial.py index ca498d684..d45a1a33b 100644 --- a/ietf/nomcom/migrations/0001_initial.py +++ b/ietf/nomcom/migrations/0001_initial.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-02-20 10:52 -from __future__ import unicode_literals + from django.conf import settings from django.db import migrations, models diff --git a/ietf/nomcom/migrations/0002_auto_20180918_0550.py b/ietf/nomcom/migrations/0002_auto_20180918_0550.py index ad4b76928..9c68a359a 100644 --- a/ietf/nomcom/migrations/0002_auto_20180918_0550.py +++ b/ietf/nomcom/migrations/0002_auto_20180918_0550.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2018-09-18 05:50 -from __future__ import unicode_literals + from django.conf import settings from django.db import migrations diff --git a/ietf/nomcom/migrations/0003_nomcom_show_accepted_nominees.py b/ietf/nomcom/migrations/0003_nomcom_show_accepted_nominees.py index a6691afd2..ec16a045f 100644 --- a/ietf/nomcom/migrations/0003_nomcom_show_accepted_nominees.py +++ b/ietf/nomcom/migrations/0003_nomcom_show_accepted_nominees.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2018-09-26 11:10 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/nomcom/migrations/0004_set_show_accepted_nominees_false_on_existing_nomcoms.py b/ietf/nomcom/migrations/0004_set_show_accepted_nominees_false_on_existing_nomcoms.py index 49bf943d9..05245b4c0 100644 --- a/ietf/nomcom/migrations/0004_set_show_accepted_nominees_false_on_existing_nomcoms.py +++ b/ietf/nomcom/migrations/0004_set_show_accepted_nominees_false_on_existing_nomcoms.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2018-09-26 11:12 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/nomcom/migrations/0005_auto_20181008_0602.py b/ietf/nomcom/migrations/0005_auto_20181008_0602.py index e35b95660..3a6f42805 100644 --- a/ietf/nomcom/migrations/0005_auto_20181008_0602.py +++ b/ietf/nomcom/migrations/0005_auto_20181008_0602.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.16 on 2018-10-08 06:02 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/nomcom/models.py b/ietf/nomcom/models.py index 9429d2541..8f8901e83 100644 --- a/ietf/nomcom/models.py +++ b/ietf/nomcom/models.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2012-2019, All Rights Reserved # -*- coding: utf-8 -*- import os @@ -108,7 +109,7 @@ class Nomination(models.Model): verbose_name_plural = 'Nominations' def __unicode__(self): - return u"%s (%s)" % (self.candidate_name, self.candidate_email) + return "%s (%s)" % (self.candidate_name, self.candidate_email) class Nominee(models.Model): @@ -128,13 +129,13 @@ class Nominee(models.Model): def __unicode__(self): if self.email.person and self.email.person.name: - return u'%s <%s> %s' % (self.email.person.plain_name(), self.email.address, self.nomcom.year()) + return '%s <%s> %s' % (self.email.person.plain_name(), self.email.address, self.nomcom.year()) else: - return u'%s %s' % (self.email.address, self.nomcom.year()) + return '%s %s' % (self.email.address, self.nomcom.year()) def name(self): if self.email.person and self.email.person.name: - return u'%s' % (self.email.person.plain_name(),) + return '%s' % (self.email.person.plain_name(),) else: return self.email.address @@ -159,7 +160,7 @@ class NomineePosition(models.Model): super(NomineePosition, self).save(**kwargs) def __unicode__(self): - return u"%s - %s - %s" % (self.nominee, self.state, self.position) + return "%s - %s - %s" % (self.nominee, self.state, self.position) @property def questionnaires(self): @@ -257,7 +258,7 @@ class Feedback(models.Model): objects = FeedbackManager() def __unicode__(self): - return u"from %s" % self.author + return "from %s" % self.author class Meta: ordering = ['time'] diff --git a/ietf/nomcom/tests.py b/ietf/nomcom/tests.py index a6d312a0d..6785e3b05 100644 --- a/ietf/nomcom/tests.py +++ b/ietf/nomcom/tests.py @@ -1,9 +1,10 @@ +# Copyright The IETF Trust 2012-2019, All Rights Reserved # -*- coding: utf-8 -*- #import tempfile import datetime import random import shutil -import urlparse +import urllib.parse from pyquery import PyQuery from django.db import IntegrityError @@ -175,10 +176,10 @@ class NomcomViewsTest(TestCase): def test_private_merge_view(self): """Verify private nominee merge view""" - nominees = [u'nominee0@example.com', - u'nominee1@example.com', - u'nominee2@example.com', - u'nominee3@example.com'] + nominees = ['nominee0@example.com', + 'nominee1@example.com', + 'nominee2@example.com', + 'nominee3@example.com'] # do nominations login_testing_unauthorized(self, COMMUNITY_USER, self.public_nominate_url) @@ -333,7 +334,7 @@ class NomcomViewsTest(TestCase): response = self.client.post(self.private_merge_nominee_url, test_data) self.assertEqual(response.status_code, 302) redirect_url = response["Location"] - redirect_path = urlparse.urlparse(redirect_url).path + redirect_path = urllib.parse.urlparse(redirect_url).path self.assertEqual(redirect_path, reverse('ietf.nomcom.views.private_index', kwargs={"year": NOMCOM_YEAR})) response = self.client.get(redirect_url) @@ -369,16 +370,16 @@ class NomcomViewsTest(TestCase): # Check nominations state self.assertEqual(NomineePosition.objects.get(position__name='TSV', - nominee=nominee).state.slug, u'accepted') + nominee=nominee).state.slug, 'accepted') self.assertEqual(NomineePosition.objects.get(position__name='IAOC', - nominee=nominee).state.slug, u'accepted') + nominee=nominee).state.slug, 'accepted') self.assertEqual(NomineePosition.objects.get(position__name='IAB', - nominee=nominee).state.slug, u'declined') + nominee=nominee).state.slug, 'declined') self.client.logout() def change_members(self, members): - members_emails = u','.join(['%s%s' % (member, EMAIL_DOMAIN) for member in members]) + members_emails = ','.join(['%s%s' % (member, EMAIL_DOMAIN) for member in members]) test_data = {'members': members_emails,} self.client.post(self.edit_members_url, test_data) @@ -421,7 +422,7 @@ class NomcomViewsTest(TestCase): nominee = Nominee.objects.get(email__person__user__username=COMMUNITY_USER) position = Position.objects.get(name='OAM') - comments = u'Plain text. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.' + comments = 'Plain text. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.' nomcom = get_nomcom_by_year(self.year) feedback = Feedback.objects.create(nomcom=nomcom, comments=comments, @@ -436,7 +437,7 @@ class NomcomViewsTest(TestCase): # Check that the set reminder date is present reminder_dates = dict([ (d.id,str(d.date)) for d in nomcom.reminderdates_set.all() ]) - self.assertIn(reminder_date, reminder_dates.values()) + self.assertIn(reminder_date, list(reminder_dates.values())) # Remove reminder date q = PyQuery(response.content) # from previous post @@ -444,14 +445,14 @@ class NomcomViewsTest(TestCase): 'reminderdates_set-TOTAL_FORMS': q('input[name="reminderdates_set-TOTAL_FORMS"]').val(), 'reminderdates_set-INITIAL_FORMS': q('input[name="reminderdates_set-INITIAL_FORMS"]').val(), 'reminderdates_set-MAX_NUM_FORMS': q('input[name="reminderdates_set-MAX_NUM_FORMS"]').val(), - 'reminderdates_set-0-id': str(reminder_dates.keys()[0]), + 'reminderdates_set-0-id': str(list(reminder_dates.keys())[0]), 'reminderdates_set-0-date': '', }) self.assertEqual(r.status_code, 200) # Check that reminder date has been removed reminder_dates = dict([ (d.id,str(d.date)) for d in ReminderDates.objects.filter(nomcom=nomcom) ]) - self.assertNotIn(reminder_date, reminder_dates.values()) + self.assertNotIn(reminder_date, list(reminder_dates.values())) self.client.logout() @@ -519,7 +520,7 @@ class NomcomViewsTest(TestCase): self.assertEqual('Nomination receipt', outbox[-1]['Subject']) self.assertEqual(self.email_from, outbox[-1]['From']) self.assertIn('plain', outbox[-1]['To']) - self.assertIn(u'Comments with accents äöå', unicode(outbox[-1].get_payload(decode=True),"utf-8","replace")) + self.assertIn('Comments with accents äöå', str(outbox[-1].get_payload(decode=True),"utf-8","replace")) # Nominate the same person for the same position again without asking for confirmation @@ -560,7 +561,7 @@ class NomcomViewsTest(TestCase): self.assertEqual('Nomination receipt', outbox[-1]['Subject']) self.assertEqual(self.email_from, outbox[-1]['From']) self.assertIn('plain', outbox[-1]['To']) - self.assertIn(u'Comments with accents äöå', unicode(outbox[-1].get_payload(decode=True),"utf-8","replace")) + self.assertIn('Comments with accents äöå', str(outbox[-1].get_payload(decode=True),"utf-8","replace")) # Nominate the same person for the same position again without asking for confirmation @@ -594,7 +595,7 @@ class NomcomViewsTest(TestCase): def nominate_view(self, *args, **kwargs): public = kwargs.pop('public', True) searched_email = kwargs.pop('searched_email', None) - nominee_email = kwargs.pop('nominee_email', u'nominee@example.com') + nominee_email = kwargs.pop('nominee_email', 'nominee@example.com') if not searched_email: searched_email = Email.objects.filter(address=nominee_email).first() if not searched_email: @@ -628,8 +629,8 @@ class NomcomViewsTest(TestCase): self.assertEqual(len(q("#nominate-form")), 1) position = Position.objects.get(name=position_name) - comments = u'Test nominate view. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.' - candidate_phone = u'123456' + comments = 'Test nominate view. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.' + candidate_phone = '123456' test_data = {'searched_email': searched_email.pk, 'candidate_phone': candidate_phone, @@ -667,7 +668,7 @@ class NomcomViewsTest(TestCase): def nominate_newperson_view(self, *args, **kwargs): public = kwargs.pop('public', True) - nominee_email = kwargs.pop('nominee_email', u'nominee@example.com') + nominee_email = kwargs.pop('nominee_email', 'nominee@example.com') nominator_email = kwargs.pop('nominator_email', "%s%s" % (COMMUNITY_USER, EMAIL_DOMAIN)) position_name = kwargs.pop('position', 'IAOC') confirmation = kwargs.pop('confirmation', False) @@ -695,9 +696,9 @@ class NomcomViewsTest(TestCase): position = Position.objects.get(name=position_name) candidate_email = nominee_email - candidate_name = u'nominee' - comments = u'Test nominate view. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.' - candidate_phone = u'123456' + candidate_name = 'nominee' + comments = 'Test nominate view. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.' + candidate_phone = '123456' test_data = {'candidate_name': candidate_name, 'candidate_email': candidate_email, @@ -744,7 +745,7 @@ class NomcomViewsTest(TestCase): def add_questionnaire(self, *args, **kwargs): public = kwargs.pop('public', False) - nominee_email = kwargs.pop('nominee_email', u'nominee@example.com') + nominee_email = kwargs.pop('nominee_email', 'nominee@example.com') nominator_email = kwargs.pop('nominator_email', "%s%s" % (COMMUNITY_USER, EMAIL_DOMAIN)) position_name = kwargs.pop('position', 'IAOC') @@ -771,7 +772,7 @@ class NomcomViewsTest(TestCase): position = Position.objects.get(name=position_name) nominee = Nominee.objects.get(email__address=nominee_email) - comments = u'Test add questionnaire view. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.' + comments = 'Test add questionnaire view. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.' test_data = {'comments': comments, 'nominee': '%s_%s' % (position.id, nominee.id)} @@ -806,7 +807,7 @@ class NomcomViewsTest(TestCase): self.assertNotIn('$', email_body) self.assertEqual(self.email_from, outbox[-2]['From']) self.assertIn('plain', outbox[2]['To']) - self.assertIn(u'Comments with accents äöå', unicode(outbox[2].get_payload(decode=True),"utf-8","replace")) + self.assertIn('Comments with accents äöå', str(outbox[2].get_payload(decode=True),"utf-8","replace")) empty_outbox() self.feedback_view(public=True) @@ -819,7 +820,7 @@ class NomcomViewsTest(TestCase): def feedback_view(self, *args, **kwargs): public = kwargs.pop('public', True) - nominee_email = kwargs.pop('nominee_email', u'nominee@example.com') + nominee_email = kwargs.pop('nominee_email', 'nominee@example.com') nominator_email = kwargs.pop('nominator_email', "%s%s" % (COMMUNITY_USER, EMAIL_DOMAIN)) position_name = kwargs.pop('position', 'IAOC') confirmation = kwargs.pop('confirmation', False) @@ -856,7 +857,7 @@ class NomcomViewsTest(TestCase): self.assertEqual(response.status_code, 200) self.assertContains(response, "feedbackform") - comments = u'Test feedback view. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.' + comments = 'Test feedback view. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.' test_data = {'comments': comments, 'position_name': position.name, @@ -960,7 +961,7 @@ class FeedbackTest(TestCase): #nomcom.public_key.storage.location = tempfile.gettempdir() nomcom.public_key.save('cert', File(open(self.cert_file.name, 'r'))) - comments = u'Plain text. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.' + comments = 'Plain text. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.' feedback = Feedback.objects.create(nomcom=nomcom, comments=comments, type=FeedbackTypeName.objects.get(slug='nomina')) @@ -989,8 +990,8 @@ class ReminderTest(TestCase): today = datetime.date.today() t_minus_3 = today - datetime.timedelta(days=3) t_minus_4 = today - datetime.timedelta(days=4) - e1 = EmailFactory(address="nominee1@example.org", person=PersonFactory(name=u"Nominee 1"), origin='test') - e2 = EmailFactory(address="nominee2@example.org", person=PersonFactory(name=u"Nominee 2"), origin='test') + e1 = EmailFactory(address="nominee1@example.org", person=PersonFactory(name="Nominee 1"), origin='test') + e2 = EmailFactory(address="nominee2@example.org", person=PersonFactory(name="Nominee 2"), origin='test') n = make_nomineeposition(self.nomcom,e1.person,gen,None) np = n.nomineeposition_set.get(position=gen) np.time = t_minus_3 @@ -1103,7 +1104,7 @@ class InactiveNomcomTests(TestCase): empty_outbox() fb_before = self.nc.feedback_set.count() - test_data = {'comments': u'Test feedback view. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.', + test_data = {'comments': 'Test feedback view. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.', 'nominator_email': self.plain_person.email_set.first().address, 'confirmation': True} response = self.client.post(url, test_data) diff --git a/ietf/nomcom/utils.py b/ietf/nomcom/utils.py index c95b5cd57..43be9b204 100644 --- a/ietf/nomcom/utils.py +++ b/ietf/nomcom/utils.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2012-2019, All Rights Reserved import datetime import hashlib import os @@ -399,9 +400,9 @@ def getheader(header_text, default="ascii"): """Decode the specified header""" headers = decode_header(header_text) - header_sections = [unicode(text, charset or default) + header_sections = [str(text, charset or default) for text, charset in headers] - return u"".join(header_sections) + return "".join(header_sections) def get_charset(message, default="ascii"): @@ -427,22 +428,22 @@ def get_body(message): body = [] for part in text_parts: charset = get_charset(part, get_charset(message)) - body.append(unicode(part.get_payload(decode=True), + body.append(str(part.get_payload(decode=True), charset, "replace")) - return u"\n".join(body).strip() + return "\n".join(body).strip() else: # if it is not multipart, the payload will be a string # representing the message body - body = unicode(message.get_payload(decode=True), + body = str(message.get_payload(decode=True), get_charset(message), "replace") return body.strip() def parse_email(text): - if isinstance(text, unicode): + if isinstance(text, str): text = smart_str(text) msg = message_from_string(text) diff --git a/ietf/nomcom/views.py b/ietf/nomcom/views.py index ba4a7f140..2da08cf68 100644 --- a/ietf/nomcom/views.py +++ b/ietf/nomcom/views.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2012-2019, All Rights Reserved import datetime import re from collections import OrderedDict, Counter @@ -179,7 +180,7 @@ def private_index(request, year): 'position__id':p.pk, 'position': p, } for p in positions] - states = list(NomineePositionStateName.objects.values('slug', 'name')) + [{'slug': questionnaire_state, 'name': u'Questionnaire'}] + states = list(NomineePositionStateName.objects.values('slug', 'name')) + [{'slug': questionnaire_state, 'name': 'Questionnaire'}] positions = set([ n.position for n in all_nominee_positions.order_by('position__name') ]) for s in stats: for state in states: diff --git a/ietf/person/factories.py b/ietf/person/factories.py index 627c9ed6a..e92b132c6 100644 --- a/ietf/person/factories.py +++ b/ietf/person/factories.py @@ -1,6 +1,6 @@ -# Copyright The IETF Trust 2014-2018, All Rights Reserved +# Copyright The IETF Trust 2015-2019, All Rights Reserved # -*- coding: utf-8 -*- -from __future__ import unicode_literals, print_function + import os import factory @@ -53,11 +53,11 @@ class PersonFactory(factory.DjangoModelFactory): model = Person user = factory.SubFactory(UserFactory) - name = factory.LazyAttribute(lambda p: normalize_name(u'%s %s'%(p.user.first_name, p.user.last_name))) - ascii = factory.LazyAttribute(lambda p: unicode(unidecode_name(p.name))) + name = factory.LazyAttribute(lambda p: normalize_name('%s %s'%(p.user.first_name, p.user.last_name))) + ascii = factory.LazyAttribute(lambda p: str(unidecode_name(p.name))) class Params: - with_bio = factory.Trait(biography = u"\n\n".join(fake.paragraphs())) + with_bio = factory.Trait(biography = "\n\n".join(fake.paragraphs())) @factory.post_generation def default_aliases(obj, create, extracted, **kwargs): # pylint: disable=no-self-argument @@ -82,7 +82,7 @@ class PersonFactory(factory.DjangoModelFactory): import atexit if obj.biography: photo_name = obj.photo_name() - media_name = u"%s/%s.jpg" % (settings.PHOTOS_DIRNAME, photo_name) + media_name = "%s/%s.jpg" % (settings.PHOTOS_DIRNAME, photo_name) obj.photo = media_name obj.photo_thumb = media_name photosrc = os.path.join(settings.TEST_DATA_DIR, "profile-default.jpg") diff --git a/ietf/person/fields.py b/ietf/person/fields.py index 1800179d1..c0c81c6be 100644 --- a/ietf/person/fields.py +++ b/ietf/person/fields.py @@ -1,8 +1,9 @@ +# Copyright The IETF Trust 2012-2019, All Rights Reserved import json import six from collections import Counter -from urllib import urlencode +from urllib.parse import urlencode from django.utils.html import escape from django import forms @@ -14,7 +15,7 @@ from ietf.person.models import Email, Person def select2_id_name_json(objs): def format_email(e): - return escape(u"%s <%s>" % (e.person.name, e.address)) + return escape("%s <%s>" % (e.person.name, e.address)) def format_person(p): if p.name_count > 1: return escape('%s (%s)' % (p.name,p.email().address if p.email() else 'no email address')) @@ -73,7 +74,7 @@ class SearchablePersonsField(forms.CharField): def prepare_value(self, value): if not value: value = "" - if isinstance(value, basestring): + if isinstance(value, str): pks = self.parse_select2_value(value) if self.model == Person: value = self.model.objects.filter(pk__in=pks) @@ -95,7 +96,7 @@ class SearchablePersonsField(forms.CharField): if query_args: self.widget.attrs["data-ajax-url"] += "?%s" % urlencode(query_args) - return u",".join(str(p.pk) for p in value) + return ",".join(str(p.pk) for p in value) def clean(self, value): value = super(SearchablePersonsField, self).clean(value) @@ -112,10 +113,10 @@ class SearchablePersonsField(forms.CharField): found_pks = [ six.text_type(o.pk) for o in objs] failed_pks = [x for x in pks if x not in found_pks] if failed_pks: - raise forms.ValidationError(u"Could not recognize the following {model_name}s: {pks}. You can only input {model_name}s already registered in the Datatracker.".format(pks=", ".join(failed_pks), model_name=self.model.__name__.lower())) + raise forms.ValidationError("Could not recognize the following {model_name}s: {pks}. You can only input {model_name}s already registered in the Datatracker.".format(pks=", ".join(failed_pks), model_name=self.model.__name__.lower())) if self.max_entries != None and len(objs) > self.max_entries: - raise forms.ValidationError(u"You can select at most %s entries only." % self.max_entries) + raise forms.ValidationError("You can select at most %s entries only." % self.max_entries) return objs @@ -162,9 +163,9 @@ class PersonEmailChoiceField(forms.ModelChoiceField): def label_from_instance(self, email): if self.label_with == "person": - return unicode(email.person) + return str(email.person) elif self.label_with == "email": return email.address else: - return u"{} <{}>".format(email.person, email.address) + return "{} <{}>".format(email.person, email.address) diff --git a/ietf/person/forms.py b/ietf/person/forms.py index aa7015b5c..2759c2ea7 100644 --- a/ietf/person/forms.py +++ b/ietf/person/forms.py @@ -1,6 +1,6 @@ -# Copyright The IETF Trust 2017, All Rights Reserved +# Copyright The IETF Trust 2018-2019, All Rights Reserved + -from __future__ import unicode_literals from django import forms from ietf.person.models import Person diff --git a/ietf/person/management/commands/deactivate_email_addresses.py b/ietf/person/management/commands/deactivate_email_addresses.py index 0218630ed..e5ec9e348 100644 --- a/ietf/person/management/commands/deactivate_email_addresses.py +++ b/ietf/person/management/commands/deactivate_email_addresses.py @@ -1,6 +1,6 @@ -# Copyright The IETF Trust 2016, All Rights Reserved +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- -from __future__ import unicode_literals, print_function + import flufl.bounce import mailbox @@ -18,7 +18,7 @@ from ietf.person.models import Email, PersonEvent class Command(BaseCommand): - help = (u""" + help = (""" Deactivate bouncing email addresses. Take one or more email addresses to deactivate from the command line, diff --git a/ietf/person/migrations/0001_initial.py b/ietf/person/migrations/0001_initial.py index f04d7b4e4..f406c4221 100644 --- a/ietf/person/migrations/0001_initial.py +++ b/ietf/person/migrations/0001_initial.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-02-20 10:52 -from __future__ import unicode_literals + import datetime from django.conf import settings diff --git a/ietf/person/migrations/0002_auto_20180330_0808.py b/ietf/person/migrations/0002_auto_20180330_0808.py index 6c852f67c..03ffc8363 100644 --- a/ietf/person/migrations/0002_auto_20180330_0808.py +++ b/ietf/person/migrations/0002_auto_20180330_0808.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2018-03-30 08:08 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/person/migrations/0003_auto_20180504_1519.py b/ietf/person/migrations/0003_auto_20180504_1519.py index 7abd048e2..db7d6ca55 100644 --- a/ietf/person/migrations/0003_auto_20180504_1519.py +++ b/ietf/person/migrations/0003_auto_20180504_1519.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.12 on 2018-05-04 15:19 -from __future__ import unicode_literals + import datetime from django.conf import settings diff --git a/ietf/person/migrations/0004_populate_email_origin.py b/ietf/person/migrations/0004_populate_email_origin.py index 3d30f9abb..55a926665 100644 --- a/ietf/person/migrations/0004_populate_email_origin.py +++ b/ietf/person/migrations/0004_populate_email_origin.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.12 on 2018-05-10 05:28 -from __future__ import unicode_literals + import sys diff --git a/ietf/person/migrations/0005_populate_person_name_from_draft.py b/ietf/person/migrations/0005_populate_person_name_from_draft.py index 62caa3868..3eb26ce63 100644 --- a/ietf/person/migrations/0005_populate_person_name_from_draft.py +++ b/ietf/person/migrations/0005_populate_person_name_from_draft.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.12 on 2018-05-10 05:28 -from __future__ import unicode_literals + import sys diff --git a/ietf/person/migrations/0006_auto_20180910_0719.py b/ietf/person/migrations/0006_auto_20180910_0719.py index cfdb07b6e..44d280305 100644 --- a/ietf/person/migrations/0006_auto_20180910_0719.py +++ b/ietf/person/migrations/0006_auto_20180910_0719.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.13 on 2018-09-10 07:19 -from __future__ import unicode_literals + from django.conf import settings from django.db import migrations diff --git a/ietf/person/migrations/0007_auto_20180929_1303.py b/ietf/person/migrations/0007_auto_20180929_1303.py index c8440c6a5..de1b3660f 100644 --- a/ietf/person/migrations/0007_auto_20180929_1303.py +++ b/ietf/person/migrations/0007_auto_20180929_1303.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2018-09-29 13:03 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/person/migrations/0008_auto_20181014_1448.py b/ietf/person/migrations/0008_auto_20181014_1448.py index 8c0292974..8a7116e8a 100644 --- a/ietf/person/migrations/0008_auto_20181014_1448.py +++ b/ietf/person/migrations/0008_auto_20181014_1448.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.16 on 2018-10-14 14:48 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/person/migrations/0009_auto_20190118_0725.py b/ietf/person/migrations/0009_auto_20190118_0725.py index e3a1e4233..24c6148b4 100644 --- a/ietf/person/migrations/0009_auto_20190118_0725.py +++ b/ietf/person/migrations/0009_auto_20190118_0725.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.18 on 2019-01-18 07:25 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/person/models.py b/ietf/person/models.py index d0159c69c..ef0ea7b3d 100644 --- a/ietf/person/models.py +++ b/ietf/person/models.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2007, All Rights Reserved +# Copyright The IETF Trust 2010-2019, All Rights Reserved import datetime import email.utils @@ -7,7 +7,7 @@ import six import uuid from hashids import Hashids -from urlparse import urljoin +from urllib.parse import urljoin from django.conf import settings @@ -83,7 +83,7 @@ class Person(models.Model): else: ascii = unidecode_name(self.name) prefix, first, middle, last, suffix = name_parts(ascii) - self._cached_plain_ascii = u" ".join([first, last]) + self._cached_plain_ascii = " ".join([first, last]) return self._cached_plain_ascii def initials(self): return initials(self.ascii or self.name) @@ -96,7 +96,7 @@ class Person(models.Model): may be an object or the group acronym.""" if group: from ietf.group.models import Group - if isinstance(group, str) or isinstance(group, unicode): + if isinstance(group, str) or isinstance(group, str): group = Group.objects.get(acronym=group) e = Email.objects.filter(person=self, role__group=group, role__name=role_name) else: @@ -144,7 +144,7 @@ class Person(models.Model): def photo_name(self,thumb=False): hasher = Hashids(salt='Person photo name salt',min_length=5) _, first, _, last, _ = name_parts(self.ascii) - return u'%s-%s%s' % ( slugify(u"%s %s" % (first, last)), hasher.encode(self.id), '-th' if thumb else '' ) + return '%s-%s%s' % ( slugify("%s %s" % (first, last)), hasher.encode(self.id), '-th' if thumb else '' ) def has_drafts(self): from ietf.doc.models import Document @@ -281,9 +281,9 @@ class Email(models.Model): Use self.formatted_email() for that. """ if self.person: - return u"%s <%s>" % (self.person.plain_name(), self.address) + return "%s <%s>" % (self.person.plain_name(), self.address) else: - return u"<%s>" % self.address + return "<%s>" % self.address def formatted_email(self): """ @@ -376,7 +376,7 @@ class PersonEvent(models.Model): desc = models.TextField() def __unicode__(self): - return u"%s %s at %s" % (self.person.plain_name(), self.get_type_display().lower(), self.time) + return "%s %s at %s" % (self.person.plain_name(), self.get_type_display().lower(), self.time) class Meta: ordering = ['-time', '-id'] diff --git a/ietf/person/name.py b/ietf/person/name.py index 4c16256a5..e01f0c343 100644 --- a/ietf/person/name.py +++ b/ietf/person/name.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2011-2019, All Rights Reserved import re import unidecode @@ -8,7 +9,7 @@ def name_particle_match(name): return re.search(r" (af|al|Al|de|der|di|Di|du|el|El|Hadi|in 't|Le|st\.?|St\.?|ten|ter|van|van der|van 't|Van|von|von der|Von|zu) ", name) def name_parts(name): - prefix, first, middle, last, suffix = u"", u"", u"", u"", u"" + prefix, first, middle, last, suffix = "", "", "", "", "" if not name.strip(): return prefix, first, middle, last, suffix @@ -36,7 +37,7 @@ def name_parts(name): parts = parts[:-1] if len(parts) > 2: # Check if we have a surname with nobiliary particle - full = u" ".join(parts) + full = " ".join(parts) if full.upper() == full: full = full.lower() # adjust case for all-uppercase input # This is an incomplete list. Adjust as needed to handle known ietf @@ -48,7 +49,7 @@ def name_parts(name): if len(parts) > 2: first = parts[0] last = parts[-1] - middle = u" ".join(parts[1:-1]) + middle = " ".join(parts[1:-1]) elif len(parts) == 2: first, last = parts else: @@ -63,16 +64,16 @@ def initials(name): prefix, first, middle, last, suffix = name_parts(name) given = first if middle: - given += u" "+middle + given += " "+middle # Don't use non-word characters as initials. # Example: The Bulgarian transcribed name "'Rnest Balkanska" should not have an initial of "'". given = re.sub('[^ .\w]', '', given) - initials = u" ".join([ n[0].upper()+'.' for n in given.split() ]) + initials = " ".join([ n[0].upper()+'.' for n in given.split() ]) return initials def plain_name(name): prefix, first, middle, last, suffix = name_parts(name) - return u" ".join( n for n in (first, last) if n) + return " ".join( n for n in (first, last) if n) def capfirst(s): # Capitalize the first word character, skipping non-word characters and @@ -127,7 +128,7 @@ def normalize_name(s): if __name__ == "__main__": import sys - name = u" ".join(sys.argv[1:]) - print name_parts(name) - print initials(name) + name = " ".join(sys.argv[1:]) + print(name_parts(name)) + print(initials(name)) diff --git a/ietf/person/tests.py b/ietf/person/tests.py index 7224a7051..75605de32 100644 --- a/ietf/person/tests.py +++ b/ietf/person/tests.py @@ -1,10 +1,11 @@ +# Copyright The IETF Trust 2014-2019, All Rights Reserved # -*- coding: utf-8 -*- -from __future__ import unicode_literals + import datetime import json from pyquery import PyQuery -from StringIO import StringIO +from io import StringIO from django.urls import reverse as urlreverse import debug # pyflakes:ignore @@ -68,28 +69,28 @@ class PersonTests(TestCase): self.assertEqual(r.status_code, 200) def test_name_methods(self): - person = PersonFactory(name=u"Dr. Jens F. Möller", ) + person = PersonFactory(name="Dr. Jens F. Möller", ) - self.assertEqual(person.name, u"Dr. Jens F. Möller" ) - self.assertEqual(person.ascii_name(), u"Dr. Jens F. Moller" ) - self.assertEqual(person.plain_name(), u"Jens Möller" ) - self.assertEqual(person.plain_ascii(), u"Jens Moller" ) - self.assertEqual(person.initials(), u"J. F.") - self.assertEqual(person.first_name(), u"Jens" ) - self.assertEqual(person.last_name(), u"Möller" ) + self.assertEqual(person.name, "Dr. Jens F. Möller" ) + self.assertEqual(person.ascii_name(), "Dr. Jens F. Moller" ) + self.assertEqual(person.plain_name(), "Jens Möller" ) + self.assertEqual(person.plain_ascii(), "Jens Moller" ) + self.assertEqual(person.initials(), "J. F.") + self.assertEqual(person.first_name(), "Jens" ) + self.assertEqual(person.last_name(), "Möller" ) - person = PersonFactory(name=u"吴建平") + person = PersonFactory(name="吴建平") # The following are probably incorrect because the given name should # be Jianping and the surname should be Wu ... # TODO: Figure out better handling for names with CJK characters. # Maybe use ietf.person.cjk.* - self.assertEqual(person.ascii_name(), u"Wu Jian Ping") + self.assertEqual(person.ascii_name(), "Wu Jian Ping") def test_duplicate_person_name(self): empty_outbox() p = PersonFactory(name="Föö Bär") PersonFactory(name=p.name) - self.assertTrue("possible duplicate" in unicode(outbox[0]["Subject"]).lower()) + self.assertTrue("possible duplicate" in str(outbox[0]["Subject"]).lower()) def test_merge(self): url = urlreverse("ietf.person.views.merge") diff --git a/ietf/person/utils.py b/ietf/person/utils.py index e72926123..9d250bc17 100755 --- a/ietf/person/utils.py +++ b/ietf/person/utils.py @@ -1,4 +1,5 @@ -from __future__ import unicode_literals, print_function +# Copyright The IETF Trust 2015-2019, All Rights Reserved + import datetime import os import pprint diff --git a/ietf/person/views.py b/ietf/person/views.py index da7b2f960..582b78337 100644 --- a/ietf/person/views.py +++ b/ietf/person/views.py @@ -1,5 +1,6 @@ +# Copyright The IETF Trust 2012-2019, All Rights Reserved import datetime -from StringIO import StringIO +from io import StringIO from django.contrib import messages from django.db.models import Q @@ -109,7 +110,7 @@ def merge(request): output = StringIO() success, changes = merge_persons(source, target, file=output) if success: - messages.success(request, u'Merged {} ({}) to {} ({}). {})'.format( + messages.success(request, 'Merged {} ({}) to {} ({}). {})'.format( source.name, source_id, target.name, target.id, changes)) else: messages.error(request, output) diff --git a/ietf/redirects/tests.py b/ietf/redirects/tests.py index 4b8aec2c5..257c12b59 100644 --- a/ietf/redirects/tests.py +++ b/ietf/redirects/tests.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2009-2019, All Rights Reserved # Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). # All rights reserved. Contact: Pasi Eronen # @@ -92,7 +93,7 @@ class RedirectsTests(TestCase): fixtures = ["initial_data.xml", ] def test_redirects(self): - for src, dst in REDIRECT_TESTS.items(): + for src, dst in list(REDIRECT_TESTS.items()): baseurl, args = split_url(src) response = self.client.get(baseurl, args) self.assertTrue(str(response.status_code).startswith("3")) diff --git a/ietf/redirects/views.py b/ietf/redirects/views.py index 3f4bc8520..7258ea880 100644 --- a/ietf/redirects/views.py +++ b/ietf/redirects/views.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2007, All Rights Reserved +# Copyright The IETF Trust 2007-2019, All Rights Reserved from django.http import HttpResponsePermanentRedirect, Http404, BadHeaderError from django.shortcuts import get_object_or_404 @@ -28,7 +28,7 @@ def redirect(request, path="", script=""): if len(fc) > 1: if rparam.get('command') != fc[1]: continue - if rparam.has_key(fc[0]): + if fc[0] in rparam: remove_args.append(fc[0]) num = re.match('(\d+)', rparam[fc[0]]) if (num and int(num.group(1))) or (num is None): @@ -84,7 +84,7 @@ def redirect(request, path="", script=""): get = request.GET.copy() remove_args += re.findall(r'%\(([^)]+)\)', rest) for arg in remove_args: - if get.has_key(arg): + if arg in get: get.pop(arg) if get: url += '?' + get.urlencode() diff --git a/ietf/release/tests.py b/ietf/release/tests.py index b03d85292..fa91c33ab 100644 --- a/ietf/release/tests.py +++ b/ietf/release/tests.py @@ -1,6 +1,6 @@ -# Copyright The IETF Trust 2016, All Rights Reserved +# Copyright The IETF Trust 2012-2019, All Rights Reserved # -*- coding: utf-8 -*- -from __future__ import unicode_literals, print_function + from pyquery import PyQuery diff --git a/ietf/release/urls.py b/ietf/release/urls.py index d33fcbb73..01b90d95e 100644 --- a/ietf/release/urls.py +++ b/ietf/release/urls.py @@ -1,6 +1,6 @@ -# Copyright The IETF Trust 2016, All Rights Reserved +# Copyright The IETF Trust 2015-2019, All Rights Reserved # -*- coding: utf-8 -*- -from __future__ import unicode_literals, print_function + from django.views.generic import TemplateView diff --git a/ietf/release/views.py b/ietf/release/views.py index faf560c64..86b4d04e9 100644 --- a/ietf/release/views.py +++ b/ietf/release/views.py @@ -1,6 +1,6 @@ -# Copyright The IETF Trust 2016, All Rights Reserved +# Copyright The IETF Trust 2012-2019, All Rights Reserved # -*- coding: utf-8 -*- -from __future__ import unicode_literals, print_function + import os import re diff --git a/ietf/review/admin.py b/ietf/review/admin.py index 4fbe41059..3d2541bf3 100644 --- a/ietf/review/admin.py +++ b/ietf/review/admin.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2016-2019, All Rights Reserved import simple_history from django.contrib import admin @@ -17,7 +18,7 @@ class ReviewerSettingsAdmin(simple_history.admin.SimpleHistoryAdmin): admin.site.register(ReviewerSettings, ReviewerSettingsAdmin) class ReviewSecretarySettingsAdmin(admin.ModelAdmin): - list_display = [u'id', 'team', 'person', 'remind_days_before_deadline'] + list_display = ['id', 'team', 'person', 'remind_days_before_deadline'] raw_id_fields = ['team', 'person'] admin.site.register(ReviewSecretarySettings, ReviewSecretarySettingsAdmin) diff --git a/ietf/review/mailarch.py b/ietf/review/mailarch.py index 025146f27..13582503c 100644 --- a/ietf/review/mailarch.py +++ b/ietf/review/mailarch.py @@ -1,9 +1,10 @@ +# Copyright The IETF Trust 2016-2019, All Rights Reserved # various utilities for working with the mailarch mail archive at # mailarchive.ietf.org import datetime, tarfile, mailbox, tempfile, hashlib, base64, email.utils -import urllib -import urllib2, contextlib +import urllib.request, urllib.parse, urllib.error +import urllib.request, urllib.error, urllib.parse, contextlib import debug # pyflakes:ignore import debug # pyflakes:ignore @@ -34,7 +35,7 @@ def construct_query_urls(review_req, query=None): if not query: query = review_req.doc.name - encoded_query = "?" + urllib.urlencode({ + encoded_query = "?" + urllib.parse.urlencode({ "qdr": "c", # custom time frame "start_date": (datetime.date.today() - datetime.timedelta(days=180)).isoformat(), "email_list": list_name, @@ -63,7 +64,7 @@ def retrieve_messages_from_mbox(mbox_fileobj): mbox = mailbox.mbox(mbox_file.name, create=False) for msg in mbox: - content = u"" + content = "" for part in msg.walk(): if part.get_content_type() == "text/plain": @@ -93,7 +94,7 @@ def retrieve_messages(query_data_url): """Retrieve and return selected content from mailarch.""" res = [] - with contextlib.closing(urllib2.urlopen(query_data_url, timeout=15)) as fileobj: + with contextlib.closing(urllib.request.urlopen(query_data_url, timeout=15)) as fileobj: content_type = fileobj.info()["Content-type"] if not content_type.startswith("application/x-tar"): if content_type.startswith("text/html"): diff --git a/ietf/review/migrations/0001_initial.py b/ietf/review/migrations/0001_initial.py index 33928e808..d9b618de3 100644 --- a/ietf/review/migrations/0001_initial.py +++ b/ietf/review/migrations/0001_initial.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-02-20 10:52 -from __future__ import unicode_literals + import datetime from django.db import migrations, models diff --git a/ietf/review/migrations/0002_unavailableperiod_reason.py b/ietf/review/migrations/0002_unavailableperiod_reason.py index ac3f89973..046697e2f 100644 --- a/ietf/review/migrations/0002_unavailableperiod_reason.py +++ b/ietf/review/migrations/0002_unavailableperiod_reason.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.14 on 2018-07-23 15:11 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/review/migrations/0003_add_notify_ad_when.py b/ietf/review/migrations/0003_add_notify_ad_when.py index 8ad40f67a..26f7e3376 100644 --- a/ietf/review/migrations/0003_add_notify_ad_when.py +++ b/ietf/review/migrations/0003_add_notify_ad_when.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.16 on 2018-11-02 10:10 -from __future__ import unicode_literals + from django.db import migrations, models import ietf.review.models diff --git a/ietf/review/migrations/0004_reviewteamsettings_secr_mail_alias.py b/ietf/review/migrations/0004_reviewteamsettings_secr_mail_alias.py index 3db6e7b66..315642947 100644 --- a/ietf/review/migrations/0004_reviewteamsettings_secr_mail_alias.py +++ b/ietf/review/migrations/0004_reviewteamsettings_secr_mail_alias.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.16 on 2018-11-03 03:10 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/review/migrations/0005_set_secdir_notify_ad_when.py b/ietf/review/migrations/0005_set_secdir_notify_ad_when.py index 89421c849..aa4eeaed2 100644 --- a/ietf/review/migrations/0005_set_secdir_notify_ad_when.py +++ b/ietf/review/migrations/0005_set_secdir_notify_ad_when.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.16 on 2018-11-02 10:20 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/review/migrations/0006_historicalreviewersettings.py b/ietf/review/migrations/0006_historicalreviewersettings.py index fe8704405..0d641d733 100644 --- a/ietf/review/migrations/0006_historicalreviewersettings.py +++ b/ietf/review/migrations/0006_historicalreviewersettings.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.16 on 2018-11-09 08:31 -from __future__ import unicode_literals + from django.conf import settings from django.db import migrations, models diff --git a/ietf/review/migrations/0007_allow_notify_ad_when_to_be_blank.py b/ietf/review/migrations/0007_allow_notify_ad_when_to_be_blank.py index ef6abc7ff..ba38a4478 100644 --- a/ietf/review/migrations/0007_allow_notify_ad_when_to_be_blank.py +++ b/ietf/review/migrations/0007_allow_notify_ad_when_to_be_blank.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.17 on 2018-12-06 13:16 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/review/migrations/0008_remove_reviewrequest_old_id.py b/ietf/review/migrations/0008_remove_reviewrequest_old_id.py index f2bc08577..5454b5eaa 100644 --- a/ietf/review/migrations/0008_remove_reviewrequest_old_id.py +++ b/ietf/review/migrations/0008_remove_reviewrequest_old_id.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.17 on 2019-01-03 12:34 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/review/migrations/0009_refactor_review_request.py b/ietf/review/migrations/0009_refactor_review_request.py index 766dc209e..642cf32a6 100644 --- a/ietf/review/migrations/0009_refactor_review_request.py +++ b/ietf/review/migrations/0009_refactor_review_request.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.18 on 2019-01-04 14:27 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion diff --git a/ietf/review/migrations/0010_populate_review_assignments.py b/ietf/review/migrations/0010_populate_review_assignments.py index d8f38f24b..d254576be 100644 --- a/ietf/review/migrations/0010_populate_review_assignments.py +++ b/ietf/review/migrations/0010_populate_review_assignments.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.18 on 2019-01-04 14:34 -from __future__ import unicode_literals + import sys @@ -37,8 +38,8 @@ def forward(apps, schema_editor): sys.stderr.write('\n') # introduce a newline before tqdm starts writing for request in tqdm(ReviewRequest.objects.exclude(unused_reviewer__isnull=True)): assignment_state = map_request_state_to_assignment_state(request.state_id) - if not (assignment_state in (u'assigned', u'accepted', u'completed', u'no-response', u'overtaken', u'part-completed', u'rejected', u'withdrawn', u'unknown')): - print ("Trouble with review_request",request.pk,"with state",request.state_id) + if not (assignment_state in ('assigned', 'accepted', 'completed', 'no-response', 'overtaken', 'part-completed', 'rejected', 'withdrawn', 'unknown')): + print(("Trouble with review_request",request.pk,"with state",request.state_id)) exit(-1) ReviewAssignment.objects.create( review_request = request, diff --git a/ietf/review/migrations/0011_review_document2_fk.py b/ietf/review/migrations/0011_review_document2_fk.py index a18e178da..78cc4d87c 100644 --- a/ietf/review/migrations/0011_review_document2_fk.py +++ b/ietf/review/migrations/0011_review_document2_fk.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-08 11:58 # Copyright The IETF Trust 2019, All Rights Reserved -from __future__ import unicode_literals + from django.db import migrations import django.db.models.deletion diff --git a/ietf/review/migrations/0012_remove_old_document_field.py b/ietf/review/migrations/0012_remove_old_document_field.py index 0028b6bb8..8f6971ce5 100644 --- a/ietf/review/migrations/0012_remove_old_document_field.py +++ b/ietf/review/migrations/0012_remove_old_document_field.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-20 09:53 # Copyright The IETF Trust 2019, All Rights Reserved -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/review/migrations/0013_rename_field_document2.py b/ietf/review/migrations/0013_rename_field_document2.py index a9ce514ea..ba9f556aa 100644 --- a/ietf/review/migrations/0013_rename_field_document2.py +++ b/ietf/review/migrations/0013_rename_field_document2.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-21 05:31 # Copyright The IETF Trust 2019, All Rights Reserved -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/review/migrations/0014_document_primary_key_cleanup.py b/ietf/review/migrations/0014_document_primary_key_cleanup.py index d54fb3a9c..818782e4e 100644 --- a/ietf/review/migrations/0014_document_primary_key_cleanup.py +++ b/ietf/review/migrations/0014_document_primary_key_cleanup.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-06-10 03:47 # Copyright The IETF Trust 2019, All Rights Reserved -from __future__ import unicode_literals + from django.db import migrations import django.db.models.deletion diff --git a/ietf/review/models.py b/ietf/review/models.py index 39373cd04..1206c439b 100644 --- a/ietf/review/models.py +++ b/ietf/review/models.py @@ -34,7 +34,7 @@ class ReviewerSettings(models.Model): expertise = models.TextField(verbose_name="Reviewer's expertise in this team's area", max_length=2048, blank=True, help_text="Describe the reviewer's expertise in this team's area", default='') def __unicode__(self): - return u"{} in {}".format(self.person, self.team) + return "{} in {}".format(self.person, self.team) class Meta: verbose_name_plural = "reviewer settings" @@ -46,7 +46,7 @@ class ReviewSecretarySettings(models.Model): remind_days_before_deadline = models.IntegerField(null=True, blank=True, help_text="To get an email reminder in case a reviewer forgets to do an assigned review, enter the number of days before review deadline you want to receive it. Clear the field if you don't want a reminder.") def __unicode__(self): - return u"{} in {}".format(self.person, self.team) + return "{} in {}".format(self.person, self.team) class Meta: verbose_name_plural = "review secretary settings" @@ -79,7 +79,7 @@ class UnavailablePeriod(models.Model): return "future" def __unicode__(self): - return u"{} is unavailable in {} {} - {}".format(self.person, self.team.acronym, self.start_date or "", self.end_date or "") + return "{} is unavailable in {} {} - {}".format(self.person, self.team.acronym, self.start_date or "", self.end_date or "") class ReviewWish(models.Model): """Reviewer wishes to review a document when it becomes available for review.""" @@ -89,7 +89,7 @@ class ReviewWish(models.Model): doc = ForeignKey(Document) def __unicode__(self): - return u"{} wishes to review {} in {}".format(self.person, self.doc.name, self.team.acronym) + return "{} wishes to review {} in {}".format(self.person, self.doc.name, self.team.acronym) class Meta: verbose_name_plural = "review wishes" @@ -100,7 +100,7 @@ class NextReviewerInTeam(models.Model): next_reviewer = ForeignKey(Person) def __unicode__(self): - return u"{} next in {}".format(self.next_reviewer, self.team) + return "{} next in {}".format(self.next_reviewer, self.team) class Meta: verbose_name = "next reviewer in team setting" @@ -122,7 +122,7 @@ class ReviewRequest(models.Model): comment = models.TextField(verbose_name="Requester's comments and instructions", max_length=2048, blank=True, help_text="Provide any additional information to show to the review team secretary and reviewer", default='') def __unicode__(self): - return u"%s review on %s by %s %s" % (self.type, self.doc, self.team, self.state) + return "%s review on %s by %s %s" % (self.type, self.doc, self.team, self.state) def all_completed_assignments_for_doc(self): return ReviewAssignment.objects.filter(review_request__doc=self.doc, state__in=['completed','part-completed']) @@ -143,7 +143,7 @@ class ReviewAssignment(models.Model): mailarch_url = models.URLField(blank=True, null = True) def __unicode__(self): - return u"Assignment for %s (%s) : %s %s of %s" % (self.reviewer.person, self.state, self.review_request.team.acronym, self.review_request.type, self.review_request.doc) + return "Assignment for %s (%s) : %s %s of %s" % (self.reviewer.person, self.state, self.review_request.team.acronym, self.review_request.type, self.review_request.doc) def get_default_review_types(): @@ -162,7 +162,7 @@ class ReviewTeamSettings(models.Model): secr_mail_alias = models.CharField(verbose_name="Email alias for all of the review team secretaries", max_length=255, blank=True, help_text="Email alias for all of the review team secretaries") def __unicode__(self): - return u"%s" % (self.group.acronym,) + return "%s" % (self.group.acronym,) class Meta: verbose_name = "Review team settings" diff --git a/ietf/review/utils.py b/ietf/review/utils.py index 3d2754423..6f6380c5f 100644 --- a/ietf/review/utils.py +++ b/ietf/review/utils.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Copyright The IETF Trust 2016-2019, All Rights Reserved -from __future__ import unicode_literals, print_function + import datetime, re, itertools @@ -128,12 +128,12 @@ def reviewer_rotation_list(team, skip_unavailable=False, dont_skip=[]): reviewers_to_skip = set() unavailable_periods = current_unavailable_periods_for_reviewers(team) - for person_id, periods in unavailable_periods.iteritems(): + for person_id, periods in unavailable_periods.items(): if periods and person_id not in dont_skip: reviewers_to_skip.add(person_id) days_needed_for_reviewers = days_needed_to_fulfill_min_interval_for_reviewers(team) - for person_id, days_needed in days_needed_for_reviewers.iteritems(): + for person_id, days_needed in days_needed_for_reviewers.items(): if person_id not in dont_skip: reviewers_to_skip.add(person_id) @@ -154,7 +154,7 @@ def days_needed_to_fulfill_min_interval_for_reviewers(team): now = datetime.datetime.now() res = {} - for person_id, latest_assignment_time in latest_assignments.iteritems(): + for person_id, latest_assignment_time in latest_assignments.items(): if latest_assignment_time is not None: min_interval = min_intervals.get(person_id) if min_interval is None: @@ -294,11 +294,11 @@ def sum_raw_review_assignment_aggregations(raw_aggregations): for raw_aggr in raw_aggregations: i_state_dict, i_late_state_dict, i_result_dict, i_assignment_to_closure_days_list, i_assignment_to_closure_days_count = raw_aggr - for s, v in i_state_dict.iteritems(): + for s, v in i_state_dict.items(): state_dict[s] += v - for s, v in i_late_state_dict.iteritems(): + for s, v in i_late_state_dict.items(): late_state_dict[s] += v - for r, v in i_result_dict.iteritems(): + for r, v in i_result_dict.items(): result_dict[r] += v assignment_to_closure_days_list.extend(i_assignment_to_closure_days_list) @@ -501,7 +501,7 @@ def assign_review_request_to_reviewer(request, review_req, reviewer, add_skip=Fa if prev_team_reviews.exists(): msg = msg + '\n\nThis team has completed other reviews of this document:\n' for assignment in prev_team_reviews: - msg += u'%s %s -%s %s\n'% ( + msg += '%s %s -%s %s\n'% ( assignment.completed_on.strftime('%d %b %Y'), assignment.reviewer.person.ascii, assignment.reviewed_rev or assignment.review_request.requested_rev, @@ -688,7 +688,7 @@ def suggested_review_requests_for_team(team): # filter those with existing explicit requests existing_requests = defaultdict(list) - for r in ReviewRequest.objects.filter(doc__id__in=requests.iterkeys(), team=team): + for r in ReviewRequest.objects.filter(doc__id__in=iter(requests.keys()), team=team): existing_requests[r.doc_id].append(r) def blocks(existing, request): @@ -706,7 +706,7 @@ def suggested_review_requests_for_team(team): return any([no_review_document, no_review_rev, pending, request_closed, some_assignment_completed]) - res = [r for r in requests.itervalues() + res = [r for r in requests.values() if not any(blocks(e, r) for e in existing_requests[r.doc_id])] res.sort(key=lambda r: (r.deadline, r.doc_id), reverse=True) return res @@ -719,7 +719,7 @@ def extract_revision_ordered_review_assignments_for_documents_and_replaced(revie replaces = extract_complete_replaces_ancestor_mapping_for_docs(names) assignments_for_each_doc = defaultdict(list) - replacement_name_set = set(e for l in replaces.itervalues() for e in l) | names + replacement_name_set = set(e for l in replaces.values() for e in l) | names for r in ( review_assignment_queryset.filter(review_request__doc__name__in=replacement_name_set) .order_by("-reviewed_rev","-assigned_on", "-id").iterator()): assignments_for_each_doc[r.review_request.doc.name].append(r) @@ -767,7 +767,7 @@ def extract_revision_ordered_review_requests_for_documents_and_replaced(review_r replaces = extract_complete_replaces_ancestor_mapping_for_docs(names) requests_for_each_doc = defaultdict(list) - for r in review_request_queryset.filter(doc__name__in=set(e for l in replaces.itervalues() for e in l) | names).order_by("-time", "-id").iterator(): + for r in review_request_queryset.filter(doc__name__in=set(e for l in replaces.values() for e in l) | names).order_by("-time", "-id").iterator(): requests_for_each_doc[r.doc.name].append(r) # now collect in breadth-first order to keep the revision order intact @@ -959,9 +959,9 @@ def make_assignment_choices(email_queryset, review_req): if stats: explanations.append(", ".join(stats)) - label = unicode(e.person) + label = str(e.person) if explanations: - label = u"{}: {}".format(label, u"; ".join(explanations)) + label = "{}: {}".format(label, "; ".join(explanations)) ranking.append({ "email": e, @@ -1026,10 +1026,10 @@ def review_assignments_needing_secretary_reminder(remind_date): if (deadline - remind_date).days == remind_days: assignment_pks[a_pk] = secretary_role_pk - review_assignments = { a.pk: a for a in ReviewAssignment.objects.filter(pk__in=assignment_pks.keys()).select_related("reviewer", "reviewer__person", "state", "review_request__team") } - secretary_roles = { r.pk: r for r in Role.objects.filter(pk__in=assignment_pks.values()).select_related("email", "person") } + review_assignments = { a.pk: a for a in ReviewAssignment.objects.filter(pk__in=list(assignment_pks.keys())).select_related("reviewer", "reviewer__person", "state", "review_request__team") } + secretary_roles = { r.pk: r for r in Role.objects.filter(pk__in=list(assignment_pks.values())).select_related("email", "person") } - return [ (review_assignments[a_pk], secretary_roles[secretary_role_pk]) for a_pk, secretary_role_pk in assignment_pks.iteritems() ] + return [ (review_assignments[a_pk], secretary_roles[secretary_role_pk]) for a_pk, secretary_role_pk in assignment_pks.items() ] def email_secretary_reminder(review_request, secretary_role): team = review_request.team diff --git a/ietf/secr/announcement/forms.py b/ietf/secr/announcement/forms.py index 6aaca732d..8be5044e2 100644 --- a/ietf/secr/announcement/forms.py +++ b/ietf/secr/announcement/forms.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2013-2019, All Rights Reserved from django import forms from ietf.group.models import Group, Role @@ -37,7 +38,7 @@ def get_from_choices(user): if nomcom_choices: addresses = list(addresses) + nomcom_choices - return zip(addresses, addresses) + return list(zip(addresses, addresses)) def get_nomcom_choices(user): @@ -58,7 +59,7 @@ def get_nomcom_choices(user): def get_to_choices(): - return zip(TO_LIST,TO_LIST) + return list(zip(TO_LIST,TO_LIST)) # --------------------------------------------- @@ -96,7 +97,7 @@ class AnnounceForm(forms.ModelForm): self.initial['reply_to'] = 'ietf@ietf.org' if self.hidden: - for key in self.fields.keys(): + for key in list(self.fields.keys()): self.fields[key].widget = forms.HiddenInput() def clean(self): diff --git a/ietf/secr/console/tests.py b/ietf/secr/console/tests.py index 354be5fe0..2f686a9b1 100644 --- a/ietf/secr/console/tests.py +++ b/ietf/secr/console/tests.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2013-2019, All Rights Reserved """ This file demonstrates two different styles of tests (one doctest and one unittest). These will both pass when you run "manage.py test". @@ -12,7 +13,7 @@ class SimpleTest(TestCase): """ Tests that 1 + 1 always equals 2. """ - self.failUnlessEqual(1 + 1, 2) + self.assertEqual(1 + 1, 2) __test__ = {"doctest": """ Another way to test that 1 + 1 is equal to 2. diff --git a/ietf/secr/drafts/forms.py b/ietf/secr/drafts/forms.py index 581e91bbf..076a43575 100644 --- a/ietf/secr/drafts/forms.py +++ b/ietf/secr/drafts/forms.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2013-2019, All Rights Reserved import re import os @@ -45,11 +46,11 @@ class DocumentField(forms.FileField): if self.filename: # validate filename if base[:-3] != self.filename: - raise forms.ValidationError, "Filename: %s doesn't match Draft filename." % base[:-3] + raise forms.ValidationError("Filename: %s doesn't match Draft filename." % base[:-3]) # validate revision next_revision = str(int(self.rev)+1).zfill(2) if base[-2:] != next_revision: - raise forms.ValidationError, "Expected revision # %s" % (next_revision) + raise forms.ValidationError("Expected revision # %s" % (next_revision)) return file @@ -217,7 +218,7 @@ class EmailForm(forms.Form): super(EmailForm, self).__init__(*args, **kwargs) if self.hidden: - for key in self.fields.keys(): + for key in list(self.fields.keys()): self.fields[key].widget = forms.HiddenInput() class ExtendForm(forms.Form): diff --git a/ietf/secr/drafts/views.py b/ietf/secr/drafts/views.py index f5c343b1b..5fbe61c1c 100644 --- a/ietf/secr/drafts/views.py +++ b/ietf/secr/drafts/views.py @@ -259,7 +259,7 @@ def authors(request, id): authors = draft.documentauthor_set.all() if authors: - order = authors.aggregate(Max('order')).values()[0] + 1 + order = list(authors.aggregate(Max('order')).values())[0] + 1 else: order = 1 DocumentAuthor.objects.create(document=draft, person=person, email=email, affiliation=affiliation, country=country, order=order) @@ -418,7 +418,7 @@ def email(request, id): # other problems with get_email_initial try: form = EmailForm(initial=get_email_initial(draft,action=action,input=data)) - except Exception, e: + except Exception as e: return render(request, 'drafts/error.html', { 'error': e},) return render(request, 'drafts/email.html', { diff --git a/ietf/secr/meetings/tests.py b/ietf/secr/meetings/tests.py index 897ce6a5e..fb63ceaf7 100644 --- a/ietf/secr/meetings/tests.py +++ b/ietf/secr/meetings/tests.py @@ -1,8 +1,9 @@ +# Copyright The IETF Trust 2013-2019, All Rights Reserved import datetime import os import shutil from pyquery import PyQuery -from StringIO import StringIO +from io import StringIO import debug # pyflakes:ignore diff --git a/ietf/secr/proceedings/migrations/0001_initial.py b/ietf/secr/proceedings/migrations/0001_initial.py index cb55ea290..ff57ba5fe 100644 --- a/ietf/secr/proceedings/migrations/0001_initial.py +++ b/ietf/secr/proceedings/migrations/0001_initial.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-02-20 10:52 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/ietf/secr/proceedings/proc_utils.py b/ietf/secr/proceedings/proc_utils.py index a25777b68..d31c15eba 100644 --- a/ietf/secr/proceedings/proc_utils.py +++ b/ietf/secr/proceedings/proc_utils.py @@ -10,7 +10,7 @@ import datetime import os import re import subprocess -from urllib import urlencode +from urllib.parse import urlencode import debug # pyflakes:ignore diff --git a/ietf/secr/proceedings/views.py b/ietf/secr/proceedings/views.py index 571d159c2..1b0178d59 100644 --- a/ietf/secr/proceedings/views.py +++ b/ietf/secr/proceedings/views.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2013-2019, All Rights Reserved import datetime import glob import itertools @@ -276,7 +277,7 @@ def recording_edit(request, meeting_num, name): by=request.user.person, doc=recording, rev=recording.rev, - desc=u'Changed URL to %s' % recording.external_url, + desc='Changed URL to %s' % recording.external_url, ) recording.save_with_history([e]) diff --git a/ietf/secr/rolodex/forms.py b/ietf/secr/rolodex/forms.py index eafcd5147..4c3351fcb 100644 --- a/ietf/secr/rolodex/forms.py +++ b/ietf/secr/rolodex/forms.py @@ -1,6 +1,6 @@ -# Copyright The IETF Trust 2016, All Rights Reserved +# Copyright The IETF Trust 2013-2019, All Rights Reserved # -*- coding: utf-8 -*- -from __future__ import unicode_literals, print_function + import re diff --git a/ietf/secr/sreq/forms.py b/ietf/secr/sreq/forms.py index af36026b0..6ed1ca4a9 100644 --- a/ietf/secr/sreq/forms.py +++ b/ietf/secr/sreq/forms.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2013-2019, All Rights Reserved from django import forms import debug # pyflakes:ignore @@ -98,7 +99,7 @@ class SessionForm(forms.Form): self.fields['third_session'].initial = True if self.hidden: - for key in self.fields.keys(): + for key in list(self.fields.keys()): self.fields[key].widget = forms.HiddenInput() self.fields['resources'].widget = forms.MultipleHiddenInput() diff --git a/ietf/secr/sreq/tests.py b/ietf/secr/sreq/tests.py index 1327b57a0..ef7908011 100644 --- a/ietf/secr/sreq/tests.py +++ b/ietf/secr/sreq/tests.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2013-2019, All Rights Reserved from django.urls import reverse import datetime @@ -176,14 +177,14 @@ class SubmitRequestCase(TestCase): r = self.client.post(url,post_data) self.assertEqual(r.status_code, 200) q = PyQuery(r.content) - self.assertTrue('Confirm' in unicode(q("title"))) + self.assertTrue('Confirm' in str(q("title"))) # confirm post_data['submit'] = 'Submit' r = self.client.post(confirm_url,post_data) self.assertRedirects(r, reverse('ietf.secr.sreq.views.main')) self.assertEqual(len(outbox),len_before+1) notification = outbox[-1] - notification_payload = unicode(notification.get_payload(decode=True),"utf-8","replace") + notification_payload = str(notification.get_payload(decode=True),"utf-8","replace") session = Session.objects.get(meeting=meeting,group=group) self.assertEqual(session.resources.count(),1) self.assertEqual(session.people_constraints.count(),1) diff --git a/ietf/secr/sreq/views.py b/ietf/secr/sreq/views.py index af6edae9a..ef8ebfff9 100644 --- a/ietf/secr/sreq/views.py +++ b/ietf/secr/sreq/views.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2013-2019, All Rights Reserved import datetime from django.conf import settings @@ -541,7 +542,7 @@ def new(request, acronym): # the "previous" querystring causes the form to be returned # pre-populated with data from last meeeting's session request - elif request.method == 'GET' and request.GET.has_key('previous'): + elif request.method == 'GET' and 'previous' in request.GET: previous_meeting = Meeting.objects.get(number=str(int(meeting.number) - 1)) previous_sessions = Session.objects.filter(meeting=previous_meeting,group=group).exclude(status__in=('notmeet','deleted')).order_by('id') if not previous_sessions: diff --git a/ietf/secr/telechat/views.py b/ietf/secr/telechat/views.py index c845d26ed..c78208ff1 100644 --- a/ietf/secr/telechat/views.py +++ b/ietf/secr/telechat/views.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2013-2019, All Rights Reserved import datetime from django.contrib import messages @@ -43,7 +44,7 @@ def get_doc_list(agenda): Document objects in the order they appear in the agenda sections 1-3. ''' docs = [] - for num, section in sorted(agenda['sections'].iteritems()): + for num, section in sorted(agenda['sections'].items()): if "docs" in section: docs.extend(section["docs"]) @@ -96,16 +97,16 @@ def get_section_header(doc, agenda): split = num.split(".") - for i in xrange(num.count(".")): + for i in range(num.count(".")): parent_num = ".".join(split[:i + 1]) parent = agenda["sections"].get(parent_num) if parent: if "." not in parent_num: parent_num += "." - header.append(u"%s %s" % (parent_num, parent["title"])) + header.append("%s %s" % (parent_num, parent["title"])) section = agenda["sections"][num] - header.append(u"%s %s" % (num, section["title"])) + header.append("%s %s" % (num, section["title"])) count = '%s of %s' % (section["docs"].index(doc) + 1, len(section["docs"])) header.append(count) @@ -116,7 +117,7 @@ def get_first_doc(agenda): ''' This function takes an agenda dictionary and returns the first document in the agenda ''' - for num, section in sorted(agenda['sections'].iteritems()): + for num, section in sorted(agenda['sections'].items()): if "docs" in section and section["docs"]: return section["docs"][0] diff --git a/ietf/secr/utils/group.py b/ietf/secr/utils/group.py index 172f1bf3f..ad791a3ec 100644 --- a/ietf/secr/utils/group.py +++ b/ietf/secr/utils/group.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2013-2019, All Rights Reserved # Python imports import os @@ -95,7 +96,7 @@ def groups_by_session(user, meeting, types=None): groups_no_session.append(group) if types: - groups_session = filter(lambda x: x.type_id in types,groups_session) - groups_no_session = filter(lambda x: x.type_id in types,groups_no_session) + groups_session = [x for x in groups_session if x.type_id in types] + groups_no_session = [x for x in groups_no_session if x.type_id in types] return groups_session, groups_no_session diff --git a/ietf/secr/utils/test.py b/ietf/secr/utils/test.py index 191b3a986..d0864d230 100644 --- a/ietf/secr/utils/test.py +++ b/ietf/secr/utils/test.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2013-2019, All Rights Reserved ''' Functions to aid unit testing ''' @@ -9,7 +10,7 @@ def reset(): me = Person.objects.get(name='Ryan Cross') me.role_set.all().delete() Role.objects.create(person=me,email_id='rcross@amsl.com',name_id='secr',group_id=4) - print me.role_set.all() + print(me.role_set.all()) def copy_roles(person): '''Copy the roles of person''' diff --git a/ietf/settings.py b/ietf/settings.py index c5112b202..12e2fe883 100644 --- a/ietf/settings.py +++ b/ietf/settings.py @@ -1058,7 +1058,7 @@ for app in INSTALLED_APPS: if app.startswith('ietf'): app_settings_file = os.path.join(BASE_DIR, '../', app.replace('.', os.sep), "settings.py") if os.path.exists(app_settings_file): - exec "from %s import *" % (app+".settings") + exec("from %s import *" % (app+".settings")) # Add DEV_APPS to INSTALLED_APPS INSTALLED_APPS += DEV_APPS diff --git a/ietf/settings_releasetest.py b/ietf/settings_releasetest.py index 86826736d..7c2a87889 100644 --- a/ietf/settings_releasetest.py +++ b/ietf/settings_releasetest.py @@ -1,10 +1,11 @@ +# Copyright The IETF Trust 2015-2019, All Rights Reserved # Standard settings except we use SQLite, this is useful for speeding # up tests that depend on the test database, try for instance: # # ./manage.py test --settings=settings_sqlitetest doc.ChangeStateTestCase # -from settings import * # pyflakes:ignore +from .settings import * # pyflakes:ignore # Workaround to avoid spending minutes stepping through the migrations in # every test run. The result of this is to use the 'syncdb' way of creating diff --git a/ietf/settings_sqlitetest.py b/ietf/settings_sqlitetest.py index f6f471ee6..7b1b3a079 100644 --- a/ietf/settings_sqlitetest.py +++ b/ietf/settings_sqlitetest.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2010-2019, All Rights Reserved # Standard settings except we use SQLite and skip migrations, this is # useful for speeding up tests that depend on the test database, try # for instance: @@ -6,7 +7,7 @@ # import os -from settings import * # pyflakes:ignore +from .settings import * # pyflakes:ignore import debug # pyflakes:ignore debug.debug = True diff --git a/ietf/settings_testcrawl.py b/ietf/settings_testcrawl.py index 967e3f5b7..5f48abd30 100644 --- a/ietf/settings_testcrawl.py +++ b/ietf/settings_testcrawl.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2015-2019, All Rights Reserved # Standard settings except we enable caching like in the production # environment, this is useful for speeding up the test crawl, try for # instance: @@ -5,8 +6,8 @@ # bin/test-crawl --settings=ietf.settings_testcrawl # -from settings import * # pyflakes:ignore -from settings import TEMPLATES +from .settings import * # pyflakes:ignore +from .settings import TEMPLATES TEMPLATES[0]['OPTIONS']['loaders'] = ( ('django.template.loaders.cached.Loader', ( diff --git a/ietf/stats/backfill_data.py b/ietf/stats/backfill_data.py index 5946abc0c..5bb37bda7 100755 --- a/ietf/stats/backfill_data.py +++ b/ietf/stats/backfill_data.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # Copyright The IETF Trust 2017-2019, All Rights Reserved -from __future__ import print_function, unicode_literals + import sys import os @@ -16,7 +16,7 @@ os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings" virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py") if os.path.exists(virtualenv_activation): - execfile(virtualenv_activation, dict(__file__=virtualenv_activation)) + exec(compile(open(virtualenv_activation, "rb").read(), virtualenv_activation, 'exec'), dict(__file__=virtualenv_activation)) import django django.setup() @@ -54,7 +54,7 @@ def say(msg): logfile.write(msg) logfile.write('\n') -def unicode(text): +def str(text): if text is None: return text # order matters here: @@ -87,7 +87,7 @@ for doc in docs_qs.prefetch_related("docalias", "formal_languages", "documentaut with open(path, 'rb') as f: say("\nProcessing %s" % doc.name) sys.stdout.flush() - d = Draft(unicode(f.read()), path) + d = Draft(str(f.read()), path) updated = False diff --git a/ietf/stats/migrations/0001_initial.py b/ietf/stats/migrations/0001_initial.py index a83449658..671036647 100644 --- a/ietf/stats/migrations/0001_initial.py +++ b/ietf/stats/migrations/0001_initial.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-02-20 10:52 -from __future__ import unicode_literals + from django.db import migrations, models import django.db.models.deletion diff --git a/ietf/stats/models.py b/ietf/stats/models.py index ac2dfb034..de448f0cd 100644 --- a/ietf/stats/models.py +++ b/ietf/stats/models.py @@ -1,4 +1,4 @@ -# Copyright The IETF Trust 2017, All Rights Reserved +# Copyright The IETF Trust 2017-2019, All Rights Reserved from django.db import models @@ -18,7 +18,7 @@ class AffiliationAlias(models.Model): name = models.CharField(max_length=255) def __unicode__(self): - return u"{} -> {}".format(self.alias, self.name) + return "{} -> {}".format(self.alias, self.name) def save(self, *args, **kwargs): self.alias = self.alias.lower() @@ -43,7 +43,7 @@ class CountryAlias(models.Model): country = ForeignKey(CountryName, max_length=255) def __unicode__(self): - return u"{} -> {}".format(self.alias, self.country.name) + return "{} -> {}".format(self.alias, self.country.name) class Meta: verbose_name_plural = "country aliases" @@ -59,4 +59,4 @@ class MeetingRegistration(models.Model): email = models.EmailField(blank=True, null=True) def __unicode__(self): - return u"{} {}".format(self.first_name, self.last_name) + return "{} {}".format(self.first_name, self.last_name) diff --git a/ietf/stats/utils.py b/ietf/stats/utils.py index 4b70dcbb2..fd7b939e7 100644 --- a/ietf/stats/utils.py +++ b/ietf/stats/utils.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2017-2019, All Rights Reserved import re import requests from collections import defaultdict @@ -83,7 +84,7 @@ def get_aliased_affiliations(affiliations): # now we just need to pick the most popular uppercase/lowercase # spelling for each affiliation with more than one - for similar_affiliations in affiliations_with_case_spellings.itervalues(): + for similar_affiliations in affiliations_with_case_spellings.values(): if len(similar_affiliations) > 1: most_popular = sorted(similar_affiliations, key=affiliation_sort_key, reverse=True)[0] for affiliation in similar_affiliations: @@ -112,8 +113,8 @@ def get_aliased_countries(countries): return possible_alias known_re_aliases = { - re.compile(u"\\b{}\\b".format(re.escape(alias))): name - for alias, name in known_aliases.iteritems() + re.compile("\\b{}\\b".format(re.escape(alias))): name + for alias, name in known_aliases.items() } # specific hack: check for zip codes from the US since in the @@ -127,7 +128,7 @@ def get_aliased_countries(countries): t = t.strip() if t: return t - return u"" + return "" known_countries = set(CountryName.objects.values_list("name", flat=True)) @@ -177,7 +178,7 @@ def get_aliased_countries(countries): # country name anywhere country_lower = country.lower() found = False - for alias_re, name in known_re_aliases.iteritems(): + for alias_re, name in known_re_aliases.items(): if alias_re.search(country) or alias_re.search(country_lower): res[original_country] = name found = True diff --git a/ietf/stats/views.py b/ietf/stats/views.py index 94e7a30e4..f90c1c05d 100644 --- a/ietf/stats/views.py +++ b/ietf/stats/views.py @@ -43,11 +43,11 @@ def stats_index(request): return render(request, "stats/index.html") def generate_query_string(query_dict, overrides): - query_part = u"" + query_part = "" if query_dict or overrides: d = query_dict.copy() - for k, v in overrides.iteritems(): + for k, v in overrides.items(): if type(v) in (list, tuple): if not v: if k in d: @@ -55,14 +55,14 @@ def generate_query_string(query_dict, overrides): else: d.setlist(k, v) else: - if v is None or v == u"": + if v is None or v == "": if k in d: del d[k] else: d[k] = v if d: - query_part = u"?" + d.urlencode() + query_part = "?" + d.urlencode() return query_part @@ -94,13 +94,13 @@ def put_into_bin(value, bin_size): def prune_unknown_bin_with_known(bins): # remove from the unknown bin all authors within the # named/known bins - all_known = { n for b, names in bins.iteritems() if b for n in names } + all_known = { n for b, names in bins.items() if b for n in names } bins[""] = [name for name in bins[""] if name not in all_known] if not bins[""]: del bins[""] def count_bins(bins): - return len({ n for b, names in bins.iteritems() if b for n in names }) + return len({ n for b, names in bins.items() if b for n in names }) def add_labeled_top_series_from_bins(chart_data, bins, limit): """Take bins on the form (x, label): [name1, name2, ...], figure out @@ -108,13 +108,13 @@ def add_labeled_top_series_from_bins(chart_data, bins, limit): them into sorted series like [(x1, len(names1)), (x2, len(names2)), ...].""" aggregated_bins = defaultdict(set) xs = set() - for (x, label), names in bins.iteritems(): + for (x, label), names in bins.items(): xs.add(x) aggregated_bins[label].update(names) xs = list(sorted(xs)) - sorted_bins = sorted(aggregated_bins.iteritems(), key=lambda t: len(t[1]), reverse=True) + sorted_bins = sorted(iter(aggregated_bins.items()), key=lambda t: len(t[1]), reverse=True) top = [ label for label, names in list(sorted_bins)[:limit]] for label in top: @@ -136,7 +136,7 @@ def document_stats(request, stats_type=None): "stats_type": stats_type if stats_type_override is Ellipsis else stats_type_override, } - return urlreverse(document_stats, kwargs={ k: v for k, v in kwargs.iteritems() if v is not None }) + generate_query_string(request.GET, get_overrides) + return urlreverse(document_stats, kwargs={ k: v for k, v in kwargs.items() if v is not None }) + generate_query_string(request.GET, get_overrides) # the length limitation is to keep the key shorter than memcached's limit # of 250 after django has added the key_prefix and key_version parameters @@ -261,7 +261,7 @@ def document_stats(request, stats_type=None): bins[author_count].add(canonical_name) series_data = [] - for author_count, names in sorted(bins.iteritems(), key=lambda t: t[0]): + for author_count, names in sorted(iter(bins.items()), key=lambda t: t[0]): percentage = len(names) * 100.0 / (total_docs or 1) series_data.append((author_count, percentage)) table_data.append((author_count, percentage, len(names), list(names)[:names_limit])) @@ -277,7 +277,7 @@ def document_stats(request, stats_type=None): bins[pages].add(canonical_name) series_data = [] - for pages, names in sorted(bins.iteritems(), key=lambda t: t[0]): + for pages, names in sorted(iter(bins.items()), key=lambda t: t[0]): percentage = len(names) * 100.0 / (total_docs or 1) if pages is not None: series_data.append((pages, len(names))) @@ -296,7 +296,7 @@ def document_stats(request, stats_type=None): bins[put_into_bin(words, bin_size)].add(canonical_name) series_data = [] - for (value, words), names in sorted(bins.iteritems(), key=lambda t: t[0][0]): + for (value, words), names in sorted(iter(bins.items()), key=lambda t: t[0][0]): percentage = len(names) * 100.0 / (total_docs or 1) if words is not None: series_data.append((value, len(names))) @@ -349,7 +349,7 @@ def document_stats(request, stats_type=None): bins[ext.upper()].add(canonical_name) series_data = [] - for fmt, names in sorted(bins.iteritems(), key=lambda t: t[0]): + for fmt, names in sorted(iter(bins.items()), key=lambda t: t[0]): percentage = len(names) * 100.0 / (total_docs or 1) series_data.append((fmt, len(names))) @@ -366,7 +366,7 @@ def document_stats(request, stats_type=None): bins[formal_language_name].add(canonical_name) series_data = [] - for formal_language, names in sorted(bins.iteritems(), key=lambda t: t[0]): + for formal_language, names in sorted(iter(bins.items()), key=lambda t: t[0]): percentage = len(names) * 100.0 / (total_docs or 1) if formal_language is not None: series_data.append((formal_language, len(names))) @@ -417,7 +417,7 @@ def document_stats(request, stats_type=None): total_persons = count_bins(bins) series_data = [] - for document_count, names in sorted(bins.iteritems(), key=lambda t: t[0]): + for document_count, names in sorted(iter(bins.items()), key=lambda t: t[0]): percentage = len(names) * 100.0 / (total_persons or 1) series_data.append((document_count, percentage)) plain_names = [ plain_name(n) for n in names ] @@ -450,7 +450,7 @@ def document_stats(request, stats_type=None): total_persons = count_bins(bins) series_data = [] - for affiliation, names in sorted(bins.iteritems(), key=lambda t: t[0].lower()): + for affiliation, names in sorted(iter(bins.items()), key=lambda t: t[0].lower()): percentage = len(names) * 100.0 / (total_persons or 1) if affiliation: series_data.append((affiliation, len(names))) @@ -462,7 +462,7 @@ def document_stats(request, stats_type=None): chart_data.append({ "data": series_data }) - for alias, name in sorted(aliases.iteritems(), key=lambda t: t[1]): + for alias, name in sorted(iter(aliases.items()), key=lambda t: t[1]): alias_data.append((name, alias)) elif stats_type == "author/country": @@ -485,7 +485,7 @@ def document_stats(request, stats_type=None): countries = { c.name: c for c in CountryName.objects.all() } eu_name = "EU" - eu_countries = { c for c in countries.itervalues() if c.in_eu } + eu_countries = { c for c in countries.values() if c.in_eu } for name, country in name_country_set: country_name = aliases.get(country, country) @@ -499,7 +499,7 @@ def document_stats(request, stats_type=None): total_persons = count_bins(bins) series_data = [] - for country, names in sorted(bins.iteritems(), key=lambda t: t[0].lower()): + for country, names in sorted(iter(bins.items()), key=lambda t: t[0].lower()): percentage = len(names) * 100.0 / (total_persons or 1) if country: series_data.append((country, len(names))) @@ -511,7 +511,7 @@ def document_stats(request, stats_type=None): chart_data.append({ "data": series_data }) - for alias, country_name in aliases.iteritems(): + for alias, country_name in aliases.items(): alias_data.append((country_name, alias, countries.get(country_name))) alias_data.sort() @@ -541,7 +541,7 @@ def document_stats(request, stats_type=None): total_persons = count_bins(bins) series_data = [] - for continent, names in sorted(bins.iteritems(), key=lambda t: t[0].lower()): + for continent, names in sorted(iter(bins.items()), key=lambda t: t[0].lower()): percentage = len(names) * 100.0 / (total_persons or 1) if continent: series_data.append((continent, len(names))) @@ -568,7 +568,7 @@ def document_stats(request, stats_type=None): total_persons = count_bins(bins) series_data = [] - for citations, names in sorted(bins.iteritems(), key=lambda t: t[0], reverse=True): + for citations, names in sorted(iter(bins.items()), key=lambda t: t[0], reverse=True): percentage = len(names) * 100.0 / (total_persons or 1) series_data.append((citations, percentage)) plain_names = [ plain_name(n) for n in names ] @@ -594,7 +594,7 @@ def document_stats(request, stats_type=None): total_persons = count_bins(bins) series_data = [] - for citations, names in sorted(bins.iteritems(), key=lambda t: t[0], reverse=True): + for citations, names in sorted(iter(bins.items()), key=lambda t: t[0], reverse=True): percentage = len(names) * 100.0 / (total_persons or 1) series_data.append((citations, percentage)) plain_names = [ plain_name(n) for n in names ] @@ -674,7 +674,7 @@ def document_stats(request, stats_type=None): countries = { c.name: c for c in CountryName.objects.all() } eu_name = "EU" - eu_countries = { c for c in countries.itervalues() if c.in_eu } + eu_countries = { c for c in countries.values() if c.in_eu } bins = defaultdict(set) @@ -770,7 +770,7 @@ def meeting_stats(request, num=None, stats_type=None): if number is not None: kwargs["num"] = number - return urlreverse(meeting_stats, kwargs={ k: v for k, v in kwargs.iteritems() if v is not None }) + generate_query_string(request.GET, get_overrides) + return urlreverse(meeting_stats, kwargs={ k: v for k, v in kwargs.items() if v is not None }) + generate_query_string(request.GET, get_overrides) cache_key = ("stats:meeting_stats:%s:%s:%s" % (num, stats_type, slugify(request.META.get('QUERY_STRING',''))))[:228] data = cache.get(cache_key) @@ -808,7 +808,7 @@ def meeting_stats(request, num=None, stats_type=None): } def reg_name(r): - return email.utils.formataddr(((r.first_name + u" " + r.last_name).strip(), r.email)) + return email.utils.formataddr(((r.first_name + " " + r.last_name).strip(), r.email)) if meeting and any(stats_type == t[0] for t in possible_stats_types): attendees = MeetingRegistration.objects.filter(meeting=meeting) @@ -835,7 +835,7 @@ def meeting_stats(request, num=None, stats_type=None): total_attendees = count_bins(bins) series_data = [] - for country, names in sorted(bins.iteritems(), key=lambda t: t[0].lower()): + for country, names in sorted(iter(bins.items()), key=lambda t: t[0].lower()): percentage = len(names) * 100.0 / (total_attendees or 1) if country: series_data.append((country, len(names))) @@ -869,7 +869,7 @@ def meeting_stats(request, num=None, stats_type=None): total_attendees = count_bins(bins) series_data = [] - for continent, names in sorted(bins.iteritems(), key=lambda t: t[0].lower()): + for continent, names in sorted(iter(bins.items()), key=lambda t: t[0].lower()): percentage = len(names) * 100.0 / (total_attendees or 1) if continent: series_data.append((continent, len(names))) @@ -903,14 +903,14 @@ def meeting_stats(request, num=None, stats_type=None): bins[meeting_number].add(name) series_data = {} - for continent in continents.keys(): + for continent in list(continents.keys()): series_data[continent] = [] for m in meetings: country = CountryName.objects.get(slug=m.country) url = build_meeting_stats_url(number=m.number, stats_type_override="country") - for continent in continents.keys(): + for continent in list(continents.keys()): if continent == country.continent.name: d = { "name": "IETF {} - {}, {}".format(int(m.number), m.city, country), @@ -928,7 +928,7 @@ def meeting_stats(request, num=None, stats_type=None): table_data.append((m, url, m.attendees, country)) - for continent in continents.keys(): + for continent in list(continents.keys()): # series_data[continent].sort(key=lambda t: t[0]["x"]) chart_data.append( { "name": continent, "data": series_data[continent] }) diff --git a/ietf/submit/checkers.py b/ietf/submit/checkers.py index dd03abccf..d59203e1c 100644 --- a/ietf/submit/checkers.py +++ b/ietf/submit/checkers.py @@ -1,5 +1,5 @@ -# Copyright The IETF Trust 2016, All Rights Reserved -from __future__ import unicode_literals, print_function +# Copyright The IETF Trust 2016-2019, All Rights Reserved + import os import re @@ -7,7 +7,7 @@ import sys from xym import xym import shutil import tempfile -import StringIO +import io from django.conf import settings @@ -142,8 +142,8 @@ class DraftYangChecker(object): # This places the yang models as files in workdir saved_stdout = sys.stdout saved_stderr = sys.stderr - sys.stdout = StringIO.StringIO() - sys.stderr = StringIO.StringIO() + sys.stdout = io.StringIO() + sys.stderr = io.StringIO() extractor.extract_yang_model(file.readlines()) model_list = extractor.get_extracted_models(False, True) out = sys.stdout.getvalue() diff --git a/ietf/submit/forms.py b/ietf/submit/forms.py index cd99c9439..a773c364d 100644 --- a/ietf/submit/forms.py +++ b/ietf/submit/forms.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2011-2019, All Rights Reserved import os import re import datetime @@ -32,7 +33,7 @@ from ietf.submit.parsers.xml_parser import XMLParser from ietf.utils.draft import Draft class SubmissionBaseUploadForm(forms.Form): - xml = forms.FileField(label=u'.xml format', required=True) + xml = forms.FileField(label='.xml format', required=True) def __init__(self, request, *args, **kwargs): super(SubmissionBaseUploadForm, self).__init__(*args, **kwargs) @@ -184,10 +185,10 @@ class SubmissionBaseUploadForm(forms.Form): self.revision = None self.filename = draftname self.title = self.xmlroot.findtext('front/title').strip() - if type(self.title) is unicode: + if type(self.title) is str: self.title = unidecode(self.title) self.abstract = (self.xmlroot.findtext('front/abstract') or '').strip() - if type(self.abstract) is unicode: + if type(self.abstract) is str: self.abstract = unidecode(self.abstract) author_info = self.xmlroot.findall('front/author') for author in author_info: @@ -304,7 +305,7 @@ class SubmissionBaseUploadForm(forms.Form): else: name_parts = name.split("-") if len(name_parts) < 3: - raise forms.ValidationError(u"The draft name \"%s\" is missing a third part, please rename it" % name) + raise forms.ValidationError("The draft name \"%s\" is missing a third part, please rename it" % name) if name.startswith('draft-ietf-') or name.startswith("draft-irtf-"): @@ -339,10 +340,10 @@ class SubmissionBaseUploadForm(forms.Form): return None class SubmissionManualUploadForm(SubmissionBaseUploadForm): - xml = forms.FileField(label=u'.xml format', required=False) # xml field with required=False instead of True - txt = forms.FileField(label=u'.txt format', required=False) - pdf = forms.FileField(label=u'.pdf format', required=False) - ps = forms.FileField(label=u'.ps format', required=False) + xml = forms.FileField(label='.xml format', required=False) # xml field with required=False instead of True + txt = forms.FileField(label='.txt format', required=False) + pdf = forms.FileField(label='.pdf format', required=False) + ps = forms.FileField(label='.ps format', required=False) def __init__(self, request, *args, **kwargs): super(SubmissionManualUploadForm, self).__init__(request, *args, **kwargs) @@ -368,7 +369,7 @@ class SubmissionAutoUploadForm(SubmissionBaseUploadForm): class NameEmailForm(forms.Form): name = forms.CharField(required=True) - email = forms.EmailField(label=u'Email address', required=True) + email = forms.EmailField(label='Email address', required=True) def __init__(self, *args, **kwargs): super(NameEmailForm, self).__init__(*args, **kwargs) @@ -392,7 +393,7 @@ class AuthorForm(NameEmailForm): class SubmitterForm(NameEmailForm): #Fields for secretariat only - approvals_received = forms.BooleanField(label=u'Approvals received', required=False, initial=False) + approvals_received = forms.BooleanField(label='Approvals received', required=False, initial=False) def cleaned_line(self): line = self.cleaned_data["name"] @@ -422,13 +423,13 @@ class ReplacesForm(forms.Form): class EditSubmissionForm(forms.ModelForm): title = forms.CharField(required=True, max_length=255) - rev = forms.CharField(label=u'Revision', max_length=2, required=True) + rev = forms.CharField(label='Revision', max_length=2, required=True) document_date = forms.DateField(required=True) pages = forms.IntegerField(required=True) formal_languages = forms.ModelMultipleChoiceField(queryset=FormalLanguageName.objects.filter(used=True), widget=forms.CheckboxSelectMultiple, required=False) abstract = forms.CharField(widget=forms.Textarea, required=True, strip=False) - note = forms.CharField(label=mark_safe(u'Comment to the Secretariat'), widget=forms.Textarea, required=False, strip=False) + note = forms.CharField(label=mark_safe('Comment to the Secretariat'), widget=forms.Textarea, required=False, strip=False) class Meta: model = Submission diff --git a/ietf/submit/mail.py b/ietf/submit/mail.py index dafbd9e9e..661bef8b1 100644 --- a/ietf/submit/mail.py +++ b/ietf/submit/mail.py @@ -82,7 +82,7 @@ def send_approval_request_to_group(request, submission): return all_addrs def send_manual_post_request(request, submission, errors): - subject = u'Manual Post Requested for %s' % submission.name + subject = 'Manual Post Requested for %s' % submission.name from_email = settings.IDSUBMIT_FROM_EMAIL (to_email,cc) = gather_address_lists('sub_manual_post_requested',submission=submission) checker = DraftIdnitsChecker(options=[]) # don't use the default --submitcheck limitation @@ -234,7 +234,7 @@ def process_response_email(msg): save_submission_email_attachments(submission_email_event, parts) - log(u"Received submission email from %s" % msg.frm) + log("Received submission email from %s" % msg.frm) return msg diff --git a/ietf/submit/management/commands/manualpost_email.py b/ietf/submit/management/commands/manualpost_email.py index 710f4a0f9..771da84be 100644 --- a/ietf/submit/management/commands/manualpost_email.py +++ b/ietf/submit/management/commands/manualpost_email.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2016-2019, All Rights Reserved import sys from django.core.management.base import BaseCommand, CommandError @@ -7,7 +8,7 @@ from ietf.submit.mail import process_response_email import debug # pyflakes:ignore class Command(BaseCommand): - help = (u"Process incoming manual post email responses") + help = ("Process incoming manual post email responses") def add_arguments(self, parser): parser.add_argument('--email-file', dest='email', help='File containing email (default: stdin)') diff --git a/ietf/submit/migrations/0001_initial.py b/ietf/submit/migrations/0001_initial.py index 1d85ccba4..feeb457b4 100644 --- a/ietf/submit/migrations/0001_initial.py +++ b/ietf/submit/migrations/0001_initial.py @@ -1,6 +1,7 @@ +# Copyright The IETF Trust 2018-2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-02-20 10:52 -from __future__ import unicode_literals + import datetime from django.db import migrations, models diff --git a/ietf/submit/migrations/0002_submission_document2_fk.py b/ietf/submit/migrations/0002_submission_document2_fk.py index 153a34559..e6a7c3b7c 100644 --- a/ietf/submit/migrations/0002_submission_document2_fk.py +++ b/ietf/submit/migrations/0002_submission_document2_fk.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-08 11:58 -from __future__ import unicode_literals + from django.db import migrations import django.db.models.deletion diff --git a/ietf/submit/migrations/0003_remove_old_document_field.py b/ietf/submit/migrations/0003_remove_old_document_field.py index 8a5cf2104..a0412cbae 100644 --- a/ietf/submit/migrations/0003_remove_old_document_field.py +++ b/ietf/submit/migrations/0003_remove_old_document_field.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-25 06:44 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/submit/migrations/0004_rename_field_document2.py b/ietf/submit/migrations/0004_rename_field_document2.py index cb8e32f15..0e928dc8c 100644 --- a/ietf/submit/migrations/0004_rename_field_document2.py +++ b/ietf/submit/migrations/0004_rename_field_document2.py @@ -1,7 +1,7 @@ # Copyright The IETF Trust 2019, All Rights Reserved # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-25 06:46 -from __future__ import unicode_literals + from django.db import migrations diff --git a/ietf/submit/models.py b/ietf/submit/models.py index 6e6b09c2d..0f84d42b2 100644 --- a/ietf/submit/models.py +++ b/ietf/submit/models.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2011-2019, All Rights Reserved import datetime import email @@ -55,7 +56,7 @@ class Submission(models.Model): draft = ForeignKey(Document, null=True, blank=True) def __unicode__(self): - return u"%s-%s" % (self.name, self.rev) + return "%s-%s" % (self.name, self.rev) def submitter_parsed(self): return parse_email_line(self.submitter) @@ -95,7 +96,7 @@ class SubmissionEvent(models.Model): desc = models.TextField() def __unicode__(self): - return u"%s %s by %s at %s" % (self.submission.name, self.desc, self.by.plain_name() if self.by else "(unknown)", self.time) + return "%s %s by %s at %s" % (self.submission.name, self.desc, self.by.plain_name() if self.by else "(unknown)", self.time) class Meta: ordering = ("-time", "-id") @@ -116,7 +117,7 @@ class SubmissionEmailEvent(SubmissionEvent): in_reply_to = ForeignKey(Message, null=True, blank=True,related_name='irtomanual') def __unicode__(self): - return u"%s %s by %s at %s" % (self.submission.name, self.desc, self.by.plain_name() if self.by else "(unknown)", self.time) + return "%s %s by %s at %s" % (self.submission.name, self.desc, self.by.plain_name() if self.by else "(unknown)", self.time) class Meta: ordering = ['-time', '-id'] diff --git a/ietf/submit/parsers/base.py b/ietf/submit/parsers/base.py index 94c928a87..24017fec5 100644 --- a/ietf/submit/parsers/base.py +++ b/ietf/submit/parsers/base.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2011-2019, All Rights Reserved import re import magic @@ -62,21 +63,21 @@ class FileParser(object): regexp = re.compile(r'&|\|\/|;|\*|\s|\$') chars = regexp.findall(name) if chars: - self.parsed_info.add_error(u'Invalid characters were found in the name of the file which was just submitted: %s' % ', '.join(set(chars))) + self.parsed_info.add_error('Invalid characters were found in the name of the file which was just submitted: %s' % ', '.join(set(chars))) def parse_max_size(self): max_size = settings.IDSUBMIT_MAX_DRAFT_SIZE[self.ext] if self.fd.size > max_size: - self.parsed_info.add_error(u'File size is larger than the permitted maximum of %s' % filesizeformat(max_size)) + self.parsed_info.add_error('File size is larger than the permitted maximum of %s' % filesizeformat(max_size)) self.parsed_info.metadata.file_size = self.fd.size def parse_filename_extension(self): if not self.fd.name.lower().endswith('.'+self.ext): - self.parsed_info.add_error(u'Expected the %s file to have extension ".%s", found the name "%s"' % (self.ext.upper(), self.ext, self.fd.name)) + self.parsed_info.add_error('Expected the %s file to have extension ".%s", found the name "%s"' % (self.ext.upper(), self.ext, self.fd.name)) def parse_file_type(self): self.fd.file.seek(0) content = self.fd.file.read() mimetype = magic.from_buffer(content, mime=True) if not mimetype in self.mimetypes: - self.parsed_info.add_error(u'Expected an %s file of type "%s", found one of type "%s"' % (self.ext.upper(), '" or "'.join(self.mimetypes), mimetype)) + self.parsed_info.add_error('Expected an %s file of type "%s", found one of type "%s"' % (self.ext.upper(), '" or "'.join(self.mimetypes), mimetype)) diff --git a/ietf/submit/parsers/plain_parser.py b/ietf/submit/parsers/plain_parser.py index afb65233f..22546d47a 100644 --- a/ietf/submit/parsers/plain_parser.py +++ b/ietf/submit/parsers/plain_parser.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2011-2019, All Rights Reserved import re from ietf.submit.parsers.base import FileParser @@ -55,16 +56,16 @@ class PlainParser(FileParser): extra_chars = re.sub('[0-9a-z\-]', '', name) if extra_chars: if len(extra_chars) == 1: - self.parsed_info.add_error((u'The document name on the first page, "%s", contains a disallowed character with byte code: %s ' % (name.decode('utf-8','replace'), ord(extra_chars[0]))) + - u'(see https://www.ietf.org/id-info/guidelines.html#naming for details).') + self.parsed_info.add_error(('The document name on the first page, "%s", contains a disallowed character with byte code: %s ' % (name.decode('utf-8','replace'), ord(extra_chars[0]))) + + '(see https://www.ietf.org/id-info/guidelines.html#naming for details).') else: - self.parsed_info.add_error((u'The document name on the first page, "%s", contains disallowed characters with byte codes: %s ' % (name.decode('utf-8','replace'), (', '.join([ str(ord(c)) for c in extra_chars] )))) + - u'(see https://www.ietf.org/id-info/guidelines.html#naming for details).') + self.parsed_info.add_error(('The document name on the first page, "%s", contains disallowed characters with byte codes: %s ' % (name.decode('utf-8','replace'), (', '.join([ str(ord(c)) for c in extra_chars] )))) + + '(see https://www.ietf.org/id-info/guidelines.html#naming for details).') match_revision = revisionre.match(name) if match_revision: self.parsed_info.metadata.rev = match_revision.group(1) else: - self.parsed_info.add_error(u'The name found on the first page of the document does not contain a revision: "%s"' % (name.decode('utf-8','replace'),)) + self.parsed_info.add_error('The name found on the first page of the document does not contain a revision: "%s"' % (name.decode('utf-8','replace'),)) name = re.sub('-\d+$', '', name) self.parsed_info.metadata.name = name return diff --git a/ietf/submit/templatetags/submit_tags.py b/ietf/submit/templatetags/submit_tags.py index 13e93abf7..fb81cdc98 100644 --- a/ietf/submit/templatetags/submit_tags.py +++ b/ietf/submit/templatetags/submit_tags.py @@ -1,3 +1,4 @@ +# Copyright The IETF Trust 2011-2019, All Rights Reserved import os from django import template @@ -26,7 +27,7 @@ def show_submission_files(context, submission): @register.filter def two_pages_decorated_with_errors(submission, errors): pages = submission.first_two_pages or '' - if 'rev' not in errors.keys(): + if 'rev' not in list(errors.keys()): return mark_safe('
%s
' % escape(pages)) result = '
\n'
     for line in pages.split('\n'):
diff --git a/ietf/submit/tests.py b/ietf/submit/tests.py
index 08c03dbfa..1302c3b4b 100644
--- a/ietf/submit/tests.py
+++ b/ietf/submit/tests.py
@@ -1,6 +1,6 @@
 # Copyright The IETF Trust 2011-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function
+
 
 import datetime
 import email
@@ -10,7 +10,7 @@ import shutil
 import sys
 
 
-from StringIO import StringIO
+from io import StringIO
 from pyquery import PyQuery
 
 from django.conf import settings
@@ -145,7 +145,7 @@ class SubmitTests(TestCase):
 
         status_url = r["Location"]
         for format in formats:
-            self.assertTrue(os.path.exists(os.path.join(self.staging_dir, u"%s-%s.%s" % (name, rev, format))))
+            self.assertTrue(os.path.exists(os.path.join(self.staging_dir, "%s-%s.%s" % (name, rev, format))))
         self.assertEqual(Submission.objects.filter(name=name).count(), 1)
         submission = Submission.objects.get(name=name)
         if len(submission.authors) != 1:
@@ -274,8 +274,8 @@ class SubmitTests(TestCase):
         self.assertEqual(new_revision.type, "new_revision")
         self.assertEqual(new_revision.by.name, author.name)
         self.assertTrue(draft.latest_event(type="added_suggested_replaces"))
-        self.assertTrue(not os.path.exists(os.path.join(self.staging_dir, u"%s-%s.txt" % (name, rev))))
-        self.assertTrue(os.path.exists(os.path.join(self.repository_dir, u"%s-%s.txt" % (name, rev))))
+        self.assertTrue(not os.path.exists(os.path.join(self.staging_dir, "%s-%s.txt" % (name, rev))))
+        self.assertTrue(os.path.exists(os.path.join(self.repository_dir, "%s-%s.txt" % (name, rev))))
         self.assertEqual(draft.type_id, "draft")
         self.assertEqual(draft.stream_id, "ietf")
         self.assertTrue(draft.expires >= datetime.datetime.now() + datetime.timedelta(days=settings.INTERNET_DRAFT_DAYS_TO_EXPIRE - 1))
@@ -289,17 +289,17 @@ class SubmitTests(TestCase):
         self.assertEqual(draft.relations_that_doc("possibly-replaces").count(), 1)
         self.assertTrue(draft.relations_that_doc("possibly-replaces").first().target, sug_replaced_alias)
         self.assertEqual(len(outbox), mailbox_before + 5)
-        self.assertIn((u"I-D Action: %s" % name), outbox[-4]["Subject"])
-        self.assertIn(author.ascii, unicode(outbox[-4]))
-        self.assertIn((u"I-D Action: %s" % name), outbox[-3]["Subject"])
-        self.assertIn(author.ascii, unicode(outbox[-3]))
+        self.assertIn(("I-D Action: %s" % name), outbox[-4]["Subject"])
+        self.assertIn(author.ascii, str(outbox[-4]))
+        self.assertIn(("I-D Action: %s" % name), outbox[-3]["Subject"])
+        self.assertIn(author.ascii, str(outbox[-3]))
         self.assertIn("New Version Notification",outbox[-2]["Subject"])
-        self.assertIn(name, unicode(outbox[-2]))
-        self.assertIn("mars", unicode(outbox[-2]))
+        self.assertIn(name, str(outbox[-2]))
+        self.assertIn("mars", str(outbox[-2]))
         # Check "Review of suggested possible replacements for..." mail
         self.assertIn("review", outbox[-1]["Subject"].lower())
-        self.assertIn(name, unicode(outbox[-1]))
-        self.assertIn(sug_replaced_alias.name, unicode(outbox[-1]))
+        self.assertIn(name, str(outbox[-1]))
+        self.assertIn(sug_replaced_alias.name, str(outbox[-1]))
         self.assertIn("ames-chairs@", outbox[-1]["To"].lower())
         self.assertIn("mars-chairs@", outbox[-1]["To"].lower())
 
@@ -367,7 +367,7 @@ class SubmitTests(TestCase):
         prev_author = draft.documentauthor_set.all()[0]
         if change_authors:
             # Make it such that one of the previous authors has an invalid email address
-            bogus_person, bogus_email = ensure_person_email_info_exists(u'Bogus Person', None, draft.name)
+            bogus_person, bogus_email = ensure_person_email_info_exists('Bogus Person', None, draft.name)
             DocumentAuthor.objects.create(document=draft, person=bogus_person, email=bogus_email, order=draft.documentauthor_set.latest('order').order+1)
 
         # Set the revision needed tag
@@ -407,7 +407,7 @@ class SubmitTests(TestCase):
         self.assertTrue("unknown-email-" not in confirm_email["To"])
         if change_authors:
             # Since authors changed, ensure chairs are copied (and that the message says why)
-            self.assertTrue("chairs have been copied" in unicode(confirm_email))
+            self.assertTrue("chairs have been copied" in str(confirm_email))
             if group_type in ['wg','rg','ag']:
                 self.assertTrue("mars-chairs@" in confirm_email["To"].lower())
             elif group_type == 'area':
@@ -417,7 +417,7 @@ class SubmitTests(TestCase):
             if stream_type=='ise':
                self.assertTrue("rfc-ise@" in confirm_email["To"].lower())
         else:
-            self.assertNotIn("chairs have been copied", unicode(confirm_email))
+            self.assertNotIn("chairs have been copied", str(confirm_email))
             self.assertNotIn("mars-chairs@", confirm_email["To"].lower())
 
         confirm_url = self.extract_confirm_url(confirm_email)
@@ -473,8 +473,8 @@ class SubmitTests(TestCase):
 
         self.assertTrue(not os.path.exists(os.path.join(self.repository_dir, "%s-%s.txt" % (name, old_rev))))
         self.assertTrue(os.path.exists(os.path.join(self.archive_dir, "%s-%s.txt" % (name, old_rev))))
-        self.assertTrue(not os.path.exists(os.path.join(self.staging_dir, u"%s-%s.txt" % (name, rev))))
-        self.assertTrue(os.path.exists(os.path.join(self.repository_dir, u"%s-%s.txt" % (name, rev))))
+        self.assertTrue(not os.path.exists(os.path.join(self.staging_dir, "%s-%s.txt" % (name, rev))))
+        self.assertTrue(os.path.exists(os.path.join(self.repository_dir, "%s-%s.txt" % (name, rev))))
         self.assertEqual(draft.type_id, "draft")
         if stream_type == 'ietf':
             self.assertEqual(draft.stream_id, "ietf")
@@ -484,19 +484,19 @@ class SubmitTests(TestCase):
         self.assertEqual(len(authors), 1)
         self.assertIn(author, [ a.person for a in authors ])
         self.assertEqual(len(outbox), mailbox_before + 3)
-        self.assertTrue((u"I-D Action: %s" % name) in outbox[-3]["Subject"])
-        self.assertTrue((u"I-D Action: %s" % name) in draft.message_set.order_by("-time")[0].subject)
-        self.assertTrue(author.ascii in unicode(outbox[-3]))
+        self.assertTrue(("I-D Action: %s" % name) in outbox[-3]["Subject"])
+        self.assertTrue(("I-D Action: %s" % name) in draft.message_set.order_by("-time")[0].subject)
+        self.assertTrue(author.ascii in str(outbox[-3]))
         self.assertTrue("i-d-announce@" in outbox[-3]['To'])
         self.assertTrue("New Version Notification" in outbox[-2]["Subject"])
-        self.assertTrue(name in unicode(outbox[-2]))
+        self.assertTrue(name in str(outbox[-2]))
         interesting_address = {'ietf':'mars', 'irtf':'irtf-chair', 'iab':'iab-chair', 'ise':'rfc-ise'}[draft.stream_id]
-        self.assertTrue(interesting_address in unicode(outbox[-2]))
+        self.assertTrue(interesting_address in str(outbox[-2]))
         if draft.stream_id == 'ietf':
-            self.assertTrue(draft.ad.role_email("ad").address in unicode(outbox[-2]))
-            self.assertTrue(ballot_position.ad.role_email("ad").address in unicode(outbox[-2]))
+            self.assertTrue(draft.ad.role_email("ad").address in str(outbox[-2]))
+            self.assertTrue(ballot_position.ad.role_email("ad").address in str(outbox[-2]))
         self.assertTrue("New Version Notification" in outbox[-1]["Subject"])
-        self.assertTrue(name in unicode(outbox[-1]))
+        self.assertTrue(name in str(outbox[-1]))
         r = self.client.get(urlreverse('ietf.doc.views_search.recent_drafts'))
         self.assertEqual(r.status_code, 200)
         self.assertIn(draft.name,  unicontent(r))
@@ -556,7 +556,7 @@ class SubmitTests(TestCase):
         # both submitter and author get email
         self.assertTrue(author.email().address.lower() in confirm_email["To"])
         self.assertTrue("submitter@example.com" in confirm_email["To"])
-        self.assertFalse("chairs have been copied" in unicode(confirm_email))
+        self.assertFalse("chairs have been copied" in str(confirm_email))
 
         confirm_url = self.extract_confirm_url(outbox[-1])
 
@@ -614,7 +614,7 @@ class SubmitTests(TestCase):
         r = self.client.get(status_url)
         self.assertEqual(len(outbox), mailbox_before + 1)
         confirm_url = self.extract_confirm_url(outbox[-1])
-        self.assertFalse("chairs have been copied" in unicode(outbox[-1]))
+        self.assertFalse("chairs have been copied" in str(outbox[-1]))
         mailbox_before = len(outbox)
         r = self.client.post(confirm_url, {'action':'confirm'})
         self.assertEqual(r.status_code, 302)
@@ -696,7 +696,7 @@ class SubmitTests(TestCase):
 
         # cancel
         r = self.client.post(status_url, dict(action=action))
-        self.assertTrue(not os.path.exists(os.path.join(self.staging_dir, u"%s-%s.txt" % (name, rev))))
+        self.assertTrue(not os.path.exists(os.path.join(self.staging_dir, "%s-%s.txt" % (name, rev))))
 
     def test_edit_submission_and_force_post(self):
         # submit -> edit
@@ -886,15 +886,15 @@ class SubmitTests(TestCase):
 
         self.assertEqual(Submission.objects.filter(name=name).count(), 1)
 
-        self.assertTrue(os.path.exists(os.path.join(self.staging_dir, u"%s-%s.txt" % (name, rev))))
-        self.assertTrue(name in open(os.path.join(self.staging_dir, u"%s-%s.txt" % (name, rev))).read())
-        self.assertTrue(os.path.exists(os.path.join(self.staging_dir, u"%s-%s.xml" % (name, rev))))
-        self.assertTrue(name in open(os.path.join(self.staging_dir, u"%s-%s.xml" % (name, rev))).read())
-        self.assertTrue('' in open(os.path.join(self.staging_dir, u"%s-%s.xml" % (name, rev))).read())
-        self.assertTrue(os.path.exists(os.path.join(self.staging_dir, u"%s-%s.pdf" % (name, rev))))
-        self.assertTrue('This is PDF' in open(os.path.join(self.staging_dir, u"%s-%s.pdf" % (name, rev))).read())
-        self.assertTrue(os.path.exists(os.path.join(self.staging_dir, u"%s-%s.ps" % (name, rev))))
-        self.assertTrue('This is PostScript' in open(os.path.join(self.staging_dir, u"%s-%s.ps" % (name, rev))).read())
+        self.assertTrue(os.path.exists(os.path.join(self.staging_dir, "%s-%s.txt" % (name, rev))))
+        self.assertTrue(name in open(os.path.join(self.staging_dir, "%s-%s.txt" % (name, rev))).read())
+        self.assertTrue(os.path.exists(os.path.join(self.staging_dir, "%s-%s.xml" % (name, rev))))
+        self.assertTrue(name in open(os.path.join(self.staging_dir, "%s-%s.xml" % (name, rev))).read())
+        self.assertTrue('' in open(os.path.join(self.staging_dir, "%s-%s.xml" % (name, rev))).read())
+        self.assertTrue(os.path.exists(os.path.join(self.staging_dir, "%s-%s.pdf" % (name, rev))))
+        self.assertTrue('This is PDF' in open(os.path.join(self.staging_dir, "%s-%s.pdf" % (name, rev))).read())
+        self.assertTrue(os.path.exists(os.path.join(self.staging_dir, "%s-%s.ps" % (name, rev))))
+        self.assertTrue('This is PostScript' in open(os.path.join(self.staging_dir, "%s-%s.ps" % (name, rev))).read())
 
     def test_expire_submissions(self):
         s = Submission.objects.create(name="draft-ietf-mars-foo",
@@ -925,10 +925,10 @@ class SubmitTests(TestCase):
 
     def test_help_pages(self):
         r = self.client.get(urlreverse("ietf.submit.views.note_well"))
-        self.assertEquals(r.status_code, 200)
+        self.assertEqual(r.status_code, 200)
 
         r = self.client.get(urlreverse("ietf.submit.views.tool_instructions"))
-        self.assertEquals(r.status_code, 200)
+        self.assertEqual(r.status_code, 200)
         
     def test_blackout_access(self):
         # get
@@ -1016,7 +1016,7 @@ class SubmitTests(TestCase):
 
         # submit
         #author = PersonFactory(name=u"Jörgen Nilsson".encode('latin1'))
-        user = UserFactory(first_name=u"Jörgen", last_name=u"Nilsson")
+        user = UserFactory(first_name="Jörgen", last_name="Nilsson")
         author = PersonFactory(user=user)
 
         file, __ = submission_file(name, rev, group, "txt", "test_submission.nonascii", author=author, ascii=False)
@@ -1051,7 +1051,7 @@ class SubmitTests(TestCase):
         r = self.client.get(status_url)
         q = PyQuery(r.content)
         #
-        self.assertContains(r, u'The yang validation returned 1 error')
+        self.assertContains(r, 'The yang validation returned 1 error')
         #
         m = q('#yang-validation-message').text()
         for command in ['xym', 'pyang', 'yanglint']:
@@ -1553,7 +1553,7 @@ Subject: test
 
         status_url = r["Location"]
         for format in formats:
-            self.assertTrue(os.path.exists(os.path.join(self.staging_dir, u"%s-%s.%s" % (name, rev, format))))
+            self.assertTrue(os.path.exists(os.path.join(self.staging_dir, "%s-%s.%s" % (name, rev, format))))
         self.assertEqual(Submission.objects.filter(name=name).count(), 1)
         submission = Submission.objects.get(name=name)
         self.assertTrue(all([ c.passed!=False for c in submission.checks.all() ]))
diff --git a/ietf/submit/utils.py b/ietf/submit/utils.py
index 64d20251e..2a30d6838 100644
--- a/ietf/submit/utils.py
+++ b/ietf/submit/utils.py
@@ -200,7 +200,7 @@ def post_submission(request, submission, approvedDesc):
     submitter_parsed = submission.submitter_parsed()
     if submitter_parsed["name"] and submitter_parsed["email"]:
         submitter, _ = ensure_person_email_info_exists(submitter_parsed["name"], submitter_parsed["email"], submission.name)
-        submitter_info = u'%s <%s>' % (submitter_parsed["name"], submitter_parsed["email"])
+        submitter_info = '%s <%s>' % (submitter_parsed["name"], submitter_parsed["email"])
     else:
         submitter = system
         submitter_info = system.name
@@ -470,7 +470,7 @@ def ensure_person_email_info_exists(name, email, docname):
     else:
         # we're in trouble, use a fake one
         active = False
-        addr = u"unknown-email-%s" % person.plain_ascii().replace(" ", "-")
+        addr = "unknown-email-%s" % person.plain_ascii().replace(" ", "-")
 
     try:
         email = person.email_set.get(address=addr)
@@ -523,7 +523,7 @@ def cancel_submission(submission):
 
 def rename_submission_files(submission, prev_rev, new_rev):
     from ietf.submit.forms import SubmissionManualUploadForm
-    for ext in SubmissionManualUploadForm.base_fields.keys():
+    for ext in list(SubmissionManualUploadForm.base_fields.keys()):
         source = os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s.%s' % (submission.name, prev_rev, ext))
         dest = os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s.%s' % (submission.name, new_rev, ext))
         if os.path.exists(source):
@@ -531,7 +531,7 @@ def rename_submission_files(submission, prev_rev, new_rev):
 
 def move_files_to_repository(submission):
     from ietf.submit.forms import SubmissionManualUploadForm
-    for ext in SubmissionManualUploadForm.base_fields.keys():
+    for ext in list(SubmissionManualUploadForm.base_fields.keys()):
         source = os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s.%s' % (submission.name, submission.rev, ext))
         dest = os.path.join(settings.IDSUBMIT_REPOSITORY_PATH, '%s-%s.%s' % (submission.name, submission.rev, ext))
         if os.path.exists(source):
@@ -600,7 +600,7 @@ def get_draft_meta(form):
     file_name = {}
     abstract = None
     file_size = None
-    for ext in form.fields.keys():
+    for ext in list(form.fields.keys()):
         if not ext in form.formats:
             continue
         f = form.cleaned_data[ext]
@@ -663,9 +663,9 @@ def get_draft_meta(form):
 
             def turn_into_unicode(s):
                 if s is None:
-                    return u""
+                    return ""
 
-                if isinstance(s, unicode):
+                if isinstance(s, str):
                     return s
                 else:
                     try:
@@ -760,8 +760,8 @@ def send_confirmation_emails(request, submission, requires_group_approval, requi
 
         sent_to = send_approval_request_to_group(request, submission)
 
-        desc = "sent approval email to group chairs: %s" % u", ".join(sent_to)
-        docDesc = u"Request for posting approval emailed to group chairs: %s" % u", ".join(sent_to)
+        desc = "sent approval email to group chairs: %s" % ", ".join(sent_to)
+        docDesc = "Request for posting approval emailed to group chairs: %s" % ", ".join(sent_to)
 
     else:
         group_authors_changed = False
@@ -781,11 +781,11 @@ def send_confirmation_emails(request, submission, requires_group_approval, requi
         sent_to = send_submission_confirmation(request, submission, chair_notice=group_authors_changed)
 
         if submission.state_id == "aut-appr":
-            desc = u"sent confirmation email to previous authors: %s" % u", ".join(sent_to)
-            docDesc = "Request for posting confirmation emailed to previous authors: %s" % u", ".join(sent_to)
+            desc = "sent confirmation email to previous authors: %s" % ", ".join(sent_to)
+            docDesc = "Request for posting confirmation emailed to previous authors: %s" % ", ".join(sent_to)
         else:
-            desc = u"sent confirmation email to submitter and authors: %s" % u", ".join(sent_to)
-            docDesc = "Request for posting confirmation emailed to submitter and authors: %s" % u", ".join(sent_to)
+            desc = "sent confirmation email to submitter and authors: %s" % ", ".join(sent_to)
+            docDesc = "Request for posting confirmation emailed to submitter and authors: %s" % ", ".join(sent_to)
     return sent_to, desc, docDesc
 
     
diff --git a/ietf/submit/views.py b/ietf/submit/views.py
index a08c39035..8d234133b 100644
--- a/ietf/submit/views.py
+++ b/ietf/submit/views.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2007-2019, All Rights Reserved
+# Copyright The IETF Trust 2011-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 import re
@@ -132,7 +132,7 @@ def api_submit(request):
                 requires_prev_authors_approval = Document.objects.filter(name=submission.name)
 
                 sent_to, desc, docDesc = send_confirmation_emails(request, submission, requires_group_approval, requires_prev_authors_approval)
-                msg = u"Set submitter to \"%s\" and %s" % (submission.submitter, desc)
+                msg = "Set submitter to \"%s\" and %s" % (submission.submitter, desc)
                 create_submission_event(request, submission, msg)
                 docevent_from_submission(request, submission, docDesc, who="(System)")
 
@@ -229,7 +229,7 @@ def submission_status(request, submission_id, access_token=None):
     if submission.state_id == "cancel":
         message = ('error', 'This submission has been cancelled, modification is no longer possible.')
     elif submission.state_id == "auth":
-        message = ('success', u'The submission is pending email authentication. An email has been sent to: %s' % ", ".join(confirmation_list))
+        message = ('success', 'The submission is pending email authentication. An email has been sent to: %s' % ", ".join(confirmation_list))
     elif submission.state_id == "grp-appr":
         message = ('success', 'The submission is pending approval by the group chairs.')
     elif submission.state_id == "aut-appr":
@@ -262,12 +262,12 @@ def submission_status(request, submission_id, access_token=None):
                     # go directly to posting submission
                     docevent_from_submission(request, submission, desc="Uploaded new revision")
 
-                    desc = u"Secretariat manually posting. Approvals already received"
+                    desc = "Secretariat manually posting. Approvals already received"
                     post_submission(request, submission, desc)
                     create_submission_event(request, submission, desc)
                 else:
                     sent_to, desc, docDesc = send_confirmation_emails(request, submission, requires_group_approval, requires_prev_authors_approval)
-                    msg = u"Set submitter to \"%s\", replaces to %s and %s" % (
+                    msg = "Set submitter to \"%s\", replaces to %s and %s" % (
                         submission.submitter,
                         ", ".join(prettify_std_name(r.name) for r in replaces) if replaces else "(none)",
                         desc)
@@ -288,9 +288,9 @@ def submission_status(request, submission_id, access_token=None):
         elif action == "sendfullurl" and submission.state_id not in ("cancel", "posted"):
             sent_to = send_full_url(request, submission)
 
-            message = ('success', u'An email has been sent with the full access URL to: %s' % u",".join(confirmation_list))
+            message = ('success', 'An email has been sent with the full access URL to: %s' % ",".join(confirmation_list))
 
-            create_submission_event(request, submission, u"Sent full access URL to: %s" % u", ".join(sent_to))
+            create_submission_event(request, submission, "Sent full access URL to: %s" % ", ".join(sent_to))
 
         elif action == "cancel" and submission.state.next_states.filter(slug="cancel"):
             if not can_cancel:
@@ -418,7 +418,7 @@ def edit_submission(request, submission_id, access_token=None):
             ]
 
             if changed_fields:
-                desc = u"Edited %s and sent request for manual post" % u", ".join(changed_fields)
+                desc = "Edited %s and sent request for manual post" % ", ".join(changed_fields)
             else:
                 desc = "Sent request for manual post"
 
diff --git a/ietf/sync/iana.py b/ietf/sync/iana.py
index 23c88c1dd..58293625d 100644
--- a/ietf/sync/iana.py
+++ b/ietf/sync/iana.py
@@ -1,9 +1,10 @@
+# Copyright The IETF Trust 2012-2019, All Rights Reserved
 import base64
 import datetime
 import email
 import json
 import re
-import urllib2
+import urllib.request, urllib.error, urllib.parse
 
 from django.utils.http import urlquote
 from django.conf import settings
@@ -19,7 +20,7 @@ from ietf.utils.timezone import local_timezone_to_utc, email_time_to_local_timez
 #CHANGES_URL = "https://datatracker.dev.icann.org:8080/data-tracker/changes"
 
 def fetch_protocol_page(url):
-    f = urllib2.urlopen(settings.IANA_SYNC_PROTOCOLS_URL)
+    f = urllib.request.urlopen(settings.IANA_SYNC_PROTOCOLS_URL)
     text = f.read()
     f.close()
     return text
@@ -63,12 +64,12 @@ def update_rfc_log_from_protocol_page(rfc_names, rfc_must_published_later_than):
 def fetch_changes_json(url, start, end):
     url += "?start=%s&end=%s" % (urlquote(local_timezone_to_utc(start).strftime("%Y-%m-%d %H:%M:%S")),
                                  urlquote(local_timezone_to_utc(end).strftime("%Y-%m-%d %H:%M:%S")))
-    request = urllib2.Request(url)
+    request = urllib.request.Request(url)
     # HTTP basic auth
     username = "ietfsync"
     password = settings.IANA_SYNC_PASSWORD
     request.add_header("Authorization", "Basic %s" % base64.encodestring("%s:%s" % (username, password)).replace("\n", ""))
-    f = urllib2.urlopen(request)
+    f = urllib.request.urlopen(request)
     text = f.read()
     f.close()
     return text
diff --git a/ietf/sync/rfceditor.py b/ietf/sync/rfceditor.py
index 8ad50da1f..17fa929a1 100644
--- a/ietf/sync/rfceditor.py
+++ b/ietf/sync/rfceditor.py
@@ -4,8 +4,8 @@
 import re
 import base64
 import datetime
-import urllib
-import urllib2
+import urllib.request, urllib.parse, urllib.error
+import urllib.request, urllib.error, urllib.parse
 import socket
 from xml.dom import pulldom, Node
 
@@ -40,7 +40,7 @@ def get_child_text(parent_node, tag_name):
 
 def fetch_queue_xml(url):
     socket.setdefaulttimeout(30)
-    return urllib2.urlopen(url)
+    return urllib.request.urlopen(url)
 
 def parse_queue(response):
     """Parse RFC Editor queue XML into a bunch of tuples + warnings."""
@@ -217,7 +217,7 @@ def update_drafts_from_queue(drafts):
 
     # remove tags and states for those not in the queue anymore
     for d in Document.objects.exclude(docalias__name__in=names).filter(states__type="draft-rfceditor").distinct():
-        d.tags.remove(*tag_mapping.values())
+        d.tags.remove(*list(tag_mapping.values()))
         d.unset_state("draft-rfceditor")
         # we do not add a history entry here - most likely we already
         # have something that explains what happened
@@ -228,7 +228,7 @@ def update_drafts_from_queue(drafts):
 
 def fetch_index_xml(url):
     socket.setdefaulttimeout(30)
-    return urllib2.urlopen(url)
+    return urllib.request.urlopen(url)
 
 def parse_index(response):
     """Parse RFC Editor index XML into a bunch of tuples."""
@@ -503,7 +503,7 @@ def update_docs_from_rfc_index(data, skip_older_than_date=None):
                 rev=doc.rev,
                 by=system,
                 type="sync_from_rfc_editor",
-                desc=u"Received changes through RFC Editor sync (%s)" % u", ".join(changes),
+                desc="Received changes through RFC Editor sync (%s)" % ", ".join(changes),
             ))
 
             doc.save_with_history(events)
@@ -517,7 +517,7 @@ def post_approved_draft(url, name):
     the data from the Datatracker and start processing it. Returns
     response and error (empty string if no error)."""
 
-    request = urllib2.Request(url)
+    request = urllib.request.Request(url)
     request.add_header("Content-type", "application/x-www-form-urlencoded")
     request.add_header("Accept", "text/plain")
     # HTTP basic auth
@@ -531,7 +531,7 @@ def post_approved_draft(url, name):
     log("Posting RFC-Editor notifcation of approved draft '%s' to '%s'" % (name, url))
     text = error = ""
     try:
-        f = urllib2.urlopen(request, data=urllib.urlencode({ 'draft': name }), timeout=20)
+        f = urllib.request.urlopen(request, data=urllib.parse.urlencode({ 'draft': name }), timeout=20)
         text = f.read()
         status_code = f.getcode()
         f.close()
@@ -547,6 +547,6 @@ def post_approved_draft(url, name):
         # catch everything so we don't leak exceptions, convert them
         # into string instead
         log("Exception on RFC-Editor notification for draft '%s': '%s'" % (name, e))
-        error = unicode(e)
+        error = str(e)
 
     return text, error
diff --git a/ietf/sync/tests.py b/ietf/sync/tests.py
index fd254ab0c..78bf1bd36 100644
--- a/ietf/sync/tests.py
+++ b/ietf/sync/tests.py
@@ -4,7 +4,7 @@
 import os
 import json
 import datetime
-import StringIO
+import io
 import shutil
 
 from django.conf import settings
@@ -136,8 +136,8 @@ class IANASyncTests(TestCase):
     def test_iana_review_mail(self):
         draft = WgDraftFactory()
 
-        subject_template = u'Subject: [IANA #12345] Last Call: <%(draft)s-%(rev)s.txt> (Long text) to Informational RFC'
-        msg_template = u"""From: "%(person)s via RT" 
+        subject_template = 'Subject: [IANA #12345] Last Call: <%(draft)s-%(rev)s.txt> (Long text) to Informational RFC'
+        msg_template = """From: "%(person)s via RT" 
 Date: Thu, 10 May 2012 12:00:0%(rtime)d +0000
 %(subject)s
 
@@ -306,7 +306,7 @@ class RFCSyncTests(TestCase):
                        area=doc.group.parent.acronym,
                        group=doc.group.acronym)
 
-        data = rfceditor.parse_index(StringIO.StringIO(t))
+        data = rfceditor.parse_index(io.StringIO(t))
         self.assertEqual(len(data), 1)
 
         rfc_number, title, authors, rfc_published_date, current_status, updates, updated_by, obsoletes, obsoleted_by, also, draft, has_errata, stream, wg, file_formats, pages, abstract = data[0]
@@ -387,7 +387,7 @@ class RFCSyncTests(TestCase):
                               group=draft.group.name,
                               ref="draft-ietf-test")
 
-        drafts, warnings = rfceditor.parse_queue(StringIO.StringIO(t))
+        drafts, warnings = rfceditor.parse_queue(io.StringIO(t))
         self.assertEqual(len(drafts), 1)
         self.assertEqual(len(warnings), 0)
 
diff --git a/ietf/utils/admin.py b/ietf/utils/admin.py
index 94c0a9c96..4aebed393 100644
--- a/ietf/utils/admin.py
+++ b/ietf/utils/admin.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2011-2019, All Rights Reserved
 from django.contrib import admin
 from ietf.utils.models import VersionInfo
 
@@ -8,10 +9,10 @@ def name(obj):
         if callable(obj.name):
             name = obj.name()
         else:
-            name = unicode(obj.name)
+            name = str(obj.name)
         if name:
             return name
-    return unicode(obj)
+    return str(obj)
     
 def admin_link(field, label=None, ordering="", display=name, suffix=""):
     if not label:
@@ -39,15 +40,15 @@ def admin_link(field, label=None, ordering="", display=name, suffix=""):
             app = obj._meta.app_label
             model = obj.__class__.__name__.lower()
             id = obj.pk
-            chunks += [ u'%(display)s' %
+            chunks += [ '%(display)s' %
                 {'app':app, "model": model, "id":id, "display": display(obj), "suffix":suffix, } ]
-        return u", ".join(chunks)
+        return ", ".join(chunks)
     _link.allow_tags = True
     _link.short_description = label
     _link.admin_order_field = ordering
     return _link
 
-from models import DumpInfo
+from .models import DumpInfo
 class DumpInfoAdmin(admin.ModelAdmin):
     list_display = ['date', 'host', 'tz']
     list_filter = ['date']
diff --git a/ietf/utils/aliases.py b/ietf/utils/aliases.py
index bc9a71a12..8068e8d17 100644
--- a/ietf/utils/aliases.py
+++ b/ietf/utils/aliases.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2013-2019, All Rights Reserved
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # -*- Python -*-
@@ -38,7 +39,7 @@ def rewrite_address_list(l):
     h = {}
     for address in l:
         #address = address.strip()
-        if h.has_key(address): continue
+        if address in h: continue
         h[address] = True
         yield address
 
@@ -46,12 +47,12 @@ def dump_sublist(afile, vfile, alias, adomains, vdomain, emails):
     if not emails:
         return emails
     # Nones in the list should be skipped
-    emails = filter(None, emails)
+    emails = [_f for _f in emails if _f]
 
     # Make sure emails are sane and eliminate the Nones again for
     # non-sane ones
     emails = [rewrite_email_address(e) for e in emails]
-    emails = filter(None, emails)
+    emails = [_f for _f in emails if _f]
 
     # And we'll eliminate the duplicates too but preserve order
     emails = list(rewrite_address_list(emails))
@@ -71,7 +72,7 @@ def dump_sublist(afile, vfile, alias, adomains, vdomain, emails):
         # If there's unicode in email address, something is badly
         # wrong and we just silently punt
         # XXX - is there better approach?
-        print '# Error encoding', alias, repr(emails)
+        print('# Error encoding', alias, repr(emails))
         return []
     return emails
 
diff --git a/ietf/utils/bootstrap.py b/ietf/utils/bootstrap.py
index 3fb57a9e8..150f92b57 100644
--- a/ietf/utils/bootstrap.py
+++ b/ietf/utils/bootstrap.py
@@ -1,9 +1,10 @@
+# Copyright The IETF Trust 2016-2019, All Rights Reserved
 import bootstrap3.renderers
 
 class SeparateErrorsFromHelpTextFieldRenderer(bootstrap3.renderers.FieldRenderer):
     def append_to_field(self, html):
         if self.field_help:
-            html += u'
{}
'.format(self.field_help)
+            html += '
{}
'.format(self.field_help)
         for e in self.field_errors:
-            html += u'
{}
'.format(e)
+            html += '
{}
'.format(e)
         return html
diff --git a/ietf/utils/decorators.py b/ietf/utils/decorators.py
index 6cce65a6e..f961ca267 100644
--- a/ietf/utils/decorators.py
+++ b/ietf/utils/decorators.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2016, All Rights Reserved
+# Copyright The IETF Trust 2016-2019, All Rights Reserved
 
 import datetime
 
@@ -79,7 +79,7 @@ def require_api_key(f, request, *args, **kwargs):
 def _memoize(func, self, *args, **kwargs):
     ''''Memoize wrapper for instance methouds.  Use @lru_cache for functions.'''
     if kwargs:  # frozenset is used to ensure hashability
-        key = args, frozenset(kwargs.items())
+        key = args, frozenset(list(kwargs.items()))
     else:
         key = args
     # instance method, set up cache if needed
diff --git a/ietf/utils/draft.py b/ietf/utils/draft.py
index fa12a0458..e4a5ae593 100755
--- a/ietf/utils/draft.py
+++ b/ietf/utils/draft.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2009-2019, All Rights Reserved
 #!/usr/bin/python
 # -*- python -*-
 """
@@ -30,8 +31,8 @@ COPYRIGHT
 
 """
 
-from __future__ import unicode_literals
-from __future__ import print_function
+
+
 
 import datetime
 import getopt
diff --git a/ietf/utils/fields.py b/ietf/utils/fields.py
index 9e7351189..6bef06b45 100644
--- a/ietf/utils/fields.py
+++ b/ietf/utils/fields.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2007, All Rights Reserved
+# Copyright The IETF Trust 2012-2019, All Rights Reserved
 
 import re
 import six
@@ -19,7 +19,7 @@ class MultiEmailField(forms.Field):
         if not value:
             return []
 
-        if isinstance(value, basestring):
+        if isinstance(value, str):
             values = value.split(',')
             return [ x.strip() for x in values if x.strip() ]
         else:
@@ -72,7 +72,7 @@ class DatepickerDateField(forms.DateField):
         self.widget.attrs["data-date-format"] = date_format
         if "placeholder" not in self.widget.attrs:
             self.widget.attrs["placeholder"] = date_format
-        for k, v in picker_settings.iteritems():
+        for k, v in picker_settings.items():
             self.widget.attrs["data-date-%s" % k] = v
 
 
diff --git a/ietf/utils/history.py b/ietf/utils/history.py
index 992902572..a4e37e81f 100644
--- a/ietf/utils/history.py
+++ b/ietf/utils/history.py
@@ -39,7 +39,7 @@ def find_history_replacements_active_at(objects, time):
     # automatically figure out how to query history model
     history_model = objects[0].history_set.model
     # core_filters contains something like "group__exact": obj
-    relation_name = objects[0].history_set.core_filters.keys()[0].replace("__exact", "")
+    relation_name = list(objects[0].history_set.core_filters.keys())[0].replace("__exact", "")
 
     # now the querying is a bit tricky - we are only interested in the
     # history version just before time, or if we can't get that, the
diff --git a/ietf/utils/html.py b/ietf/utils/html.py
index 018246eae..dbbff0303 100644
--- a/ietf/utils/html.py
+++ b/ietf/utils/html.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2010-2019, All Rights Reserved
 # Taken from http://code.google.com/p/soclone/source/browse/trunk/soclone/utils/html.py
 
 """Utilities for working with HTML."""
@@ -54,7 +55,7 @@ class Cleaner(lxml.html.clean.Cleaner):
     # Copied from lxml 4.2.0 and modified to insert charset meta:
     def clean_html(self, html):
         result_type = type(html)
-        if isinstance(html, basestring):
+        if isinstance(html, str):
             doc = lxml.html.fromstring(html)
         else:
             doc = copy.deepcopy(html)
diff --git a/ietf/utils/log.py b/ietf/utils/log.py
index d59874bd0..7d15b9d04 100644
--- a/ietf/utils/log.py
+++ b/ietf/utils/log.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2007, All Rights Reserved
+# Copyright The IETF Trust 2007-2019, All Rights Reserved
 
 import sys
 import logging
@@ -44,7 +44,7 @@ def log(msg):
     elif settings.DEBUG == True:
         _logfunc = debug.say
         _flushfunc = sys.stdout.flush   # pyflakes:ignore (intentional redefinition)
-    if isinstance(msg, unicode):
+    if isinstance(msg, str):
         msg = msg.encode('unicode_escape')
     try:
         mod, cls, func, file, line = getcaller()
diff --git a/ietf/utils/mail.py b/ietf/utils/mail.py
index 7ebe32e88..d9c453c61 100644
--- a/ietf/utils/mail.py
+++ b/ietf/utils/mail.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2007, All Rights Reserved
+# Copyright The IETF Trust 2007-2019, All Rights Reserved
 
 import copy
 import datetime
@@ -49,11 +49,11 @@ def empty_outbox():
     outbox[:] = []
 
 def add_headers(msg):
-    if not(msg.has_key('Message-ID')):
+    if not('Message-ID' in msg):
 	msg['Message-ID'] = make_msgid('idtracker')
-    if not(msg.has_key('Date')):
+    if not('Date' in msg):
 	msg['Date'] = formatdate(time.time(), True)
-    if not(msg.has_key('From')):
+    if not('From' in msg):
 	msg['From'] = settings.DEFAULT_FROM_EMAIL
     return msg
 
@@ -90,7 +90,7 @@ def send_smtp(msg, bcc=None):
         addrlist += [bcc]
     to = [addr for name, addr in getaddresses(addrlist) if ( addr != '' and not addr.startswith('unknown-email-') )]
     if not to:
-        log(u"No addressees for email from '%s', subject '%s'.  Nothing sent." % (frm, msg.get('Subject', '[no subject]')))
+        log("No addressees for email from '%s', subject '%s'.  Nothing sent." % (frm, msg.get('Subject', '[no subject]')))
     else:
         if test_mode:
             outbox.append(msg)
@@ -118,7 +118,7 @@ def send_smtp(msg, bcc=None):
                 raise SMTPSomeRefusedRecipients(message="%d addresses were refused"%len(unhandled),original_msg=msg,refusals=unhandled)
         except Exception as e:
             # need to improve log message
-            log(u"Exception while trying to send email from '%s' to %s subject '%s'" % (frm, to, msg.get('Subject', '[no subject]')))
+            log("Exception while trying to send email from '%s' to %s subject '%s'" % (frm, to, msg.get('Subject', '[no subject]')))
             if isinstance(e, smtplib.SMTPException):
                 e.original_msg=msg
                 raise 
@@ -129,8 +129,8 @@ def send_smtp(msg, bcc=None):
                 server.quit()
             except smtplib.SMTPServerDisconnected:
                 pass
-        subj = msg.get('Subject', u'[no subject]')
-        log(u"sent email from '%s' to %s id %s subject '%s'" % (frm, to, msg.get('Message-ID', u''), subj))
+        subj = msg.get('Subject', '[no subject]')
+        log("sent email from '%s' to %s id %s subject '%s'" % (frm, to, msg.get('Message-ID', ''), subj))
     
 def copy_email(msg, to, toUser=False, originalBcc=None):
     '''
@@ -178,7 +178,7 @@ def send_mail(request, to, frm, subject, template, context, *args, **kwargs):
     return send_mail_text(request, to, frm, subject, txt, *args, **kwargs)
 
 def encode_message(txt):
-    assert isinstance(txt, unicode)
+    assert isinstance(txt, str)
     return MIMEText(txt.encode('utf-8'), 'plain', 'UTF-8')
 
 def send_mail_text(request, to, frm, subject, txt, cc=None, extra=None, toUser=False, bcc=None, copy=True):
@@ -230,7 +230,7 @@ def parseaddr(addr):
     which case a 2-tuple of ('', '') is returned.
 
     """
-    addr = u''.join( [ s.decode(m) if m else unicode(s) for (s,m) in decode_header(addr) ] )
+    addr = ''.join( [ s.decode(m) if m else str(s) for (s,m) in decode_header(addr) ] )
     name, addr = simple_parseaddr(addr)
     return name, addr
 
@@ -284,7 +284,7 @@ def condition_message(to, frm, subject, msg, cc, extra):
     msg['Auto-Submitted'] = "auto-generated"
     msg['Precedence'] = "bulk"
     if extra:
-	for k, v in extra.items():
+	for k, v in list(extra.items()):
             if v:
                 assertion('len(list(set(v))) == len(v)')
                 try:
@@ -332,7 +332,7 @@ def send_mail_mime(request, to, frm, subject, msg, cc=None, extra=None, toUser=F
     elif settings.SERVER_MODE == 'test':
 	if toUser:
 	    copy_email(msg, to, toUser=True, originalBcc=bcc)
-	elif request and request.COOKIES.has_key( 'testmailcc' ):
+	elif request and 'testmailcc' in request.COOKIES:
 	    copy_email(msg, request.COOKIES[ 'testmailcc' ],originalBcc=bcc)
     try:
 	copy_to = settings.EMAIL_COPY_TO
@@ -355,7 +355,7 @@ def parse_preformatted(preformatted, extra={}, override={}):
     msg = message_from_string(preformatted.encode("utf-8"))
     msg.set_charset('UTF-8')
 
-    for k, v in override.iteritems():
+    for k, v in override.items():
         if k in msg:
             del msg[k]
         if v:
@@ -368,7 +368,7 @@ def parse_preformatted(preformatted, extra={}, override={}):
     headers = copy.copy(msg)            # don't modify the message
     for key in ['To', 'From', 'Subject', 'Bcc']:
         del headers[key]
-    for k in headers.keys():
+    for k in list(headers.keys()):
         v = headers.get_all(k, [])
         if k in extra:
             ev = extra[k]
@@ -398,7 +398,7 @@ def parse_preformatted(preformatted, extra={}, override={}):
     bcc = msg['Bcc']
     del msg['Bcc']
 
-    for v in extra.values():
+    for v in list(extra.values()):
         assertion('len(list(set(v))) == len(v)')
     return (msg, extra, bcc)
 
@@ -427,7 +427,7 @@ def send_mail_message(request, message, extra={}):
 
 def exception_components(e):
     # See if it's a non-smtplib exception that we faked
-    if len(e.args)==1 and isinstance(e.args[0],dict) and e.args[0].has_key('really'):
+    if len(e.args)==1 and isinstance(e.args[0],dict) and 'really' in e.args[0]:
         orig = e.args[0]
         extype = orig['really']
         tb = orig['tb']
diff --git a/ietf/utils/management/commands/check_referential_integrity.py b/ietf/utils/management/commands/check_referential_integrity.py
index 66176a386..3b8d7f2a7 100644
--- a/ietf/utils/management/commands/check_referential_integrity.py
+++ b/ietf/utils/management/commands/check_referential_integrity.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2015-2019, All Rights Reserved
 
 from tqdm import tqdm
 
@@ -25,18 +26,18 @@ class Command(BaseCommand):
                 debug.pprint('dir(field)')
                 raise
             if verbosity > 1:
-                print "    %s -> %s.%s" % (field.name,foreign_model.__module__,foreign_model.__name__),
+                print("    %s -> %s.%s" % (field.name,foreign_model.__module__,foreign_model.__name__), end=' ')
             used = set(field.model.objects.values_list(field.name,flat=True))
             used.discard(None)
             exists = set(foreign_model.objects.values_list('pk',flat=True))
             if verbosity > 1:
                 if used - exists:
-                    print "  ** Bad key values:",list(used - exists)
+                    print("  ** Bad key values:",list(used - exists))
                 else:
-                    print "  ok"
+                    print("  ok")
             else:
                 if used - exists:
-                    print "\n%s.%s.%s -> %s.%s  ** Bad key values:" % (model.__module__,model.__name__,field.name,foreign_model.__module__,foreign_model.__name__),list(used - exists)
+                    print("\n%s.%s.%s -> %s.%s  ** Bad key values:" % (model.__module__,model.__name__,field.name,foreign_model.__module__,foreign_model.__name__),list(used - exists))
 
         def check_reverse_field(field):
             try:
@@ -49,33 +50,33 @@ class Command(BaseCommand):
             foreign_field_name  = field.remote_field.name
             foreign_accessor_name = field.remote_field.get_accessor_name()
             if verbosity > 1:
-                print "    %s <- %s -> %s.%s" % (field.model.__name__, field.remote_field.through._meta.db_table, foreign_model.__module__, foreign_model.__name__),
+                print("    %s <- %s -> %s.%s" % (field.model.__name__, field.remote_field.through._meta.db_table, foreign_model.__module__, foreign_model.__name__), end=' ')
             try:
                 used = set(foreign_model.objects.values_list(foreign_field_name, flat=True))
             except FieldError:
                 try:
                     used = set(foreign_model.objects.values_list(foreign_accessor_name, flat=True))
                 except FieldError:
-                    print "    ** Warning: could not find reverse name for %s.%s -> %s.%s" % (field.model.__module__, field.model.__name__, foreign_model.__name__, foreign_field_name),
+                    print("    ** Warning: could not find reverse name for %s.%s -> %s.%s" % (field.model.__module__, field.model.__name__, foreign_model.__name__, foreign_field_name), end=' ')
             used.discard(None)
             exists = set(field.model.objects.values_list('pk',flat=True))
             if verbosity > 1:
                 if used - exists:
-                    print "  ** Bad key values:\n    ",list(used - exists)
+                    print("  ** Bad key values:\n    ",list(used - exists))
                 else:
-                    print "  ok"
+                    print("  ok")
             else:
                 if used - exists:
-                    print "\n%s.%s <- %s -> %s.%s  ** Bad key values:\n    " % (field.model.__module__, field.model.__name__, field.remote_field.through._meta.db_table, foreign_model.__module__, foreign_model.__name__), list(used - exists)
+                    print("\n%s.%s <- %s -> %s.%s  ** Bad key values:\n    " % (field.model.__module__, field.model.__name__, field.remote_field.through._meta.db_table, foreign_model.__module__, foreign_model.__name__), list(used - exists))
 
         for conf in tqdm([ c for c in apps.get_app_configs() if c.name.startswith('ietf.')], desc='apps', disable=verbose):
             if verbosity > 1:
-                print "Checking", conf.name
+                print("Checking", conf.name)
             for model in tqdm(list(conf.get_models()), desc='models', disable=verbose):
                 if model._meta.proxy:
                     continue
                 if verbosity > 1:
-                    print "  %s.%s" % (model.__module__,model.__name__)
+                    print("  %s.%s" % (model.__module__,model.__name__))
                 for field in [f for f in model._meta.fields if isinstance(f, (ForeignKey, OneToOneField)) ]: 
                     check_field(field)
                 for field in [f for f in model._meta.many_to_many ]: 
diff --git a/ietf/utils/management/commands/coverage_changes.py b/ietf/utils/management/commands/coverage_changes.py
index c119f9f46..08e0c70e5 100644
--- a/ietf/utils/management/commands/coverage_changes.py
+++ b/ietf/utils/management/commands/coverage_changes.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2016, All Rights Reserved
+# Copyright The IETF Trust 2015-2019, All Rights Reserved
 
 import os
 import json
@@ -64,7 +64,7 @@ class Command(BaseCommand):
                 else:
                     file = codecs.open(filename, "r", encoding="utf-8")
             except IOError as e:
-                self.stderr.write(u"%s" % e)
+                self.stderr.write("%s" % e)
                 exit(1)
         else:
             file = filename
@@ -87,8 +87,8 @@ class Command(BaseCommand):
             lcoverage = latest_coverage[section]["covered"]
             lformat   = latest_coverage[section].get("format", 1)
             #
-            mkeys = mcoverage.keys()
-            lkeys = lcoverage.keys()
+            mkeys = list(mcoverage.keys())
+            lkeys = list(lcoverage.keys())
             #
             keys = list(lkeys)
             keys.sort()
@@ -181,7 +181,7 @@ class Command(BaseCommand):
             lcoverage = latest_coverage[section]["covered"]
             lformat   = latest_coverage[section].get("format", 1)
             #
-            lkeys = lcoverage.keys()
+            lkeys = list(lcoverage.keys())
             #
             keys = list(lkeys)
             keys.sort()
diff --git a/ietf/utils/management/commands/create_group_wikis.py b/ietf/utils/management/commands/create_group_wikis.py
index c7d239a0a..459ccc47b 100644
--- a/ietf/utils/management/commands/create_group_wikis.py
+++ b/ietf/utils/management/commands/create_group_wikis.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2016-2019, All Rights Reserved
 # Copyright 2016 IETF Trust
 
 import os
@@ -326,7 +327,7 @@ class Command(BaseCommand):
         if not self.group_list is None:
             self.group_list = self.group_list.split('.')
 
-        if isinstance(self.verbosity, (type(""), type(u""))) and self.verbosity.isdigit():
+        if isinstance(self.verbosity, (type(""), type(""))) and self.verbosity.isdigit():
             self.verbosity = int(self.verbosity)
 
         if self.dummy_run and self.verbosity < 2:
diff --git a/ietf/utils/management/commands/dumprelated.py b/ietf/utils/management/commands/dumprelated.py
index 48583f0aa..61b38441d 100644
--- a/ietf/utils/management/commands/dumprelated.py
+++ b/ietf/utils/management/commands/dumprelated.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2018-2019, All Rights Reserved
 import warnings
 from collections import OrderedDict
 
@@ -152,7 +153,7 @@ class Command(BaseCommand):
             Collate the objects to be serialized. If count_only is True, just
             count the number of objects to be serialized.
             """
-            models = serializers.sort_dependencies(app_list.items())
+            models = serializers.sort_dependencies(list(app_list.items()))
             for model in models:
                 if model in excluded_models:
                     continue
diff --git a/ietf/utils/management/commands/loadrelated.py b/ietf/utils/management/commands/loadrelated.py
index 31d24dfb2..2e68d2163 100644
--- a/ietf/utils/management/commands/loadrelated.py
+++ b/ietf/utils/management/commands/loadrelated.py
@@ -1,6 +1,6 @@
-# Copyright The IETF Trust 2016, All Rights Reserved
+# Copyright The IETF Trust 2018-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function
+
 
 import gzip
 import os
@@ -26,7 +26,7 @@ import debug                            # pyflakes:ignore
 from ietf.community.models import notify_events
 
 class Command(loaddata.Command):
-    help = (u"""
+    help = ("""
 
         Load a fixture of related objects to the database.  The fixture is expected
         to contain a set of related objects, created with the 'dumprelated' management
diff --git a/ietf/utils/management/commands/makefixture.py b/ietf/utils/management/commands/makefixture.py
index 907ec3185..5046eb7ea 100644
--- a/ietf/utils/management/commands/makefixture.py
+++ b/ietf/utils/management/commands/makefixture.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2013-2019, All Rights Reserved
 # From https://github.com/ericholscher/django-test-utils/blob/master/test_utils/management/commands/makefixture.py
 """
 "Make fixture" command.
@@ -101,7 +102,7 @@ class Command(LabelCommand):
 
         objects = []
         for model, slice in models:
-            if isinstance(slice, basestring) and slice:
+            if isinstance(slice, str) and slice:
                 objects.extend(model._default_manager.filter(pk__exact=slice))
             elif not slice or type(slice) is list:
                 items = model._default_manager.all()
@@ -132,7 +133,7 @@ class Command(LabelCommand):
                 related = []
                 for obj in objects:
                     if DEBUG:
-                        print "Adding %s[%s]" % (model_name(obj), obj.pk)
+                        print("Adding %s[%s]" % (model_name(obj), obj.pk))
                     # follow forward relation fields
                     for f in obj.__class__._meta.fields + obj.__class__._meta.many_to_many:
                         if isinstance(f, ForeignKey):
@@ -150,7 +151,7 @@ class Command(LabelCommand):
 
         try:
             return serializers.serialize(format, all, indent=indent)
-        except Exception, e:
+        except Exception as e:
             if show_traceback:
                 raise
             raise CommandError("Unable to serialize database: %s" % e)
diff --git a/ietf/utils/management/commands/populate_yang_model_dirs.py b/ietf/utils/management/commands/populate_yang_model_dirs.py
index 9ea4e9ab4..5d7adea17 100644
--- a/ietf/utils/management/commands/populate_yang_model_dirs.py
+++ b/ietf/utils/management/commands/populate_yang_model_dirs.py
@@ -1,11 +1,12 @@
-from __future__ import print_function, unicode_literals
+# Copyright The IETF Trust 2016-2019, All Rights Reserved
+
 
 import os
 import sys
 import time
 
 from pathlib2 import Path
-from StringIO import StringIO
+from io import StringIO
 from textwrap import dedent
 from xym import xym
 
diff --git a/ietf/utils/management/commands/pyflakes.py b/ietf/utils/management/commands/pyflakes.py
index 376df9986..449263748 100644
--- a/ietf/utils/management/commands/pyflakes.py
+++ b/ietf/utils/management/commands/pyflakes.py
@@ -1,4 +1,5 @@
-from __future__ import absolute_import
+# Copyright The IETF Trust 2014-2019, All Rights Reserved
+
 import ast
 import os
 from pyflakes import checker, messages
@@ -50,7 +51,7 @@ def check(codeString, filename, verbosity=1):
     try:
         with BlackHole():
             tree = ast.parse(codeString, filename)
-    except SyntaxError, e:
+    except SyntaxError as e:
         return [PySyntaxError(filename, e.lineno, e.offset, e.text)]
     else:
         # Okay, it's syntactically valid.  Now parse it into an ast and check
@@ -82,7 +83,7 @@ def checkPath(filename, verbosity):
     """
     try:
         return check(file(filename, 'U').read() + '\n', filename, verbosity)
-    except IOError, msg:
+    except IOError as msg:
         return ["%s: %s" % (filename, msg.args[1])]
     except TypeError:
         pass
@@ -97,7 +98,7 @@ def checkPaths(filenames, verbosity):
                         try:
                             warnings.extend(checkPath(os.path.join(dirpath, filename), verbosity))
                         except TypeError as e:
-                            print("Exception while processing dirpath=%s, filename=%s: %s" % (dirpath, filename,e ))
+                            print(("Exception while processing dirpath=%s, filename=%s: %s" % (dirpath, filename,e )))
                             raise
         else:
             warnings.extend(checkPath(arg, verbosity))
@@ -114,11 +115,11 @@ class Command(BaseCommand):
             filenames = getattr(settings, 'PYFLAKES_DEFAULT_ARGS', ['.'])
         verbosity = int(options.get('verbosity'))
         warnings = checkPaths(filenames, verbosity=verbosity)
-        print ""
+        print("")
         for warning in warnings:
-            print warning
+            print(warning)
 
         if warnings:
-            print 'Total warnings: %d' % len(warnings)
+            print('Total warnings: %d' % len(warnings))
             raise SystemExit(1)
             
diff --git a/ietf/utils/management/commands/run_yang_model_checks.py b/ietf/utils/management/commands/run_yang_model_checks.py
index 75569e611..8df7e9da8 100644
--- a/ietf/utils/management/commands/run_yang_model_checks.py
+++ b/ietf/utils/management/commands/run_yang_model_checks.py
@@ -1,4 +1,5 @@
-from __future__ import print_function, unicode_literals
+# Copyright The IETF Trust 2017-2019, All Rights Reserved
+
 
 import sys
 import json
diff --git a/ietf/utils/management/commands/send_apikey_usage_emails.py b/ietf/utils/management/commands/send_apikey_usage_emails.py
index 2718ef02a..ead143e92 100644
--- a/ietf/utils/management/commands/send_apikey_usage_emails.py
+++ b/ietf/utils/management/commands/send_apikey_usage_emails.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-# Copyright The IETF Trust 2017, All Rights Reserved
-from __future__ import print_function, unicode_literals
+# Copyright The IETF Trust 2017-2019, All Rights Reserved
+
 
 import datetime
 
diff --git a/ietf/utils/management/commands/send_gdpr_consent_request.py b/ietf/utils/management/commands/send_gdpr_consent_request.py
index 80b6e174e..b9a37e4a3 100644
--- a/ietf/utils/management/commands/send_gdpr_consent_request.py
+++ b/ietf/utils/management/commands/send_gdpr_consent_request.py
@@ -1,6 +1,6 @@
-# Copyright The IETF Trust 2016, All Rights Reserved
+# Copyright The IETF Trust 2018-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function
+
 
 import datetime
 import time
@@ -14,7 +14,7 @@ from ietf.person.models import Person, PersonEvent
 from ietf.utils.mail import send_mail
 
 class Command(BaseCommand):
-    help = (u"""
+    help = ("""
         Send GDPR consent request emails to persons who have not indicated consent
         to having their personal information stored.  Each send is logged as a
         PersonEvent.
diff --git a/ietf/utils/management/commands/update_community_list_index.py b/ietf/utils/management/commands/update_community_list_index.py
index cecf68e8a..a7d8bcbfe 100644
--- a/ietf/utils/management/commands/update_community_list_index.py
+++ b/ietf/utils/management/commands/update_community_list_index.py
@@ -1,6 +1,6 @@
 # Copyright The IETF Trust 2019, All Rights Reserved
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function
+
 
 
 from django.core.management.base import BaseCommand
@@ -11,7 +11,7 @@ from ietf.community.models import SearchRule
 from ietf.community.utils import reset_name_contains_index_for_rule
 
 class Command(BaseCommand):
-    help = (u"""
+    help = ("""
         Update the index tables for stored regex-based document search rules.
         """)
 
diff --git a/ietf/utils/management/commands/update_external_command_info.py b/ietf/utils/management/commands/update_external_command_info.py
index 04949951c..d950eb01b 100644
--- a/ietf/utils/management/commands/update_external_command_info.py
+++ b/ietf/utils/management/commands/update_external_command_info.py
@@ -1,4 +1,5 @@
-from __future__ import print_function, unicode_literals
+# Copyright The IETF Trust 2017-2019, All Rights Reserved
+
 
 import sys
 
diff --git a/ietf/utils/markup_txt.py b/ietf/utils/markup_txt.py
index fd71a517f..fe69e61e6 100644
--- a/ietf/utils/markup_txt.py
+++ b/ietf/utils/markup_txt.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2009-2019, All Rights Reserved
 # Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen 
 #
@@ -42,7 +43,7 @@ from ietf.utils.text import wordwrap
 def markup_ascii(content, width=None):
     log.unreachable('2017-12-08')
     if six.PY2:
-        assert isinstance(content, basestring)
+        assert isinstance(content, str)
         # at this point, "content" is normal string
         # fix most common non-ASCII characters
         t1 = string.maketrans("\x91\x92\x93\x94\x95\x96\x97\xc6\xe8\xe9", "\'\'\"\"o--\'ee")
diff --git a/ietf/utils/migrations/0001_initial.py b/ietf/utils/migrations/0001_initial.py
index 0d4130201..38c7566ae 100644
--- a/ietf/utils/migrations/0001_initial.py
+++ b/ietf/utils/migrations/0001_initial.py
@@ -1,6 +1,7 @@
+# Copyright The IETF Trust 2018-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.10 on 2018-02-20 10:52
-from __future__ import unicode_literals
+
 
 from django.db import migrations, models
 
diff --git a/ietf/utils/ordereddict.py b/ietf/utils/ordereddict.py
index 94cc04e6c..18ec55f8f 100644
--- a/ietf/utils/ordereddict.py
+++ b/ietf/utils/ordereddict.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2014-2019, All Rights Reserved
 def insert_after_in_ordered_dict(dictionary, key, value, after):
     """There's no "insert" in ordered dict so simulate it instead by
     re-adding entries. Obviously that's not ideal, but for small dicts the
@@ -5,7 +6,7 @@ def insert_after_in_ordered_dict(dictionary, key, value, after):
     dictionary[key] = value
 
     reorder = False
-    l = dictionary.items() # don't mutate the dict while looping
+    l = list(dictionary.items()) # don't mutate the dict while looping
     for k, v in l:
         if reorder and k != key:
             del dictionary[k]
diff --git a/ietf/utils/templatetags/htmlfilters.py b/ietf/utils/templatetags/htmlfilters.py
index 4bae6da2a..6d8e666b7 100644
--- a/ietf/utils/templatetags/htmlfilters.py
+++ b/ietf/utils/templatetags/htmlfilters.py
@@ -1,6 +1,6 @@
-# Copyright the IETF Trust 2017, All Rights Reserved
+# Copyright The IETF Trust 2017-2019, All Rights Reserved
+
 
-from __future__ import unicode_literals
 
 from django.template.library import Library
 from django.template.defaultfilters import stringfilter
diff --git a/ietf/utils/templatetags/textfilters.py b/ietf/utils/templatetags/textfilters.py
index 6c8102d5e..63a694199 100644
--- a/ietf/utils/templatetags/textfilters.py
+++ b/ietf/utils/templatetags/textfilters.py
@@ -1,4 +1,5 @@
-from __future__ import unicode_literals
+# Copyright The IETF Trust 2016-2019, All Rights Reserved
+
 
 import bleach
 
diff --git a/ietf/utils/test_data.py b/ietf/utils/test_data.py
index 94e34a030..be8f7b791 100644
--- a/ietf/utils/test_data.py
+++ b/ietf/utils/test_data.py
@@ -1,7 +1,7 @@
-# Copyright The IETF Trust 2017-2019, All Rights Reserved
+# Copyright The IETF Trust 2011-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals
+
 
 import datetime
 
@@ -98,7 +98,7 @@ def make_immutable_base_data():
 
     # one area
     area = create_group(name="Far Future", acronym="farfut", type_id="area", parent=ietf)
-    create_person(area, "ad", name=u"Areað Irector", username="ad", email_address="aread@example.org")
+    create_person(area, "ad", name="Areað Irector", username="ad", email_address="aread@example.org")
 
     # second area
     opsarea = create_group(name="Operations", acronym="ops", type_id="area", parent=ietf)
@@ -421,7 +421,7 @@ def make_review_data(doc):
     u = User.objects.create(username="reviewer")
     u.set_password("reviewer+password")
     u.save()
-    reviewer = Person.objects.create(name=u"Some Réviewer", ascii="Some Reviewer", user=u)
+    reviewer = Person.objects.create(name="Some Réviewer", ascii="Some Reviewer", user=u)
     email = Email.objects.create(address="reviewer@example.com", person=reviewer, origin=u.username)
 
     for team in (team1, team2, team3):
@@ -444,14 +444,14 @@ def make_review_data(doc):
     u = User.objects.create(username="reviewsecretary")
     u.set_password("reviewsecretary+password")
     u.save()
-    reviewsecretary = Person.objects.create(name=u"Réview Secretary", ascii="Review Secretary", user=u)
+    reviewsecretary = Person.objects.create(name="Réview Secretary", ascii="Review Secretary", user=u)
     reviewsecretary_email = Email.objects.create(address="reviewsecretary@example.com", person=reviewsecretary, origin=u.username)
     Role.objects.create(name_id="secr", person=reviewsecretary, email=reviewsecretary_email, group=team1)
 
     u = User.objects.create(username="reviewsecretary3")
     u.set_password("reviewsecretary3+password")
     u.save()
-    reviewsecretary3 = Person.objects.create(name=u"Réview Secretary3", ascii="Review Secretary3", user=u)
+    reviewsecretary3 = Person.objects.create(name="Réview Secretary3", ascii="Review Secretary3", user=u)
     reviewsecretary3_email = Email.objects.create(address="reviewsecretary3@example.com", person=reviewsecretary, origin=u.username)
     Role.objects.create(name_id="secr", person=reviewsecretary3, email=reviewsecretary3_email, group=team3)
     
diff --git a/ietf/utils/test_runner.py b/ietf/utils/test_runner.py
index 67eacab25..252643668 100644
--- a/ietf/utils/test_runner.py
+++ b/ietf/utils/test_runner.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2007-2019, All Rights Reserved
+# Copyright The IETF Trust 2009-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -93,14 +93,14 @@ def safe_create_test_db(self, verbosity, *args, **kwargs):
     global test_database_name, old_create
     keepdb = kwargs.get('keepdb', False)
     if not keepdb:
-        print "     Creating test database..."
+        print("     Creating test database...")
         if settings.DATABASES["default"]["ENGINE"] == 'django.db.backends.mysql':
             settings.DATABASES["default"]["OPTIONS"] = settings.DATABASE_TEST_OPTIONS
-            print "     Using OPTIONS: %s" % settings.DATABASES["default"]["OPTIONS"]
+            print("     Using OPTIONS: %s" % settings.DATABASES["default"]["OPTIONS"])
     test_database_name = old_create(self, 0, *args, **kwargs)
 
     if settings.GLOBAL_TEST_FIXTURES:
-        print "     Loading global test fixtures: %s" % ", ".join(settings.GLOBAL_TEST_FIXTURES)
+        print("     Loading global test fixtures: %s" % ", ".join(settings.GLOBAL_TEST_FIXTURES))
         loadable = [f for f in settings.GLOBAL_TEST_FIXTURES if "." not in f]
         call_command('loaddata', *loadable, verbosity=int(verbosity)-1, commit=False, database="default")
 
@@ -120,7 +120,7 @@ def safe_destroy_test_db(*args, **kwargs):
     keepdb = kwargs.get('keepdb', False)
     if not keepdb:
         if settings.DATABASES["default"]["NAME"] != test_database_name:
-            print '     NOT SAFE; Changing settings.DATABASES["default"]["NAME"] from %s to %s' % (settings.DATABASES["default"]["NAME"], test_database_name)
+            print('     NOT SAFE; Changing settings.DATABASES["default"]["NAME"] from %s to %s' % (settings.DATABASES["default"]["NAME"], test_database_name))
             settings.DATABASES["default"]["NAME"] = test_database_name
     return old_destroy(*args, **kwargs)
 
@@ -296,11 +296,11 @@ class CoverageTest(unittest.TestCase):
             latest_coverage_version = self.runner.coverage_master["version"]
 
             master_data = self.runner.coverage_master[latest_coverage_version][test]
-            master_missing = [ k for k,v in master_data["covered"].items() if not v ]
+            master_missing = [ k for k,v in list(master_data["covered"].items()) if not v ]
             master_coverage = master_data["coverage"]
 
             test_data = self.runner.coverage_data[test]
-            test_missing = [ k for k,v in test_data["covered"].items() if not v ]
+            test_missing = [ k for k,v in list(test_data["covered"].items()) if not v ]
             test_coverage = test_data["coverage"]
 
             # Assert coverage failure only if we're running the full test suite -- if we're
@@ -564,7 +564,7 @@ class IetfTestRunner(DiscoverRunner):
                 self.code_coverage_checker.start()
 
         if settings.SITE_ID != 1:
-            print "     Changing SITE_ID to '1' during testing."
+            print("     Changing SITE_ID to '1' during testing.")
             settings.SITE_ID = 1
 
         if settings.TEMPLATES[0]['OPTIONS']['string_if_invalid'] != '':
@@ -572,7 +572,7 @@ class IetfTestRunner(DiscoverRunner):
             settings.TEMPLATES[0]['OPTIONS']['string_if_invalid'] = ''
 
         if settings.INTERNAL_IPS:
-            print "     Changing INTERNAL_IPS to '[]' during testing."
+            print("     Changing INTERNAL_IPS to '[]' during testing.")
             settings.INTERNAL_IPS = []
 
         assert not settings.IDTRACKER_BASE_URL.endswith('/')
@@ -586,7 +586,7 @@ class IetfTestRunner(DiscoverRunner):
                 ietf.utils.mail.SMTP_ADDR['port'] = base + offset 
                 self.smtpd_driver = SMTPTestServerDriver((ietf.utils.mail.SMTP_ADDR['ip4'],ietf.utils.mail.SMTP_ADDR['port']),None) 
                 self.smtpd_driver.start()
-                print("     Running an SMTP test server on %(ip4)s:%(port)s to catch outgoing email." % ietf.utils.mail.SMTP_ADDR)
+                print(("     Running an SMTP test server on %(ip4)s:%(port)s to catch outgoing email." % ietf.utils.mail.SMTP_ADDR))
                 break
             except socket.error:
                 pass
@@ -594,9 +594,9 @@ class IetfTestRunner(DiscoverRunner):
         maybe_create_svn_symlinks(settings)
 
         if os.path.exists(settings.UTILS_TEST_RANDOM_STATE_FILE):
-            print "     Loading factory-boy random state from %s" % settings.UTILS_TEST_RANDOM_STATE_FILE
+            print("     Loading factory-boy random state from %s" % settings.UTILS_TEST_RANDOM_STATE_FILE)
         else:
-            print "     Saving factory-boy random state to %s" % settings.UTILS_TEST_RANDOM_STATE_FILE
+            print("     Saving factory-boy random state to %s" % settings.UTILS_TEST_RANDOM_STATE_FILE)
             with open(settings.UTILS_TEST_RANDOM_STATE_FILE, 'w') as f:
                 s = factory.random.get_random_state()
                 json.dump(s, f)
@@ -709,7 +709,7 @@ class IetfTestRunner(DiscoverRunner):
             if self.run_full_test_suite:
                 print("Test coverage data:")
             else:
-                print("Test coverage for this test run across the related app%s (%s):" % (("s" if len(self.test_apps)>1 else ""), ", ".join(self.test_apps)))
+                print(("Test coverage for this test run across the related app%s (%s):" % (("s" if len(self.test_apps)>1 else ""), ", ".join(self.test_apps))))
             for test in ["template", "url", "code"]:
                 latest_coverage_version = self.coverage_master["version"]
 
@@ -724,19 +724,19 @@ class IetfTestRunner(DiscoverRunner):
                 test_coverage = test_data["coverage"]
 
                 if self.run_full_test_suite:
-                    print("      %8s coverage: %6.2f%%  (%s: %6.2f%%)" %
-                        (test.capitalize(), test_coverage*100, latest_coverage_version, master_coverage*100, ))
+                    print(("      %8s coverage: %6.2f%%  (%s: %6.2f%%)" %
+                        (test.capitalize(), test_coverage*100, latest_coverage_version, master_coverage*100, )))
                 else:
-                    print("      %8s coverage: %6.2f%%" %
-                        (test.capitalize(), test_coverage*100, ))
+                    print(("      %8s coverage: %6.2f%%" %
+                        (test.capitalize(), test_coverage*100, )))
 
-            print("""
+            print(("""
                 Per-file code and template coverage and per-url-pattern url coverage data
                 for the latest test run has been written to %s.
 
                 Per-statement code coverage data has been written to '.coverage', readable
                 by the 'coverage' program.
-                """.replace("    ","") % (settings.TEST_COVERAGE_LATEST_FILE))
+                """.replace("    ","") % (settings.TEST_COVERAGE_LATEST_FILE)))
 
         save_test_results(failures, test_labels)
 
diff --git a/ietf/utils/test_utils.py b/ietf/utils/test_utils.py
index 4cb5020e6..c7134b970 100644
--- a/ietf/utils/test_utils.py
+++ b/ietf/utils/test_utils.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2007, All Rights Reserved
+# Copyright The IETF Trust 2009-2019, All Rights Reserved
 
 # Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen 
@@ -37,7 +37,7 @@ import re
 import email
 import html5lib
 import sys
-import urllib2
+import urllib.request, urllib.error, urllib.parse
 
 from unittest.util import strclass
 from bs4 import BeautifulSoup
@@ -53,7 +53,7 @@ real_database_name = settings.DATABASES["default"]["NAME"]
 def split_url(url):
     if "?" in url:
         url, args = url.split("?", 1)
-        args = dict([ map(urllib2.unquote,arg.split("=", 1)) for arg in args.split("&") if "=" in arg ])
+        args = dict([ list(map(urllib.parse.unquote,arg.split("=", 1))) for arg in args.split("&") if "=" in arg ])
     else:
         args = {}
     return url, args
@@ -145,7 +145,7 @@ class TestCase(django.test.TestCase):
 
             errors = [html.tostring(n).decode() for n in PyQuery(response.content)(error_css_selector)]
             if errors:
-                explanation = u"{} != {}\nGot form back with errors:\n----\n".format(response.status_code, 302) + u"----\n".join(errors)
+                explanation = "{} != {}\nGot form back with errors:\n----\n".format(response.status_code, 302) + "----\n".join(errors)
                 self.assertEqual(response.status_code, 302, explanation)
 
         self.assertEqual(response.status_code, 302)
diff --git a/ietf/utils/tests.py b/ietf/utils/tests.py
index 8be182604..f28fb55da 100644
--- a/ietf/utils/tests.py
+++ b/ietf/utils/tests.py
@@ -1,6 +1,6 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals, print_function
+
 
 import os.path
 import types
@@ -11,8 +11,8 @@ from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 from fnmatch import fnmatch
 from importlib import import_module
-from pipe import pipe
-from StringIO import StringIO
+from .pipe import pipe
+from io import StringIO
 from textwrap import dedent
 from unittest import skipIf
 from tempfile import mkdtemp
@@ -115,7 +115,7 @@ class TestSMTPServer(TestCase):
     def test_address_rejected(self):
 
         def send_simple_mail(to):
-            send_mail_text(None, to=to, frm=None, subject="Test for rejection", txt=u"dummy body")
+            send_mail_text(None, to=to, frm=None, subject="Test for rejection", txt="dummy body")
 
         len_before = len(outbox)
         send_simple_mail('good@example.com,poison@example.com')
@@ -131,7 +131,7 @@ class TestSMTPServer(TestCase):
 
         def send_complex_mail(to):
             msg = MIMEMultipart()
-            textpart= MIMEText(dedent(u"""\
+            textpart= MIMEText(dedent("""\
                              Sometimes people send mail with things like “smart quotes” in them.
                              Sometimes they have attachments with pictures.
                               """),_charset='utf-8')
@@ -139,7 +139,7 @@ class TestSMTPServer(TestCase):
             img = MIMEImage(b'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x10\x08\x06\x00\x00\x00\x1f\xf3\xffa\x00\x00\x02\x88IDATx\xda\xa5\x93\xcbO\x13Q\x14\xc6\xbf\xb9\xd32}L\x9fZ\x06\x10Q\x90\x10\x85b\x89\xfe\x01\x06BXK"\xd4hB\xdc\xa0\x06q\xe1c% H1l\xd0\x8dbT6\x1a5\x91\x12#K\x891\xf2\x07\x98\xc8[L\x1ay\xa8@\xdb\xd0\xd2\xe9\x83N;\xbdc\x1f\x11\x03\x04\x17zW\'_\xce\xf9\xdd\xef\x9c\x9c\xc3\xe0?\x1f\xb3S\xf8\xfe\xba\xc2Be\xa9]m\xd6\x9e\xe6x\xde\x9e\xd1\xa4HdF\x0e\xc5G\x89\x8a{X\xec\xfc\x1a\xdc\x1307X\xd4$T\nC\xc6\xfc|\x13\x8d\xa6\x00\xe5O\x16\xd1\xb3\x10}\xbe\x90w\xce\xdbZyeed\x17\xc03(4\x15\x9d(s\x13\xca!\x10\xa6\xb0\x1a\xb6\x9b\x0b\x84\x95\xb4F@\x89\x84\xe5O\x0b\xcdG\xaf\xae\x8dl\x01V\x9f\x1d\xb4q\x16\xde\xa33[\x8d\xe3\x93)\xdc\x7f\x9b\xc4\xf3\x1b\x1c,|\xaex#\n\xb4\x0cH\xb8\xd6\xa8F\xad\x83El# \xc6\x83\xb1\xf2\xa2\x0bK\xfe,`y\xd0\xe6*\x03\xaes\x0c\xea\xaas.\xc6g\x14t\xbcR\xd0P\x03t;\tX\x15\x83\xd5\xf9\xc5\xbe\x926_W6\xe3\xe7ca\xc2Z,82\xb1\xeb\r\x8b\xb1)\x82\xde\xa6\x14\xea\xec4\x0b\xf88K\xd0\xe5fQ_M\xd1s&\x95k\xe9\x87w\xf2\xc0eoM\x16\xe0\x1b*\xdc4XM\x9aL\xfca\x8e\xc5\xbd1\x0e//\xc6`\xd5\xe7Z\x08\xa6[8\xffT\x87\xeb\r\x12\xea\xabr\x80p \x14\xcfo]\xd5f\x01k\x8fl\x9bF3\xaf\xf9=\xb0X\x82\x81.O\xd96\xc4\x9d\x9a\xb8\x11\x89\x17\xb4\xf9s\x80\xe5\x01\xc3\xc4\xfe}FG\\\x064\xaa\xbf/\x0eM3\x92i\x13\xe1\x908Yr3\x9ck\xe1[\xbf\xd6%X\xf4\x9d\xef=z$(\xc1\xa9\xc3Q\xf0\x1c\xddV(\xa7\x18Ly9L\xafq8{\\D0\x14\xbd{\xe4V\xac3\x0bX\xe8\xd7\xdb\xb4,\xf5\x18\xb4j\xe3\xf8\xa2\x1e/\xa6\xac`\x18\x06\x02\x9f\x84\x8a\xa4\x07\x16c\xb1\xbe\xc9\xa2\xf6P\x04-\x8e\x00\x12\xc9\x84(&\xd9\xf2\x8a\x8e\x88\x7fk[\xbet\xe75\x0bzf\x98cI\xd6\xe6\xfc\xba\x06\xd3~\x1d\x12\xe9\x9fK\xcd\x12N\x16\xc4\xa0UQH)\x8a\x95\x08\x9c\xf6^\xc9\xbdk\x95\xe7o\xab\x9c&\xb5\xf2\x84W3\xa6\x9dG\x92\x19_$\xa9\x84\xd6%r\xc9\xde\x97\x1c\xde\xf3\x98\x96\xee\xb0\x16\x99\xd2v\x15\x94\xc6<\xc2Te\xb4\x04Ufe\x85\x8c2\x84<(\xeb\x91\xf7>\xa6\x7fy\xbf\x00\x96T\xff\x11\xf7\xd8R\xb9\x00\x00\x00\x00IEND\xaeB`\x82')
 
             msg.attach(img)
-            send_mail_mime(request=None, to=to, frm=settings.DEFAULT_FROM_EMAIL, subject=u'это сложно', msg=msg, cc=None, extra=None)
+            send_mail_mime(request=None, to=to, frm=settings.DEFAULT_FROM_EMAIL, subject='это сложно', msg=msg, cc=None, extra=None)
 
         len_before = len(outbox)
         send_complex_mail('good@example.com')
@@ -157,12 +157,12 @@ def get_callbacks(urllist):
             callbacks.update(get_callbacks(entry.url_patterns))
         else:
             if hasattr(entry, '_callback_str'):
-                callbacks.add(unicode(entry._callback_str))
+                callbacks.add(str(entry._callback_str))
             if (hasattr(entry, 'callback') and entry.callback
                 and type(entry.callback) in [types.FunctionType, types.MethodType ]):
                 callbacks.add("%s.%s" % (entry.callback.__module__, entry.callback.__name__))
             if hasattr(entry, 'name') and entry.name:
-                callbacks.add(unicode(entry.name))
+                callbacks.add(str(entry.name))
             # There are some entries we don't handle here, mostly clases
             # (such as Feed subclasses)
 
@@ -205,7 +205,7 @@ class TemplateChecksTestCase(TestCase):
 
     def apply_template_test(self, func, node_type, msg, *args, **kwargs):
         errors = []
-        for path, template in self.templates.items():
+        for path, template in list(self.templates.items()):
             origin = str(template.origin).replace(settings.BASE_DIR, '')
             for node in template:
                 for child in node.get_nodes_by_type(node_type):
@@ -413,13 +413,13 @@ class DraftTests(TestCase):
         self.assertEqual(self.draft.get_status(),'Informational')
     
     def test_get_authors(self):
-        self.assertTrue(all([u'@' in author for author in self.draft.get_authors()]))
+        self.assertTrue(all(['@' in author for author in self.draft.get_authors()]))
 
     def test_get_authors_with_firm(self):
-        self.assertTrue(all([u'@' in author for author in self.draft.get_authors_with_firm()]))
+        self.assertTrue(all(['@' in author for author in self.draft.get_authors_with_firm()]))
         
     def test_old_get_refs(self):
-        self.assertEqual(self.draft.old_get_refs()[1][0],u'rfc2119')
+        self.assertEqual(self.draft.old_get_refs()[1][0],'rfc2119')
 
     def test_get_meta(self):
         tempdir = mkdtemp()
diff --git a/ietf/utils/tests_restapi.py b/ietf/utils/tests_restapi.py
index 93f0df687..31f1be70f 100644
--- a/ietf/utils/tests_restapi.py
+++ b/ietf/utils/tests_restapi.py
@@ -1,4 +1,5 @@
-from __future__ import print_function
+# Copyright The IETF Trust 2014-2019, All Rights Reserved
+
 
 import debug
 debug.debug = True
@@ -73,6 +74,6 @@ class RestApi(ResourceTestCaseMixin, TestCase):
         for doc in doclist:
             for key in doc:
                 value = doc[key]
-                if isinstance(value, basestring) and value.startswith('%s/'%apitop):
+                if isinstance(value, str) and value.startswith('%s/'%apitop):
                     self.api_client.get(value, format='json')
                     
diff --git a/ietf/utils/texescape.py b/ietf/utils/texescape.py
index 0c73fea96..83a78812e 100644
--- a/ietf/utils/texescape.py
+++ b/ietf/utils/texescape.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2018-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Copied from https://github.com/sphinx-doc/sphinx/blob/master/sphinx/util/texescape.py
 # Copyright and license as indicated in the original and below
@@ -11,7 +12,7 @@
     :license: BSD, see LICENSE for details.
 """
 
-from __future__ import unicode_literals
+
 
 tex_replacements = [
     # map TeX special chars
diff --git a/ietf/utils/text.py b/ietf/utils/text.py
index 30a38891d..06a4d05e9 100644
--- a/ietf/utils/text.py
+++ b/ietf/utils/text.py
@@ -1,4 +1,5 @@
-from __future__ import unicode_literals
+# Copyright The IETF Trust 2016-2019, All Rights Reserved
+
 
 import re
 import textwrap
@@ -11,7 +12,7 @@ from django.utils.safestring import mark_safe
 
 import debug                            # pyflakes:ignore
 
-from texescape import init as texescape_init, tex_escape_map
+from .texescape import init as texescape_init, tex_escape_map
 
 @keep_lazy(six.text_type)
 def xslugify(value):
@@ -57,7 +58,7 @@ def fill(text, width):
 def wordwrap(text, width=80):
     """Wraps long lines without loosing the formatting and indentation
        of short lines"""
-    if not isinstance(text, (types.StringType,types.UnicodeType)):
+    if not isinstance(text, (bytes,str)):
         return text
     width = int(width)                  # ensure we have an int, if this is used as a template filter
     text = re.sub(" *\r\n", "\n", text) # get rid of DOS line endings
@@ -173,7 +174,7 @@ def text_to_dict(t):
 def dict_to_text(d):
     "Convert a dictionary to RFC2822-formatted text"
     t = ""
-    for k, v in d.items():
+    for k, v in list(d.items()):
         t += "%s: %s\n" % (k, v)
     return t
 
diff --git a/ietf/utils/textupload.py b/ietf/utils/textupload.py
index 574342d32..69f2af8b3 100644
--- a/ietf/utils/textupload.py
+++ b/ietf/utils/textupload.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2012-2019, All Rights Reserved
 import re
 
 from django.core.exceptions import ValidationError
@@ -11,7 +12,7 @@ def get_cleaned_text_file_content(uploaded_file):
     django.core.exceptions.ValidationError exceptions."""
 
     if not uploaded_file:
-        return u""
+        return ""
 
     if uploaded_file.size and uploaded_file.size > 10 * 1000 * 1000:
         raise ValidationError("Text file too large (size %s)." % uploaded_file.size)
diff --git a/ietf/utils/validators.py b/ietf/utils/validators.py
index f2a6b319e..77e4bbf09 100644
--- a/ietf/utils/validators.py
+++ b/ietf/utils/validators.py
@@ -1,6 +1,6 @@
 # -*- python -*-
-# Copyright The IETF Trust 2007, All Rights Reserved
-from __future__ import unicode_literals
+# Copyright The IETF Trust 2016-2019, All Rights Reserved
+
 
 import os
 import re
diff --git a/ietf/virtualenv-manage.py b/ietf/virtualenv-manage.py
index df6477fd9..dc318c738 100755
--- a/ietf/virtualenv-manage.py
+++ b/ietf/virtualenv-manage.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2016-2019, All Rights Reserved
 #!/usr/bin/env python
 
 import os
@@ -11,7 +12,7 @@ os.chdir(path)
 # Virtualenv support
 virtualenv_activation = os.path.join(path, "env", "bin", "activate_this.py")
 if os.path.exists(virtualenv_activation):
-    execfile(virtualenv_activation, dict(__file__=virtualenv_activation))
+    exec(compile(open(virtualenv_activation, "rb").read(), virtualenv_activation, 'exec'), dict(__file__=virtualenv_activation))
 else:
     raise RuntimeError("Could not find the expected virtual python environment.")
 
diff --git a/ietf/wsgi.py b/ietf/wsgi.py
index d82a32446..fc92e3e91 100644
--- a/ietf/wsgi.py
+++ b/ietf/wsgi.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2013-2019, All Rights Reserved
 """
 WSGI configuration for the datatracker.
 
@@ -50,7 +51,7 @@ syslog.openlog("datatracker", syslog.LOG_PID, syslog.LOG_USER)
 virtualenv_activation = os.path.join(path, "env", "bin", "activate_this.py")
 if os.path.exists(virtualenv_activation):
     syslog.syslog("Starting datatracker wsgi with virtualenv %s" % os.path.dirname(os.path.dirname(virtualenv_activation)))
-    execfile(virtualenv_activation, dict(__file__=virtualenv_activation))
+    exec(compile(open(virtualenv_activation, "rb").read(), virtualenv_activation, 'exec'), dict(__file__=virtualenv_activation))
 else:
     syslog.syslog("Starting datatracker wsgi without virtualenv")
 
diff --git a/tzparse.py b/tzparse.py
index 8ba624730..ad264406b 100755
--- a/tzparse.py
+++ b/tzparse.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2012-2019, All Rights Reserved
 #!/usr/bin/env python
 
 """
@@ -8,7 +9,7 @@ SYNOPSIS
     >>> tzparse("2008-09-08 14:40:35 +0200", "%Y-%m-%d %H:%M:%S %Z")
     datetime.datetime(2008, 9, 8, 14, 40, 35, tzinfo=pytz.FixedOffset(120))
     
-    >>> print tzparse("14:40:35 CEST, 08 Sep 2008", "%H:%M:%S %Z, %d %b %Y")
+    >>> print(tzparse("14:40:35 CEST, 08 Sep 2008", "%H:%M:%S %Z, %d %b %Y"))
     2008-09-08 14:40:35+02:00
 
 DESCRIPTION
@@ -94,31 +95,31 @@ def tzparse(string, format):
     Given a time specification string and a format, tzparse() returns a localized
     datetime.datetime.
 
-    >>> print tzparse("9 Oct 2009 CEST 13:58", "%d %b %Y %Z %H:%M")
+    >>> print(tzparse("9 Oct 2009 CEST 13:58", "%d %b %Y %Z %H:%M"))
     2009-10-09 13:58:00+02:00
 
-    >>> print tzparse("9 Oct 2009 13:58:00 Europe/Stockholm", "%d %b %Y %H:%M:%S %Z") 
+    >>> print(tzparse("9 Oct 2009 13:58:00 Europe/Stockholm", "%d %b %Y %H:%M:%S %Z"))
     2009-10-09 13:58:00+02:00
 
-    >>> print tzparse("9 Oct 2009 13:58:00 +0200", "%d %b %Y %H:%M:%S %Z") 
+    >>> print(tzparse("9 Oct 2009 13:58:00 +0200", "%d %b %Y %H:%M:%S %Z"))
     2009-10-09 13:58:00+02:00
 
-    >>> print tzparse("Fri, 9 Oct 2009 13:58:00 +0200", "%a, %d %b %Y %H:%M:%S %Z") 
+    >>> print(tzparse("Fri, 9 Oct 2009 13:58:00 +0200", "%a, %d %b %Y %H:%M:%S %Z"))
     2009-10-09 13:58:00+02:00
 
-    >>> print tzparse("2009-10-09 13:58:00 EST", '%Y-%m-%d %H:%M:%S %Z')
+    >>> print(tzparse("2009-10-09 13:58:00 EST", '%Y-%m-%d %H:%M:%S %Z'))
     2009-10-09 13:58:00-05:00
 
-    >>> print tzparse("2009-10-09 13:58:00+02:00", "%Y-%m-%d %H:%M:%S%Z")
+    >>> print(tzparse("2009-10-09 13:58:00+02:00", "%Y-%m-%d %H:%M:%S%Z"))
     2009-10-09 13:58:00+02:00
     
-    >>> print tzparse("1985-04-12T23:20:50Z", "%Y-%m-%dT%H:%M:%S%Z")
+    >>> print(tzparse("1985-04-12T23:20:50Z", "%Y-%m-%dT%H:%M:%S%Z"))
     1985-04-12 23:20:50+00:00
 
-    >>> print tzparse("1996-12-19T16:39:57-08:00", "%Y-%m-%dT%H:%M:%S%Z")
+    >>> print(tzparse("1996-12-19T16:39:57-08:00", "%Y-%m-%dT%H:%M:%S%Z"))
     1996-12-19 16:39:57-08:00
 
-    >>> print tzparse("1996-12-19T16:39:57", "%Y-%m-%dT%H:%M:%S")
+    >>> print(tzparse("1996-12-19T16:39:57", "%Y-%m-%dT%H:%M:%S"))
     1996-12-19 16:39:57+01:00
 
     """
@@ -131,8 +132,8 @@ def tzparse(string, format):
         # from the string, too.
 
         def fmt2pat(s):
-            s = re.sub("%[dHIjmMSUwWyY]", "\d+", s)
-            s = re.sub("%[aAbBp]", "\w+", s)
+            s = re.sub("%[dHIjmMSUwWyY]", r"\\d+", s)
+            s = re.sub("%[aAbBp]", r"\\w+", s)
             s = re.sub("%[cxX]", ".+", s)
             s = s.replace("%%", "%")
             return s
@@ -177,9 +178,9 @@ def tzparse(string, format):
 if __name__ == "__main__":
     import sys
     if len(sys.argv[1:]) == 2:
-        print tzparse(sys.argv[1], sys.argv[2])
+        print(tzparse(sys.argv[1], sys.argv[2]))
     else:
-        print "Running module tests:\n"
+        print("Running module tests:\n")
         import doctest
-        print doctest.testmod()
+        print(doctest.testmod())
     
\ No newline at end of file

From 3ec7e864bee751313d7b02e074685778db95530b Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 27 Jun 2019 14:51:02 +0000
Subject: [PATCH 003/114] Converted leading tabs to spaces in ietf/**/*.py  -
 Legacy-Id: 16310

---
 ietf/doc/feeds.py                             |  14 +-
 ietf/doc/mails.py                             |  18 +--
 ietf/doc/templatetags/ietf_filters.py         |   4 +-
 ietf/doc/tests_draft.py                       |   2 +-
 ietf/doc/views_draft.py                       |   6 +-
 ietf/group/feeds.py                           |   8 +-
 ietf/group/forms.py                           |   6 +-
 .../0012_add_old_nomcom_announcements.py      | 128 +++++++++---------
 ietf/group/tests_review.py                    |   4 +-
 ietf/group/views.py                           |   6 +-
 ietf/iesg/feeds.py                            |   3 +-
 ietf/ietfauth/utils.py                        |  26 ++--
 ietf/liaisons/feeds.py                        |   2 +-
 .../migrations/0005_backfill_old_meetings.py  | 116 ++++++++--------
 ietf/middleware.py                            |  22 +--
 ietf/nomcom/tests.py                          |   2 +-
 ietf/redirects/models.py                      |  16 +--
 ietf/redirects/views.py                       |  82 +++++------
 ietf/review/resources.py                      |   2 +-
 ietf/secr/utils/ams_utils.py                  |   5 +-
 ietf/settings_sqlitetest.py                   |   2 +-
 ietf/submit/templatetags/submit_tags.py       |   2 +-
 ietf/utils/draft.py                           |  20 +--
 ietf/utils/mail.py                            |  28 ++--
 ietf/wsgi.py                                  |  12 +-
 25 files changed, 269 insertions(+), 267 deletions(-)

diff --git a/ietf/doc/feeds.py b/ietf/doc/feeds.py
index 108f3112a..16e51a5e5 100644
--- a/ietf/doc/feeds.py
+++ b/ietf/doc/feeds.py
@@ -22,8 +22,8 @@ class DocumentChangesFeed(Feed):
         return "Changes for %s" % obj.display_name()
 
     def link(self, obj):
-	if obj is None:
-	    raise FeedDoesNotExist
+        if obj is None:
+            raise FeedDoesNotExist
         return urlreverse('ietf.doc.views_doc.document_history', kwargs=dict(name=obj.canonical_name()))
 
     def subtitle(self, obj):
@@ -32,7 +32,7 @@ class DocumentChangesFeed(Feed):
     def items(self, obj):
         events = obj.docevent_set.all().order_by("-time","-id")
         augment_events_with_revision(obj, events)
-	return events
+        return events
 
     def item_title(self, item):
         return "[%s] %s [rev. %s]" % (item.by, truncatewords(strip_tags(item.desc), 15), item.rev)
@@ -41,10 +41,10 @@ class DocumentChangesFeed(Feed):
         return truncatewords_html(format_textarea(item.desc), 20)
 
     def item_pubdate(self, item):
-	return item.time
+        return item.time
 
     def item_author_name(self, item):
-	return str(item.by)
+        return str(item.by)
 
     def item_link(self, item):
         return urlreverse('ietf.doc.views_doc.document_history', kwargs=dict(name=item.doc.canonical_name())) + "#history-%s" % item.pk
@@ -62,9 +62,9 @@ class InLastCallFeed(Feed):
             d.lc_event = d.latest_event(LastCallDocEvent, type="sent_last_call")
 
         docs = [d for d in docs if d.lc_event]
-	docs.sort(key=lambda d: d.lc_event.expires)
+        docs.sort(key=lambda d: d.lc_event.expires)
 
-	return docs
+        return docs
 
     def item_title(self, item):
         return "%s (%s - %s)" % (item.name,
diff --git a/ietf/doc/mails.py b/ietf/doc/mails.py
index b42a03a32..b2de66f83 100644
--- a/ietf/doc/mails.py
+++ b/ietf/doc/mails.py
@@ -33,15 +33,15 @@ def email_state_changed(request, doc, text, mailtrigger_id=None):
               cc=cc)
     
 def email_ad_approved_doc(request, doc, text):
-	to = "iesg@iesg.org"
-	bcc = "iesg-secretary@ietf.org"
-	frm = request.user.person.formatted_email()
-	send_mail(request, to, frm,
-			  "Approved: %s" % doc.filename_with_rev(),
-			  "doc/mail/ad_approval_email.txt",
-			  dict(text=text,
-				   docname=doc.filename_with_rev()),
-			  bcc=bcc)
+        to = "iesg@iesg.org"
+        bcc = "iesg-secretary@ietf.org"
+        frm = request.user.person.formatted_email()
+        send_mail(request, to, frm,
+                          "Approved: %s" % doc.filename_with_rev(),
+                          "doc/mail/ad_approval_email.txt",
+                          dict(text=text,
+                                   docname=doc.filename_with_rev()),
+                          bcc=bcc)
     
 def email_stream_changed(request, doc, old_stream, new_stream, text=""):
     """Email the change text to the notify group and to the stream chairs"""
diff --git a/ietf/doc/templatetags/ietf_filters.py b/ietf/doc/templatetags/ietf_filters.py
index 0ab6d4452..b4d9113f8 100644
--- a/ietf/doc/templatetags/ietf_filters.py
+++ b/ietf/doc/templatetags/ietf_filters.py
@@ -146,8 +146,8 @@ def sanitize(value):
 def square_brackets(value):
     """Adds square brackets around text."""
     if isinstance(value, (bytes,str)):
-	if value == "":
-	     value = " "
+        if value == "":
+             value = " "
         return "[ %s ]" % value
     elif value > 0:
         return "[ X ]"
diff --git a/ietf/doc/tests_draft.py b/ietf/doc/tests_draft.py
index b063c0260..fec704051 100644
--- a/ietf/doc/tests_draft.py
+++ b/ietf/doc/tests_draft.py
@@ -40,7 +40,7 @@ class ChangeStateTests(TestCase):
 
         url = urlreverse('ietf.doc.views_draft.change_state', kwargs=dict(name=draft.name))
         login_testing_unauthorized(self, "ad", url)
-	
+        
         # normal get
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
diff --git a/ietf/doc/views_draft.py b/ietf/doc/views_draft.py
index bb4b4456d..050ad7890 100644
--- a/ietf/doc/views_draft.py
+++ b/ietf/doc/views_draft.py
@@ -134,7 +134,7 @@ def change_state(request, name):
                 email_state_changed(request, doc, msg,'doc_state_edited')
                 
                 if new_state.slug == "approved" and new_tags == [] and has_role(request.user, "Area Director"):
-					email_ad_approved_doc(request, doc, comment)
+                                        email_ad_approved_doc(request, doc, comment)
 
                 if prev_state and prev_state.slug in ("ann", "rfcqueue") and new_state.slug not in ("rfcqueue", "pub"):
                     email_pulled_from_rfc_queue(request, doc, comment, prev_state, new_state)
@@ -578,7 +578,7 @@ def to_iesg(request,name):
                 doc.notify = notify
                 changes.append("State Change Notice email list changed to %s" % doc.notify)
 
-	    # Get the last available writeup
+            # Get the last available writeup
             previous_writeup = doc.latest_event(WriteupDocEvent,type="changed_protocol_writeup")
             if previous_writeup != None:
                 changes.append(previous_writeup.text)
@@ -904,7 +904,7 @@ def edit_shepherd_writeup(request, name):
                      writeup = form.cleaned_data['content']
                 e = WriteupDocEvent(doc=doc, rev=doc.rev, by=login, type="changed_protocol_writeup")
 
-		# Add the shepherd writeup to description if the document is in submitted for publication state
+                # Add the shepherd writeup to description if the document is in submitted for publication state
                 stream_state = doc.get_state("draft-stream-%s" % doc.stream_id)
                 iesg_state   = doc.get_state("draft-iesg")
                 if (iesg_state or (stream_state and stream_state.slug=='sub-pub')):
diff --git a/ietf/group/feeds.py b/ietf/group/feeds.py
index aaf8097b7..57521c983 100644
--- a/ietf/group/feeds.py
+++ b/ietf/group/feeds.py
@@ -21,12 +21,12 @@ class GroupChangesFeed(Feed):
         return "Changes for %s %s" % (obj.acronym, obj.type)
 
     def link(self, obj):
-	if not obj:
-	    raise FeedDoesNotExist
+        if not obj:
+            raise FeedDoesNotExist
         return obj.about_url()
 
     def description(self, obj):
-	return self.title(obj)
+        return self.title(obj)
 
     def items(self, obj):
         events = list(obj.groupevent_set.all().select_related("group"))
@@ -44,7 +44,7 @@ class GroupChangesFeed(Feed):
             return obj.group.about_url()
 
     def item_pubdate(self, obj):
-	return obj.time
+        return obj.time
 
     def item_title(self, obj):
         title = "%s - %s" % (truncatewords(strip_tags(obj.desc), 10), obj.by)
diff --git a/ietf/group/forms.py b/ietf/group/forms.py
index 1c4bc550d..04cfc9f3f 100644
--- a/ietf/group/forms.py
+++ b/ietf/group/forms.py
@@ -48,11 +48,11 @@ class StatusUpdateForm(forms.Form):
 
     def clean(self):
         if (self.cleaned_data['content'] and self.cleaned_data['content'].strip() and self.cleaned_data['txt']):
-	    raise forms.ValidationError("Cannot enter both text box and TXT file")
-	elif (self.cleaned_data['content'] and not self.cleaned_data['content'].strip() and not self.cleaned_data['txt']):
+            raise forms.ValidationError("Cannot enter both text box and TXT file")
+        elif (self.cleaned_data['content'] and not self.cleaned_data['content'].strip() and not self.cleaned_data['txt']):
             raise forms.ValidationError("NULL input is not a valid option")
         elif (self.cleaned_data['txt'] and not self.cleaned_data['txt'].strip()) :
-	    raise forms.ValidationError("NULL TXT file input is not a valid option")
+            raise forms.ValidationError("NULL TXT file input is not a valid option")
 
 class ConcludeGroupForm(forms.Form):
     instructions = forms.CharField(widget=forms.Textarea(attrs={'rows': 30}), required=True, strip=False)
diff --git a/ietf/group/migrations/0012_add_old_nomcom_announcements.py b/ietf/group/migrations/0012_add_old_nomcom_announcements.py
index 8647b3dc5..19d232f66 100644
--- a/ietf/group/migrations/0012_add_old_nomcom_announcements.py
+++ b/ietf/group/migrations/0012_add_old_nomcom_announcements.py
@@ -12,14 +12,14 @@ from datetime import datetime
 
 def forward(apps, schema_editor):
 
- 	p=Person.objects.filter(name="Jim Fenton")[0]
+        p=Person.objects.filter(name="Jim Fenton")[0]
 
 # Unfortunately, get_nomcom_by_year only works for 2013 and later, so we need to do things the hard way.
 
-	n = Group.objects.filter(acronym="nomcom2002")[0]
+        n = Group.objects.filter(acronym="nomcom2002")[0]
  
-   	n.message_set.create(by=p, subject="nomcom call for volunteers", time=datetime(2002,7,30),
-   		frm="Phil Roberts ", to="IETF Announcement list ", body="""
+        n.message_set.create(by=p, subject="nomcom call for volunteers", time=datetime(2002,7,30),
+                frm="Phil Roberts ", to="IETF Announcement list ", body="""
 This is the call for volunteers to participate in the 2002 IETF
 Nominations Committee, the committee that will select this year's
 nominees for the IAB and the IESG.  Details about the Nominations
@@ -116,8 +116,8 @@ Nordstrom (JWN)
 
 """)
 
-	n.message_set.create(by=p, subject="Selection of the Nominations Committee", time=datetime(2002,9,17),
-		frm="Phil Roberts ", to="IETF Announcement list ", body="""
+        n.message_set.create(by=p, subject="Selection of the Nominations Committee", time=datetime(2002,9,17),
+                frm="Phil Roberts ", to="IETF Announcement list ", body="""
 STOCKS USED IN THE NOMCOM SELECTION PROCESS, published result (in 100s), 
 number used as input (using 000s, rounded):
 
@@ -225,10 +225,10 @@ Nominations committee:
 140. Eva Gustaffson
 
 """
-	)
+        )
 
-	n.message_set.create(by=p, subject="Announcement of the Nominations Committee", time=datetime(2002,9,18),
-		frm="Phil Roberts ", to="IETF Announcement list ", body="""
+        n.message_set.create(by=p, subject="Announcement of the Nominations Committee", time=datetime(2002,9,18),
+                frm="Phil Roberts ", to="IETF Announcement list ", body="""
 We have completed selection of the 2002 
 Nominations committee.
 
@@ -256,10 +256,10 @@ Theodore Ts'o  (previous nomcom chair)
 Information on this year's selection process is available at: 
 
 """
-	)
+        )
 
-	n.message_set.create(by=p, subject="Announcement of IESG and IAB Nominations Requests", time=datetime(2002,10,21),
-		frm="Phil Roberts ", to="IETF Announcement list ", body="""
+        n.message_set.create(by=p, subject="Announcement of IESG and IAB Nominations Requests", time=datetime(2002,10,21),
+                frm="Phil Roberts ", to="IETF Announcement list ", body="""
 The 2002-2003 Nominations Committee is now
 soliciting nominations for the open
 slots on the IESG and IAB. 
@@ -343,8 +343,8 @@ also serves as a non-voting liaison.
 
 """)
 
-	n.message_set.create(by=p, subject="Announcement of IESG and IAB Nominations Requests", time=datetime(2002,11,0o5),
-		frm="Phil Roberts ", to="IETF Announcement list ", body="""
+        n.message_set.create(by=p, subject="Announcement of IESG and IAB Nominations Requests", time=datetime(2002,11,0o5),
+                frm="Phil Roberts ", to="IETF Announcement list ", body="""
 The 2002-2003 Nominations Committee is now
 soliciting nominations for the open
 slots on the IESG and IAB.
@@ -430,8 +430,8 @@ open position.  The Chair of the prior year's nominating committee
 also serves as a non-voting liaison.
 """)
 
-	n.message_set.create(by=p, subject="Announcement of IESG and IAB Nominations Requests", time=datetime(2002,11,12),
-		frm="Phil Roberts ", to="IETF Announcement list ", body="""
+        n.message_set.create(by=p, subject="Announcement of IESG and IAB Nominations Requests", time=datetime(2002,11,12),
+                frm="Phil Roberts ", to="IETF Announcement list ", body="""
 The 2002-2003 Nominations Committee is now
 soliciting nominations for the open
 slots on the IESG and IAB.
@@ -516,10 +516,10 @@ committee from their current membership who are not sitting in an
 open position.  The Chair of the prior year's nominating committee 
 also serves as a non-voting liaison.
 """
-	)
+        )
 
-	n.message_set.create(by=p, subject="IETF Nomcom Announcement", time=datetime(2003,2,27),
-		frm="Phil Roberts ", to="IETF Announcement list ", body="""
+        n.message_set.create(by=p, subject="IETF Nomcom Announcement", time=datetime(2003,2,27),
+                frm="Phil Roberts ", to="IETF Announcement list ", body="""
 The nomcom is pleased to announce the results of the 2002-2003
 selection process.  The IAB has approved the IESG candidates and
 the ISOC has approved the IAB candidates.  Please welcome them
@@ -581,8 +581,8 @@ Eric Rescorla - IAB liaison
 Ted Ts'o - past chair
 """)
 
-	n.message_set.create(by=p, subject="Announcement of IESG and IAB Nominations Request", time=datetime(2003,6,11),
-		frm="Phil Roberts ", to="IETF Announcement list ", body="""
+        n.message_set.create(by=p, subject="Announcement of IESG and IAB Nominations Request", time=datetime(2003,6,11),
+                frm="Phil Roberts ", to="IETF Announcement list ", body="""
  The nominations committee has received notice to fill the vacancy in the
  Internet Area created with Erik Nordmark's departure. The nominations
  committee is seeking nominees to fill the open position. The chosen
@@ -641,8 +641,8 @@ Ted Ts'o - past chair
  also serves as a non-voting liaison.
 """)
 
-	n.message_set.create(by=p, subject="Nomcom result announcement", time=datetime(2003,7,15),
-		frm="Phil Roberts ", to="IETF Announcement list ", body="""
+        n.message_set.create(by=p, subject="Nomcom result announcement", time=datetime(2003,7,15),
+                frm="Phil Roberts ", to="IETF Announcement list ", body="""
  The nomcom is pleased to announce that it has selected Margaret Wasserman
  to fill the mid-term vacancy left by Erik Nordmark's resignation.
    
@@ -681,10 +681,10 @@ Ted Ts'o - past chair
  Ted Ts'o - past chair
 """)
 
-	n = Group.objects.filter(acronym="nomcom2003")[0]
+        n = Group.objects.filter(acronym="nomcom2003")[0]
 
-	n.message_set.create(by=p, subject="IETF Nominations Committee Chair Announcement", time=datetime(2003,8,25),
-		frm="Lynn St. Amour", to="IETF Announcement list ", body="""
+        n.message_set.create(by=p, subject="IETF Nominations Committee Chair Announcement", time=datetime(2003,8,25),
+                frm="Lynn St. Amour", to="IETF Announcement list ", body="""
  One of the roles of the ISOC President is to appoint the IETF Nominations 
 Committee chair. This is done through consultation with the IETF and IAB Chairs 
 as well as the ISOC Executive Committee and it gives us great pleasure to announce 
@@ -706,8 +706,8 @@ President & CEO
 The Internet Society
 """)
 
-	n.message_set.create(by=p, subject="NomCom call for volunteers", time=datetime(2003,9,22),
-		frm="Richard Draves ", to="IETF Announcement list ", body="""
+        n.message_set.create(by=p, subject="NomCom call for volunteers", time=datetime(2003,9,22),
+                frm="Richard Draves ", to="IETF Announcement list ", body="""
 This is the call for volunteers to participate in the 2003 IETF Nominations Committee, 
 the committee that will select this year's nominees for the IAB and the IESG.
 
@@ -797,8 +797,8 @@ Corning (GLW)
 Tyco International (TYC)
 """)
 
-	n.message_set.create(by=p, subject="NomCom volunteer list", time=datetime(2003,10,6),
-		frm="Richard Draves ", to="IETF Announcement list ", body="""
+        n.message_set.create(by=p, subject="NomCom volunteer list", time=datetime(2003,10,6),
+                frm="Richard Draves ", to="IETF Announcement list ", body="""
 The final list of volunteers for the 2003 NomCom can be found at
 http://www.ietf.org/nomcom. I would like to thank everyone who
 volunteered.
@@ -845,8 +845,8 @@ Corning (GLW)
 Tyco International (TYC)
 """)
 
-	n.message_set.create(by=p, subject="Selection of the Nominations Committee", time=datetime(2003,10,10),
-		frm="Richard Draves ", to="IETF Announcement list ", body="""
+        n.message_set.create(by=p, subject="Selection of the Nominations Committee", time=datetime(2003,10,10),
+                frm="Richard Draves ", to="IETF Announcement list ", body="""
 STOCKS USED IN THE NOMCOM SELECTION PROCESS, published result (in 100s), 
 number used as input (using 000s, rounded):
 
@@ -972,8 +972,8 @@ Nominations committee:
 108. Andrew Thiessen 
 """)
 
-	n.message_set.create(by=p, subject="NomCom Selection", time=datetime(2003,10,10),
-		frm="Richard Draves ", to="IETF Announcement list ", body="""
+        n.message_set.create(by=p, subject="NomCom Selection", time=datetime(2003,10,10),
+                frm="Richard Draves ", to="IETF Announcement list ", body="""
 Please welcome the voting members of this year's nomcom:
 
 Kireeti Kompella 
@@ -1010,8 +1010,8 @@ Thanks,
 Rich
 """)
 
-	n.message_set.create(by=p, subject="Call for Nominees", time=datetime(2003,10,17),
-		frm="Richard Draves ", to="IETF Announcement list ", body="""
+        n.message_set.create(by=p, subject="Call for Nominees", time=datetime(2003,10,17),
+                frm="Richard Draves ", to="IETF Announcement list ", body="""
 Please send the NomCom  nominations for the open IESG
 and IAB positions:
 
@@ -1042,8 +1042,8 @@ Thanks,
 Rich
 """)
 
-	n.message_set.create(by=p, subject="NomCom members", time=datetime(2003,10,24),
-		frm="Richard Draves ", to="IETF Announcement list ", body="""
+        n.message_set.create(by=p, subject="NomCom members", time=datetime(2003,10,24),
+                frm="Richard Draves ", to="IETF Announcement list ", body="""
 AB has appointed Geoff Huston as its non-voting liaison to the
 nomcom.
 
@@ -1075,8 +1075,8 @@ Thanks,
 Rich
 """)
 
-	n.message_set.create(by=p, subject="NomCom at IETF", time=datetime(2003,11,7),
-		frm="Richard Draves ", to="IETF Announcement list ", body="""
+        n.message_set.create(by=p, subject="NomCom at IETF", time=datetime(2003,11,7),
+                frm="Richard Draves ", to="IETF Announcement list ", body="""
 Members of the nomcom at IETF will be happy to chat with you in person
 about what the nomcom should look for in candidates for the IESG and
 IAB, specific feedback about the incumbents or potential nominees,
@@ -1095,8 +1095,8 @@ Thanks,
 Rich
 """)
 
-	n.message_set.create(by=p, subject="NomCom News", time=datetime(2003,11,14),
-		frm="Richard Draves ", to="IETF Announcement list ", body="""
+        n.message_set.create(by=p, subject="NomCom News", time=datetime(2003,11,14),
+                frm="Richard Draves ", to="IETF Announcement list ", body="""
 Randy Bush has resigned from his position as O&M Area Director. Hence,
 the nomcom will be filling Randy's position in addition to the
 previously announced positions.
@@ -1120,8 +1120,8 @@ Thanks,
 Rich
 """)
 
- 	n.message_set.create(by=p, subject="reminder - nominations to replace Randy Bush", time=datetime(2003,11,26),
-		frm="Richard Draves ", to="IETF Announcement list ", body="""
+        n.message_set.create(by=p, subject="reminder - nominations to replace Randy Bush", time=datetime(2003,11,26),
+                frm="Richard Draves ", to="IETF Announcement list ", body="""
 At IETF Randy Bush resigned from his position as Operations & Management
 Area Director for the IETF. This creates a mid-term vacancy that the
 IETF NomCom needs to fill. Randy's replacement will have a one-year
@@ -1144,8 +1144,8 @@ Thanks,
 Rich
 """)
 
- 	n.message_set.create(by=p, subject="Randy Bush replacement schedule", time=datetime(2003,12,1),
-		frm="Richard Draves ", to="IETF Announcement list ", body="""
+        n.message_set.create(by=p, subject="Randy Bush replacement schedule", time=datetime(2003,12,1),
+                frm="Richard Draves ", to="IETF Announcement list ", body="""
 For mid-term vacancies, RFC 2727 says "the selection and confirmation
 process is expected to be completed within 1 month." However, there are
 several factors that make a one-month schedule impractical in this
@@ -1171,8 +1171,8 @@ Thanks,
 Rich
 """)
 
-  	n.message_set.create(by=p, subject="Randy Bush replacement", time=datetime(2004,1,14),
-		frm="Richard Draves ", to="IETF Announcement list ", body="""
+        n.message_set.create(by=p, subject="Randy Bush replacement", time=datetime(2004,1,14),
+                frm="Richard Draves ", to="IETF Announcement list ", body="""
 I am pleased to announce that the IAB has confirmed the NomCom's
 selection of David Kessens for a one-year term as O&M Area Director,
 filling the mid-term vacancy left by Randy Bush's resignation.
@@ -1181,8 +1181,8 @@ Thanks,
 Rich
 """)
 
-  	n.message_set.create(by=p, subject="NomCom results", time=datetime(2004,2,13),
-		frm="Richard Draves ", to="IETF Announcement list ", body="""
+        n.message_set.create(by=p, subject="NomCom results", time=datetime(2004,2,13),
+                frm="Richard Draves ", to="IETF Announcement list ", body="""
 I am pleased to announce the results of the 2003-2004 NomCom selection
 process. The IAB has approved the IESG candidates and the ISOC board has
 approved the IAB candidates. Please welcome them in their roles:
@@ -1241,8 +1241,8 @@ Thanks,
 Rich
 """)
 
-  	n.message_set.create(by=p, subject="call for Security AD nominations", time=datetime(2004,9,28),
-		frm="Richard Draves ", to="IETF Announcement list ", body="""
+        n.message_set.create(by=p, subject="call for Security AD nominations", time=datetime(2004,9,28),
+                frm="Richard Draves ", to="IETF Announcement list ", body="""
 Steve Bellovin has resigned from his position as Security Area Director,
 effective the end of the November IETF meeting. The IESG has asked the
 2003-2004 NomCom to fill the mid-term vacancy. Steve's replacement will
@@ -1266,8 +1266,8 @@ Thanks,
 Rich
 """)
 
-  	n.message_set.create(by=p, subject="Steve Bellovin replacement", time=datetime(2004,11,7),
-		frm="Richard Draves ", to="IETF Announcement list ", body="""
+        n.message_set.create(by=p, subject="Steve Bellovin replacement", time=datetime(2004,11,7),
+                frm="Richard Draves ", to="IETF Announcement list ", body="""
 I am pleased to announce that the IAB has confirmed the NomCom's
 selection of Sam Hartman for a one-year term as Security Area Director,
 filling the mid-term vacancy left by Steve Bellovin's resignation.
@@ -1281,20 +1281,20 @@ Thanks,
 Rich
 """)
 
-	return
-	
+        return
+        
 
 def reverse(apps, schema_editor):
-	n = Group.objects.filter(acronym="nomcom2002")[0]
+        n = Group.objects.filter(acronym="nomcom2002")[0]
 
-	announcements = Message.objects.filter(related_groups=n)
-	announcements.delete()
+        announcements = Message.objects.filter(related_groups=n)
+        announcements.delete()
 
-	n = Group.objects.filter(acronym="nomcom2003")[0]
- 	announcements = Message.objects.filter(related_groups=n)
-	announcements.delete()
+        n = Group.objects.filter(acronym="nomcom2003")[0]
+        announcements = Message.objects.filter(related_groups=n)
+        announcements.delete()
 
-	return
+        return
 
 
 class Migration(migrations.Migration):
@@ -1304,5 +1304,5 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        	migrations.RunPython(forward, reverse)
+                migrations.RunPython(forward, reverse)
     ]
diff --git a/ietf/group/tests_review.py b/ietf/group/tests_review.py
index fa689dfe7..65000b939 100644
--- a/ietf/group/tests_review.py
+++ b/ietf/group/tests_review.py
@@ -349,7 +349,7 @@ class ReviewTests(TestCase):
             'start_date': start_date.isoformat(),
             'end_date': "",
             'availability': "unavailable",
-	    'reason': "Whimsy",
+            'reason': "Whimsy",
         })
         self.assertEqual(r.status_code, 302)
         period = UnavailablePeriod.objects.get(person=reviewer, team=review_req.team, start_date=start_date)
@@ -359,7 +359,7 @@ class ReviewTests(TestCase):
         msg_content = outbox[0].get_payload(decode=True).decode("utf-8").lower()
         self.assertTrue(start_date.isoformat(), msg_content)
         self.assertTrue("indefinite", msg_content)
-    	self.assertEqual(period.reason, "Whimsy")
+        self.assertEqual(period.reason, "Whimsy")
 
         # end unavailable period
         empty_outbox()
diff --git a/ietf/group/views.py b/ietf/group/views.py
index 0a89d33d9..704467135 100644
--- a/ietf/group/views.py
+++ b/ietf/group/views.py
@@ -337,8 +337,8 @@ def active_programs(request):
     return render(request, 'group/active_programs.html', {'programs' : programs })
 
 def active_areas(request):
-	areas = Group.objects.filter(type="area", state="active").order_by("name")  
-	return render(request, 'group/active_areas.html', {'areas': areas })
+        areas = Group.objects.filter(type="area", state="active").order_by("name")  
+        return render(request, 'group/active_areas.html', {'areas': areas })
 
 def active_wgs(request):
     areas = Group.objects.filter(type="area", state="active").order_by("name")
@@ -1692,7 +1692,7 @@ def change_reviewer_settings(request, acronym, reviewer_email, group_type=None):
                     period.start_date.isoformat() if period.start_date else "indefinite",
                     period.end_date.isoformat() if period.end_date else "indefinite",
                     period.get_availability_display(),
-		    period.reason,
+                    period.reason,
                 )
 
                 if period.availability == "unavailable":
diff --git a/ietf/iesg/feeds.py b/ietf/iesg/feeds.py
index 01ae1e4cb..3e620a780 100644
--- a/ietf/iesg/feeds.py
+++ b/ietf/iesg/feeds.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2007-2019, All Rights Reserved
 import datetime
 
 from django.contrib.syndication.views import Feed
@@ -26,7 +27,7 @@ class IESGAgendaFeed(Feed):
         return doc.latest_telechat_event.time
         
     def item_author_name(self, doc):
-	return doc.ad.plain_name() if doc.ad else "None"
+        return doc.ad.plain_name() if doc.ad else "None"
 
     def item_author_email(self, doc):
         if not doc.ad:
diff --git a/ietf/ietfauth/utils.py b/ietf/ietfauth/utils.py
index d6e1bd80a..b07509268 100644
--- a/ietf/ietfauth/utils.py
+++ b/ietf/ietfauth/utils.py
@@ -48,24 +48,24 @@ def has_role(user, role_names, *args, **kwargs):
             return False
 
         role_qs = {
-	    "Area Director": Q(person=person, name__in=("pre-ad", "ad"), group__type="area", group__state="active"),
-	    "Secretariat": Q(person=person, name="secr", group__acronym="secretariat"),
+            "Area Director": Q(person=person, name__in=("pre-ad", "ad"), group__type="area", group__state="active"),
+            "Secretariat": Q(person=person, name="secr", group__acronym="secretariat"),
             "IAB" : Q(person=person, name="member", group__acronym="iab"),
-	    "IANA": Q(person=person, name="auth", group__acronym="iana"),
+            "IANA": Q(person=person, name="auth", group__acronym="iana"),
             "RFC Editor": Q(person=person, name="auth", group__acronym="rfceditor"),
             "ISE" : Q(person=person, name="chair", group__acronym="ise"),
-	    "IAD": Q(person=person, name="admdir", group__acronym="ietf"),
-	    "IETF Chair": Q(person=person, name="chair", group__acronym="ietf"),
-	    "IETF Trust Chair": Q(person=person, name="chair", group__acronym="ietf-trust"),
-	    "IRTF Chair": Q(person=person, name="chair", group__acronym="irtf"),
-	    "IAB Chair": Q(person=person, name="chair", group__acronym="iab"),
-	    "IAB Executive Director": Q(person=person, name="execdir", group__acronym="iab"),
+            "IAD": Q(person=person, name="admdir", group__acronym="ietf"),
+            "IETF Chair": Q(person=person, name="chair", group__acronym="ietf"),
+            "IETF Trust Chair": Q(person=person, name="chair", group__acronym="ietf-trust"),
+            "IRTF Chair": Q(person=person, name="chair", group__acronym="irtf"),
+            "IAB Chair": Q(person=person, name="chair", group__acronym="iab"),
+            "IAB Executive Director": Q(person=person, name="execdir", group__acronym="iab"),
             "IAB Group Chair": Q(person=person, name="chair", group__type="iab", group__state="active"),
             "IAOC Chair": Q(person=person, name="chair", group__acronym="iaoc"),
-	    "WG Chair": Q(person=person,name="chair", group__type="wg", group__state__in=["active","bof", "proposed"]),
-	    "WG Secretary": Q(person=person,name="secr", group__type="wg", group__state__in=["active","bof", "proposed"]),
-	    "RG Chair": Q(person=person,name="chair", group__type="rg", group__state__in=["active","proposed"]),
-	    "RG Secretary": Q(person=person,name="secr", group__type="rg", group__state__in=["active","proposed"]),
+            "WG Chair": Q(person=person,name="chair", group__type="wg", group__state__in=["active","bof", "proposed"]),
+            "WG Secretary": Q(person=person,name="secr", group__type="wg", group__state__in=["active","bof", "proposed"]),
+            "RG Chair": Q(person=person,name="chair", group__type="rg", group__state__in=["active","proposed"]),
+            "RG Secretary": Q(person=person,name="secr", group__type="rg", group__state__in=["active","proposed"]),
             "AG Secretary": Q(person=person,name="secr", group__type="ag", group__state__in=["active"]),
             "Team Chair": Q(person=person,name="chair", group__type="team", group__state="active"),
             "Nomcom Chair": Q(person=person, name="chair", group__type="nomcom", group__acronym__icontains=kwargs.get('year', '0000')),
diff --git a/ietf/liaisons/feeds.py b/ietf/liaisons/feeds.py
index b6ee64e46..d2f0b43a9 100644
--- a/ietf/liaisons/feeds.py
+++ b/ietf/liaisons/feeds.py
@@ -79,7 +79,7 @@ class LiaisonStatementsFeed(Feed):
 
         qs = qs.prefetch_related("attachments")
 
-	return qs
+        return qs
 
     def title(self, obj):
         return obj['title']
diff --git a/ietf/meeting/migrations/0005_backfill_old_meetings.py b/ietf/meeting/migrations/0005_backfill_old_meetings.py
index f56fc33ca..36e308dc7 100644
--- a/ietf/meeting/migrations/0005_backfill_old_meetings.py
+++ b/ietf/meeting/migrations/0005_backfill_old_meetings.py
@@ -10,64 +10,64 @@ def backfill_old_meetings(apps, schema_editor):
 
         for id, number, type_id, date, city, country, time_zone, continent, attendees in [
                 ( 59,'59','ietf','2004-03-29','Seoul','KR','Asia/Seoul','Asia','1390' ),
-		( 58,'58','ietf','2003-11-09','Minneapolis','US','America/Menominee','America','1233' ),
-		( 57,'57','ietf','2003-07-13','Vienna','AT','Europe/Vienna','Europe','1304' ),
-		( 56,'56','ietf','2003-03-16','San Francisco','US','America/Los_Angeles','America','1679' ),
-		( 55,'55','ietf','2002-11-17','Atlanta','US','America/New_York','America','1570' ),
-		( 54,'54','ietf','2002-07-14','Yokohama','JP','Asia/Tokyo','Asia','1885' ),
-		( 53,'53','ietf','2002-03-17','Minneapolis','US','America/Menominee','America','1656' ),
-		( 52,'52','ietf','2001-12-09','Salt Lake City','US','America/Denver','America','1691' ),
-		( 51,'51','ietf','2001-08-05','London','GB','Europe/London','Europe','2226' ),
-		( 50,'50','ietf','2001-03-18','Minneapolis','US','America/Menominee','America','1822' ),
-		( 49,'49','ietf','2000-12-10','San Diego','US','America/Los_Angeles','America','2810' ),
-		( 48,'48','ietf','2000-07-31','Pittsburgh','US','America/New_York','America','2344' ),
-		( 47,'47','ietf','2000-03-26','Adelaide','AU','Australia/Adelaide','Australia','1431' ),
-		( 46,'46','ietf','1999-11-07','Washington','US','America/New_York','America','2379' ),
-		( 45,'45','ietf','1999-07-11','Oslo','NO','Europe/Oslo','Europe','1710' ),
-		( 44,'44','ietf','1999-03-14','Minneapolis','US','America/Menominee','America','1705' ),
-		( 43,'43','ietf','1998-12-07','Orlando','US','America/New_York','America','2124' ),
-		( 42,'42','ietf','1998-08-24','Chicago','US','America/Chicago','America','2106' ),
-		( 41,'41','ietf','1998-03-30','Los Angeles','US','America/Los_Angeles','America','1775' ),
-		( 40,'40','ietf','1997-12-08','Washington','US','America/New_York','America','1897' ),
-		( 39,'39','ietf','1997-08-11','Munich','DE','Europe/Berlin','Europe','1308' ),
-		( 38,'38','ietf','1997-04-07','Memphis','US','America/Chicago','America','1321' ),
-		( 37,'37','ietf','1996-12-09','San Jose','US','America/Los_Angeles','America','1993' ),
-		( 36,'36','ietf','1996-06-24','Montreal','CA','America/New_York','America','1283' ),
-		( 35,'35','ietf','1996-03-04','Los Angeles','US','America/Los_Angeles','America','1038' ),
-		( 34,'34','ietf','1995-12-04','Dallas','US','America/Chicago','America','1007' ),
-		( 33,'33','ietf','1995-07-17','Stockholm','SE','Europe/Stockholm','Europe','617' ),
-		( 32,'32','ietf','1995-04-03','Danvers','US','America/New_York','America','983' ),
-		( 31,'31','ietf','1994-12-05','San Jose','US','America/Los_Angeles','America','1079' ),
-		( 30,'30','ietf','1994-07-25','Toronto','CA','America/New_York','America','710' ),
-		( 29,'29','ietf','1994-03-28','Seattle','US','America/Los_Angeles','America','785' ),
-		( 28,'28','ietf','1993-11-01','Houston','US','America/Chicago','America','636' ),
-		( 27,'27','ietf','1993-07-12','Amsterdam','NL','Europe/Amsterdam','Europe','493' ),
-		( 26,'26','ietf','1993-03-29','Columbus','US','America/New_York','America','638' ),
-		( 25,'25','ietf','1992-11-16','Washington','US','America/New_York','America','633' ),
-		( 24,'24','ietf','1992-07-13','Cambridge','US','America/New_York','America','677' ),
-		( 23,'23','ietf','1992-03-16','San Diego','US','America/Los_Angeles','America','530' ),
-		( 22,'22','ietf','1991-11-18','Santa Fe','US','America/Denver','America','372' ),
-		( 21,'21','ietf','1991-07-29','Atlanta','US','America/New_York','America','387' ),
-		( 20,'20','ietf','1991-03-11','St. Louis','US','America/Chicago','America','348' ),
-		( 19,'19','ietf','1990-12-03','Boulder','US','America/Denver','America','292' ),
-		( 18,'18','ietf','1990-07-30','Vancouver','CA','America/Los_Angeles','America','293' ),
-		( 17,'17','ietf','1990-05-01','Pittsburgh','US','America/New_York','America','244' ),
-		( 16,'16','ietf','1990-02-06','Tallahassee','US','America/New_York','America','196' ),
-		( 15,'15','ietf','1989-10-31','Honolulu','US','Pacific/Honolulu','America','138' ),
-		( 14,'14','ietf','1989-07-25','Stanford','US','America/Los_Angeles','America','217' ),
-		( 13,'13','ietf','1989-04-11','Cocoa Beach','US','America/New_York','America','114' ),
-		( 12,'12','ietf','1989-01-18','Austin','US','America/Chicago','America','120' ),
-		( 11,'11','ietf','1988-10-17','Ann Arbor','US','America/New_York','America','114' ),
-		( 10,'10','ietf','1988-06-15','Annapolis','US','America/New_York','America','112' ),
-		( 9,'9','ietf','1988-03-01','San Diego','US','America/Los_Angeles','America','82' ),
-		( 8,'8','ietf','1987-11-02','Boulder','US','America/Denver','America','56' ),
-		( 7,'7','ietf','1987-07-27','McLean','US','America/New_York','America','101' ),
-		( 6,'6','ietf','1987-04-22','Boston','US','America/New_York','America','88' ),
-		( 5,'5','ietf','1987-02-04','Moffett Field','US','America/Los_Angeles','America','35' ),
-		( 4,'4','ietf','1986-10-15','Menlo Park','US','America/Los_Angeles','America','35' ),
-		( 3,'3','ietf','1986-07-23','Ann Arbor','US','America/New_York','America','18' ),
-		( 2,'2','ietf','1986-04-08','Aberdeen','US','America/New_York','America','21' ),
-		( 1,'1','ietf','1986-01-16','San Diego','US','America/Los_Angeles','America','21' ),
+                ( 58,'58','ietf','2003-11-09','Minneapolis','US','America/Menominee','America','1233' ),
+                ( 57,'57','ietf','2003-07-13','Vienna','AT','Europe/Vienna','Europe','1304' ),
+                ( 56,'56','ietf','2003-03-16','San Francisco','US','America/Los_Angeles','America','1679' ),
+                ( 55,'55','ietf','2002-11-17','Atlanta','US','America/New_York','America','1570' ),
+                ( 54,'54','ietf','2002-07-14','Yokohama','JP','Asia/Tokyo','Asia','1885' ),
+                ( 53,'53','ietf','2002-03-17','Minneapolis','US','America/Menominee','America','1656' ),
+                ( 52,'52','ietf','2001-12-09','Salt Lake City','US','America/Denver','America','1691' ),
+                ( 51,'51','ietf','2001-08-05','London','GB','Europe/London','Europe','2226' ),
+                ( 50,'50','ietf','2001-03-18','Minneapolis','US','America/Menominee','America','1822' ),
+                ( 49,'49','ietf','2000-12-10','San Diego','US','America/Los_Angeles','America','2810' ),
+                ( 48,'48','ietf','2000-07-31','Pittsburgh','US','America/New_York','America','2344' ),
+                ( 47,'47','ietf','2000-03-26','Adelaide','AU','Australia/Adelaide','Australia','1431' ),
+                ( 46,'46','ietf','1999-11-07','Washington','US','America/New_York','America','2379' ),
+                ( 45,'45','ietf','1999-07-11','Oslo','NO','Europe/Oslo','Europe','1710' ),
+                ( 44,'44','ietf','1999-03-14','Minneapolis','US','America/Menominee','America','1705' ),
+                ( 43,'43','ietf','1998-12-07','Orlando','US','America/New_York','America','2124' ),
+                ( 42,'42','ietf','1998-08-24','Chicago','US','America/Chicago','America','2106' ),
+                ( 41,'41','ietf','1998-03-30','Los Angeles','US','America/Los_Angeles','America','1775' ),
+                ( 40,'40','ietf','1997-12-08','Washington','US','America/New_York','America','1897' ),
+                ( 39,'39','ietf','1997-08-11','Munich','DE','Europe/Berlin','Europe','1308' ),
+                ( 38,'38','ietf','1997-04-07','Memphis','US','America/Chicago','America','1321' ),
+                ( 37,'37','ietf','1996-12-09','San Jose','US','America/Los_Angeles','America','1993' ),
+                ( 36,'36','ietf','1996-06-24','Montreal','CA','America/New_York','America','1283' ),
+                ( 35,'35','ietf','1996-03-04','Los Angeles','US','America/Los_Angeles','America','1038' ),
+                ( 34,'34','ietf','1995-12-04','Dallas','US','America/Chicago','America','1007' ),
+                ( 33,'33','ietf','1995-07-17','Stockholm','SE','Europe/Stockholm','Europe','617' ),
+                ( 32,'32','ietf','1995-04-03','Danvers','US','America/New_York','America','983' ),
+                ( 31,'31','ietf','1994-12-05','San Jose','US','America/Los_Angeles','America','1079' ),
+                ( 30,'30','ietf','1994-07-25','Toronto','CA','America/New_York','America','710' ),
+                ( 29,'29','ietf','1994-03-28','Seattle','US','America/Los_Angeles','America','785' ),
+                ( 28,'28','ietf','1993-11-01','Houston','US','America/Chicago','America','636' ),
+                ( 27,'27','ietf','1993-07-12','Amsterdam','NL','Europe/Amsterdam','Europe','493' ),
+                ( 26,'26','ietf','1993-03-29','Columbus','US','America/New_York','America','638' ),
+                ( 25,'25','ietf','1992-11-16','Washington','US','America/New_York','America','633' ),
+                ( 24,'24','ietf','1992-07-13','Cambridge','US','America/New_York','America','677' ),
+                ( 23,'23','ietf','1992-03-16','San Diego','US','America/Los_Angeles','America','530' ),
+                ( 22,'22','ietf','1991-11-18','Santa Fe','US','America/Denver','America','372' ),
+                ( 21,'21','ietf','1991-07-29','Atlanta','US','America/New_York','America','387' ),
+                ( 20,'20','ietf','1991-03-11','St. Louis','US','America/Chicago','America','348' ),
+                ( 19,'19','ietf','1990-12-03','Boulder','US','America/Denver','America','292' ),
+                ( 18,'18','ietf','1990-07-30','Vancouver','CA','America/Los_Angeles','America','293' ),
+                ( 17,'17','ietf','1990-05-01','Pittsburgh','US','America/New_York','America','244' ),
+                ( 16,'16','ietf','1990-02-06','Tallahassee','US','America/New_York','America','196' ),
+                ( 15,'15','ietf','1989-10-31','Honolulu','US','Pacific/Honolulu','America','138' ),
+                ( 14,'14','ietf','1989-07-25','Stanford','US','America/Los_Angeles','America','217' ),
+                ( 13,'13','ietf','1989-04-11','Cocoa Beach','US','America/New_York','America','114' ),
+                ( 12,'12','ietf','1989-01-18','Austin','US','America/Chicago','America','120' ),
+                ( 11,'11','ietf','1988-10-17','Ann Arbor','US','America/New_York','America','114' ),
+                ( 10,'10','ietf','1988-06-15','Annapolis','US','America/New_York','America','112' ),
+                ( 9,'9','ietf','1988-03-01','San Diego','US','America/Los_Angeles','America','82' ),
+                ( 8,'8','ietf','1987-11-02','Boulder','US','America/Denver','America','56' ),
+                ( 7,'7','ietf','1987-07-27','McLean','US','America/New_York','America','101' ),
+                ( 6,'6','ietf','1987-04-22','Boston','US','America/New_York','America','88' ),
+                ( 5,'5','ietf','1987-02-04','Moffett Field','US','America/Los_Angeles','America','35' ),
+                ( 4,'4','ietf','1986-10-15','Menlo Park','US','America/Los_Angeles','America','35' ),
+                ( 3,'3','ietf','1986-07-23','Ann Arbor','US','America/New_York','America','18' ),
+                ( 2,'2','ietf','1986-04-08','Aberdeen','US','America/New_York','America','21' ),
+                ( 1,'1','ietf','1986-01-16','San Diego','US','America/Los_Angeles','America','21' ),
         ]:
             Meeting.objects.get_or_create(id=id, number=number, type_id=type_id,
                                           date=date, city=city, country=country,
diff --git a/ietf/middleware.py b/ietf/middleware.py
index fcb7687c4..149a87f72 100644
--- a/ietf/middleware.py
+++ b/ietf/middleware.py
@@ -14,9 +14,9 @@ import unicodedata
 def sql_log_middleware(get_response):
     def sql_log(request):
         response = get_response(request)
-	for q in connection.queries:
-	    if re.match('(update|insert)', q['sql'], re.IGNORECASE):
-		log(q['sql'])
+        for q in connection.queries:
+            if re.match('(update|insert)', q['sql'], re.IGNORECASE):
+                log(q['sql'])
         return response
     return sql_log
 
@@ -26,11 +26,11 @@ class SMTPExceptionMiddleware(object):
     def __call__(self, request):
         return self.get_response(request)
     def process_exception(self, request, exception):
-	if isinstance(exception, smtplib.SMTPException):
+        if isinstance(exception, smtplib.SMTPException):
             (extype, value, tb) = log_smtp_exception(exception)
-	    return render(request, 'email_failed.html',
+            return render(request, 'email_failed.html',
                           {'exception': extype, 'args': value, 'traceback': "".join(tb)} )
-	return None
+        return None
 
 class Utf8ExceptionMiddleware(object):
     def __init__(self, get_response):
@@ -38,20 +38,20 @@ class Utf8ExceptionMiddleware(object):
     def __call__(self, request):
         return self.get_response(request)
     def process_exception(self, request, exception):
-	if isinstance(exception, OperationalError):
+        if isinstance(exception, OperationalError):
             extype, value, tb = exc_parts()
             if value[0] == 1366:
                 log("Database 4-byte utf8 exception: %s: %s" % (extype, value))
                 return render(request, 'utf8_4byte_failed.html',
                               {'exception': extype, 'args': value, 'traceback': "".join(tb)} )
-	return None
+        return None
 
 def redirect_trailing_period_middleware(get_response):
     def redirect_trailing_period(request):
         response = get_response(request)
-	if response.status_code == 404 and request.path.endswith("."):
-	    return HttpResponsePermanentRedirect(request.path.rstrip("."))
-	return response
+        if response.status_code == 404 and request.path.endswith("."):
+            return HttpResponsePermanentRedirect(request.path.rstrip("."))
+        return response
     return redirect_trailing_period
 
 def unicode_nfkc_normalization_middleware(get_response):
diff --git a/ietf/nomcom/tests.py b/ietf/nomcom/tests.py
index 6785e3b05..7cb02fdb2 100644
--- a/ietf/nomcom/tests.py
+++ b/ietf/nomcom/tests.py
@@ -1127,7 +1127,7 @@ class InactiveNomcomTests(TestCase):
 
     def test_acceptance_closed(self):
         today = datetime.date.today().strftime('%Y%m%d')
-	pid = self.nc.position_set.first().nomineeposition_set.order_by('pk').first().id 
+        pid = self.nc.position_set.first().nomineeposition_set.order_by('pk').first().id 
         url = reverse('ietf.nomcom.views.process_nomination_status', kwargs = {
                       'year' : self.nc.year(),
                       'nominee_position_id' : pid,
diff --git a/ietf/redirects/models.py b/ietf/redirects/models.py
index d9b7b46df..eddf59cc7 100644
--- a/ietf/redirects/models.py
+++ b/ietf/redirects/models.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2007, All Rights Reserved
+# Copyright The IETF Trust 2007-2019, All Rights Reserved
 
 from django.db import models
 
@@ -22,7 +22,7 @@ class Redirect(models.Model):
     rest = models.CharField(max_length=100, blank=True)
     remove = models.CharField(max_length=50, blank=True)
     def __str__(self):
-	return "%s -> %s/%s" % (self.cgi, self.url, self.rest)
+        return "%s -> %s/%s" % (self.cgi, self.url, self.rest)
 
 class Suffix(models.Model):
     """This is a "rest" and "remove" (see Redirect class)
@@ -31,7 +31,7 @@ class Suffix(models.Model):
     rest = models.CharField(max_length=100, blank=True)
     remove = models.CharField(max_length=50, blank=True)
     def __str__(self):
-	return "-> %s - %s" % (self.rest, self.remove)
+        return "-> %s - %s" % (self.rest, self.remove)
     class Meta:
         verbose_name_plural="Suffixes"
 
@@ -47,12 +47,12 @@ class Command(models.Model):
     script = ForeignKey(Redirect, related_name='commands', editable=False)
     suffix = ForeignKey(Suffix, null=True, blank=True)
     def __str__(self):
-	ret = "%s?command=%s" % (self.script.cgi, self.command)
-	if self.suffix_id:
-	    ret += " %s" % (self.suffix)
-	return ret
+        ret = "%s?command=%s" % (self.script.cgi, self.command)
+        if self.suffix_id:
+            ret += " %s" % (self.suffix)
+        return ret
     class Meta:
-	unique_together = (("script", "command"), )
+        unique_together = (("script", "command"), )
 
 # changes done by convert-096.py:changed maxlength to max_length
 # removed core
diff --git a/ietf/redirects/views.py b/ietf/redirects/views.py
index 7258ea880..db557a6f1 100644
--- a/ietf/redirects/views.py
+++ b/ietf/redirects/views.py
@@ -10,7 +10,7 @@ from ietf.redirects.models import Redirect, Command
 
 def redirect(request, path="", script=""):
     if path:
-	script = path + "/" + script
+        script = path + "/" + script
     redir = get_object_or_404(Redirect, cgi=script)
     url = "/" + redir.url + "/"
     (rest, remove) = (redir.rest, redir.remove)
@@ -24,70 +24,70 @@ def redirect(request, path="", script=""):
     else:
         rparam = request.GET    
     for flag in redir.commands.all().filter(command__startswith='^'):
-	fc = flag.command[1:].split("^")
-	if len(fc) > 1:
-	    if rparam.get('command') != fc[1]:
-		continue
-	if fc[0] in rparam:
-	    remove_args.append(fc[0])
-	    num = re.match('(\d+)', rparam[fc[0]])
-	    if (num and int(num.group(1))) or (num is None):
-		cmd = flag
-	    break
+        fc = flag.command[1:].split("^")
+        if len(fc) > 1:
+            if rparam.get('command') != fc[1]:
+                continue
+        if fc[0] in rparam:
+            remove_args.append(fc[0])
+            num = re.match('(\d+)', rparam[fc[0]])
+            if (num and int(num.group(1))) or (num is None):
+                cmd = flag
+            break
     #
     # If that search didn't result in a match, then look
     # for an exact match for the command= parameter.
     if cmd is None:
-	try:
-	    cmd = redir.commands.all().get(command=rparam['command'])
-	except Command.DoesNotExist:
-	    pass	# it's ok, there's no more-specific request.
-	except KeyError:
-	    pass	# it's ok, request didn't have 'command'.
-	except:
-	    pass	# strange exception like the one described in
-	    		# http://merlot.tools.ietf.org/tools/ietfdb/ticket/179 ?
-			# just ignore the command string.
+        try:
+            cmd = redir.commands.all().get(command=rparam['command'])
+        except Command.DoesNotExist:
+            pass	# it's ok, there's no more-specific request.
+        except KeyError:
+            pass	# it's ok, request didn't have 'command'.
+        except:
+            pass	# strange exception like the one described in
+                        # http://merlot.tools.ietf.org/tools/ietfdb/ticket/179 ?
+                        # just ignore the command string.
     if cmd is not None:
-	remove_args.append('command')
-	if cmd.url:
-	    rest = cmd.url + "/"
-	else:
-	    rest = ""
-	if cmd.suffix:
-	    rest = rest + cmd.suffix.rest
-	    remove = cmd.suffix.remove
-	else:
-	    remove = ""
+        remove_args.append('command')
+        if cmd.url:
+            rest = cmd.url + "/"
+        else:
+            rest = ""
+        if cmd.suffix:
+            rest = rest + cmd.suffix.rest
+            remove = cmd.suffix.remove
+        else:
+            remove = ""
     try:
         # This throws exception (which gets caught below) if request 
         # contains non-ASCII characters. The old scripts didn't support 
         # non-ASCII characters anyway, so there's no need to handle 
         # them fully correctly in these redirects.
-	url += str(rest % rparam)
-	url += "/"
+        url += str(rest % rparam)
+        url += "/"
     except:
-	# rest had something in it that request didn't have, so just
-	# redirect to the root of the tool.
-	pass
+        # rest had something in it that request didn't have, so just
+        # redirect to the root of the tool.
+        pass
     # Be generous in what you accept: collapse multiple slashes
     url = re.sub(r'/+', '/', url)
     if remove:
-	url = re.sub(re.escape(remove) + "/?$", "", url)
+        url = re.sub(re.escape(remove) + "/?$", "", url)
     # If there is a dot in the last url segment, remove the
     # trailing slash.  This is basically the inverse of the
     # APPEND_SLASH middleware.
     if '/' in url and '.' in url.split('/')[-2]:
-	url = url.rstrip('/')
+        url = url.rstrip('/')
     # Copy the GET arguments, remove all the ones we were
     # expecting and if there are any left, add them to the URL.
     get = request.GET.copy()
     remove_args += re.findall(r'%\(([^)]+)\)', rest)
     for arg in remove_args:
-	if arg in get:
-	    get.pop(arg)
+        if arg in get:
+            get.pop(arg)
     if get:
-	url += '?' + get.urlencode()
+        url += '?' + get.urlencode()
     try:
         return HttpResponsePermanentRedirect(url)
     except BadHeaderError:
diff --git a/ietf/review/resources.py b/ietf/review/resources.py
index 45599e7b1..7b5a912d5 100644
--- a/ietf/review/resources.py
+++ b/ietf/review/resources.py
@@ -83,7 +83,7 @@ class UnavailablePeriodResource(ModelResource):
             "start_date": ALL,
             "end_date": ALL,
             "availability": ALL,
-	    "reason": ALL,
+            "reason": ALL,
             "team": ALL_WITH_RELATIONS,
             "person": ALL_WITH_RELATIONS,
         }
diff --git a/ietf/secr/utils/ams_utils.py b/ietf/secr/utils/ams_utils.py
index efd688c54..6a9ac3196 100644
--- a/ietf/secr/utils/ams_utils.py
+++ b/ietf/secr/utils/ams_utils.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2013-2019, All Rights Reserved
 from django.conf import settings
 
 from ietf.person.models import Person
@@ -32,8 +33,8 @@ def get_last_revision(filename):
     """
     files = glob.glob(os.path.join(settings.INTERNET_DRAFT_ARCHIVE_DIR,filename) + '-??.txt')
     if files:
-	sorted_files = sorted(files)
-	return get_revision(sorted_files[-1])
+        sorted_files = sorted(files)
+        return get_revision(sorted_files[-1])
     else:
         raise Exception('last revision not found in archive')
 
diff --git a/ietf/settings_sqlitetest.py b/ietf/settings_sqlitetest.py
index 7b1b3a079..e41fbf96c 100644
--- a/ietf/settings_sqlitetest.py
+++ b/ietf/settings_sqlitetest.py
@@ -7,7 +7,7 @@
 #
 
 import os 
-from .settings import *                                          # pyflakes:ignore
+from ietf.settings import *                                          # pyflakes:ignore
 import debug                            # pyflakes:ignore
 debug.debug = True
 
diff --git a/ietf/submit/templatetags/submit_tags.py b/ietf/submit/templatetags/submit_tags.py
index fb81cdc98..aefd3cb9e 100644
--- a/ietf/submit/templatetags/submit_tags.py
+++ b/ietf/submit/templatetags/submit_tags.py
@@ -20,7 +20,7 @@ def show_submission_files(context, submission):
             continue
         result.append({'ext': '%s' % ext[1:],
                        'exists': exists,
-		       'url': '%s%s-%s%s' % (settings.IDSUBMIT_STAGING_URL, submission.name, submission.rev, ext)})
+                       'url': '%s%s-%s%s' % (settings.IDSUBMIT_STAGING_URL, submission.name, submission.rev, ext)})
     return {'files': result}
 
 
diff --git a/ietf/utils/draft.py b/ietf/utils/draft.py
index e4a5ae593..e8781052e 100755
--- a/ietf/utils/draft.py
+++ b/ietf/utils/draft.py
@@ -3,10 +3,10 @@
 # -*- python -*-
 """
 NAME
-	%(program)s - Extract meta-information from an IETF draft.
+        %(program)s - Extract meta-information from an IETF draft.
 
 SYNOPSIS
-	%(program)s [OPTIONS] DRAFTLIST_FILE
+        %(program)s [OPTIONS] DRAFTLIST_FILE
 
 DESCRIPTION
         Extract information about authors' names and email addresses,
@@ -17,17 +17,17 @@ DESCRIPTION
 %(options)s
 
 AUTHOR
-	Written by Henrik Levkowetz, 
+        Written by Henrik Levkowetz, 
 
 COPYRIGHT
-	Copyright 2008 Henrik Levkowetz
+        Copyright 2008 Henrik Levkowetz
 
-	This program is free software; you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation; either version 2 of the License, or (at
-	your option) any later version. There is NO WARRANTY; not even the
-	implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-	PURPOSE. See the GNU General Public License for more details.
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or (at
+        your option) any later version. There is NO WARRANTY; not even the
+        implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+        PURPOSE. See the GNU General Public License for more details.
 
 """
 
diff --git a/ietf/utils/mail.py b/ietf/utils/mail.py
index d9c453c61..c3e5bf939 100644
--- a/ietf/utils/mail.py
+++ b/ietf/utils/mail.py
@@ -50,11 +50,11 @@ def empty_outbox():
 
 def add_headers(msg):
     if not('Message-ID' in msg):
-	msg['Message-ID'] = make_msgid('idtracker')
+        msg['Message-ID'] = make_msgid('idtracker')
     if not('Date' in msg):
-	msg['Date'] = formatdate(time.time(), True)
+        msg['Date'] = formatdate(time.time(), True)
     if not('From' in msg):
-	msg['From'] = settings.DEFAULT_FROM_EMAIL
+        msg['From'] = settings.DEFAULT_FROM_EMAIL
     return msg
 
 class SMTPSomeRefusedRecipients(smtplib.SMTPException):
@@ -145,11 +145,11 @@ def copy_email(msg, to, toUser=False, originalBcc=None):
     # django settings if debugging?
     # Should this be a template?
     if settings.SERVER_MODE == 'production':
-	explanation = "This is a copy of a message sent from the I-D tracker."
+        explanation = "This is a copy of a message sent from the I-D tracker."
     elif settings.SERVER_MODE == 'test' and toUser:
-	explanation = "The attached message was generated by an instance of the tracker\nin test mode.  It is being sent to you because you, or someone acting\non your behalf, is testing the system.  If you do not recognize\nthis action, please accept our apologies and do not be concerned as\nthe action is being taken in a test context."
+        explanation = "The attached message was generated by an instance of the tracker\nin test mode.  It is being sent to you because you, or someone acting\non your behalf, is testing the system.  If you do not recognize\nthis action, please accept our apologies and do not be concerned as\nthe action is being taken in a test context."
     else:
-	explanation = "The attached message would have been sent, but the tracker is in %s mode.\nIt was not sent to anybody." % settings.SERVER_MODE
+        explanation = "The attached message would have been sent, but the tracker is in %s mode.\nIt was not sent to anybody." % settings.SERVER_MODE
         if originalBcc:
           explanation += ("\nIn addition to the destinations derived from the header below, the message would have been sent Bcc to %s" % originalBcc)
     new.attach(MIMEText(explanation + "\n\n"))
@@ -256,7 +256,7 @@ def condition_message(to, frm, subject, msg, cc, extra):
             else:
                 extra['Reply-To'] = [frm, ]
             frm = on_behalf_of(frm)
-	msg['From'] = frm
+        msg['From'] = frm
 
     # The following is a hack to avoid an issue with how the email module (as of version 4.0.3)
     # breaks lines when encoding header fields with anything other than the us-ascii codec.
@@ -277,14 +277,14 @@ def condition_message(to, frm, subject, msg, cc, extra):
     msg['To'] = to_str
 
     if cc:
-	msg['Cc'] = cc
+        msg['Cc'] = cc
     msg['Subject'] = subject
     msg['X-Test-IDTracker'] = (settings.SERVER_MODE == 'production') and 'no' or 'yes'
     msg['X-IETF-IDTracker'] = ietf.__version__
     msg['Auto-Submitted'] = "auto-generated"
     msg['Precedence'] = "bulk"
     if extra:
-	for k, v in list(extra.items()):
+        for k, v in list(extra.items()):
             if v:
                 assertion('len(list(set(v))) == len(v)')
                 try:
@@ -330,12 +330,12 @@ def send_mail_mime(request, to, frm, subject, msg, cc=None, extra=None, toUser=F
         show_that_mail_was_sent(request,'Email was sent',msg,bcc)
             
     elif settings.SERVER_MODE == 'test':
-	if toUser:
-	    copy_email(msg, to, toUser=True, originalBcc=bcc)
-	elif request and 'testmailcc' in request.COOKIES:
-	    copy_email(msg, request.COOKIES[ 'testmailcc' ],originalBcc=bcc)
+        if toUser:
+            copy_email(msg, to, toUser=True, originalBcc=bcc)
+        elif request and 'testmailcc' in request.COOKIES:
+            copy_email(msg, request.COOKIES[ 'testmailcc' ],originalBcc=bcc)
     try:
-	copy_to = settings.EMAIL_COPY_TO
+        copy_to = settings.EMAIL_COPY_TO
     except AttributeError:
         copy_to = "ietf.tracker.archive+%s@gmail.com" % settings.SERVER_MODE
     if copy_to and (copy or not production) and not (test_mode or debugging): # if we're running automated tests, this copy is just annoying
diff --git a/ietf/wsgi.py b/ietf/wsgi.py
index fc92e3e91..01080e8b3 100644
--- a/ietf/wsgi.py
+++ b/ietf/wsgi.py
@@ -26,12 +26,12 @@ WSGIPythonEggs /var/www/.python-eggs/
     WSGIScriptAlias / /srv/www/ietfdb/ietf/wsgi.py
 
     
-	AuthType Digest
-	AuthName "IETF"
-	AuthUserFile /var/local/loginmgr/digest
-	AuthGroupFile /var/local/loginmgr/groups
-	AuthDigestDomain http://tools.ietf.org/
-	Require valid-user
+        AuthType Digest
+        AuthName "IETF"
+        AuthUserFile /var/local/loginmgr/digest
+        AuthGroupFile /var/local/loginmgr/groups
+        AuthDigestDomain http://tools.ietf.org/
+        Require valid-user
     
 
 ----

From 218f6d86a65a70be5a41874b5e25e43e8e4959a6 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 27 Jun 2019 18:04:50 +0000
Subject: [PATCH 004/114] Replaced smart_unicode() with smart_text()  -
 Legacy-Id: 16311

---
 ietf/dbtemplate/template.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ietf/dbtemplate/template.py b/ietf/dbtemplate/template.py
index 624aab3c9..efb3b06b4 100644
--- a/ietf/dbtemplate/template.py
+++ b/ietf/dbtemplate/template.py
@@ -8,7 +8,7 @@ import debug                            # pyflakes:ignore
 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
+from django.utils.encoding import smart_text
 
 from ietf.dbtemplate.models import DBTemplate
 
@@ -21,7 +21,7 @@ class Template(object):
 
     def __init__(self, template_string, origin=None, name=''):
         try:
-            template_string = smart_unicode(template_string)
+            template_string = smart_text(template_string)
         except UnicodeDecodeError:
             raise TemplateEncodingError("Templates can only be constructed from unicode or UTF-8 strings.")
         self.template_string = string.Template(template_string)

From 06daf6ac659a832005de761176f57768c33db299 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 27 Jun 2019 18:08:02 +0000
Subject: [PATCH 005/114] Changed regex strings to raw strings.  - Legacy-Id:
 16312

---
 ietf/doc/expire.py              |  2 +-
 ietf/doc/views_status_change.py |  4 ++--
 ietf/group/views.py             | 10 +++++-----
 ietf/meeting/helpers.py         |  2 +-
 ietf/utils/textupload.py        |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ietf/doc/expire.py b/ietf/doc/expire.py
index 5a060048d..0bfe5c40d 100644
--- a/ietf/doc/expire.py
+++ b/ietf/doc/expire.py
@@ -168,7 +168,7 @@ def clean_up_draft_files():
     cut_off = datetime.date.today()
 
     pattern = os.path.join(settings.INTERNET_DRAFT_PATH, "draft-*.*")
-    filename_re = re.compile('^(.*)-(\d\d)$')
+    filename_re = re.compile(r'^(.*)-(\d\d)$')
 
     def splitext(fn):
         """
diff --git a/ietf/doc/views_status_change.py b/ietf/doc/views_status_change.py
index 2df24b419..dd607f1ea 100644
--- a/ietf/doc/views_status_change.py
+++ b/ietf/doc/views_status_change.py
@@ -395,7 +395,7 @@ def clean_helper(form, formtype):
         for k in sorted(form.data.keys()):
             v = form.data[k]
             if k.startswith('new_relation_row'):
-                if re.match('\d{1,4}',v):
+                if re.match(r'\d{1,4}',v):
                     v = 'rfc'+v
                 rfc_fields[k[17:]]=v
             elif k.startswith('statchg_relation_row'):
@@ -412,7 +412,7 @@ def clean_helper(form, formtype):
         errors=[]
         for key in new_relations:
 
-           if not re.match('(?i)rfc\d{1,4}',key):
+           if not re.match(r'(?i)rfc\d{1,4}',key):
               errors.append(key+" is not a valid RFC - please use the form RFCn\n")
            elif not DocAlias.objects.filter(name=key):
               errors.append(key+" does not exist\n")
diff --git a/ietf/group/views.py b/ietf/group/views.py
index 704467135..7e820bf50 100644
--- a/ietf/group/views.py
+++ b/ietf/group/views.py
@@ -201,7 +201,7 @@ def fill_in_wg_drafts(group):
 
 
 def check_group_email_aliases():
-    pattern = re.compile('expand-(.*?)(-\w+)@.*? +(.*)$')
+    pattern = re.compile(r'expand-(.*?)(-\w+)@.*? +(.*)$')
     tot_count = 0
     good_count = 0
     with open(settings.GROUP_VIRTUAL_PATH,"r") as virtual_file:
@@ -414,7 +414,7 @@ def concluded_groups(request):
     sections['Review teams'] = Group.objects.filter(type='review', state="conclude").select_related("state", "charter").order_by("parent__name","acronym")
     sections['Teams'] = Group.objects.filter(type='team', state="conclude").select_related("state", "charter").order_by("parent__name","acronym")
 
-    for name, groups in list(sections.items()):
+    for name, groups in sections.items():
         
         # add start/conclusion date
         d = dict((g.pk, g) for g in groups)
@@ -625,9 +625,9 @@ def group_about_status_edit(request, acronym, group_type=None):
 
 def get_group_email_aliases(acronym, group_type):
     if acronym:
-        pattern = re.compile('expand-(%s)(-\w+)@.*? +(.*)$'%acronym)
+        pattern = re.compile(r'expand-(%s)(-\w+)@.*? +(.*)$'%acronym)
     else:
-        pattern = re.compile('expand-(.*?)(-\w+)@.*? +(.*)$')
+        pattern = re.compile(r'expand-(.*?)(-\w+)@.*? +(.*)$')
 
     aliases = []
     with open(settings.GROUP_VIRTUAL_PATH,"r") as virtual_file:
@@ -976,7 +976,7 @@ def edit(request, group_type=None, acronym=None, action="edit", field=None):
                     group.groupurl_set.all().delete()
                     # Add new ones
                     for u in new_urls:
-                        m = re.search('(?P[\w\d:#@%/;$()~_?\+-=\\\.&]+)( \((?P.+)\))?', u)
+                        m = re.search(r'(?P[\w\d:#@%/;$()~_?\+-=\\\.&]+)( \((?P.+)\))?', u)
                         if m:
                             if m.group('name'):
                                 url = GroupURL(url=m.group('url'), name=m.group('name'), group=group)
diff --git a/ietf/meeting/helpers.py b/ietf/meeting/helpers.py
index 6d8300e45..fde7887af 100644
--- a/ietf/meeting/helpers.py
+++ b/ietf/meeting/helpers.py
@@ -238,7 +238,7 @@ def convert_draft_to_pdf(doc_name):
     for line in infile:
         line = re.sub("\r","",line)
         line = re.sub("[ \t]+$","",line)
-        if re.search("\[?[Pp]age [0-9ivx]+\]?[ \t]*$",line):
+        if re.search(r"\[?[Pp]age [0-9ivx]+\]?[ \t]*$",line):
             pageend=1
             tempfile.write(line)
             continue
diff --git a/ietf/utils/textupload.py b/ietf/utils/textupload.py
index 69f2af8b3..2cf90549c 100644
--- a/ietf/utils/textupload.py
+++ b/ietf/utils/textupload.py
@@ -34,7 +34,7 @@ def get_cleaned_text_file_content(uploaded_file):
     if not filetype.startswith("text"):
         raise ValidationError("Uploaded file does not appear to be a text file.")
 
-    match = re.search("charset=([\w-]+)", filetype)
+    match = re.search(r"charset=([\w-]+)", filetype)
     if not match:
         raise ValidationError("File has unknown encoding.")
 

From 240d5bc64d48ceb11d9d8350b1e43c83edffcf99 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 27 Jun 2019 18:08:56 +0000
Subject: [PATCH 006/114] Replaced force_unicode() with force_text()  -
 Legacy-Id: 16313

---
 ietf/group/admin.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ietf/group/admin.py b/ietf/group/admin.py
index 0073808af..a6b31a1d5 100644
--- a/ietf/group/admin.py
+++ b/ietf/group/admin.py
@@ -9,7 +9,7 @@ from django.core.exceptions import PermissionDenied
 from django.core.management import load_command_class
 from django.http import Http404
 from django.shortcuts import render
-from django.utils.encoding import force_unicode
+from django.utils.encoding import force_text
 from django.utils.html import escape
 from django.utils.translation import ugettext as _
 
@@ -96,7 +96,7 @@ class GroupAdmin(admin.ModelAdmin):
             raise PermissionDenied
 
         if obj is None:
-            raise Http404(_('%(name)s object with primary key %(key)r does not exist.') % {'name': force_unicode(opts.verbose_name), 'key': escape(object_id)})
+            raise Http404(_('%(name)s object with primary key %(key)r does not exist.') % {'name': force_text(opts.verbose_name), 'key': escape(object_id)})
 
         return self.send_reminder(request, sdo=obj)
     

From 2fdaa7f9c4b5dd67a749ab5cab81c3a2db671b2f Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 27 Jun 2019 18:10:13 +0000
Subject: [PATCH 007/114] Changed sort() argument to use key=  - Legacy-Id:
 16314

---
 ietf/meeting/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py
index 145e0935f..a4626c67e 100644
--- a/ietf/meeting/models.py
+++ b/ietf/meeting/models.py
@@ -34,7 +34,7 @@ from ietf.utils.timezone import date2datetime
 from ietf.utils.models import ForeignKey
 
 countries = list(pytz.country_names.items())
-countries.sort(lambda x,y: cmp(x[1], y[1]))
+countries.sort(key=lambda x: x[1])
 
 timezones = []
 for name in pytz.common_timezones:

From e39ac520711711bc7ba29414cc7a3470a6132a51 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 27 Jun 2019 18:11:17 +0000
Subject: [PATCH 008/114] Removed 2to3-generated list() around .items()
 iterator in for loops.  - Legacy-Id: 16315

---
 ietf/api/management/commands/makeresources.py         | 2 +-
 ietf/api/serializer.py                                | 2 +-
 ietf/group/migrations/0007_new_group_features_data.py | 2 +-
 ietf/group/migrations/0010_add_group_types.py         | 4 ++--
 ietf/mailtrigger/models.py                            | 2 +-
 ietf/name/migrations/0006_adjust_statenames.py        | 2 +-
 ietf/redirects/tests.py                               | 2 +-
 ietf/utils/mail.py                                    | 2 +-
 ietf/utils/tests.py                                   | 2 +-
 ietf/utils/text.py                                    | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ietf/api/management/commands/makeresources.py b/ietf/api/management/commands/makeresources.py
index 03c66d64e..6cc011a74 100644
--- a/ietf/api/management/commands/makeresources.py
+++ b/ietf/api/management/commands/makeresources.py
@@ -66,7 +66,7 @@ class Command(AppCommand):
             app_resources = {}
             if os.path.exists(resource_file_path):
                 resources = import_module("%s.resources" % app.name)
-                for n,v in list(resources.__dict__.items()):
+                for n,v in resources.__dict__.items():
                     if issubclass(type(v), type(ModelResource)):
                         app_resources[n] = v
 
diff --git a/ietf/api/serializer.py b/ietf/api/serializer.py
index e57c73bf1..e1619351c 100644
--- a/ietf/api/serializer.py
+++ b/ietf/api/serializer.py
@@ -17,7 +17,7 @@ import debug                            # pyflakes:ignore
 def filter_from_queryargs(request):
     #@debug.trace
     def fix_ranges(d):
-        for k,v in list(d.items()):
+        for k,v in d.items():
             if v.startswith("[") and v.endswith("]"):
                 d[k] = [ s for s in v[1:-1].split(",") if s ]
             elif "," in v:
diff --git a/ietf/group/migrations/0007_new_group_features_data.py b/ietf/group/migrations/0007_new_group_features_data.py
index dabdb1d5f..555be5809 100644
--- a/ietf/group/migrations/0007_new_group_features_data.py
+++ b/ietf/group/migrations/0007_new_group_features_data.py
@@ -224,7 +224,7 @@ def forward(apps, schema_editor):
     for type in group_type_features:
         features = group_type_features[type]
         gf = GroupFeatures.objects.get(type=type)
-        for k,v in list(features.items()):
+        for k,v in features.items():
             setattr(gf, k, v)
         gf.save()
 # This migration does not remove or change any previous fields, and executes
diff --git a/ietf/group/migrations/0010_add_group_types.py b/ietf/group/migrations/0010_add_group_types.py
index 98a8a6010..ad4472c67 100644
--- a/ietf/group/migrations/0010_add_group_types.py
+++ b/ietf/group/migrations/0010_add_group_types.py
@@ -128,13 +128,13 @@ def forward(apps, schema_editor):
     for slug in group_type_features:
         typename = group_type_features[slug]['grouptypename']
         gt, _ = GroupTypeName.objects.get_or_create(slug=slug)
-        for k,v in list(typename.items()):
+        for k,v in typename.items():
             setattr(gt, k, v)
         gt.save()
         #
         features = group_type_features[slug]['groupfeatures']
         gf, _ = GroupFeatures.objects.get_or_create(type_id=slug)
-        for k,v in list(features.items()):
+        for k,v in features.items():
             setattr(gf, k, v)
         gf.save()
 
diff --git a/ietf/mailtrigger/models.py b/ietf/mailtrigger/models.py
index 6f5abaffb..99b4b306b 100644
--- a/ietf/mailtrigger/models.py
+++ b/ietf/mailtrigger/models.py
@@ -18,7 +18,7 @@ def clean_duplicates(addrlist):
         # name from the last one:
         address_info[addr] = (name, a)
     addresses = []
-    for addr, info in list(address_info.items()):
+    for addr, info in address_info.items():
         name, a = info
         if (name,addr)==('',''):
             addresses.append(a)
diff --git a/ietf/name/migrations/0006_adjust_statenames.py b/ietf/name/migrations/0006_adjust_statenames.py
index 763034d76..30c49e774 100644
--- a/ietf/name/migrations/0006_adjust_statenames.py
+++ b/ietf/name/migrations/0006_adjust_statenames.py
@@ -79,7 +79,7 @@ def forward(apps, schema_editor):
     for entry in assignment_states:
         name, created = ReviewAssignmentStateName.objects.get_or_create(slug=entry['slug'])
         if created:
-            for k, v in list(entry.items()):
+            for k, v in entry.items():
                 setattr(name, k, v)
             name.save()
 
diff --git a/ietf/redirects/tests.py b/ietf/redirects/tests.py
index 257c12b59..175a1bd43 100644
--- a/ietf/redirects/tests.py
+++ b/ietf/redirects/tests.py
@@ -93,7 +93,7 @@ class RedirectsTests(TestCase):
     fixtures = ["initial_data.xml", ]
 
     def test_redirects(self):
-        for src, dst in list(REDIRECT_TESTS.items()):
+        for src, dst in REDIRECT_TESTS.items():
             baseurl, args = split_url(src)
             response = self.client.get(baseurl, args)
             self.assertTrue(str(response.status_code).startswith("3"))
diff --git a/ietf/utils/mail.py b/ietf/utils/mail.py
index c3e5bf939..7f22acbf3 100644
--- a/ietf/utils/mail.py
+++ b/ietf/utils/mail.py
@@ -284,7 +284,7 @@ def condition_message(to, frm, subject, msg, cc, extra):
     msg['Auto-Submitted'] = "auto-generated"
     msg['Precedence'] = "bulk"
     if extra:
-        for k, v in list(extra.items()):
+        for k, v in extra.items():
             if v:
                 assertion('len(list(set(v))) == len(v)')
                 try:
diff --git a/ietf/utils/tests.py b/ietf/utils/tests.py
index f28fb55da..855139547 100644
--- a/ietf/utils/tests.py
+++ b/ietf/utils/tests.py
@@ -205,7 +205,7 @@ class TemplateChecksTestCase(TestCase):
 
     def apply_template_test(self, func, node_type, msg, *args, **kwargs):
         errors = []
-        for path, template in list(self.templates.items()):
+        for path, template in self.templates.items():
             origin = str(template.origin).replace(settings.BASE_DIR, '')
             for node in template:
                 for child in node.get_nodes_by_type(node_type):
diff --git a/ietf/utils/text.py b/ietf/utils/text.py
index 06a4d05e9..131f13fa7 100644
--- a/ietf/utils/text.py
+++ b/ietf/utils/text.py
@@ -174,7 +174,7 @@ def text_to_dict(t):
 def dict_to_text(d):
     "Convert a dictionary to RFC2822-formatted text"
     t = ""
-    for k, v in list(d.items()):
+    for k, v in d.items():
         t += "%s: %s\n" % (k, v)
     return t
 

From 2ba686193a6659872ecaee3b6301109bf57351e1 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Fri, 28 Jun 2019 12:47:16 +0000
Subject: [PATCH 009/114] Use print function  - Legacy-Id: 16316

---
 changelog.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/changelog.py b/changelog.py
index 27980b393..f5f867f0e 100644
--- a/changelog.py
+++ b/changelog.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2012-2019, All Rights Reserved
 import re
 from tzparse import tzparse
 from datetime import datetime as Datetime
@@ -66,5 +67,5 @@ def parse(logfile):
         elif entry:
             entry.logentry += line
         else:
-            print "Unexpected line: '%s'" % line
+            print("Unexpected line: '%s'" % line)
     return entries

From d0f10187349bf92906f07a2d2b8c75cf691a4d0e Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Fri, 28 Jun 2019 13:23:32 +0000
Subject: [PATCH 010/114] Tweaked the debug.type() display.  - Legacy-Id: 16317

---
 debug.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/debug.py b/debug.py
index dfd465a5a..01551152b 100644
--- a/debug.py
+++ b/debug.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2012-2019, All Rights Reserved
 import os
 import sys
 import time as timeutils
@@ -165,12 +166,13 @@ def dir(name):
 
 def type(name):
     if debug:
-        name = "type(%s)" % name
         frame = inspect.stack()[1][0]
         value = eval(name, frame.f_globals, frame.f_locals)
+        name = "type(%s)" % name
+        tvalue = eval(name, frame.f_globals, frame.f_locals)
         indent = ' ' * (_report_indent[0])
-        sys.stderr.write("%s%s: %s\n" % (indent, name, value))
-            
+        sys.stderr.write("%s%s: %s %s\n" % (indent, name, tvalue, value))
+
 def say(s):
     if debug:
         indent = ' ' * (_report_indent[0])

From d8ac01dd421504a03813f4fa7cbe999a3ddeac43 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Fri, 28 Jun 2019 13:29:56 +0000
Subject: [PATCH 011/114] Removed anora from installed apps, and changed PEM
 key to bytes instead of str.  - Legacy-Id: 16318

---
 ietf/settings.py | 5 ++---
 requirements.txt | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/ietf/settings.py b/ietf/settings.py
index 12e2fe883..d163d472e 100644
--- a/ietf/settings.py
+++ b/ietf/settings.py
@@ -389,7 +389,6 @@ INSTALLED_APPS = (
     'django.contrib.sites',
     'django.contrib.staticfiles',
     # External apps 
-    'anora',
     'bootstrap3',
     'corsheaders',
     'django_markup',
@@ -1035,13 +1034,13 @@ UTILS_APIKEY_GUI_LOGIN_LIMIT_DAYS = 30
 
 
 API_KEY_TYPE="ES256"                    # EC / P=256
-API_PUBLIC_KEY_PEM = """
+API_PUBLIC_KEY_PEM = b"""
 -----BEGIN PUBLIC KEY-----
 MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEqVojsaofDJScuMJN+tshumyNM5ME
 garzVPqkVovmF6yE7IJ/dv4FcV+QKCtJ/rOS8e36Y8ZAEVYuukhes0yZ1w==
 -----END PUBLIC KEY-----
 """
-API_PRIVATE_KEY_PEM = """
+API_PRIVATE_KEY_PEM = b"""
 -----BEGIN PRIVATE KEY-----
 MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgoI6LJkopKq8XrHi9
 QqGQvE4A83TFYjqLz+8gULYecsqhRANCAASpWiOxqh8MlJy4wk362yG6bI0zkwSB
diff --git a/requirements.txt b/requirements.txt
index 456a64660..45af314a9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 # -*- conf-mode -*-
 setuptools>=18.5			# Require this first, to prevent later errors
 #
-anora>=0.1.2
+#anora>=0.1.2
 argon2-cffi>=16.1.0		# For the Argon2 password hasher option
 beautifulsoup4>=4.5.0
 bibtexparser>=0.6.2,<1.0	# Version 1.0 doesn't work under python 2.7.  1.0.1 doesn't recognize month names or abbreviations.

From bafcc55d05a35d946961c3262f65db3ff6ddbd91 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Fri, 28 Jun 2019 13:30:18 +0000
Subject: [PATCH 012/114] Removed anora from installed apps, and changed PEM
 key to bytes instead of str.  - Legacy-Id: 16319

---
 requirements.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 45af314a9..2fc01abff 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,6 @@
 # -*- conf-mode -*-
 setuptools>=18.5			# Require this first, to prevent later errors
 #
-#anora>=0.1.2
 argon2-cffi>=16.1.0		# For the Argon2 password hasher option
 beautifulsoup4>=4.5.0
 bibtexparser>=0.6.2,<1.0	# Version 1.0 doesn't work under python 2.7.  1.0.1 doesn't recognize month names or abbreviations.

From 318bd0d5ea09a5b2a654ceacc34536772c1dc31d Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Fri, 28 Jun 2019 13:32:50 +0000
Subject: [PATCH 013/114] Changed regex strings to r strings.  - Legacy-Id:
 16320

---
 ietf/meeting/views.py | 10 +++++-----
 ietf/utils/text.py    |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py
index 95a444340..395a665d3 100644
--- a/ietf/meeting/views.py
+++ b/ietf/meeting/views.py
@@ -171,11 +171,11 @@ def current_materials(request):
 def materials_document(request, document, num=None, ext=None):
     if num is None:
         num = get_meeting(num).number
-    if (re.search('^\w+-\d+-.+-\d\d$', document) or
-        re.search('^\w+-interim-\d+-.+-\d\d-\d\d$', document) or
-        re.search('^\w+-interim-\d+-.+-sess[a-z]-\d\d$', document) or
-        re.search('^minutes-interim-\d+-.+-\d\d$', document) or
-        re.search('^slides-interim-\d+-.+-\d\d$', document)):
+    if (re.search(r'^\w+-\d+-.+-\d\d$', document) or
+        re.search(r'^\w+-interim-\d+-.+-\d\d-\d\d$', document) or
+        re.search(r'^\w+-interim-\d+-.+-sess[a-z]-\d\d$', document) or
+        re.search(r'^minutes-interim-\d+-.+-\d\d$', document) or
+        re.search(r'^slides-interim-\d+-.+-\d\d$', document)):
         name, rev = document.rsplit('-', 1)
     else:
         name, rev = document, None
diff --git a/ietf/utils/text.py b/ietf/utils/text.py
index 131f13fa7..d82a2fcb1 100644
--- a/ietf/utils/text.py
+++ b/ietf/utils/text.py
@@ -23,8 +23,8 @@ def xslugify(value):
     (I.e., does the same as slugify, but also converts slashes to dashes.)
     """
     value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore').decode('ascii')
-    value = re.sub('[^\w\s/-]', '', value).strip().lower()
-    return mark_safe(re.sub('[-\s/]+', '-', value))
+    value = re.sub(r'[^\w\s/-]', '', value).strip().lower()
+    return mark_safe(re.sub(r'[-\s/]+', '-', value))
 
 def strip_prefix(text, prefix):
     if text.startswith(prefix):

From d40a5ac5acd710083ddc576bb5294b659e217576 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Fri, 28 Jun 2019 13:33:38 +0000
Subject: [PATCH 014/114] Removed some regex unicode flags.  - Legacy-Id: 16321

---
 ietf/doc/urls.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ietf/doc/urls.py b/ietf/doc/urls.py
index 4e5220646..32f3ae5bc 100644
--- a/ietf/doc/urls.py
+++ b/ietf/doc/urls.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2009-2019, All Rights Reserved
 # Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen 
 #
@@ -47,8 +48,8 @@ urlpatterns = [
     url(r'^$', views_search.search),
     url(r'^search/?$', views_search.search),
     url(r'^in-last-call/?$', views_search.drafts_in_last_call),
-    url(r'^ad/(?P[^/]+)/?$(?u)', views_search.docs_for_ad),
-    url(r'^ad2/(?P[\w.-]+)/$(?u)', RedirectView.as_view(url='/doc/ad/%(name)s/', permanent=True)),
+    url(r'^ad/(?P[^/]+)/?$', views_search.docs_for_ad),
+    url(r'^ad2/(?P[\w.-]+)/$', RedirectView.as_view(url='/doc/ad/%(name)s/', permanent=True)),
     url(r'^rfc-status-changes/?$', views_status_change.rfc_status_changes),
     url(r'^start-rfc-status-change/(?:%(name)s/)?$' % settings.URL_REGEXPS, views_status_change.start_rfc_status_change),
     url(r'^iesg/?$', views_search.drafts_in_iesg_process),

From e66c0243d5f6a4f8bbcd38510353d22c5693d7c8 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Fri, 28 Jun 2019 13:35:37 +0000
Subject: [PATCH 015/114] Updated PersonalApiKey models with correct python3
 unicode/bytes handling.  - Legacy-Id: 16322

---
 ietf/person/models.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ietf/person/models.py b/ietf/person/models.py
index ef0ea7b3d..9fc01b800 100644
--- a/ietf/person/models.py
+++ b/ietf/person/models.py
@@ -16,6 +16,7 @@ from django.core.exceptions import ObjectDoesNotExist
 from django.db import models
 from django.contrib.auth.models import User
 from django.template.loader import render_to_string
+from django.utils.encoding import smart_bytes
 from django.utils.text import slugify
 from simple_history.models import HistoricalRecords
 
@@ -336,9 +337,10 @@ class PersonalApiKey(models.Model):
     def validate_key(cls, s):
         import struct, hashlib, base64
         try:
-            key = base64.urlsafe_b64decode(six.binary_type(s))
-        except TypeError:
+            key = base64.urlsafe_b64decode(s)
+        except TypeError as e:
             return None
+
         id, salt, hash = struct.unpack(KEY_STRUCT, key)
         k = cls.objects.filter(id=id)
         if not k.exists():
@@ -346,6 +348,7 @@ class PersonalApiKey(models.Model):
         k = k.first()
         check = hashlib.sha256()
         for v in (str(id), str(k.person.id), k.created.isoformat(), k.endpoint, str(k.valid), salt, settings.SECRET_KEY):
+            v = smart_bytes(v)
             check.update(v)
         return k if check.digest() == hash else None
 
@@ -355,9 +358,10 @@ class PersonalApiKey(models.Model):
             hash = hashlib.sha256()
             # Hash over: ( id, person, created, endpoint, valid, salt, secret )
             for v in (str(self.id), str(self.person.id), self.created.isoformat(), self.endpoint, str(self.valid), self.salt, settings.SECRET_KEY):
+                v = smart_bytes(v)
                 hash.update(v)
             key = struct.pack(KEY_STRUCT, self.id, six.binary_type(self.salt), hash.digest())
-            self._cached_hash =  base64.urlsafe_b64encode(key)
+            self._cached_hash =  base64.urlsafe_b64encode(key).decode('ascii')
         return self._cached_hash
 
     def __unicode__(self):

From 92350834c75f088f31592ed5df11c517ba4a56c5 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Fri, 28 Jun 2019 20:20:18 +0000
Subject: [PATCH 016/114] Give hashlib.md5() bytes instead of str.  -
 Legacy-Id: 16325

---
 ietf/api/serializer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ietf/api/serializer.py b/ietf/api/serializer.py
index e1619351c..3fdfc428c 100644
--- a/ietf/api/serializer.py
+++ b/ietf/api/serializer.py
@@ -90,7 +90,7 @@ class AdminJsonSerializer(Serializer):
     use_natural_keys = False
 
     def serialize(self, queryset, **options):
-        qi = options.get('query_info', '')
+        qi = options.get('query_info', '').encode('utf-8')
         if len(list(queryset)) == 1:
             obj = queryset[0]
             key = 'json:%s:%s' % (hashlib.md5(qi).hexdigest(), unique_obj_name(obj))

From 5e4146cb5871b4f989c437a4460c5446cc44851c Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Fri, 28 Jun 2019 20:47:36 +0000
Subject: [PATCH 017/114] Fixed a bytes/str issue in a patch library call.  -
 Legacy-Id: 16326

---
 ietf/checks.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ietf/checks.py b/ietf/checks.py
index ae8e3b611..f4d6e2e9a 100644
--- a/ietf/checks.py
+++ b/ietf/checks.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2015-2019, All Rights Reserved
 import os
 import patch
 import sys
@@ -367,7 +368,7 @@ def maybe_patch_library(app_configs, **kwargs):
             patch_path = os.path.join(cwd, patch_file)
             patch_set = patch.fromfile(patch_path)
             if patch_set:
-                if not patch_set.apply(root=library_path):
+                if not patch_set.apply(root=library_path.encode('utf-8')):
                     errors.append(checks.Warning(
                         "Could not apply patch from file '%s'"%patch_file,
                         hint=("Make sure that the patch file contains a unified diff and has valid file paths\n\n"

From 9decae5e7e070a7c6d34cec50a6fb9e0ae1dec82 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Fri, 28 Jun 2019 20:49:03 +0000
Subject: [PATCH 018/114] Fixed changed object attributes for UUID objets.  -
 Legacy-Id: 16327

---
 ietf/community/views.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ietf/community/views.py b/ietf/community/views.py
index b74b3e718..a3a250be2 100644
--- a/ietf/community/views.py
+++ b/ietf/community/views.py
@@ -221,7 +221,7 @@ def feed(request, username=None, acronym=None, group_type=None):
 
     host = request.get_host()
     feed_url = 'https://%s%s' % (host, request.get_full_path())
-    feed_id = uuid.uuid5(uuid.NAMESPACE_URL, feed_url.encode('utf-8'))
+    feed_id = uuid.uuid5(uuid.NAMESPACE_URL, feed_url)
     title = '%s RSS Feed' % clist.long_name()
     if significant:
         subtitle = 'Significant document changes'
@@ -233,7 +233,7 @@ def feed(request, username=None, acronym=None, group_type=None):
         'entries': events[:50],
         'title': title,
         'subtitle': subtitle,
-        'id': feed_id.get_urn(),
+        'id': feed_id.urn,
         'updated': datetime.datetime.now(),
     }, content_type='text/xml')
 

From 1e86ccb4ee2bdce2d9ba72d25c4acc56d4875fca Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Fri, 28 Jun 2019 20:51:13 +0000
Subject: [PATCH 019/114] Builtin function file() --> open()  - Legacy-Id:
 16328

---
 ietf/utils/management/commands/pyflakes.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ietf/utils/management/commands/pyflakes.py b/ietf/utils/management/commands/pyflakes.py
index 449263748..e3b1b0a69 100644
--- a/ietf/utils/management/commands/pyflakes.py
+++ b/ietf/utils/management/commands/pyflakes.py
@@ -8,6 +8,8 @@ import sys
 from django.conf import settings
 from django.core.management.base import BaseCommand
 
+import debug                            # pyflakes:ignore
+
 # BlackHole, PySyntaxError and checking based on 
 # https://github.com/patrys/gedit-pyflakes-plugin.git
 class BlackHole(object):
@@ -82,7 +84,7 @@ def checkPath(filename, verbosity):
     @return: the number of warnings printed
     """
     try:
-        return check(file(filename, 'U').read() + '\n', filename, verbosity)
+        return check(open(filename, 'U').read() + '\n', filename, verbosity)
     except IOError as msg:
         return ["%s: %s" % (filename, msg.args[1])]
     except TypeError:

From ea109f2b1baa8fc1ac19982b404ef164966abfbf Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Fri, 28 Jun 2019 20:52:15 +0000
Subject: [PATCH 020/114] Fixed API changes in SMTPChannel  - Legacy-Id: 16329

---
 ietf/utils/test_smtpserver.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/ietf/utils/test_smtpserver.py b/ietf/utils/test_smtpserver.py
index 58227ee2d..48c3cbc2c 100644
--- a/ietf/utils/test_smtpserver.py
+++ b/ietf/utils/test_smtpserver.py
@@ -1,7 +1,11 @@
+# Copyright The IETF Trust 2014-2019, All Rights Reserved
+
 import smtpd
 import threading
 import asyncore
 
+import debug                            # pyflakes:ignore
+
 class AsyncCoreLoopThread(object):
 
     def wrap_loop(self, exit_condition, timeout=1.0, use_poll=False, map=None):
@@ -27,18 +31,22 @@ class AsyncCoreLoopThread(object):
 
 class SMTPTestChannel(smtpd.SMTPChannel):
 
+#    mail_options = ['BODY=8BITMIME', 'SMTPUTF8']
+
     def smtp_RCPT(self, arg):
-        if not self._SMTPChannel__mailfrom:
+        self.rcpt_options = []
+        if not self.mailfrom:
             self.push('503 Error: need MAIL command')
             return
-        address = self._SMTPChannel__getaddr('TO:', arg) if arg else None
+        arg = self._strip_command_keyword('TO:', arg)
+        address, params = self._getaddr(arg)
         if not address:
             self.push('501 Syntax: RCPT TO: 
')
             return
         if "poison" in address:
            self.push('550 Error: Not touching that')
            return
-        self._SMTPChannel__rcpttos.append(address)
+        self.rcpttos.append(address)
         self.push('250 Ok')
 
 class SMTPTestServer(smtpd.SMTPServer):
@@ -57,7 +65,7 @@ class SMTPTestServer(smtpd.SMTPServer):
             #channel = SMTPTestChannel(self, conn, addr)
             SMTPTestChannel(self, conn, addr)
 
-    def process_message(self, peer, mailfrom, rcpttos, data):
+    def process_message(self, peer, mailfrom, rcpttos, data, mail_options=[], rcpt_options=[]):
         self.inbox.append(data)
 
 

From 484dcece5fe783a1cb8028445cf8b8a2d8f718a9 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Fri, 28 Jun 2019 21:07:08 +0000
Subject: [PATCH 021/114] Changed all model __unicode__() methods to __str__() 
 - Legacy-Id: 16330

---
 ietf/community/models.py        |  6 +++---
 ietf/dbtemplate/models.py       |  2 +-
 ietf/doc/models.py              | 24 ++++++++++++------------
 ietf/group/models.py            | 14 +++++++-------
 ietf/iesg/models.py             |  4 ++--
 ietf/ipr/models.py              |  8 ++++----
 ietf/liaisons/models.py         | 10 +++++-----
 ietf/mailinglists/models.py     |  8 ++++----
 ietf/mailtrigger/models.py      |  4 ++--
 ietf/meeting/models.py          | 22 +++++++++++-----------
 ietf/message/models.py          |  8 ++++----
 ietf/name/models.py             |  4 ++--
 ietf/nomcom/models.py           | 14 +++++++-------
 ietf/person/models.py           | 10 +++++-----
 ietf/review/models.py           | 16 ++++++++--------
 ietf/secr/proceedings/models.py |  3 ++-
 ietf/stats/models.py            |  8 ++++----
 ietf/submit/models.py           | 10 +++++-----
 18 files changed, 88 insertions(+), 87 deletions(-)

diff --git a/ietf/community/models.py b/ietf/community/models.py
index e719f2315..ffaf307b0 100644
--- a/ietf/community/models.py
+++ b/ietf/community/models.py
@@ -22,7 +22,7 @@ class CommunityList(models.Model):
         else:
             return 'ID list'
 
-    def __unicode__(self):
+    def __str__(self):
         return self.long_name()
 
     def get_absolute_url(self):
@@ -76,7 +76,7 @@ class SearchRule(models.Model):
     # when new documents are submitted
     name_contains_index = models.ManyToManyField(Document)
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s %s %s/%s/%s/%s" % (self.community_list, self.rule_type, self.state, self.group, self.person, self.text)
 
 class EmailSubscription(models.Model):
@@ -89,7 +89,7 @@ class EmailSubscription(models.Model):
     ]
     notify_on = models.CharField(max_length=30, choices=NOTIFICATION_CHOICES, default="all")
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s to %s (%s changes)" % (self.email, self.community_list, self.notify_on)
 
 
diff --git a/ietf/dbtemplate/models.py b/ietf/dbtemplate/models.py
index e21633ac2..9ba70a9be 100644
--- a/ietf/dbtemplate/models.py
+++ b/ietf/dbtemplate/models.py
@@ -27,7 +27,7 @@ class DBTemplate(models.Model):
     content = models.TextField( blank=False, null=False, )
     group = ForeignKey( Group, blank=True, null=True, )
 
-    def __unicode__(self):
+    def __str__(self):
         return self.title
 
     def clean(self):
diff --git a/ietf/doc/models.py b/ietf/doc/models.py
index 58cbed06e..123ad76c5 100644
--- a/ietf/doc/models.py
+++ b/ietf/doc/models.py
@@ -38,7 +38,7 @@ class StateType(models.Model):
     slug = models.CharField(primary_key=True, max_length=30) # draft, draft-iesg, charter, ...
     label = models.CharField(max_length=255, help_text="Label that should be used (e.g. in admin) for state drop-down for this type of state") # State, IESG state, WG state, ...
 
-    def __unicode__(self):
+    def __str__(self):
         return self.slug
 
 @checks.register('db-consistency')
@@ -65,7 +65,7 @@ class State(models.Model):
 
     next_states = models.ManyToManyField('State', related_name="previous_states", blank=True)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
     
     class Meta:
@@ -530,7 +530,7 @@ class RelatedDocument(models.Model):
     relationship = ForeignKey(DocRelationshipName)
     def action(self):
         return self.relationship.name
-    def __unicode__(self):
+    def __str__(self):
         return "%s %s %s" % (self.source.name, self.relationship.name.lower(), self.target.name)
 
     def is_downref(self):
@@ -600,7 +600,7 @@ class DocumentAuthorInfo(models.Model):
 class DocumentAuthor(DocumentAuthorInfo):
     document = ForeignKey('Document')
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s %s (%s)" % (self.document.name, self.person, self.order)
 
 
@@ -613,7 +613,7 @@ validate_docname = RegexValidator(
 class Document(DocumentInfo):
     name = models.CharField(max_length=255, validators=[validate_docname,], unique=True)           # immutable
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     def get_absolute_url(self):
@@ -849,7 +849,7 @@ class RelatedDocHistory(models.Model):
     source = ForeignKey('DocHistory')
     target = ForeignKey('DocAlias', related_name="reversely_related_document_history_set")
     relationship = ForeignKey(DocRelationshipName)
-    def __unicode__(self):
+    def __str__(self):
         return "%s %s %s" % (self.source.doc.name, self.relationship.name.lower(), self.target.name)
 
 class DocHistoryAuthor(DocumentAuthorInfo):
@@ -857,7 +857,7 @@ class DocHistoryAuthor(DocumentAuthorInfo):
     # easier to write generic code
     document = ForeignKey('DocHistory', related_name="documentauthor_set")
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s %s (%s)" % (self.document.doc.name, self.person, self.order)
 
 class DocHistory(DocumentInfo):
@@ -868,7 +868,7 @@ class DocHistory(DocumentInfo):
     # property
     name = models.CharField(max_length=255)
 
-    def __unicode__(self):
+    def __str__(self):
         return str(self.doc.name)
 
     def canonical_name(self):
@@ -917,7 +917,7 @@ class DocAlias(models.Model):
     def document(self):
         return self.docs.first()
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s-->%s" % (self.name, ','.join([str(d.name) for d in self.docs.all() if isinstance(d, Document) ]))
     document_link = admin_link("document")
     class Meta:
@@ -1023,7 +1023,7 @@ class DocEvent(models.Model):
     def get_dochistory(self):
         return DocHistory.objects.filter(time__lte=self.time,doc__name=self.doc.name).order_by('-time', '-pk').first()
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s %s by %s at %s" % (self.doc.name, self.get_type_display().lower(), self.by.plain_name(), self.time)
 
     def save(self, *args, **kwargs):
@@ -1056,7 +1056,7 @@ class BallotType(models.Model):
     order = models.IntegerField(default=0)
     positions = models.ManyToManyField(BallotPositionName, blank=True)
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s: %s" % (self.name, self.doc_type.name)
     
     class Meta:
@@ -1183,7 +1183,7 @@ class DeletedEvent(models.Model):
     by = ForeignKey(Person)
     time = models.DateTimeField(default=datetime.datetime.now)
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s by %s %s" % (self.content_type, self.by, self.time)
 
 class EditedAuthorsDocEvent(DocEvent):
diff --git a/ietf/group/models.py b/ietf/group/models.py
index 2069d6ca9..62879df80 100644
--- a/ietf/group/models.py
+++ b/ietf/group/models.py
@@ -42,7 +42,7 @@ class GroupInfo(models.Model):
     unused_states = models.ManyToManyField('doc.State', help_text="Document states that have been disabled for the group.", blank=True)
     unused_tags = models.ManyToManyField(DocTagName, help_text="Document tags that have been disabled for the group.", blank=True)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     def ad_role(self):
@@ -252,7 +252,7 @@ class GroupURL(models.Model):
     name = models.CharField(max_length=255)
     url = models.URLField()
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s (%s)" % (self.url, self.name)
 
 class GroupMilestoneInfo(models.Model):
@@ -268,7 +268,7 @@ class GroupMilestoneInfo(models.Model):
 
     docs = models.ManyToManyField('doc.Document', blank=True)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.desc[:20] + "..."
     class Meta:
         abstract = True
@@ -288,7 +288,7 @@ class GroupStateTransitions(models.Model):
     state = ForeignKey('doc.State', help_text="State for which the next states should be overridden")
     next_states = models.ManyToManyField('doc.State', related_name='previous_groupstatetransitions_states')
 
-    def __unicode__(self):
+    def __str__(self):
         return '%s "%s" -> %s' % (self.group.acronym, self.state.name, [s.name for s in self.next_states.all()])
 
 GROUP_EVENT_CHOICES = [
@@ -309,7 +309,7 @@ class GroupEvent(models.Model):
     by = ForeignKey(Person)
     desc = models.TextField()
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s %s at %s" % (self.by.plain_name(), self.get_type_display().lower(), self.time)
 
     class Meta:
@@ -326,7 +326,7 @@ class Role(models.Model):
     group = ForeignKey(Group)
     person = ForeignKey(Person)
     email = ForeignKey(Email, help_text="Email address used by person for this role.")
-    def __unicode__(self):
+    def __str__(self):
         return "%s is %s in %s" % (self.person.plain_name(), self.name.name, self.group.acronym or self.group.name)
 
     def formatted_ascii_email(self):
@@ -347,7 +347,7 @@ class RoleHistory(models.Model):
     group = ForeignKey(GroupHistory)
     person = ForeignKey(Person)
     email = ForeignKey(Email, help_text="Email address used by person for this role.")
-    def __unicode__(self):
+    def __str__(self):
         return "%s is %s in %s" % (self.person.plain_name(), self.name.name, self.group.acronym)
 
     class Meta:
diff --git a/ietf/iesg/models.py b/ietf/iesg/models.py
index 40444a203..d20172cbd 100644
--- a/ietf/iesg/models.py
+++ b/ietf/iesg/models.py
@@ -49,7 +49,7 @@ class TelechatAgendaItem(models.Model):
     type = models.IntegerField(db_column='template_type', choices=TYPE_CHOICES, default=3)
     title = models.CharField(max_length=255, db_column='template_title')
 
-    def __unicode__(self):
+    def __str__(self):
         type_name = self.TYPE_CHOICES_DICT.get(self.type, str(self.type))
         return '%s: %s' % (type_name, self.title or "")
 
@@ -82,7 +82,7 @@ class TelechatDate(models.Model):
 
     date = models.DateField(default=next_telechat_date)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.date.isoformat()
 
     class Meta:
diff --git a/ietf/ipr/models.py b/ietf/ipr/models.py
index 6e69b5b3e..0c79818e1 100644
--- a/ietf/ipr/models.py
+++ b/ietf/ipr/models.py
@@ -29,7 +29,7 @@ class IprDisclosureBase(models.Model):
     class Meta:
         ordering = ['-time', '-id']
 
-    def __unicode__(self):
+    def __str__(self):
         return self.title
 
     def get_absolute_url(self):
@@ -172,7 +172,7 @@ class IprDocRel(models.Model):
         else:
             return name
 
-    def __unicode__(self):
+    def __str__(self):
         if self.revisions:
             return "%s which applies to %s-%s" % (self.disclosure, self.document.name, self.revisions)
         else:
@@ -183,7 +183,7 @@ class RelatedIpr(models.Model):
     target       = ForeignKey(IprDisclosureBase,related_name='relatedipr_target_set')
     relationship = ForeignKey(DocRelationshipName) # Re-use; change to a dedicated RelName if needed
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s %s %s" % (self.source.title, self.relationship.name.lower(), self.target.title)
 
 class IprEvent(models.Model):
@@ -196,7 +196,7 @@ class IprEvent(models.Model):
     in_reply_to = ForeignKey(Message, null=True, blank=True,related_name='irtoevents')
     response_due= models.DateTimeField(blank=True,null=True)
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s %s by %s at %s" % (self.disclosure.title, self.type.name.lower(), self.by.plain_name(), self.time)
 
     def response_past_due(self):
diff --git a/ietf/liaisons/models.py b/ietf/liaisons/models.py
index 7af82a5ed..ed2ddfac9 100644
--- a/ietf/liaisons/models.py
+++ b/ietf/liaisons/models.py
@@ -49,7 +49,7 @@ class LiaisonStatement(models.Model):
         ordering = ['id']
         
 
-    def __unicode__(self):
+    def __str__(self):
         return self.title or ""
 
     def change_state(self,state_id=None,person=None):
@@ -203,7 +203,7 @@ class LiaisonStatementAttachment(models.Model):
     document = ForeignKey(Document)
     removed = models.BooleanField(default=False)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.document.name
 
 
@@ -212,7 +212,7 @@ class RelatedLiaisonStatement(models.Model):
     target = ForeignKey(LiaisonStatement, related_name='target_of_set')
     relationship = ForeignKey(DocRelationshipName)
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s %s %s" % (self.source.title, self.relationship.name.lower(), self.target.title)
 
 
@@ -221,7 +221,7 @@ class LiaisonStatementGroupContacts(models.Model):
     contacts = models.CharField(max_length=255,blank=True)
     cc_contacts = models.CharField(max_length=255,blank=True)
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s" % self.group.name
 
 
@@ -232,7 +232,7 @@ class LiaisonStatementEvent(models.Model):
     statement = ForeignKey(LiaisonStatement)
     desc = models.TextField()
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s %s by %s at %s" % (self.statement.title, self.type.slug, self.by.plain_name(), self.time)
 
     class Meta:
diff --git a/ietf/mailinglists/models.py b/ietf/mailinglists/models.py
index 119afac74..63e4808d8 100644
--- a/ietf/mailinglists/models.py
+++ b/ietf/mailinglists/models.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2016, All Rights Reserved
+# Copyright The IETF Trust 2016-2019, All Rights Reserved
 
 
 from django.conf import settings
@@ -12,7 +12,7 @@ class List(models.Model):
     name = models.CharField(max_length=32)
     description = models.CharField(max_length=256)
     advertised = models.BooleanField(default=True)
-    def __unicode__(self):
+    def __str__(self):
         return "" % self.name
     def info_url(self):
         return settings.MAILING_LIST_INFO_URL % {'list_addr': self.name }
@@ -21,7 +21,7 @@ class Subscribed(models.Model):
     time = models.DateTimeField(auto_now_add=True)
     email = models.CharField(max_length=64, validators=[validate_email])
     lists = models.ManyToManyField(List)
-    def __unicode__(self):
+    def __str__(self):
         return "" % (self.email, self.time)
     class Meta:
         verbose_name_plural = "Subscribed"
@@ -30,7 +30,7 @@ class Whitelisted(models.Model):
     time = models.DateTimeField(auto_now_add=True)
     email = models.CharField("Email address", max_length=64, validators=[validate_email])
     by = ForeignKey(Person)
-    def __unicode__(self):
+    def __str__(self):
         return "" % (self.email, self.time)
     class Meta:
         verbose_name_plural = "Whitelisted"
diff --git a/ietf/mailtrigger/models.py b/ietf/mailtrigger/models.py
index 99b4b306b..7e770b388 100644
--- a/ietf/mailtrigger/models.py
+++ b/ietf/mailtrigger/models.py
@@ -37,7 +37,7 @@ class MailTrigger(models.Model):
     class Meta:
         ordering = ["slug"]
 
-    def __unicode__(self):
+    def __str__(self):
         return self.slug
 
 class Recipient(models.Model):
@@ -48,7 +48,7 @@ class Recipient(models.Model):
     class Meta:
         ordering = ["slug"]
 
-    def __unicode__(self):
+    def __str__(self):
         return self.slug
 
     def gather(self, **kwargs):
diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py
index a4626c67e..5bce1032d 100644
--- a/ietf/meeting/models.py
+++ b/ietf/meeting/models.py
@@ -107,7 +107,7 @@ class Meeting(models.Model):
     attendees = models.IntegerField(blank=True, null=True, default=None,
                                     help_text="Number of Attendees for backfilled meetings, leave it blank for new meetings, and then it is calculated from the registrations")
 
-    def __unicode__(self):
+    def __str__(self):
         if self.type_id == "ietf":
             return "IETF-%s" % (self.number)
         else:
@@ -315,7 +315,7 @@ class ResourceAssociation(models.Model):
     icon = models.CharField(max_length=64)       # icon to be found in /static/img
     desc = models.CharField(max_length=256)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.desc
 
     def json_dict(self, host_scheme):
@@ -344,7 +344,7 @@ class Room(models.Model):
     y2 = models.SmallIntegerField(null=True, blank=True, default=None)
     # end floorplan-related stuff
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s size: %s" % (self.name, self.capacity)
 
     def delete_timeslots(self):
@@ -426,7 +426,7 @@ class FloorPlan(models.Model):
     class Meta:
         ordering = ['-id',]
     #
-    def __unicode__(self):
+    def __str__(self):
         return 'floorplan-%s-%s' % (self.meeting.number, xslugify(self.name))
 
 # === Schedules, Sessions, Timeslots and Assignments ===========================
@@ -472,7 +472,7 @@ class TimeSlot(models.Model):
                 self._reg_info = None
         return self._reg_info
 
-    def __unicode__(self):
+    def __str__(self):
         location = self.get_location()
         if not location:
             location = "(no location)"
@@ -616,7 +616,7 @@ class Schedule(models.Model):
     badness  = models.IntegerField(null=True, blank=True)
     # considering copiedFrom = ForeignKey('Schedule', blank=True, null=True)
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s:%s(%s)" % (self.meeting, self.name, self.owner)
 
     def base_url(self):
@@ -725,7 +725,7 @@ class SchedTimeSessAssignment(models.Model):
     class Meta:
         ordering = ["timeslot__time", "timeslot__type__slug", "session__group__parent__name", "session__group__acronym", "session__name", ]
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s [%s<->%s]" % (self.schedule, self.session, self.timeslot)
 
     @property
@@ -828,7 +828,7 @@ class Constraint(models.Model):
 
     active_status = None
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s %s target=%s person=%s" % (self.source, self.name.name.lower(), self.target, self.person)
 
     def brief_display(self):
@@ -868,7 +868,7 @@ class SessionPresentation(models.Model):
         ordering = ('order',)
         unique_together = (('session', 'document'),)
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s -> %s-%s" % (self.session, self.document.name, self.rev)
 
 constraint_cache_uses = 0
@@ -1007,7 +1007,7 @@ class Session(models.Model):
     def is_material_submission_cutoff(self):
         return datetime.date.today() > self.meeting.get_submission_correction_date()
 
-    def __unicode__(self):
+    def __str__(self):
         if self.meeting.type_id == "interim":
             return self.meeting.number
 
@@ -1154,7 +1154,7 @@ class ImportantDate(models.Model):
     class Meta:
         ordering = ["-meeting_id","date", ]
 
-    def __unicode__(self):
+    def __str__(self):
         return '%s : %s : %s' % ( self.meeting, self.name, self.date )
 
 class SlideSubmission(models.Model):
diff --git a/ietf/message/models.py b/ietf/message/models.py
index 3e06e7da4..0740d1f27 100644
--- a/ietf/message/models.py
+++ b/ietf/message/models.py
@@ -33,7 +33,7 @@ class Message(models.Model):
     class Meta:
         ordering = ['time']
 
-    def __unicode__(self):
+    def __str__(self):
         return "'%s' %s -> %s" % (self.subject, self.frm, self.to)
 
     def get(self, field):
@@ -49,7 +49,7 @@ class MessageAttachment(models.Model):
     removed = models.BooleanField(default=False)
     body = models.TextField()
 
-    def __unicode__(self):
+    def __str__(self):
         return self.filename
 
 
@@ -67,7 +67,7 @@ class SendQueue(models.Model):
     class Meta:
         ordering = ['time']
 
-    def __unicode__(self):
+    def __str__(self):
         return "'%s' %s -> %s (sent at %s)" % (self.message.subject, self.message.frm, self.message.to, self.sent_at or "")
 
 
@@ -76,7 +76,7 @@ class AnnouncementFrom(models.Model):
     group = ForeignKey(Group)
     address = models.CharField(max_length=255)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.address
 
     class Meta:
diff --git a/ietf/name/models.py b/ietf/name/models.py
index 5a257c22f..19d2d7eea 100644
--- a/ietf/name/models.py
+++ b/ietf/name/models.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2007, All Rights Reserved
+# Copyright The IETF Trust 2010-2019, All Rights Reserved
 
 from django.db import models
 
@@ -11,7 +11,7 @@ class NameModel(models.Model):
     used = models.BooleanField(default=True)
     order = models.IntegerField(default=0)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     class Meta:
diff --git a/ietf/nomcom/models.py b/ietf/nomcom/models.py
index 8f8901e83..92c1d1ed7 100644
--- a/ietf/nomcom/models.py
+++ b/ietf/nomcom/models.py
@@ -59,7 +59,7 @@ class NomCom(models.Model):
         verbose_name_plural = 'NomComs'
         verbose_name = 'NomCom'
 
-    def __unicode__(self):
+    def __str__(self):
         return self.group.acronym
 
     def save(self, *args, **kwargs):
@@ -108,7 +108,7 @@ class Nomination(models.Model):
     class Meta:
         verbose_name_plural = 'Nominations'
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s (%s)" % (self.candidate_name, self.candidate_email)
 
 
@@ -127,7 +127,7 @@ class Nominee(models.Model):
         unique_together = ('email', 'nomcom')
         ordering = ['-nomcom__group__acronym', 'person__name', ]
 
-    def __unicode__(self):
+    def __str__(self):
         if self.email.person and self.email.person.name:
             return '%s <%s> %s' % (self.email.person.plain_name(), self.email.address, self.nomcom.year())
         else:
@@ -159,7 +159,7 @@ class NomineePosition(models.Model):
             self.state = NomineePositionStateName.objects.get(slug='pending')
         super(NomineePosition, self).save(**kwargs)
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s - %s - %s" % (self.nominee, self.state, self.position)
 
     @property
@@ -182,7 +182,7 @@ class Position(models.Model):
     class Meta:
         verbose_name_plural = 'Positions'
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
     def save(self, *args, **kwargs):
@@ -224,7 +224,7 @@ class Topic(models.Model):
     class Meta:
         verbose_name_plural = 'Topics'
 
-    def __unicode__(self):
+    def __str__(self):
         return self.subject
 
     def save(self, *args, **kwargs):
@@ -257,7 +257,7 @@ class Feedback(models.Model):
 
     objects = FeedbackManager()
 
-    def __unicode__(self):
+    def __str__(self):
         return "from %s" % self.author
 
     class Meta:
diff --git a/ietf/person/models.py b/ietf/person/models.py
index 9fc01b800..bfc329d0f 100644
--- a/ietf/person/models.py
+++ b/ietf/person/models.py
@@ -48,7 +48,7 @@ class Person(models.Model):
     name_from_draft = models.CharField("Full Name (from submission)", null=True, max_length=255, editable=False, help_text="Name as found in a draft submission.")
     consent = models.NullBooleanField("I hereby give my consent to the use of the personal details I have provided (photo, bio, name, email) within the IETF Datatracker", null=True, default=None)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.plain_name()
     def name_parts(self):
         return name_parts(self.name)
@@ -248,7 +248,7 @@ class Alias(models.Model):
                 send_mail_preformatted(None, msg)
 
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
     class Meta:
         verbose_name_plural = "Aliases"
@@ -263,7 +263,7 @@ class Email(models.Model):
     active = models.BooleanField(default=True)      # Old email addresses are *not* purged, as history
                                                     # information points to persons through these
 
-    def __unicode__(self):
+    def __str__(self):
         return self.address or "Email object with id: %s"%self.pk
 
     def get_name(self):
@@ -364,7 +364,7 @@ class PersonalApiKey(models.Model):
             self._cached_hash =  base64.urlsafe_b64encode(key).decode('ascii')
         return self._cached_hash
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s (%s): %s ..." % (self.endpoint, self.created.strftime("%Y-%m-%d %H:%M"), self.hash()[:16])
 
 PERSON_EVENT_CHOICES = [
@@ -379,7 +379,7 @@ class PersonEvent(models.Model):
     type = models.CharField(max_length=50, choices=PERSON_EVENT_CHOICES)
     desc = models.TextField()
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s %s at %s" % (self.person.plain_name(), self.get_type_display().lower(), self.time)
 
     class Meta:
diff --git a/ietf/review/models.py b/ietf/review/models.py
index 1206c439b..2a1536077 100644
--- a/ietf/review/models.py
+++ b/ietf/review/models.py
@@ -33,7 +33,7 @@ class ReviewerSettings(models.Model):
     remind_days_before_deadline = models.IntegerField(null=True, blank=True, help_text="To get an email reminder in case you forget to do an assigned review, enter the number of days before review deadline you want to receive it. Clear the field if you don't want a reminder.")
     expertise = models.TextField(verbose_name="Reviewer's expertise in this team's area", max_length=2048, blank=True, help_text="Describe the reviewer's expertise in this team's area", default='')
 
-    def __unicode__(self):
+    def __str__(self):
         return "{} in {}".format(self.person, self.team)
 
     class Meta:
@@ -45,7 +45,7 @@ class ReviewSecretarySettings(models.Model):
     person      = ForeignKey(Person)
     remind_days_before_deadline = models.IntegerField(null=True, blank=True, help_text="To get an email reminder in case a reviewer forgets to do an assigned review, enter the number of days before review deadline you want to receive it. Clear the field if you don't want a reminder.")
 
-    def __unicode__(self):
+    def __str__(self):
         return "{} in {}".format(self.person, self.team)
 
     class Meta:
@@ -78,7 +78,7 @@ class UnavailablePeriod(models.Model):
         else:
             return "future"
 
-    def __unicode__(self):
+    def __str__(self):
         return "{} is unavailable in {} {} - {}".format(self.person, self.team.acronym, self.start_date or "", self.end_date or "")
 
 class ReviewWish(models.Model):
@@ -88,7 +88,7 @@ class ReviewWish(models.Model):
     person      = ForeignKey(Person)
     doc         = ForeignKey(Document)
 
-    def __unicode__(self):
+    def __str__(self):
         return "{} wishes to review {} in {}".format(self.person, self.doc.name, self.team.acronym)
 
     class Meta:
@@ -99,7 +99,7 @@ class NextReviewerInTeam(models.Model):
     team        = ForeignKey(Group, limit_choices_to=~models.Q(reviewteamsettings=None))
     next_reviewer = ForeignKey(Person)
 
-    def __unicode__(self):
+    def __str__(self):
         return "{} next in {}".format(self.next_reviewer, self.team)
 
     class Meta:
@@ -121,7 +121,7 @@ class ReviewRequest(models.Model):
     requested_rev = models.CharField(verbose_name="requested revision", max_length=16, blank=True, help_text="Fill in if a specific revision is to be reviewed, e.g. 02")
     comment       = models.TextField(verbose_name="Requester's comments and instructions", max_length=2048, blank=True, help_text="Provide any additional information to show to the review team secretary and reviewer", default='')
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s review on %s by %s %s" % (self.type, self.doc, self.team, self.state)
 
     def all_completed_assignments_for_doc(self):
@@ -142,7 +142,7 @@ class ReviewAssignment(models.Model):
     result         = ForeignKey(ReviewResultName, blank=True, null=True)
     mailarch_url   = models.URLField(blank=True, null = True)
 
-    def __unicode__(self):
+    def __str__(self):
         return "Assignment for %s (%s) : %s %s of %s" % (self.reviewer.person, self.state, self.review_request.team.acronym, self.review_request.type, self.review_request.doc)
 
 
@@ -161,7 +161,7 @@ class ReviewTeamSettings(models.Model):
     notify_ad_when = models.ManyToManyField(ReviewResultName, related_name='reviewteamsettings_notify_ad_set', blank=True)
     secr_mail_alias = models.CharField(verbose_name="Email alias for all of the review team secretaries", max_length=255, blank=True, help_text="Email alias for all of the review team secretaries")
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s" % (self.group.acronym,)
 
     class Meta:
diff --git a/ietf/secr/proceedings/models.py b/ietf/secr/proceedings/models.py
index 7ddf6d6fe..107da0cd3 100644
--- a/ietf/secr/proceedings/models.py
+++ b/ietf/secr/proceedings/models.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2013-2019, All Rights Reserved
 import os
 
 from django.conf import settings
@@ -63,7 +64,7 @@ class Registration(models.Model):
     company = models.CharField(max_length=255)
     country = models.CharField(max_length=2)
     
-    def __unicode__(self):
+    def __str__(self):
         return "%s %s" % (self.fname, self.lname)
     class Meta:
         db_table = 'registrations'
diff --git a/ietf/stats/models.py b/ietf/stats/models.py
index de448f0cd..7a139bcf7 100644
--- a/ietf/stats/models.py
+++ b/ietf/stats/models.py
@@ -17,7 +17,7 @@ class AffiliationAlias(models.Model):
     alias = models.CharField(max_length=255, help_text="Note that aliases will be matched case-insensitive and both before and after some clean-up.", unique=True)
     name = models.CharField(max_length=255)
 
-    def __unicode__(self):
+    def __str__(self):
         return "{} -> {}".format(self.alias, self.name)
 
     def save(self, *args, **kwargs):
@@ -32,7 +32,7 @@ class AffiliationIgnoredEnding(models.Model):
 
     ending = models.CharField(max_length=255, help_text="Regexp with ending, e.g. 'Inc\\.?' - remember to escape .!")
 
-    def __unicode__(self):
+    def __str__(self):
         return self.ending
 
 class CountryAlias(models.Model):
@@ -42,7 +42,7 @@ class CountryAlias(models.Model):
     alias = models.CharField(max_length=255, help_text="Note that lower-case aliases are matched case-insensitive while aliases with at least one uppercase letter is matched case-sensitive. So 'United States' is best entered as 'united states' so it both matches 'United States' and 'United states' and 'UNITED STATES', whereas 'US' is best entered as 'US' so it doesn't accidentally match an ordinary word like 'us'.")
     country = ForeignKey(CountryName, max_length=255)
 
-    def __unicode__(self):
+    def __str__(self):
         return "{} -> {}".format(self.alias, self.country.name)
 
     class Meta:
@@ -58,5 +58,5 @@ class MeetingRegistration(models.Model):
     person = ForeignKey(Person, blank=True, null=True)
     email =  models.EmailField(blank=True, null=True)
     
-    def __unicode__(self):
+    def __str__(self):
         return "{} {}".format(self.first_name, self.last_name)
diff --git a/ietf/submit/models.py b/ietf/submit/models.py
index 0f84d42b2..9450a283d 100644
--- a/ietf/submit/models.py
+++ b/ietf/submit/models.py
@@ -55,7 +55,7 @@ class Submission(models.Model):
 
     draft = ForeignKey(Document, null=True, blank=True)
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s-%s" % (self.name, self.rev)
 
     def submitter_parsed(self):
@@ -82,7 +82,7 @@ class SubmissionCheck(models.Model):
     items = jsonfield.JSONField(null=True, blank=True, default='{}')
     symbol = models.CharField(max_length=64, default='')
     #
-    def __unicode__(self):
+    def __str__(self):
         return "%s submission check: %s: %s" % (self.checker, 'Passed' if self.passed else 'Failed', self.message[:48]+'...')
     def has_warnings(self):
         return self.warnings != '[]'
@@ -95,7 +95,7 @@ class SubmissionEvent(models.Model):
     by = ForeignKey(Person, null=True, blank=True)
     desc = models.TextField()
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s %s by %s at %s" % (self.submission.name, self.desc, self.by.plain_name() if self.by else "(unknown)", self.time)
 
     class Meta:
@@ -108,7 +108,7 @@ class Preapproval(models.Model):
     by = ForeignKey(Person)
     time = models.DateTimeField(default=datetime.datetime.now)
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
 class SubmissionEmailEvent(SubmissionEvent):
@@ -116,7 +116,7 @@ class SubmissionEmailEvent(SubmissionEvent):
     msgtype     = models.CharField(max_length=25)
     in_reply_to = ForeignKey(Message, null=True, blank=True,related_name='irtomanual')
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s %s by %s at %s" % (self.submission.name, self.desc, self.by.plain_name() if self.by else "(unknown)", self.time)
 
     class Meta:

From e27a06c0b80dc36752c9f6dc2067f4e8eef2b0e5 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Sat, 29 Jun 2019 13:25:30 +0000
Subject: [PATCH 022/114] Added a warnings filter for deprecated library code. 
 - Legacy-Id: 16332

---
 ietf/settings.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ietf/settings.py b/ietf/settings.py
index d163d472e..fea10b7c0 100644
--- a/ietf/settings.py
+++ b/ietf/settings.py
@@ -23,6 +23,8 @@ warnings.filterwarnings("ignore", message="You passed a bytestring as `filenames
 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="'U' mode is deprecated", module="docutils.io")
 
 
 try:

From 2b1f238204670aa6764964b15460c70ccae93fee Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Sat, 29 Jun 2019 13:29:13 +0000
Subject: [PATCH 023/114] Changed regex strings to raw strings and fixed a sort
 comparison int/str issue.  - Legacy-Id: 16333

---
 ietf/doc/utils.py        | 16 ++++++++--------
 ietf/doc/views_search.py |  4 ++--
 ietf/group/models.py     |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ietf/doc/utils.py b/ietf/doc/utils.py
index 6e5a755fe..4b935b454 100644
--- a/ietf/doc/utils.py
+++ b/ietf/doc/utils.py
@@ -767,7 +767,7 @@ def get_search_cache_key(params):
     from ietf.doc.views_search import SearchForm
     fields = set(SearchForm.base_fields) - set(['sort',])
     kwargs = dict([ (k,v) for (k,v) in list(params.items()) if k in fields ])
-    key = "doc:document:search:" + hashlib.sha512(json.dumps(kwargs, sort_keys=True)).hexdigest()
+    key = "doc:document:search:" + hashlib.sha512(json.dumps(kwargs, sort_keys=True).encode()).hexdigest()
     return key
     
 def label_wrap(label, items, joiner=',', max=50):
@@ -817,21 +817,21 @@ def build_doc_meta_block(doc, path):
         ipr_url = "%s?submit=draft&id=%s" % (urlreverse('ietf.ipr.views.search'), name)
         for i, line in enumerate(lines):
             # add draft links
-            line = re.sub(r'\b(draft-[-a-z0-9]+)\b', '\g<1>'%(path, ), line)
+            line = re.sub(r'\b(draft-[-a-z0-9]+)\b', r'\g<1>'%(path, ), line)
             # add rfcXXXX to RFC links
-            line = re.sub(r' (rfc[0-9]+)\b', ' \g<1>'%(path, ), line)
+            line = re.sub(r' (rfc[0-9]+)\b', r' \g<1>'%(path, ), line)
             # add XXXX to RFC links
-            line = re.sub(r' ([0-9]{3,5})\b', ' \g<1>'%(path, ), line)
+            line = re.sub(r' ([0-9]{3,5})\b', r' \g<1>'%(path, ), line)
             # add draft revision links
-            line = re.sub(r' ([0-9]{2})\b', ' \g<1>'%(path, name, ), line)
+            line = re.sub(r' ([0-9]{2})\b', r' \g<1>'%(path, name, ), line)
             if rfcnum:
                 # add errata link
-                line = re.sub(r'Errata exist', 'Errata exist'%(errata_url, ), line)
+                line = re.sub(r'Errata exist', r'Errata exist'%(errata_url, ), line)
             if is_hst or not rfcnum:
                 # make current draft rev bold
                 line = re.sub(r'>(%s)<'%rev, '>\g<1><', line)
-            line = re.sub(r'IPR declarations', 'IPR declarations'%(ipr_url, ), line)
-            line = line.replace(r'[txt]', '[txt]' % doc.href())
+            line = re.sub(r'IPR declarations', r'IPR declarations'%(ipr_url, ), line)
+            line = line.replace(r'[txt]', r'[txt]' % doc.href())
             lines[i] = line
         return lines
     #
diff --git a/ietf/doc/views_search.py b/ietf/doc/views_search.py
index 24ec9f51e..5f9a26fd8 100644
--- a/ietf/doc/views_search.py
+++ b/ietf/doc/views_search.py
@@ -265,7 +265,7 @@ def search_for_name(request, name):
             return HttpResponseRedirect(url)
 
     # chop away extension
-    extension_split = re.search("^(.+)\.(txt|ps|pdf)$", n)
+    extension_split = re.search(r"^(.+)\.(txt|ps|pdf)$", n)
     if extension_split:
         n = extension_split.group(1)
 
@@ -494,7 +494,7 @@ def index_all_drafts(request):
 
             if name.startswith("rfc"):
                 name = name.upper()
-                sort_key = -int(name[3:])
+                sort_key = '%09d' % (100000000-int(name[3:]))
 
             names.append((name, sort_key))
 
diff --git a/ietf/group/models.py b/ietf/group/models.py
index 62879df80..ec36e8014 100644
--- a/ietf/group/models.py
+++ b/ietf/group/models.py
@@ -192,7 +192,7 @@ class Group(GroupInfo):
                 text = self.charter.text()
                 # split into paragraphs and grab the first non-empty one
                 if text:
-                    desc = [ p for p in re.split('\r?\n\s*\r?\n\s*', text) if p.strip() ][0]
+                    desc = [ p for p in re.split(r'\r?\n\s*\r?\n\s*', text) if p.strip() ][0]
         return desc
 
 

From 70c00950b6bf2763d3c0d027af2263223b2696dd Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Sat, 29 Jun 2019 13:30:36 +0000
Subject: [PATCH 024/114] Fixed several email handling str/bytes issues.  -
 Legacy-Id: 16334

---
 ietf/message/utils.py | 17 +++++++++--------
 ietf/utils/mail.py    |  6 +++---
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ietf/message/utils.py b/ietf/message/utils.py
index 5fae361fd..9ae32f796 100644
--- a/ietf/message/utils.py
+++ b/ietf/message/utils.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2012-2019, All Rights Reserved
 import re, datetime, email
 
 from ietf.utils.mail import send_mail_text, send_mail_mime
@@ -6,16 +7,16 @@ from ietf.message.models import Message
 first_dot_on_line_re = re.compile(r'^\.', re.MULTILINE)
 
 def infer_message(s):
-    parsed = email.message_from_string(s.encode("utf-8"))
+    parsed = email.message_from_string(s)
 
     m = Message()
-    m.subject = parsed.get("Subject", "").decode("utf-8")
-    m.frm = parsed.get("From", "").decode("utf-8")
-    m.to = parsed.get("To", "").decode("utf-8")
-    m.cc = parsed.get("Cc", "").decode("utf-8")
-    m.bcc = parsed.get("Bcc", "").decode("utf-8")
-    m.reply_to = parsed.get("Reply-To", "").decode("utf-8")
-    m.body = parsed.get_payload().decode("utf-8")
+    m.subject = parsed.get("Subject", "")
+    m.frm = parsed.get("From", "")
+    m.to = parsed.get("To", "")
+    m.cc = parsed.get("Cc", "")
+    m.bcc = parsed.get("Bcc", "")
+    m.reply_to = parsed.get("Reply-To", "")
+    m.body = parsed.get_payload()
 
     return m
 
diff --git a/ietf/utils/mail.py b/ietf/utils/mail.py
index 7f22acbf3..778582f68 100644
--- a/ietf/utils/mail.py
+++ b/ietf/utils/mail.py
@@ -113,7 +113,7 @@ def send_smtp(msg, bcc=None):
                 # advertise the AUTH capability.
                 server.ehlo()
                 server.login(settings.EMAIL_HOST_USER, settings.EMAIL_HOST_PASSWORD)
-            unhandled = server.sendmail(frm, to, msg.as_string())
+            unhandled = server.sendmail(frm, to, msg.as_bytes())
             if unhandled != {}:
                 raise SMTPSomeRefusedRecipients(message="%d addresses were refused"%len(unhandled),original_msg=msg,refusals=unhandled)
         except Exception as e:
@@ -352,7 +352,7 @@ def send_mail_mime(request, to, frm, subject, msg, cc=None, extra=None, toUser=F
 
 def parse_preformatted(preformatted, extra={}, override={}):
     """Parse preformatted string containing mail with From:, To:, ...,"""
-    msg = message_from_string(preformatted.encode("utf-8"))
+    msg = message_from_string(preformatted)
     msg.set_charset('UTF-8')
 
     for k, v in override.items():
@@ -408,7 +408,7 @@ def send_mail_preformatted(request, preformatted, extra={}, override={}):
     extra headers as needed)."""
 
     (msg, extra, bcc) = parse_preformatted(preformatted, extra, override)
-    txt = msg.get_payload().decode(str(msg.get_charset()))
+    txt = msg.get_payload()
     send_mail_text(request, msg['To'], msg["From"], msg["Subject"], txt, extra=extra, bcc=bcc)
     return msg
 

From 42c620f4aea3fff471553b64132d86d40a06e2fa Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Sat, 29 Jun 2019 13:32:44 +0000
Subject: [PATCH 025/114] Fixed search result ordering where we had comparisons
 between int and str, which is disallowed in py3.  - Legacy-Id: 16335

---
 ietf/doc/utils_search.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/ietf/doc/utils_search.py b/ietf/doc/utils_search.py
index 90093b6ef..6abad12e2 100644
--- a/ietf/doc/utils_search.py
+++ b/ietf/doc/utils_search.py
@@ -163,13 +163,16 @@ def prepare_document_table(request, docs, query=None, max_results=200):
 
     # sort
     def generate_sort_key(d):
+        def num(i):
+            # sortable representation of number as string
+            return ('%09d' % int(i))
+
         res = []
 
         rfc_num = d.rfc_number()
 
-
         if d.type_id == "draft":
-            res.append(["Active", "Expired", "Replaced", "Withdrawn", "RFC"].index(d.search_heading.split()[0]))
+            res.append(num(["Active", "Expired", "Replaced", "Withdrawn", "RFC"].index(d.search_heading.split()[0])))
         else:
             res.append(d.type_id);
             res.append("-");
@@ -182,14 +185,14 @@ def prepare_document_table(request, docs, query=None, max_results=200):
             res.append(str(d.latest_revision_date))
         elif sort_key == "status":
             if rfc_num != None:
-                res.append(int(rfc_num))
+                res.append(num(rfc_num))
             else:
-                res.append(d.get_state().order if d.get_state() else None)
+                res.append(num(d.get_state().order) if d.get_state() else None)
         elif sort_key == "ipr":
             res.append(len(d.ipr()))
         elif sort_key == "ad":
             if rfc_num != None:
-                res.append(int(rfc_num))
+                res.append(num(rfc_num))
             elif d.get_state_slug() == "active":
                 if d.get_state("draft-iesg"):
                     res.append(d.get_state("draft-iesg").order)
@@ -197,7 +200,7 @@ def prepare_document_table(request, docs, query=None, max_results=200):
                     res.append(0)
         else:
             if rfc_num != None:
-                res.append(int(rfc_num))
+                res.append(num(rfc_num))
             else:
                 res.append(d.canonical_name())
 

From 15e74e89cb1ec9b60c9e3bb7302e5388df763f0f Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Sat, 29 Jun 2019 13:43:31 +0000
Subject: [PATCH 026/114] Converted instances of assertTrue(text in
 response.content) to the recommended assertContains(response, text), and
 similar for assertFalse(... in ...)  - Legacy-Id: 16336

---
 ietf/community/tests.py           |  10 +-
 ietf/doc/tests.py                 | 201 +++++++++++++++---------------
 ietf/doc/tests_ballot.py          |  12 +-
 ietf/doc/tests_charter.py         |   4 +-
 ietf/doc/tests_conflict_review.py |   2 +-
 ietf/doc/tests_draft.py           |   2 +-
 ietf/doc/tests_material.py        |   2 +-
 ietf/doc/tests_review.py          |   8 +-
 ietf/doc/tests_status_change.py   |   4 +-
 ietf/group/tests.py               |   4 +-
 ietf/group/tests_info.py          | 114 ++++++++---------
 ietf/group/tests_review.py        |   4 +-
 ietf/iesg/tests.py                |  12 +-
 ietf/ietfauth/tests.py            |   2 +-
 ietf/ipr/tests.py                 |  56 ++++-----
 ietf/liaisons/tests.py            |  26 ++--
 ietf/mailtrigger/tests.py         |   9 +-
 ietf/meeting/tests_views.py       |  56 ++++-----
 ietf/message/tests.py             |   8 +-
 ietf/nomcom/tests.py              |   6 +-
 ietf/secr/sreq/tests.py           |   6 +-
 ietf/stats/tests.py               |   2 +-
 ietf/submit/tests.py              |  12 +-
 ietf/sync/tests.py                |  12 +-
 24 files changed, 286 insertions(+), 288 deletions(-)

diff --git a/ietf/community/tests.py b/ietf/community/tests.py
index b730697c3..f74ca7569 100644
--- a/ietf/community/tests.py
+++ b/ietf/community/tests.py
@@ -96,7 +96,7 @@ class CommunityListTests(TestCase):
         )
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(draft.name in unicontent(r))
+        self.assertContains(r, draft.name)
 
     def test_manage_personal_list(self):
         PersonFactory(user__username='plain')
@@ -118,7 +118,7 @@ class CommunityListTests(TestCase):
         # document shows up on GET
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(draft.name in unicontent(r))
+        self.assertContains(r, draft.name)
 
         # remove document
         r = self.client.post(url, { "action": "remove_document", "document": draft.name })
@@ -259,7 +259,7 @@ class CommunityListTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         # this is a simple-minded test, we don't actually check the fields
-        self.assertTrue(draft.name in unicontent(r))
+        self.assertContains(r, draft.name)
 
     def test_csv_for_group(self):
         draft = WgDraftFactory()
@@ -293,12 +293,12 @@ class CommunityListTests(TestCase):
         )
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(draft.name in unicontent(r))
+        self.assertContains(r, draft.name)
 
         # only significant
         r = self.client.get(url + "?significant=1")
         self.assertEqual(r.status_code, 200)
-        self.assertTrue('' not in unicontent(r))
+        self.assertContains(r, '' not)
 
     def test_feed_for_group(self):
         draft = WgDraftFactory()
diff --git a/ietf/doc/tests.py b/ietf/doc/tests.py
index 66f038e98..bdc7b4758 100644
--- a/ietf/doc/tests.py
+++ b/ietf/doc/tests.py
@@ -56,72 +56,72 @@ class SearchTests(TestCase):
         # no match
         r = self.client.get(base_url + "?activedrafts=on&name=thisisnotadocumentname")
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("no documents match" in str(r.content).lower())
+        self.assertContains(r, "No documents match")
 
         r = self.client.get(base_url + "?rfcs=on&name=xyzzy")
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("no documents match" in unicontent(r).lower())
+        self.assertContains(r, "No documents match")
 
         r = self.client.get(base_url + "?olddrafts=on&name=bar")
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("no documents match" in unicontent(r).lower())
+        self.assertContains(r, "No documents match")
 
         r = self.client.get(base_url + "?olddrafts=on&name=foo")
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("draft-foo-mars-test" in unicontent(r).lower())
+        self.assertContains(r, "draft-foo-mars-test")
 
         # find by rfc/active/inactive
         draft.set_state(State.objects.get(type="draft", slug="rfc"))
         r = self.client.get(base_url + "?rfcs=on&name=%s" % draft.name)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(draft.title in unicontent(r))
+        self.assertContains(r, draft.title)
 
         draft.set_state(State.objects.get(type="draft", slug="active"))
         r = self.client.get(base_url + "?activedrafts=on&name=%s" % draft.name)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(draft.title in unicontent(r))
+        self.assertContains(r, draft.title)
 
         draft.set_state(State.objects.get(type="draft", slug="expired"))
         r = self.client.get(base_url + "?olddrafts=on&name=%s" % draft.name)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(draft.title in unicontent(r))
+        self.assertContains(r, draft.title)
         
         draft.set_state(State.objects.get(type="draft", slug="active"))
 
         # find by title
         r = self.client.get(base_url + "?activedrafts=on&name=%s" % draft.title.split()[0])
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(draft.title in unicontent(r))
+        self.assertContains(r, draft.title)
 
         # find by author
         r = self.client.get(base_url + "?activedrafts=on&by=author&author=%s" % draft.documentauthor_set.first().person.name_parts()[1])
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(draft.title in unicontent(r))
+        self.assertContains(r, draft.title)
 
         # find by group
         r = self.client.get(base_url + "?activedrafts=on&by=group&group=%s" % draft.group.acronym)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(draft.title in unicontent(r))
+        self.assertContains(r, draft.title)
 
         # find by area
         r = self.client.get(base_url + "?activedrafts=on&by=area&area=%s" % draft.group.parent_id)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(draft.title in unicontent(r))
+        self.assertContains(r, draft.title)
 
         # find by area
         r = self.client.get(base_url + "?activedrafts=on&by=area&area=%s" % draft.group.parent_id)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(draft.title in unicontent(r))
+        self.assertContains(r, draft.title)
 
         # find by AD
         r = self.client.get(base_url + "?activedrafts=on&by=ad&ad=%s" % draft.ad_id)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(draft.title in unicontent(r))
+        self.assertContains(r, draft.title)
 
         # find by IESG state
         r = self.client.get(base_url + "?activedrafts=on&by=state&state=%s&substate=" % draft.get_state("draft-iesg").pk)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(draft.title in unicontent(r))
+        self.assertContains(r, draft.title)
 
     def test_search_for_name(self):
         draft = WgDraftFactory(name='draft-ietf-mars-test',group=GroupFactory(acronym='mars',parent=Group.objects.get(acronym='farfut')),authors=[PersonFactory()],ad=PersonFactory())
@@ -211,7 +211,7 @@ class SearchTests(TestCase):
     def test_frontpage(self):
         r = self.client.get("/")
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("Document Search" in unicontent(r))
+        self.assertContains(r, "Document Search")
 
     def test_docs_for_ad(self):
         ad = PersonFactory()
@@ -229,13 +229,11 @@ class SearchTests(TestCase):
         
         r = self.client.get(urlreverse('ietf.doc.views_search.docs_for_ad', kwargs=dict(name=ad.full_name_as_key())))
         self.assertEqual(r.status_code, 200)
-        response_content = unicontent(r)
-        #debug.show('response_content')
-        self.assertTrue(draft.name in response_content)
-        self.assertTrue(rfc.canonical_name() in response_content)
-        self.assertTrue(conflrev.name in response_content)
-        self.assertTrue(statchg.name in response_content)
-        self.assertTrue(charter.name in response_content)
+        self.assertContains(r, draft.name)
+        self.assertContains(r, rfc.canonical_name())
+        self.assertContains(r, conflrev.name)
+        self.assertContains(r, statchg.name)
+        self.assertContains(r, charter.name)
         
 
     def test_drafts_in_last_call(self):
@@ -243,7 +241,7 @@ class SearchTests(TestCase):
         draft.set_state(State.objects.get(type="draft-iesg", slug="lc"))
         r = self.client.get(urlreverse('ietf.doc.views_search.drafts_in_last_call'))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(draft.title in unicontent(r))
+        self.assertContains(r, draft.title)
 
     def test_in_iesg_process(self):
         doc_in_process = IndividualDraftFactory()
@@ -251,8 +249,8 @@ class SearchTests(TestCase):
         doc_not_in_process = IndividualDraftFactory()
         r = self.client.get(urlreverse('ietf.doc.views_search.drafts_in_iesg_process'))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(doc_in_process.title in unicontent(r))
-        self.assertFalse(doc_not_in_process.title in unicontent(r))
+        self.assertContains(r, doc_in_process.title)
+        self.assertNotContains(r, doc_not_in_process.title)
         
     def test_indexes(self):
         draft = IndividualDraftFactory()
@@ -260,12 +258,12 @@ class SearchTests(TestCase):
 
         r = self.client.get(urlreverse('ietf.doc.views_search.index_all_drafts'))
         self.assertEqual(r.status_code, 200)
-        self.assertIn(draft.name, unicontent(r))
-        self.assertIn(rfc.canonical_name().upper(),unicontent(r))
+        self.assertContains(r, draft.name)
+        self.assertContains(r, rfc.canonical_name().upper())
 
         r = self.client.get(urlreverse('ietf.doc.views_search.index_active_drafts'))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(draft.title in unicontent(r))
+        self.assertContains(r, draft.title)
 
     def test_ajax_search_docs(self):
         draft = IndividualDraftFactory()
@@ -509,53 +507,53 @@ Man                    Expires September 22, 2015               [Page 3]
 
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("Active Internet-Draft" in unicontent(r))
-        self.assertTrue("Show full document text" in unicontent(r))
-        self.assertFalse("Deimos street" in unicontent(r))
+        self.assertContains(r, "Active Internet-Draft")
+        self.assertContains(r, "Show full document text")
+        self.assertNotContains(r, "Deimos street")
 
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)) + "?include_text=0")
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("Active Internet-Draft" in unicontent(r))
-        self.assertFalse("Show full document text" in unicontent(r))
-        self.assertTrue("Deimos street" in unicontent(r))
+        self.assertContains(r, "Active Internet-Draft")
+        self.assertNotContains(r, "Show full document text")
+        self.assertContains(r, "Deimos street")
 
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)) + "?include_text=foo")
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("Active Internet-Draft" in unicontent(r))
-        self.assertFalse("Show full document text" in unicontent(r))
-        self.assertTrue("Deimos street" in unicontent(r))
+        self.assertContains(r, "Active Internet-Draft")
+        self.assertNotContains(r, "Show full document text")
+        self.assertContains(r, "Deimos street")
 
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)) + "?include_text=1")
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("Active Internet-Draft" in unicontent(r))
-        self.assertFalse("Show full document text" in unicontent(r))
-        self.assertTrue("Deimos street" in unicontent(r))
+        self.assertContains(r, "Active Internet-Draft")
+        self.assertNotContains(r, "Show full document text")
+        self.assertContains(r, "Deimos street")
 
         self.client.cookies = SimpleCookie({'full_draft': 'on'})
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("Active Internet-Draft" in unicontent(r))
-        self.assertFalse("Show full document text" in unicontent(r))
-        self.assertTrue("Deimos street" in unicontent(r))
+        self.assertContains(r, "Active Internet-Draft")
+        self.assertNotContains(r, "Show full document text")
+        self.assertContains(r, "Deimos street")
 
         self.client.cookies = SimpleCookie({'full_draft': 'off'})
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("Active Internet-Draft" in unicontent(r))
-        self.assertTrue("Show full document text" in unicontent(r))
-        self.assertFalse("Deimos street" in unicontent(r))
+        self.assertContains(r, "Active Internet-Draft")
+        self.assertContains(r, "Show full document text")
+        self.assertNotContains(r, "Deimos street")
 
         self.client.cookies = SimpleCookie({'full_draft': 'foo'})
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("Active Internet-Draft" in unicontent(r))
-        self.assertTrue("Show full document text" in unicontent(r))
-        self.assertFalse("Deimos street" in unicontent(r))
+        self.assertContains(r, "Active Internet-Draft")
+        self.assertContains(r, "Show full document text")
+        self.assertNotContains(r, "Deimos street")
 
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_html", kwargs=dict(name=draft.name)))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("Versions:" in unicontent(r))
-        self.assertTrue("Deimos street" in unicontent(r))
+        self.assertContains(r, "Versions:")
+        self.assertContains(r, "Deimos street")
         q = PyQuery(r.content)
         self.assertEqual(len(q('.rfcmarkup pre')), 4)
         self.assertEqual(len(q('.rfcmarkup span.h1')), 2)
@@ -569,7 +567,7 @@ Man                    Expires September 22, 2015               [Page 3]
 
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("Expired Internet-Draft" in unicontent(r))
+        self.assertContains(r, "Expired Internet-Draft")
 
         # replaced draft
         draft.set_state(State.objects.get(type="draft", slug="repl"))
@@ -588,8 +586,8 @@ Man                    Expires September 22, 2015               [Page 3]
 
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("Replaced Internet-Draft" in unicontent(r))
-        self.assertTrue(replacement.name in unicontent(r))
+        self.assertContains(r, "Replaced Internet-Draft")
+        self.assertContains(r, replacement.name)
         rel.delete()
 
         # draft published as RFC
@@ -610,8 +608,8 @@ Man                    Expires September 22, 2015               [Page 3]
 
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=rfc_alias.name)))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("RFC 123456" in unicontent(r))
-        self.assertTrue(draft.name in unicontent(r))
+        self.assertContains(r, "RFC 123456")
+        self.assertContains(r, draft.name)
 
         # naked RFC - also wierd that we test a PS from the ISE
         rfc = IndividualDraftFactory(
@@ -621,7 +619,7 @@ Man                    Expires September 22, 2015               [Page 3]
             std_level_id="ps")
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=rfc.name)))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("RFC 1234567" in unicontent(r))
+        self.assertContains(r, "RFC 1234567")
 
         # unknown draft
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name="draft-xyz123")))
@@ -658,14 +656,14 @@ Man                    Expires September 22, 2015               [Page 3]
 
             r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
             self.assertEqual(r.status_code, 200)
-            self.assertTrue("%s-01"%docname in unicontent(r))
+            self.assertContains(r, "%s-01"%docname)
     
             r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name,rev="01")))
             self.assertEqual(r.status_code, 302)
      
             r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name,rev="00")))
             self.assertEqual(r.status_code, 200)
-            self.assertTrue("%s-00"%docname in unicontent(r))
+            self.assertContains(r, "%s-00"%docname)
 
 class DocTestCase(TestCase):
     def test_document_charter(self):
@@ -730,12 +728,12 @@ class DocTestCase(TestCase):
 
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_ballot", kwargs=dict(name=doc.name)))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(pos.comment in unicontent(r))
+        self.assertContains(r, pos.comment)
 
         # test with ballot_id
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_ballot", kwargs=dict(name=doc.name, ballot_id=ballot.pk)))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(pos.comment in unicontent(r))
+        self.assertContains(r, pos.comment)
 
         # test popup too while we're at it
         r = self.client.get(urlreverse("ietf.doc.views_doc.ballot_popup", kwargs=dict(name=doc.name, ballot_id=ballot.pk)))
@@ -748,7 +746,7 @@ class DocTestCase(TestCase):
         doc.save_with_history([e])
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_ballot", kwargs=dict(name=doc.name)))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue( '(%s for -%s)' % (pos.comment_time.strftime('%Y-%m-%d'), oldrev) in unicontent(r))
+        self.assertContains(r,  '(%s for -%s)' % (pos.comment_time.strftime('%Y-%m-%d'), oldrev))
         
     def test_document_ballot_needed_positions(self):
         # draft
@@ -758,10 +756,10 @@ class DocTestCase(TestCase):
         create_ballot_if_not_open(None, doc, ad, 'approve')
 
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_ballot", kwargs=dict(name=doc.name)))
-        self.assertTrue('more YES or NO' in unicontent(r))
+        self.assertContains(r, 'more YES or NO')
         Document.objects.filter(pk=doc.pk).update(intended_std_level='inf')
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_ballot", kwargs=dict(name=doc.name)))
-        self.assertFalse('more YES or NO' in unicontent(r))
+        self.assertNotContains(r, 'more YES or NO')
 
         # status change
         DocAlias.objects.create(name='rfc9998').docs.add(IndividualDraftFactory())
@@ -772,16 +770,16 @@ class DocTestCase(TestCase):
         r = self.client.post(urlreverse('ietf.doc.views_status_change.change_state',kwargs=dict(name=doc.name)),dict(new_state=iesgeval_pk))
         self.assertEqual(r.status_code, 302)
         r = self.client.get(r._headers["location"][1])
-        self.assertTrue(">IESG Evaluation<" in unicontent(r))
+        self.assertContains(r, ">IESG Evaluation<")
 
         doc.relateddocument_set.create(target=DocAlias.objects.get(name='rfc9998'),relationship_id='tohist')
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_ballot", kwargs=dict(name=doc.name)))
-        self.assertFalse('Needs a YES' in unicontent(r))
-        self.assertFalse('more YES or NO' in unicontent(r))
+        self.assertNotContains(r, 'Needs a YES')
+        self.assertNotContains(r, 'more YES or NO')
 
         doc.relateddocument_set.create(target=DocAlias.objects.get(name='rfc9999'),relationship_id='tois')
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_ballot", kwargs=dict(name=doc.name)))
-        self.assertTrue('more YES or NO' in unicontent(r))
+        self.assertContains(r, 'more YES or NO')
 
     def test_document_json(self):
         doc = IndividualDraftFactory()
@@ -793,8 +791,7 @@ class DocTestCase(TestCase):
         self.assertEqual(doc.pages,data['pages'])
 
     def test_writeup(self):
-        doc = IndividualDraftFactory(states = [('draft','active'),('draft-iesg','iesg-eva')],
-)
+        doc = IndividualDraftFactory(states = [('draft','active'),('draft-iesg','iesg-eva')],)
 
         appr = WriteupDocEvent.objects.create(
             doc=doc,
@@ -823,9 +820,9 @@ class DocTestCase(TestCase):
         url = urlreverse('ietf.doc.views_doc.document_writeup', kwargs=dict(name=doc.name))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(appr.text in unicontent(r))
-        self.assertTrue(notes.text in unicontent(r))
-        self.assertTrue(rfced_note.text in r.content)
+        self.assertContains(r, appr.text)
+        self.assertContains(r, notes.text)
+        self.assertContains(r, rfced_note.text)
 
     def test_history(self):
         doc = IndividualDraftFactory()
@@ -840,7 +837,7 @@ class DocTestCase(TestCase):
         url = urlreverse('ietf.doc.views_doc.document_history', kwargs=dict(name=doc.name))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(e.desc in unicontent(r))
+        self.assertContains(r, e.desc)
         
     def test_document_feed(self):
         doc = IndividualDraftFactory()
@@ -854,7 +851,7 @@ class DocTestCase(TestCase):
 
         r = self.client.get("/feed/document-changes/%s/" % doc.name)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(e.desc in unicontent(r))
+        self.assertContains(r, e.desc)
 
     def test_last_call_feed(self):
         doc = IndividualDraftFactory()
@@ -871,7 +868,7 @@ class DocTestCase(TestCase):
 
         r = self.client.get("/feed/last-call/")
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(doc.name in unicontent(r))
+        self.assertContains(r, doc.name)
 
     def test_rfc_feed(self):
         WgRfcFactory()
@@ -884,7 +881,7 @@ class DocTestCase(TestCase):
         url = urlreverse('ietf.doc.views_help.state_help', kwargs=dict(type="draft-iesg"))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(State.objects.get(type="draft-iesg", slug="lc").name in unicontent(r))
+        self.assertContains(r, State.objects.get(type="draft-iesg", slug="lc").name)
 
     def test_document_nonietf_pubreq_button(self):
         doc = IndividualDraftFactory()
@@ -892,17 +889,17 @@ class DocTestCase(TestCase):
         self.client.login(username='iab-chair', password='iab-chair+password')
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
         self.assertEqual(r.status_code, 200)
-        self.assertNotIn("Request publication", unicontent(r))
+        self.assertNotContains(r, "Request publication")
 
         Document.objects.filter(pk=doc.pk).update(stream='iab')
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
         self.assertEqual(r.status_code, 200)
-        self.assertIn("Request publication", unicontent(r))
+        self.assertContains(r, "Request publication")
 
         doc.states.add(State.objects.get(type_id='draft-stream-iab',slug='rfc-edit'))
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
         self.assertEqual(r.status_code, 200)
-        self.assertNotIn("Request publication", unicontent(r))
+        self.assertNotContains(r, "Request publication")
 
 
     def test_document_bibtex(self):
@@ -918,7 +915,7 @@ class DocTestCase(TestCase):
         #
         url = urlreverse('ietf.doc.views_doc.document_bibtex', kwargs=dict(name=rfc.name))
         r = self.client.get(url)
-        entry = bibtexparser.loads(r.content).get_entry_dict()["rfc%s"%num]
+        entry = bibtexparser.loads(unicontent(r)).get_entry_dict()["rfc%s"%num]
         self.assertEqual(entry['series'],   'Request for Comments')
         self.assertEqual(entry['number'],   num)
         self.assertEqual(entry['doi'],      '10.17487/RFC%s'%num)
@@ -938,7 +935,7 @@ class DocTestCase(TestCase):
         #
         url = urlreverse('ietf.doc.views_doc.document_bibtex', kwargs=dict(name=april1.name))
         r = self.client.get(url)
-        entry = bibtexparser.loads(r.content).get_entry_dict()['rfc%s'%num]
+        entry = bibtexparser.loads(unicontent(r)).get_entry_dict()['rfc%s'%num]
         self.assertEqual(entry['series'],   'Request for Comments')
         self.assertEqual(entry['number'],   num)
         self.assertEqual(entry['doi'],      '10.17487/RFC%s'%num)
@@ -951,7 +948,7 @@ class DocTestCase(TestCase):
         bibname = docname[6:]           # drop the 'draft-' prefix
         url = urlreverse('ietf.doc.views_doc.document_bibtex', kwargs=dict(name=draft.name))
         r = self.client.get(url)
-        entry = bibtexparser.loads(r.content).get_entry_dict()[bibname]
+        entry = bibtexparser.loads(unicontent(r)).get_entry_dict()[bibname]
         self.assertEqual(entry['note'],     'Work in Progress')
         self.assertEqual(entry['number'],   docname)
         self.assertEqual(entry['year'],     str(draft.pub_date().year))
@@ -969,7 +966,7 @@ class AddCommentTestCase(TestCase):
         # normal get
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        q = PyQuery(r.content)
+        q = PyQuery(unicontent(r))
         self.assertEqual(len(q('form textarea[name=comment]')), 1)
 
         # request resurrect
@@ -983,9 +980,9 @@ class AddCommentTestCase(TestCase):
         self.assertEqual("This is a test.", draft.latest_event().desc)
         self.assertEqual("added_comment", draft.latest_event().type)
         self.assertEqual(len(outbox), mailbox_before + 1)
-        self.assertTrue("Comment added" in outbox[-1]['Subject'])
-        self.assertTrue(draft.name in outbox[-1]['Subject'])
-        self.assertTrue('draft-ietf-mars-test@' in outbox[-1]['To'])
+        self.assertIn("Comment added", outbox[-1]['Subject'])
+        self.assertIn(draft.name, outbox[-1]['Subject'])
+        self.assertIn('draft-ietf-mars-test@', outbox[-1]['To'])
 
         # Make sure we can also do it as IANA
         self.client.login(username="iana", password="iana+password")
@@ -993,7 +990,7 @@ class AddCommentTestCase(TestCase):
         # normal get
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        q = PyQuery(r.content)
+        q = PyQuery(unicontent(r))
         self.assertEqual(len(q('form textarea[name=comment]')), 1)
 
 
@@ -1013,11 +1010,11 @@ class ReferencesTest(TestCase):
         url = urlreverse('ietf.doc.views_doc.document_references', kwargs=dict(name=doc1.name))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(doc2.name in unicontent(r))
+        self.assertContains(r, doc2.name)
         url = urlreverse('ietf.doc.views_doc.document_referenced_by', kwargs=dict(name=doc2.name))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(doc1.name in unicontent(r))
+        self.assertContains(r, doc1.name)
        
 
 class EmailAliasesTests(TestCase):
@@ -1025,7 +1022,7 @@ class EmailAliasesTests(TestCase):
     def setUp(self):
         WgDraftFactory(name='draft-ietf-mars-test',group__acronym='mars')
         WgDraftFactory(name='draft-ietf-ames-test',group__acronym='ames')
-        self.doc_alias_file = NamedTemporaryFile(delete=False)
+        self.doc_alias_file = NamedTemporaryFile(delete=False, encoding='utf-8', mode='w+')
         self.doc_alias_file.write("""# Generated by hand at 2015-02-12_16:26:45
 virtual.ietf.org anything
 draft-ietf-mars-test@ietf.org              xfilter-draft-ietf-mars-test
@@ -1071,8 +1068,8 @@ expand-draft-ietf-ames-test.all@virtual.ietf.org  ames-author@example.ames, ames
         url = urlreverse('ietf.doc.views_doc.document_email', kwargs=dict(name="draft-ietf-mars-test"))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue('draft-ietf-mars-test.all@ietf.org' in unicontent(r))
-        self.assertTrue('ballot_saved' in unicontent(r))
+        self.assertContains(r, 'draft-ietf-mars-test.all@ietf.org')
+        self.assertContains(r, 'ballot_saved')
 
 class DocumentMeetingTests(TestCase):
 
@@ -1266,17 +1263,17 @@ class ChartTests(ResourceTestCaseMixin, TestCase):
         # No qurey arguments; expect an empty json object
         r = self.client.get(conf_url)
         self.assertValidJSONResponse(r)
-        self.assertEqual(r.content, '{}')
+        self.assertEqual(unicontent(r), '{}')
 
         # No match
         r = self.client.get(conf_url + '?activedrafts=on&name=thisisnotadocumentname')
         self.assertValidJSONResponse(r)
-        d = json.loads(r.content)
+        d = json.loads(unicontent(r))
         self.assertEqual(d['chart']['type'], settings.CHART_TYPE_COLUMN_OPTIONS['chart']['type'])
 
         r = self.client.get(conf_url + '?activedrafts=on&name=%s'%doc.name[6:12])
         self.assertValidJSONResponse(r)
-        d = json.loads(r.content)
+        d = json.loads(unicontent(r))
         self.assertEqual(d['chart']['type'], settings.CHART_TYPE_COLUMN_OPTIONS['chart']['type'])
         self.assertEqual(len(d['series'][0]['data']), 0)
 
@@ -1288,17 +1285,17 @@ class ChartTests(ResourceTestCaseMixin, TestCase):
         # No qurey arguments; expect an empty json list
         r = self.client.get(data_url)
         self.assertValidJSONResponse(r)
-        self.assertEqual(r.content, '[]')
+        self.assertEqual(unicontent(r), '[]')
 
         # No match
         r = self.client.get(data_url + '?activedrafts=on&name=thisisnotadocumentname')
         self.assertValidJSONResponse(r)
-        d = json.loads(r.content)
-        self.assertEqual(r.content, '[]')
+        d = json.loads(unicontent(r))
+        self.assertEqual(unicontent(r), '[]')
 
         r = self.client.get(data_url + '?activedrafts=on&name=%s'%doc.name[6:12])
         self.assertValidJSONResponse(r)
-        d = json.loads(r.content)
+        d = json.loads(unicontent(r))
         self.assertEqual(len(d), 1)
         self.assertEqual(len(d[0]), 2)
 
@@ -1322,7 +1319,7 @@ class ChartTests(ResourceTestCaseMixin, TestCase):
 
         r = self.client.get(conf_url)
         self.assertValidJSONResponse(r)
-        d = json.loads(r.content)
+        d = json.loads(unicontent(r))
         self.assertEqual(d['chart']['type'], settings.CHART_TYPE_COLUMN_OPTIONS['chart']['type'])
         self.assertEqual("New draft revisions over time for %s" % person.name, d['title']['text'])
 
@@ -1330,7 +1327,7 @@ class ChartTests(ResourceTestCaseMixin, TestCase):
 
         r = self.client.get(data_url)
         self.assertValidJSONResponse(r)
-        d = json.loads(r.content)
+        d = json.loads(unicontent(r))
         self.assertEqual(len(d), 1)
         self.assertEqual(len(d[0]), 2)
 
diff --git a/ietf/doc/tests_ballot.py b/ietf/doc/tests_ballot.py
index 59e195dfb..9284f8172 100644
--- a/ietf/doc/tests_ballot.py
+++ b/ietf/doc/tests_ballot.py
@@ -363,7 +363,7 @@ class BallotWriteupsTests(TestCase):
         q = PyQuery(r.content)
         self.assertEqual(len(q('textarea[name=ballot_writeup]')), 1)
         self.assertTrue(q('[type=submit]:contains("Save")'))
-        self.assertTrue("IANA does not" in unicontent(r))
+        self.assertContains(r, "IANA does not")
 
         # save
         r = self.client.post(url, dict(
@@ -393,8 +393,8 @@ class BallotWriteupsTests(TestCase):
         q = PyQuery(r.content)
         self.assertEqual(len(q('textarea[name=rfc_editor_note]')), 1)
         self.assertTrue(q('[type=submit]:contains("Save")'))
-        self.assertTrue("" in r.content)
-        self.assertTrue("This is a note for the RFC Editor" in r.content)
+        self.assertContains(r, "")
+        self.assertContains(r, "This is a note for the RFC Editor")
 
         # save with a note
         empty_outbox()
@@ -734,13 +734,13 @@ class ApproveBallotTests(TestCase):
         login_testing_unauthorized(self, "ad", url)
         r = self.client.get(url)
         self.assertEqual(r.status_code, 403)
-        self.assertTrue("Restricted to role Secretariat" in r.content)
+        self.assertContains(r, "Restricted to role Secretariat")
 
         # There are no downrefs, the page should say so
         login_testing_unauthorized(self, "secretary", url)
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("No downward references for" in r.content)
+        self.assertContains(r, "No downward references for")
 
         # Add a downref, the page should ask if it should be added to the registry
         rel = draft.relateddocument_set.create(target=rfc.docalias.get(name='rfc6666'),relationship_id='refnorm')
@@ -748,7 +748,7 @@ class ApproveBallotTests(TestCase):
         original_len = len(d)
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("normatively references rfc6666" in r.content)
+        self.assertContains(r, "normatively references rfc6666")
 
         # POST with the downref checked
         r = self.client.post(url, dict(checkboxes=rel.pk))
diff --git a/ietf/doc/tests_charter.py b/ietf/doc/tests_charter.py
index e30211e78..e38cf2c33 100644
--- a/ietf/doc/tests_charter.py
+++ b/ietf/doc/tests_charter.py
@@ -394,7 +394,7 @@ class EditCharterTests(TestCase):
 
         r = self.client.post(url, dict(txt=test_file))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("does not appear to be a text file" in unicontent(r))
+        self.assertContains(r, "does not appear to be a text file")
 
         # post
         prev_rev = charter.rev
@@ -696,7 +696,7 @@ class EditCharterTests(TestCase):
         url = urlreverse('ietf.doc.views_charter.charter_with_milestones_txt', kwargs=dict(name=charter.name, rev=charter.rev))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(m.desc in unicontent(r))
+        self.assertContains(r, m.desc)
 
     def test_chartering_from_bof(self):
         ad_role = RoleFactory(group__type_id='area',name_id='ad')
diff --git a/ietf/doc/tests_conflict_review.py b/ietf/doc/tests_conflict_review.py
index 7dcb33410..b328af217 100644
--- a/ietf/doc/tests_conflict_review.py
+++ b/ietf/doc/tests_conflict_review.py
@@ -368,7 +368,7 @@ class ConflictReviewSubmitTests(TestCase):
         test_file.name = "unnamed"
         r = self.client.post(url, dict(txt=test_file,submit_response="1"))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("does not appear to be a text file" in unicontent(r))
+        self.assertContains(r, "does not appear to be a text file")
 
         # sane post uploading a file
         test_file = StringIO("This is a new proposal.")
diff --git a/ietf/doc/tests_draft.py b/ietf/doc/tests_draft.py
index fec704051..c728f477b 100644
--- a/ietf/doc/tests_draft.py
+++ b/ietf/doc/tests_draft.py
@@ -210,7 +210,7 @@ class ChangeStateTests(TestCase):
         self.assertTrue(not draft.latest_event(type="changed_ballot_writeup_text"))
         r = self.client.post(url, dict(state=State.objects.get(used=True, type="draft-iesg", slug="lc-req").pk))
         self.assertEqual(r.status_code,200)
-        self.assertTrue("Your request to issue" in unicontent(r))
+        self.assertContains(r, "Your request to issue")
 
         # last call text
         e = draft.latest_event(WriteupDocEvent, type="changed_last_call_text")
diff --git a/ietf/doc/tests_material.py b/ietf/doc/tests_material.py
index b6028b4c8..1640e38db 100644
--- a/ietf/doc/tests_material.py
+++ b/ietf/doc/tests_material.py
@@ -68,7 +68,7 @@ class GroupMaterialTests(TestCase):
         # normal get
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("Slides" in unicontent(r))
+        self.assertContains(r, "Slides")
 
         url = urlreverse('ietf.doc.views_material.choose_material_type', kwargs=dict(acronym='mars'))
         r = self.client.get(url)
diff --git a/ietf/doc/tests_review.py b/ietf/doc/tests_review.py
index 49dd19bd6..ee55251bf 100644
--- a/ietf/doc/tests_review.py
+++ b/ietf/doc/tests_review.py
@@ -193,7 +193,7 @@ class ReviewTests(TestCase):
         self.client.login(username="reviewsecretary", password="reviewsecretary+password")
         r = self.client.get(req_url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(close_url in unicontent(r))
+        self.assertContains(r, close_url)
         self.client.logout()
 
         # get close page
@@ -381,7 +381,7 @@ class ReviewTests(TestCase):
         self.client.login(username="reviewsecretary", password="reviewsecretary+password")
         r = self.client.get(req_url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(assign_url in unicontent(r))
+        self.assertContains(r, assign_url)
         self.client.logout()
 
         # get assign page
@@ -455,14 +455,14 @@ class ReviewTests(TestCase):
         self.client.login(username="reviewsecretary", password="reviewsecretary+password")
         r = self.client.get(req_url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(reject_url in unicontent(r))
+        self.assertContains(r, reject_url)
         self.client.logout()
 
         # get reject page
         login_testing_unauthorized(self, "reviewsecretary", reject_url)
         r = self.client.get(reject_url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(str(assignment.reviewer.person) in unicontent(r))
+        self.assertContains(r, str(assignment.reviewer.person))
 
         # reject
         empty_outbox()
diff --git a/ietf/doc/tests_status_change.py b/ietf/doc/tests_status_change.py
index 4807b3f5c..0183cf31e 100644
--- a/ietf/doc/tests_status_change.py
+++ b/ietf/doc/tests_status_change.py
@@ -456,7 +456,7 @@ class StatusChangeSubmitTests(TestCase):
         test_file.name = "unnamed"
         r = self.client.post(url, dict(txt=test_file,submit_response="1"))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("does not appear to be a text file" in unicontent(r))
+        self.assertContains(r, "does not appear to be a text file")
 
         # sane post uploading a file
         test_file = StringIO("This is a new proposal.")
@@ -481,7 +481,7 @@ class StatusChangeSubmitTests(TestCase):
         url = urlreverse('ietf.doc.views_doc.document_main',kwargs=dict(name=doc.name,rev='00'))
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
-        self.assertTrue("This is the old proposal." in unicontent(r))
+        self.assertContains(r, "This is the old proposal.")
 
     def setUp(self):
         DocumentFactory(type_id='statchg',name='status-change-imaginary-mid-review',notify='notify@example.org')
diff --git a/ietf/group/tests.py b/ietf/group/tests.py
index eb0acba7f..72fd4552f 100644
--- a/ietf/group/tests.py
+++ b/ietf/group/tests.py
@@ -39,7 +39,7 @@ class StreamTests(TestCase):
     def test_streams(self):
         r = self.client.get(urlreverse("ietf.group.views.streams"))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("Independent Submission Editor" in unicontent(r))
+        self.assertContains(r, "Independent Submission Editor")
 
     def test_stream_documents(self):
         draft = DocumentFactory(type_id='draft',group__acronym='iab',states=[('draft','active')])
@@ -48,7 +48,7 @@ class StreamTests(TestCase):
 
         r = self.client.get(urlreverse("ietf.group.views.stream_documents", kwargs=dict(acronym="iab")))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(draft.name in unicontent(r))
+        self.assertContains(r, draft.name)
 
     def test_stream_edit(self):
         EmailFactory(address="ad2@ietf.org")
diff --git a/ietf/group/tests_info.py b/ietf/group/tests_info.py
index d4f347911..3f8be633f 100644
--- a/ietf/group/tests_info.py
+++ b/ietf/group/tests_info.py
@@ -66,10 +66,10 @@ class GroupPagesTests(TestCase):
         url = urlreverse('ietf.group.views.active_groups', kwargs=dict(group_type="wg"))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(group.parent.name in unicontent(r))
-        self.assertTrue(group.acronym in unicontent(r))
-        self.assertTrue(group.name in unicontent(r))
-        self.assertTrue(group.ad_role().person.plain_name() in unicontent(r))
+        self.assertContains(r, group.parent.name)
+        self.assertContains(r, group.acronym)
+        self.assertContains(r, group.name)
+        self.assertContains(r, group.ad_role().person.plain_name())
 
         for t in ('rg','area','ag','dir','review','team','program'):
             g = GroupFactory.create(type_id=t,state_id='active') 
@@ -79,13 +79,13 @@ class GroupPagesTests(TestCase):
             url = urlreverse('ietf.group.views.active_groups', kwargs=dict(group_type=t))
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
-            self.assertTrue(g.acronym in unicontent(r))
+            self.assertContains(r, g.acronym)
 
         url = urlreverse('ietf.group.views.active_groups', kwargs=dict())
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("Directorate" in unicontent(r))
-        self.assertTrue("AG" in unicontent(r))
+        self.assertContains(r, "Directorate")
+        self.assertContains(r, "AG")
 
         for slug in GroupTypeName.objects.exclude(slug__in=['wg','rg','ag','area','dir','review','team', 'program']).values_list('slug',flat=True):
             with self.assertRaises(NoReverseMatch):
@@ -103,12 +103,12 @@ class GroupPagesTests(TestCase):
             r = self.client.get(url)
             self.assertRedirects(r, next)
             r = self.client.get(next)
-            self.assertTrue(group.acronym in unicontent(r))
-            self.assertTrue(group.name in unicontent(r))
+            self.assertContains(r, group.acronym)
+            self.assertContains(r, group.name)
             for word in ['Documents', 'Date', 'Status', 'IPR', 'AD', 'Shepherd']:
-                self.assertTrue(word in unicontent(r))
-            self.assertTrue(draft.name in unicontent(r))
-            self.assertTrue(draft.title in unicontent(r))
+                self.assertContains(r, word)
+            self.assertContains(r, draft.name)
+            self.assertContains(r, draft.title)
 
     def test_wg_summaries(self):
         group = CharterFactory(group__type_id='wg',group__parent=GroupFactory(type_id='area')).group
@@ -123,35 +123,35 @@ class GroupPagesTests(TestCase):
         url = urlreverse('ietf.group.views.wg_summary_area', kwargs=dict(group_type="wg"))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(group.parent.name in unicontent(r))
-        self.assertTrue(group.acronym in unicontent(r))
-        self.assertTrue(group.name in unicontent(r))
-        self.assertTrue(chair.address in unicontent(r))
+        self.assertContains(r, group.parent.name)
+        self.assertContains(r, group.acronym)
+        self.assertContains(r, group.name)
+        self.assertContains(r, chair.address)
 
         url = urlreverse('ietf.group.views.wg_summary_acronym', kwargs=dict(group_type="wg"))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(group.acronym in unicontent(r))
-        self.assertTrue(group.name in unicontent(r))
-        self.assertTrue(chair.address in unicontent(r))
+        self.assertContains(r, group.acronym)
+        self.assertContains(r, group.name)
+        self.assertContains(r, chair.address)
         
         url = urlreverse('ietf.group.views.wg_charters', kwargs=dict(group_type="wg"))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(group.acronym in unicontent(r))
-        self.assertTrue(group.name in unicontent(r))
-        self.assertTrue(group.ad_role().person.plain_name() in unicontent(r))
-        self.assertTrue(chair.address in unicontent(r))
-        self.assertTrue("This is a charter." in unicontent(r))
+        self.assertContains(r, group.acronym)
+        self.assertContains(r, group.name)
+        self.assertContains(r, group.ad_role().person.plain_name())
+        self.assertContains(r, chair.address)
+        self.assertContains(r, "This is a charter.")
 
         url = urlreverse('ietf.group.views.wg_charters_by_acronym', kwargs=dict(group_type="wg"))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(group.acronym in unicontent(r))
-        self.assertTrue(group.name in unicontent(r))
-        self.assertTrue(group.ad_role().person.plain_name() in unicontent(r))
-        self.assertTrue(chair.address in unicontent(r))
-        self.assertTrue("This is a charter." in unicontent(r))
+        self.assertContains(r, group.acronym)
+        self.assertContains(r, group.name)
+        self.assertContains(r, group.ad_role().person.plain_name())
+        self.assertContains(r, chair.address)
+        self.assertContains(r, "This is a charter.")
 
     def test_chartering_groups(self):
         group = CharterFactory(group__type_id='wg',group__parent=GroupFactory(type_id='area'),states=[('charter','intrev')]).group
@@ -209,10 +209,10 @@ class GroupPagesTests(TestCase):
         for url in group_urlreverse_list(group, 'ietf.group.views.group_documents'):
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
-            self.assertTrue(draft.name in unicontent(r))
-            self.assertTrue(group.name in unicontent(r))
-            self.assertTrue(group.acronym in unicontent(r))
-            self.assertTrue(draft2.name in unicontent(r))
+            self.assertContains(r, draft.name)
+            self.assertContains(r, group.name)
+            self.assertContains(r, group.acronym)
+            self.assertContains(r, draft2.name)
 
         # Make sure that a logged in user is presented with an opportunity to add results to their community list
         self.client.login(username="secretary", password="secretary+password")
@@ -224,8 +224,8 @@ class GroupPagesTests(TestCase):
         for url in group_urlreverse_list(group, 'ietf.group.views.group_documents_txt'):
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
-            self.assertTrue(draft.name in unicontent(r))
-            self.assertTrue(draft2.name in unicontent(r))
+            self.assertContains(r, draft.name)
+            self.assertContains(r, draft2.name)
 
     def test_group_charter(self):
         group = CharterFactory().group
@@ -244,11 +244,11 @@ class GroupPagesTests(TestCase):
         for url in [group.about_url(),] + group_urlreverse_list(group, 'ietf.group.views.group_about'):
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
-            self.assertTrue(group.name in unicontent(r))
-            self.assertTrue(group.acronym in unicontent(r))
-            self.assertTrue("This is a charter." in unicontent(r))
-            self.assertTrue(milestone.desc in unicontent(r))
-            self.assertTrue(milestone.docs.all()[0].name in unicontent(r))
+            self.assertContains(r, group.name)
+            self.assertContains(r, group.acronym)
+            self.assertContains(r, "This is a charter.")
+            self.assertContains(r, milestone.desc)
+            self.assertContains(r, milestone.docs.all()[0].name)
 
     def test_group_about(self):
 
@@ -306,9 +306,9 @@ class GroupPagesTests(TestCase):
                 url = group.about_url()
                 r = self.client.get(url)
                 self.assertEqual(r.status_code, 200)
-                self.assertTrue(group.name in unicontent(r))
-                self.assertTrue(group.acronym in unicontent(r))
-                self.assertTrue(group.description in unicontent(r))
+                self.assertContains(r, group.name)
+                self.assertContains(r, group.acronym)
+                self.assertContains(r, group.description)
     
             for url in group_urlreverse_list(group, 'ietf.group.views.edit'):
     
@@ -334,8 +334,8 @@ class GroupPagesTests(TestCase):
         for url in group_urlreverse_list(group, 'ietf.group.views.materials'):
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
-            self.assertTrue(doc.title in unicontent(r))
-            self.assertTrue(doc.name in unicontent(r))
+            self.assertContains(r, doc.title)
+            self.assertContains(r, doc.name)
 
         url =  urlreverse("ietf.group.views.materials", kwargs={ 'acronym': group.acronym })
 
@@ -344,7 +344,7 @@ class GroupPagesTests(TestCase):
 
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(doc.title not in unicontent(r))
+        self.assertContains(r, doc.title not)
 
     def test_history(self):
         group = GroupFactory()
@@ -358,7 +358,7 @@ class GroupPagesTests(TestCase):
         for url in group_urlreverse_list(group, 'ietf.group.views.history'):
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
-            self.assertTrue(e.desc in unicontent(r))
+            self.assertContains(r, e.desc)
 
     def test_feed(self):
         group = CharterFactory().group
@@ -378,8 +378,8 @@ class GroupPagesTests(TestCase):
 
         r = self.client.get("/feed/group-changes/%s/" % group.acronym)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(ge.desc in unicontent(r))
-        self.assertTrue(de.desc in unicontent(r))
+        self.assertContains(r, ge.desc)
+        self.assertContains(r, de.desc)
 
 
     def test_chair_photos(self):
@@ -790,8 +790,8 @@ class MilestoneTests(TestCase):
 
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
-            self.assertTrue(m1.desc in unicontent(r))
-            self.assertTrue(m2.desc not in unicontent(r))
+            self.assertContains(r, m1.desc)
+            self.assertContains(r, m2.desc not)
             self.client.logout()
 
         login_testing_unauthorized(self, "secretary", url)
@@ -799,8 +799,8 @@ class MilestoneTests(TestCase):
         for url in group_urlreverse_list(group, 'ietf.group.milestones.edit_milestones;charter'):
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
-            self.assertTrue(m1.desc not in unicontent(r))
-            self.assertTrue(m2.desc in unicontent(r))
+            self.assertContains(r, m1.desc not)
+            self.assertContains(r, m2.desc)
 
     def test_add_milestone(self):
         m1, m2, group = self.create_test_milestones()
@@ -1148,7 +1148,7 @@ expand-ames-chairs@virtual.ietf.org                              mars_chair@ietf
         url = urlreverse('ietf.group.views.email_aliases', kwargs=dict(group_type="wg"))
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
-        self.assertTrue('mars-ads@' in unicontent(r))
+        self.assertContains(r, 'mars-ads@')
 
         url = urlreverse('ietf.group.views.email_aliases', kwargs=dict(group_type="rg"))
         r = self.client.get(url)
@@ -1159,9 +1159,9 @@ expand-ames-chairs@virtual.ietf.org                              mars_chair@ietf
         url = urlreverse('ietf.group.views.email', kwargs=dict(acronym="mars"))
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
-        self.assertTrue('Email aliases' in unicontent(r))
-        self.assertTrue('mars-ads@ietf.org' in unicontent(r))
-        self.assertTrue('group_personnel_change' in unicontent(r))
+        self.assertContains(r, 'Email aliases')
+        self.assertContains(r, 'mars-ads@ietf.org')
+        self.assertContains(r, 'group_personnel_change')
  
 
 
diff --git a/ietf/group/tests_review.py b/ietf/group/tests_review.py
index 65000b939..7c9a5bfcf 100644
--- a/ietf/group/tests_review.py
+++ b/ietf/group/tests_review.py
@@ -51,7 +51,7 @@ class ReviewTests(TestCase):
 
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(review_req.doc.name in unicontent(r))
+        self.assertContains(r, review_req.doc.name)
 
     def test_suggested_review_requests(self):
         review_req = ReviewRequestFactory(state_id='assigned')
@@ -198,7 +198,7 @@ class ReviewTests(TestCase):
         # get
         r = self.client.get(unassigned_url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(review_req1.doc.name in unicontent(r))
+        self.assertContains(r, review_req1.doc.name)
 
         # Test that conflicts are detected
         r = self.client.post(unassigned_url, {
diff --git a/ietf/iesg/tests.py b/ietf/iesg/tests.py
index a7a008cd0..bdb7d33ec 100644
--- a/ietf/iesg/tests.py
+++ b/ietf/iesg/tests.py
@@ -42,8 +42,8 @@ class IESGTests(TestCase):
         r = self.client.get(urlreverse("ietf.iesg.views.discusses"))
         self.assertEqual(r.status_code, 200)
 
-        self.assertTrue(draft.name in unicontent(r))
-        self.assertTrue(pos.ad.plain_name() in unicontent(r))
+        self.assertContains(r, draft.name)
+        self.assertContains(r, pos.ad.plain_name())
 
     def test_milestones_needing_review(self):
         draft = WgDraftFactory()
@@ -58,7 +58,7 @@ class IESGTests(TestCase):
         login_testing_unauthorized(self, "ad", url)
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(m.desc in unicontent(r))
+        self.assertContains(r, m.desc)
         draft.group.state_id = 'conclude'
         draft.group.save()
         r = self.client.get(url)
@@ -79,7 +79,7 @@ class IESGTests(TestCase):
 
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(draft.name in unicontent(r))
+        self.assertContains(r, draft.name)
 
     def test_photos(self):
         url = urlreverse("ietf.iesg.views.photos")
@@ -305,8 +305,8 @@ class IESGAgendaTests(TestCase):
         self.assertEqual(r.status_code, 200)
 
         for d in list(self.telechat_docs.values()):
-            self.assertTrue(d.name in unicontent(r))
-            self.assertTrue(d.title in unicontent(r))
+            self.assertContains(r, d.name)
+            self.assertContains(r, d.title)
 
     def test_agenda_json(self):
         r = self.client.get(urlreverse("ietf.iesg.views.agenda_json"))
diff --git a/ietf/ietfauth/tests.py b/ietf/ietfauth/tests.py
index 03cbe9ef5..958784f4a 100644
--- a/ietf/ietfauth/tests.py
+++ b/ietf/ietfauth/tests.py
@@ -379,7 +379,7 @@ class IetfAuthTests(TestCase):
         # get
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(review_req.doc.name in unicontent(r))
+        self.assertContains(r, review_req.doc.name)
 
         # wish to review
         r = self.client.post(url, {
diff --git a/ietf/ipr/tests.py b/ietf/ipr/tests.py
index 557a6a9ac..5a4c656d1 100644
--- a/ietf/ipr/tests.py
+++ b/ietf/ipr/tests.py
@@ -73,13 +73,13 @@ class IprTests(TestCase):
         ipr = HolderIprDisclosureFactory()
         r = self.client.get(urlreverse("ietf.ipr.views.showlist"))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(ipr.title in unicontent(r))
+        self.assertContains(r, ipr.title)
 
     def test_show_posted(self):
         ipr = HolderIprDisclosureFactory()
         r = self.client.get(urlreverse("ietf.ipr.views.show", kwargs=dict(id=ipr.pk)))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(ipr.title in unicontent(r))
+        self.assertContains(r, ipr.title)
         
     def test_show_parked(self):
         ipr = HolderIprDisclosureFactory(state_id='parked')
@@ -100,21 +100,21 @@ class IprTests(TestCase):
         ipr = HolderIprDisclosureFactory(state_id='removed')
         r = self.client.get(urlreverse("ietf.ipr.views.show", kwargs=dict(id=ipr.pk)))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue('This IPR disclosure was removed' in unicontent(r))
+        self.assertContains(r, 'This IPR disclosure was removed')
         
     def test_ipr_history(self):
         ipr = HolderIprDisclosureFactory()
         r = self.client.get(urlreverse("ietf.ipr.views.history", kwargs=dict(id=ipr.pk)))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(ipr.title in unicontent(r))
+        self.assertContains(r, ipr.title)
 
     def test_iprs_for_drafts(self):
         draft=WgDraftFactory()
         ipr = HolderIprDisclosureFactory(docs=[draft,])
         r = self.client.get(urlreverse("ietf.ipr.views.by_draft_txt"))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(draft.name in unicontent(r))
-        self.assertTrue(str(ipr.pk) in unicontent(r))
+        self.assertContains(r, draft.name)
+        self.assertContains(r, str(ipr.pk))
 
     def test_iprs_for_drafts_recursive(self):
         draft = WgDraftFactory(relations=[('replaces', IndividualDraftFactory())])
@@ -122,15 +122,15 @@ class IprTests(TestCase):
         replaced = draft.all_related_that_doc('replaces')
         r = self.client.get(urlreverse("ietf.ipr.views.by_draft_recursive_txt"))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(draft.name in unicontent(r))
+        self.assertContains(r, draft.name)
         for alias in replaced:
-            self.assertTrue(alias.name in unicontent(r))
-        self.assertTrue(str(ipr.pk) in unicontent(r))
+            self.assertContains(r, alias.name)
+        self.assertContains(r, str(ipr.pk))
 
     def test_about(self):
         r = self.client.get(urlreverse("ietf.ipr.views.about"))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("File a disclosure" in unicontent(r))
+        self.assertContains(r, "File a disclosure")
 
     def test_search(self):
         WgDraftFactory() # The test matching the prefix "draft" needs more than one thing to find
@@ -147,66 +147,66 @@ class IprTests(TestCase):
         # find by id
         r = self.client.get(url + "?submit=draft&id=%s" % draft.name)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(ipr.title in unicontent(r))
+        self.assertContains(r, ipr.title)
 
         # find draft
         r = self.client.get(url + "?submit=draft&draft=%s" % draft.name)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(ipr.title in unicontent(r))
+        self.assertContains(r, ipr.title)
 
         # search + select document
         r = self.client.get(url + "?submit=draft&draft=draft")
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(draft.name in unicontent(r))
-        self.assertTrue(ipr.title not in unicontent(r))
+        self.assertContains(r, draft.name)
+        self.assertContains(r, ipr.title not)
 
         DocAlias.objects.create(name="rfc321").docs.add(draft)
 
         # find RFC
         r = self.client.get(url + "?submit=rfc&rfc=321")
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(ipr.title in unicontent(r))
+        self.assertContains(r, ipr.title)
 
         # find by patent owner
         r = self.client.get(url + "?submit=holder&holder=%s" % ipr.holder_legal_name)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(ipr.title in unicontent(r))
+        self.assertContains(r, ipr.title)
         
         # find by patent info
         r = self.client.get(url + "?submit=patent&patent=%s" % ipr.patent_info)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(ipr.title in unicontent(r))
+        self.assertContains(r, ipr.title)
 
         r = self.client.get(url + "?submit=patent&patent=US12345")
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(ipr.title in unicontent(r))
+        self.assertContains(r, ipr.title)
 
         # find by group acronym
         r = self.client.get(url + "?submit=group&group=%s" % draft.group.pk)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(ipr.title in unicontent(r))
+        self.assertContains(r, ipr.title)
 
         # find by doc title
         r = self.client.get(url + "?submit=doctitle&doctitle=%s" % urllib.parse.quote(draft.title))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(ipr.title in unicontent(r))
+        self.assertContains(r, ipr.title)
 
         # find by ipr title
         r = self.client.get(url + "?submit=iprtitle&iprtitle=%s" % urllib.parse.quote(ipr.title))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(ipr.title in unicontent(r))
+        self.assertContains(r, ipr.title)
 
     def test_feed(self):
         ipr = HolderIprDisclosureFactory()
         r = self.client.get("/feed/ipr/")
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(ipr.title in unicontent(r))
+        self.assertContains(r, ipr.title)
 
     def test_sitemap(self):
         ipr = HolderIprDisclosureFactory()
         r = self.client.get("/sitemap-ipr.xml")
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("/ipr/%s/" % ipr.pk in unicontent(r))
+        self.assertContains(r, "/ipr/%s/" % ipr.pk)
 
     def test_new_generic(self):
         """Add a new generic disclosure.  Note: submitter does not need to be logged in.
@@ -233,7 +233,7 @@ class IprTests(TestCase):
             "notes": "some notes"
             })
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("Your IPR disclosure has been submitted" in unicontent(r))
+        self.assertContains(r, "Your IPR disclosure has been submitted")
         self.assertEqual(len(outbox),1)
         self.assertTrue('New IPR Submission' in outbox[0]['Subject'])
         self.assertTrue('ietf-ipr@' in outbox[0]['To'])
@@ -276,7 +276,7 @@ class IprTests(TestCase):
             "submitter_email": "test@holder.com",
             })
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("Your IPR disclosure has been submitted" in unicontent(r))
+        self.assertContains(r, "Your IPR disclosure has been submitted")
 
         iprs = IprDisclosureBase.objects.filter(title__icontains=draft.name)
         self.assertEqual(len(iprs), 1)
@@ -319,7 +319,7 @@ class IprTests(TestCase):
             "submitter_email": "test@holder.com",
             })
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("Your IPR disclosure has been submitted" in unicontent(r))
+        self.assertContains(r, "Your IPR disclosure has been submitted")
 
         iprs = IprDisclosureBase.objects.filter(title__icontains="belonging to Test Legal")
         self.assertEqual(len(iprs), 1)
@@ -416,7 +416,7 @@ class IprTests(TestCase):
             "submitter_email": "test@holder.com",
             })
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("Your IPR disclosure has been submitted" in unicontent(r))
+        self.assertContains(r, "Your IPR disclosure has been submitted")
 
         iprs = IprDisclosureBase.objects.filter(title__icontains=draft.name)
         self.assertEqual(len(iprs), 1)
@@ -473,7 +473,7 @@ class IprTests(TestCase):
         # private comment
         r = self.client.post(url, dict(comment='Private comment',private=True),follow=True)
         self.assertEqual(r.status_code,200)
-        self.assertTrue('Private comment' in unicontent(r))
+        self.assertContains(r, 'Private comment')
         self.client.logout()
         r = self.client.get(url)
         self.assertFalse('Private comment' in unicontent(r))
diff --git a/ietf/liaisons/tests.py b/ietf/liaisons/tests.py
index 22cef5911..ab8f2a22f 100644
--- a/ietf/liaisons/tests.py
+++ b/ietf/liaisons/tests.py
@@ -58,40 +58,40 @@ class LiaisonTests(TestCase):
 
         r = self.client.get(urlreverse('ietf.liaisons.views.liaison_list'))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(liaison.title in unicontent(r))
+        self.assertContains(r, liaison.title)
 
     def test_details(self):
         liaison = LiaisonStatementFactory()
 
         r = self.client.get(urlreverse("ietf.liaisons.views.liaison_detail", kwargs={ 'object_id': liaison.pk }))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(liaison.title in unicontent(r))
+        self.assertContains(r, liaison.title)
 
     def test_feeds(self):
         liaison = LiaisonStatementFactory(title="Comment from United League of Marsmen")
 
         r = self.client.get('/feed/liaison/recent/')
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(liaison.title in unicontent(r))
+        self.assertContains(r, liaison.title)
 
         r = self.client.get('/feed/liaison/from/%s/' % liaison.from_groups.first().acronym)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(liaison.title in unicontent(r))
+        self.assertContains(r, liaison.title)
 
         r = self.client.get('/feed/liaison/to/%s/' % liaison.to_groups.first().acronym)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(liaison.title in unicontent(r))
+        self.assertContains(r, liaison.title)
 
         r = self.client.get('/feed/liaison/subject/marsmen/')
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(liaison.title in unicontent(r))
+        self.assertContains(r, liaison.title)
 
     def test_sitemap(self):
         liaison = LiaisonStatementFactory()
 
         r = self.client.get('/sitemap-liaison.xml')
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(urlreverse("ietf.liaisons.views.liaison_detail", kwargs={ 'object_id': liaison.pk }) in unicontent(r))
+        self.assertContains(r, urlreverse("ietf.liaisons.views.liaison_detail", kwargs={ 'object_id': liaison.pk }))
 
     def test_help_pages(self):
         self.assertEqual(self.client.get('/liaison/help/').status_code, 200)
@@ -300,7 +300,7 @@ class LiaisonManagementTests(TestCase):
         # private comment
         r = self.client.post(addurl, dict(comment='Private comment',private=True),follow=True)
         self.assertEqual(r.status_code,200)
-        self.assertTrue('Private comment' in r.content)
+        self.assertContains(r, 'Private comment')
         self.client.logout()
         r = self.client.get(url)
         self.assertFalse('Private comment' in r.content)
@@ -344,14 +344,14 @@ class LiaisonManagementTests(TestCase):
         login_testing_unauthorized(self, "ad", url)
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(liaison.title in unicontent(r))
+        self.assertContains(r, liaison.title)
 
         # check the detail page / unauthorized
         url = urlreverse('ietf.liaisons.views.liaison_detail', kwargs=dict(object_id=liaison.pk))
         self.client.logout()
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(liaison.title in unicontent(r))
+        self.assertContains(r, liaison.title)
         q = PyQuery(r.content)
         self.assertEqual(len(q('form input[name=approved]')), 0)
 
@@ -359,7 +359,7 @@ class LiaisonManagementTests(TestCase):
         self.client.login(username="ulm-liaiman", password="ulm-liaiman+password")
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(liaison.title in unicontent(r))
+        self.assertContains(r, liaison.title)
         q = PyQuery(r.content)
         from ietf.liaisons.utils import can_edit_liaison
         user = User.objects.get(username='ulm-liaiman')
@@ -1091,7 +1091,7 @@ class LiaisonManagementTests(TestCase):
         r = self.client.post(url,get_liaison_post_data(),follow=True)
 
         self.assertEqual(r.status_code, 200)
-        self.assertTrue('As an IETF Liaison Manager you can not send incoming liaison statements' in unicontent(r))
+        self.assertContains(r, 'As an IETF Liaison Manager you can not send incoming liaison statements')
 
     def test_deadline_field(self):
         '''Required for action, comment, not info, response'''
@@ -1131,7 +1131,7 @@ class LiaisonManagementTests(TestCase):
         r = self.client.post(url,post_data,follow=True)
 
         self.assertEqual(r.status_code, 200)
-        self.assertTrue('You must provide a body or attachment files' in unicontent(r))
+        self.assertContains(r, 'You must provide a body or attachment files')
 
     def test_send_sdo_reminder(self):
         RoleFactory(name_id='liaiman',person__user__username='ulm-liaiman',person__user__email='ulm-liaiman@somewhere.example',group__type_id='sdo',group__acronym='ulm')
diff --git a/ietf/mailtrigger/tests.py b/ietf/mailtrigger/tests.py
index 058f9c037..6868c5b77 100644
--- a/ietf/mailtrigger/tests.py
+++ b/ietf/mailtrigger/tests.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2015-2019, All Rights Reserved
 from django.urls import reverse as urlreverse
 
 from ietf.utils.test_utils import TestCase, unicontent
@@ -9,22 +10,22 @@ class EventMailTests(TestCase):
         url = urlreverse('ietf.mailtrigger.views.show_triggers')
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue('ballot_saved' in unicontent(r))
+        self.assertContains(r, 'ballot_saved')
    
         url = urlreverse('ietf.mailtrigger.views.show_triggers',kwargs=dict(mailtrigger_slug='ballot_saved'))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue('ballot_saved' in unicontent(r))
+        self.assertContains(r, 'ballot_saved')
 
     def test_show_recipients(self):
 
         url = urlreverse('ietf.mailtrigger.views.show_recipients')
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue('doc_group_mail_list' in unicontent(r))
+        self.assertContains(r, 'doc_group_mail_list')
    
         url = urlreverse('ietf.mailtrigger.views.show_recipients',kwargs=dict(recipient_slug='doc_group_mail_list'))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue('doc_group_mail_list' in unicontent(r))
+        self.assertContains(r, 'doc_group_mail_list')
 
diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py
index 6b67f4009..8c7ff4ad0 100644
--- a/ietf/meeting/tests_views.py
+++ b/ietf/meeting/tests_views.py
@@ -153,7 +153,7 @@ class MeetingTests(TestCase):
 
         r = self.client.get(urlreverse("ietf.meeting.views.agenda", kwargs=dict(num=meeting.number,name=meeting.unofficial_schedule.name,owner=meeting.unofficial_schedule.owner.email())))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue('not the official schedule' in unicontent(r))
+        self.assertContains(r, 'not the official schedule')
 
         # future meeting, no agenda
         r = self.client.get(urlreverse("ietf.meeting.views.agenda", kwargs=dict(num=future_meeting.number, ext=".txt")))
@@ -170,8 +170,8 @@ class MeetingTests(TestCase):
         self.assertTrue(session.group.parent.acronym.upper() in agenda_content)
         self.assertTrue(slot.location.name in agenda_content)
 
-        self.assertTrue(session.materials.get(type='agenda').uploaded_filename in unicontent(r))
-        self.assertTrue(session.materials.filter(type='slides').exclude(states__type__slug='slides',states__slug='deleted').first().uploaded_filename in unicontent(r))
+        self.assertContains(r, session.materials.get(type='agenda').uploaded_filename)
+        self.assertContains(r, session.materials.filter(type='slides').exclude(states__type__slug='slides',states__slug='deleted').first().uploaded_filename)
         self.assertFalse(session.materials.filter(type='slides',states__type__slug='slides',states__slug='deleted').first().uploaded_filename in unicontent(r))
 
         # iCal
@@ -185,8 +185,8 @@ class MeetingTests(TestCase):
         self.assertTrue("BEGIN:VTIMEZONE" in agenda_content)
         self.assertTrue("END:VTIMEZONE" in agenda_content)        
 
-        self.assertTrue(session.agenda().href() in unicontent(r))
-        self.assertTrue(session.materials.filter(type='slides').exclude(states__type__slug='slides',states__slug='deleted').first().href() in unicontent(r))
+        self.assertContains(r, session.agenda().href())
+        self.assertContains(r, session.materials.filter(type='slides').exclude(states__type__slug='slides',states__slug='deleted').first().href())
         # TODO - the ics view uses .all on a queryset in a view so it's showing the deleted slides.
         #self.assertFalse(session.materials.filter(type='slides',states__type__slug='slides',states__slug='deleted').first().get_absolute_url() in unicontent(r))
 
@@ -214,7 +214,7 @@ class MeetingTests(TestCase):
         make_meeting_test_data(meeting=meeting)
         url = urlreverse("ietf.meeting.views.agenda", kwargs=dict(num=meeting.number))
         r = self.client.get(url)
-        self.assertTrue("Audio stream" in unicontent(r))
+        self.assertContains(r, "Audio stream")
 
     def test_agenda_by_room(self):
         meeting = make_meeting_test_data()
@@ -303,14 +303,14 @@ class MeetingTests(TestCase):
             q = PyQuery(r.content)
             debug.show('q(".alert").text()')
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("1. WG status" in unicontent(r))
+        self.assertContains(r, "1. WG status")
 
         # session minutes
         url = urlreverse("ietf.meeting.views.materials_document",
                          kwargs=dict(num=meeting.number, document=session.minutes()))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("1. More work items underway" in unicontent(r))
+        self.assertContains(r, "1. More work items underway")
 
         # test with explicit meeting number in url
         if meeting.number.isdigit():
@@ -362,22 +362,22 @@ class MeetingTests(TestCase):
         self.client.login(username="marschairman", password="marschairman+password")
         r = self.client.get(urlreverse("ietf.meeting.views.materials_editable_groups", kwargs={'num':meeting.number}))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(meeting.number in unicontent(r))
-        self.assertTrue("mars" in unicontent(r))
+        self.assertContains(r, meeting.number)
+        self.assertContains(r, "mars")
         self.assertFalse("No session requested" in unicontent(r))
 
         self.client.login(username="ad", password="ad+password")
         r = self.client.get(urlreverse("ietf.meeting.views.materials_editable_groups", kwargs={'num':meeting.number}))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(meeting.number in unicontent(r))
-        self.assertTrue("frfarea" in unicontent(r))
-        self.assertTrue("No session requested" in unicontent(r))
+        self.assertContains(r, meeting.number)
+        self.assertContains(r, "frfarea")
+        self.assertContains(r, "No session requested")
 
         self.client.login(username="plain",password="plain+password")
         r = self.client.get(urlreverse("ietf.meeting.views.materials_editable_groups", kwargs={'num':meeting.number}))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(meeting.number in unicontent(r))
-        self.assertTrue("You cannot manage the meeting materials for any groups" in unicontent(r))
+        self.assertContains(r, meeting.number)
+        self.assertContains(r, "You cannot manage the meeting materials for any groups")
 
     def test_proceedings(self):
         meeting = make_meeting_test_data()
@@ -445,8 +445,8 @@ class MeetingTests(TestCase):
 
         r = self.client.get("/feed/wg-proceedings/")
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("agenda" in unicontent(r))
-        self.assertTrue(session.group.acronym in unicontent(r))
+        self.assertContains(r, "agenda")
+        self.assertContains(r, session.group.acronym)
 
     def test_important_dates(self):
         meeting=MeetingFactory(type_id='ietf')
@@ -595,7 +595,7 @@ class EditTests(TestCase):
         self.client.login(username="secretary", password="secretary+password")
         r = self.client.get(urlreverse("ietf.meeting.views.edit_agenda", kwargs=dict(num=meeting.number)))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("load_assignments" in unicontent(r))
+        self.assertContains(r, "load_assignments")
 
     def test_save_agenda_as_and_read_permissions(self):
         meeting = make_meeting_test_data()
@@ -691,7 +691,7 @@ class EditTests(TestCase):
         self.client.login(username="secretary", password="secretary+password")
         r = self.client.get(urlreverse("ietf.meeting.views.edit_timeslots", kwargs=dict(num=meeting.number)))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(meeting.room_set.all().first().name in unicontent(r))
+        self.assertContains(r, meeting.room_set.all().first().name)
 
     def test_edit_timeslot_type(self):
         timeslot = TimeSlotFactory(meeting__type_id='ietf')
@@ -759,7 +759,7 @@ class SessionDetailsTests(TestCase):
         self.client.login(username=group_chair.user.username, password='%s+password'%group_chair.user.username)
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(old_draft.name in unicontent(r))
+        self.assertContains(r, old_draft.name)
 
         r = self.client.post(url,dict(drafts=[new_draft.pk, old_draft.pk]))
         self.assertTrue(r.status_code, 200)
@@ -881,7 +881,7 @@ class InterimTests(TestCase):
         login_testing_unauthorized(self, "secretary", url)
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(meeting.number in r.content)
+        self.assertContains(r, meeting.number)
 
     def test_interim_skip_announcement(self):
         make_meeting_test_data()
@@ -946,7 +946,7 @@ class InterimTests(TestCase):
         url = urlreverse('ietf.meeting.views.past')
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue('IETF - %02d'%int(ietf.meeting.number) in unicontent(r))
+        self.assertContains(r, 'IETF - %02d'%int(ietf.meeting.number))
         q = PyQuery(r.content)
         id="-%s" % interim.group.acronym
         self.assertTrue('CANCELLED' in q('[id*="'+id+'"]').text())
@@ -959,9 +959,9 @@ class InterimTests(TestCase):
         today = datetime.date.today()
         mars_interim = Meeting.objects.filter(date__gt=today, type='interim', session__group__acronym='mars', session__status='sched').first()
         ames_interim = Meeting.objects.filter(date__gt=today, type='interim', session__group__acronym='ames', session__status='canceled').first()
-        self.assertTrue(mars_interim.number in r.content)
-        self.assertTrue(ames_interim.number in r.content)
-        self.assertTrue('IETF - 42' in r.content)
+        self.assertContains(r, mars_interim.number)
+        self.assertContains(r, ames_interim.number)
+        self.assertContains(r, 'IETF - 42')
         # cancelled session
         q = PyQuery(r.content)
         self.assertTrue('CANCELLED' in q('[id*="-ames"]').text())
@@ -1242,7 +1242,7 @@ class InterimTests(TestCase):
 
         r = self.client.post(urlreverse("ietf.meeting.views.interim_request"),data)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue('days must be consecutive' in r.content)
+        self.assertContains(r, 'days must be consecutive')
 
     def test_interim_request_series(self):
         make_meeting_test_data()
@@ -2144,8 +2144,8 @@ class SessionTests(TestCase):
         url = urlreverse('ietf.meeting.views.meeting_requests',kwargs={'num':meeting.number})
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
-        self.assertTrue(requested_session.group.acronym in unicontent(r))
-        self.assertTrue(not_meeting.group.acronym in unicontent(r))
+        self.assertContains(r, requested_session.group.acronym)
+        self.assertContains(r, not_meeting.group.acronym)
 
     def test_request_minutes(self):
         meeting = MeetingFactory(type_id='ietf')
diff --git a/ietf/message/tests.py b/ietf/message/tests.py
index a9ca78b67..679404e2a 100644
--- a/ietf/message/tests.py
+++ b/ietf/message/tests.py
@@ -26,10 +26,10 @@ class MessageTests(TestCase):
 
         r = self.client.get(urlreverse("ietf.message.views.message", kwargs=dict(message_id=msg.id)))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(msg.subject in unicontent(r))
-        self.assertTrue(msg.to in unicontent(r))
-        self.assertTrue(msg.frm in unicontent(r))
-        self.assertTrue("Hello World!" in unicontent(r))
+        self.assertContains(r, msg.subject)
+        self.assertContains(r, msg.to)
+        self.assertContains(r, msg.frm)
+        self.assertContains(r, "Hello World!")
 
 
 class SendScheduledAnnouncementsTests(TestCase):
diff --git a/ietf/nomcom/tests.py b/ietf/nomcom/tests.py
index 7cb02fdb2..061ce5e9b 100644
--- a/ietf/nomcom/tests.py
+++ b/ietf/nomcom/tests.py
@@ -487,9 +487,9 @@ class NomcomViewsTest(TestCase):
         
         r = self.client.get(reverse('ietf.nomcom.views.announcements'))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(("Messages from %s" % nomcom.time.year) in unicontent(r))
-        self.assertTrue(nomcom.role_set.filter(name="chair")[0].person.email_address() in unicontent(r))
-        self.assertTrue(msg.subject in unicontent(r))
+        self.assertContains(r, ("Messages from %s" % nomcom.time.year))
+        self.assertContains(r, nomcom.role_set.filter(name="chair")[0].person.email_address())
+        self.assertContains(r, msg.subject)
 
 
     def test_requirements_view(self):
diff --git a/ietf/secr/sreq/tests.py b/ietf/secr/sreq/tests.py
index ef7908011..18f7750c5 100644
--- a/ietf/secr/sreq/tests.py
+++ b/ietf/secr/sreq/tests.py
@@ -147,7 +147,7 @@ class SubmitRequestCase(TestCase):
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
         self.assertEqual(len(q('#session-request-form')),1)
-        self.assertTrue('You must enter a length for all sessions' in unicontent(r))
+        self.assertContains(r, 'You must enter a length for all sessions')
 
     def test_request_notification(self):
         meeting = MeetingFactory(type_id='ietf', date=datetime.date.today())
@@ -248,11 +248,11 @@ class NotMeetingCase(TestCase):
 
         # This is a sign of a problem - a get shouldn't have a side-effect like this one does
         self.assertEqual(r.status_code, 200)
-        self.assertTrue('A message was sent to notify not having a session' in unicontent(r))
+        self.assertContains(r, 'A message was sent to notify not having a session')
 
         r = self.client.get(url,follow=True)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue('is already marked as not meeting' in unicontent(r))
+        self.assertContains(r, 'is already marked as not meeting')
 
         self.assertEqual(len(outbox),1)
         self.assertTrue('Not having a session' in outbox[0]['Subject'])
diff --git a/ietf/stats/tests.py b/ietf/stats/tests.py
index f0c6888ae..cbcfe4626 100644
--- a/ietf/stats/tests.py
+++ b/ietf/stats/tests.py
@@ -158,7 +158,7 @@ class StatisticsTests(TestCase):
 
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("United States" in unicontent(r))
+        self.assertContains(r, "United States")
 
     def test_review_stats(self):
         reviewer = PersonFactory()
diff --git a/ietf/submit/tests.py b/ietf/submit/tests.py
index 1302c3b4b..be5f7cc58 100644
--- a/ietf/submit/tests.py
+++ b/ietf/submit/tests.py
@@ -393,7 +393,7 @@ class SubmitTests(TestCase):
         status_url = r["Location"]
         r = self.client.get(status_url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("The submission is pending approval by the authors" in unicontent(r))
+        self.assertContains(r, "The submission is pending approval by the authors")
 
         self.assertEqual(len(outbox), mailbox_before + 1)
         confirm_email = outbox[-1]
@@ -547,7 +547,7 @@ class SubmitTests(TestCase):
         status_url = r["Location"]
         r = self.client.get(status_url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("The submission is pending email authentication" in unicontent(r))
+        self.assertContains(r, "The submission is pending email authentication")
 
         self.assertEqual(len(outbox), mailbox_before + 1)
         confirm_email = outbox[-1]
@@ -598,16 +598,16 @@ class SubmitTests(TestCase):
         replaced_alias = draft.docalias.first()
         r = self.supply_extra_metadata(name, status_url, "Submitter Name", "author@example.com", replaces=str(replaced_alias.pk))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue('cannot replace itself' in unicontent(r))
+        self.assertContains(r, 'cannot replace itself')
         replaced_alias = DocAlias.objects.get(name='draft-ietf-random-thing')
         r = self.supply_extra_metadata(name, status_url, "Submitter Name", "author@example.com", replaces=str(replaced_alias.pk))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue('cannot replace an RFC' in unicontent(r))
+        self.assertContains(r, 'cannot replace an RFC')
         replaced_alias.document.set_state(State.objects.get(type='draft-iesg',slug='approved'))
         replaced_alias.document.set_state(State.objects.get(type='draft',slug='active'))
         r = self.supply_extra_metadata(name, status_url, "Submitter Name", "author@example.com", replaces=str(replaced_alias.pk))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue('approved by the IESG and cannot' in unicontent(r))
+        self.assertContains(r, 'approved by the IESG and cannot')
         r = self.supply_extra_metadata(name, status_url, "Submitter Name", "author@example.com", replaces='')
         self.assertEqual(r.status_code, 302)
         status_url = r["Location"]
@@ -805,7 +805,7 @@ class SubmitTests(TestCase):
         # search status page
         r = self.client.get(urlreverse("ietf.submit.views.search_submission"))
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("submission status" in unicontent(r))
+        self.assertContains(r, "submission status")
 
         # search
         r = self.client.post(urlreverse("ietf.submit.views.search_submission"), dict(name=name))
diff --git a/ietf/sync/tests.py b/ietf/sync/tests.py
index 78bf1bd36..edb1439cf 100644
--- a/ietf/sync/tests.py
+++ b/ietf/sync/tests.py
@@ -205,7 +205,7 @@ ICANN
         login_testing_unauthorized(self, "secretary", url)
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("new changes at" in unicontent(r))
+        self.assertContains(r, "new changes at")
 
         # we don't actually try posting as that would trigger a real run
         
@@ -430,7 +430,7 @@ class DiscrepanciesTests(TestCase):
         doc.set_state(State.objects.get(used=True, type="draft-iesg", slug="ann"))
 
         r = self.client.get(urlreverse("ietf.sync.views.discrepancies"))
-        self.assertTrue(doc.name in unicontent(r))
+        self.assertContains(r, doc.name)
 
         # draft with IANA state "In Progress" but RFC Editor state not IANA
         doc = Document.objects.create(name="draft-ietf-test2", type_id="draft")
@@ -439,7 +439,7 @@ class DiscrepanciesTests(TestCase):
         doc.set_state(State.objects.get(used=True, type="draft-rfceditor", slug="auth"))
 
         r = self.client.get(urlreverse("ietf.sync.views.discrepancies"))
-        self.assertTrue(doc.name in unicontent(r))
+        self.assertContains(r, doc.name)
 
         # draft with IANA state "Waiting on RFC Editor" or "RFC-Ed-Ack"
         # but RFC Editor state is IANA
@@ -449,7 +449,7 @@ class DiscrepanciesTests(TestCase):
         doc.set_state(State.objects.get(used=True, type="draft-rfceditor", slug="iana"))
 
         r = self.client.get(urlreverse("ietf.sync.views.discrepancies"))
-        self.assertTrue(doc.name in unicontent(r))
+        self.assertContains(r, doc.name)
 
         # draft with state other than "RFC Ed Queue" or "RFC Published"
         # that are in RFC Editor or IANA queues
@@ -458,7 +458,7 @@ class DiscrepanciesTests(TestCase):
         doc.set_state(State.objects.get(used=True, type="draft-rfceditor", slug="auth"))
 
         r = self.client.get(urlreverse("ietf.sync.views.discrepancies"))
-        self.assertTrue(doc.name in unicontent(r))
+        self.assertContains(r, doc.name)
 
 class RFCEditorUndoTests(TestCase):
     def test_rfceditor_undo(self):
@@ -480,7 +480,7 @@ class RFCEditorUndoTests(TestCase):
         # get
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue(e2.doc.name in unicontent(r))
+        self.assertContains(r, e2.doc.name)
 
         # delete e2
         deleted_before = DeletedEvent.objects.count()

From 4b080c80429abc4725345766fb0f6f1945235dac Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Sun, 30 Jun 2019 17:55:54 +0000
Subject: [PATCH 027/114] Added a simple functional test for
 hash_list_message_id()  - Legacy-Id: 16337

---
 ietf/review/tests.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 ietf/review/tests.py

diff --git a/ietf/review/tests.py b/ietf/review/tests.py
new file mode 100644
index 000000000..b0ace5272
--- /dev/null
+++ b/ietf/review/tests.py
@@ -0,0 +1,22 @@
+# Copyright The IETF Trust 2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+from ietf.utils.test_utils import TestCase
+from .mailarch import hash_list_message_id
+
+class HashTest(TestCase):
+
+    def test_hash_list_message_id(self):
+        for list, msgid, hash in (
+                ('ietf', '156182196167.12901.11966487185176024571@ietfa.amsl.com',  b'lr6RtZ4TiVMZn1fZbykhkXeKhEk'),
+                ('codesprints', 'E1hNffl-0004RM-Dh@zinfandel.tools.ietf.org',       b'N1nFHHUXiFWYtdzBgjtqzzILFHI'),
+                ('xml2rfc', '3A0F4CD6-451F-44E2-9DA4-28235C638588@rfc-editor.org',  b'g6DN4SxJGDrlSuKsubwb6rRSePU'),
+                (u'ietf', u'156182196167.12901.11966487185176024571@ietfa.amsl.com',b'lr6RtZ4TiVMZn1fZbykhkXeKhEk'),
+                (u'codesprints', u'E1hNffl-0004RM-Dh@zinfandel.tools.ietf.org',     b'N1nFHHUXiFWYtdzBgjtqzzILFHI'),
+                (u'xml2rfc', u'3A0F4CD6-451F-44E2-9DA4-28235C638588@rfc-editor.org',b'g6DN4SxJGDrlSuKsubwb6rRSePU'),
+                (b'ietf', b'156182196167.12901.11966487185176024571@ietfa.amsl.com',b'lr6RtZ4TiVMZn1fZbykhkXeKhEk'),
+                (b'codesprints', b'E1hNffl-0004RM-Dh@zinfandel.tools.ietf.org',     b'N1nFHHUXiFWYtdzBgjtqzzILFHI'),
+                (b'xml2rfc', b'3A0F4CD6-451F-44E2-9DA4-28235C638588@rfc-editor.org',b'g6DN4SxJGDrlSuKsubwb6rRSePU'),
+            ):
+            self.assertEqual(hash, hash_list_message_id(list, msgid))
+            

From 05f275a3afd33d71bb93ec4fb71221101884a9ed Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Sun, 30 Jun 2019 20:44:45 +0000
Subject: [PATCH 028/114] Changed instances of json.loads(r.content) to
 r.json().  Changed some instances of assert* to assertContains.  - Legacy-Id:
 16338

---
 ietf/api/tests.py         |  6 +++---
 ietf/community/tests.py   |  4 ++--
 ietf/doc/tests.py         | 18 +++++++++---------
 ietf/doc/tests_review.py  | 19 +++++++------------
 ietf/liaisons/tests.py    | 10 +++++-----
 ietf/meeting/tests_api.py | 30 +++++++++++++++---------------
 ietf/person/tests.py      |  2 +-
 7 files changed, 42 insertions(+), 47 deletions(-)

diff --git a/ietf/api/tests.py b/ietf/api/tests.py
index f9cf30ed4..1972a3e00 100644
--- a/ietf/api/tests.py
+++ b/ietf/api/tests.py
@@ -194,7 +194,7 @@ class TastypieApiTestCase(ResourceTestCaseMixin, TestCase):
         client = Client(Accept='application/json')
         r = client.get("/api/v1/")
         self.assertValidJSONResponse(r)        
-        resource_list = json.loads(r.content)
+        resource_list = r.json()
 
         for name in self.apps:
             if not name in self.apps:
@@ -207,14 +207,14 @@ class TastypieApiTestCase(ResourceTestCaseMixin, TestCase):
     def test_all_model_resources_exist(self):
         client = Client(Accept='application/json')
         r = client.get("/api/v1")
-        top = json.loads(r.content)
+        top = r.json()
         for name in self.apps:
             app_name = self.apps[name]
             app = import_module(app_name)
             self.assertEqual("/api/v1/%s/"%name, top[name]["list_endpoint"])
             r = client.get(top[name]["list_endpoint"])
             self.assertValidJSONResponse(r)
-            app_resources = json.loads(r.content)
+            app_resources = r.json()
             #
             model_list = apps.get_app_config(name).get_models()
             for model in model_list:
diff --git a/ietf/community/tests.py b/ietf/community/tests.py
index f74ca7569..2cd914afe 100644
--- a/ietf/community/tests.py
+++ b/ietf/community/tests.py
@@ -225,7 +225,7 @@ class CommunityListTests(TestCase):
         # track
         r = self.client.post(url, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
         self.assertEqual(r.status_code, 200)
-        self.assertEqual(json.loads(r.content)["success"], True)
+        self.assertEqual(r.json()["success"], True)
         clist = CommunityList.objects.get(user__username="plain")
         self.assertEqual(list(clist.added_docs.all()), [draft])
 
@@ -233,7 +233,7 @@ class CommunityListTests(TestCase):
         url = urlreverse(ietf.community.views.untrack_document, kwargs={ "username": "plain", "name": draft.name })
         r = self.client.post(url, HTTP_X_REQUESTED_WITH='XMLHttpRequest')
         self.assertEqual(r.status_code, 200)
-        self.assertEqual(json.loads(r.content)["success"], True)
+        self.assertEqual(r.json()["success"], True)
         clist = CommunityList.objects.get(user__username="plain")
         self.assertEqual(list(clist.added_docs.all()), [])
 
diff --git a/ietf/doc/tests.py b/ietf/doc/tests.py
index bdc7b4758..980c36281 100644
--- a/ietf/doc/tests.py
+++ b/ietf/doc/tests.py
@@ -275,7 +275,7 @@ class SearchTests(TestCase):
         })
         r = self.client.get(url, dict(q=draft.name))
         self.assertEqual(r.status_code, 200)
-        data = json.loads(r.content)
+        data = r.json()
         self.assertEqual(data[0]["id"], draft.pk)
 
         # DocAlias
@@ -288,7 +288,7 @@ class SearchTests(TestCase):
 
         r = self.client.get(url, dict(q=doc_alias.name))
         self.assertEqual(r.status_code, 200)
-        data = json.loads(r.content)
+        data = r.json()
         self.assertEqual(data[0]["id"], doc_alias.pk)
 
     def test_recent_drafts(self):
@@ -786,7 +786,7 @@ class DocTestCase(TestCase):
 
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_json", kwargs=dict(name=doc.name)))
         self.assertEqual(r.status_code, 200)
-        data = json.loads(r.content)
+        data = r.json()
         self.assertEqual(doc.name, data['name'])
         self.assertEqual(doc.pages,data['pages'])
 
@@ -1268,12 +1268,12 @@ class ChartTests(ResourceTestCaseMixin, TestCase):
         # No match
         r = self.client.get(conf_url + '?activedrafts=on&name=thisisnotadocumentname')
         self.assertValidJSONResponse(r)
-        d = json.loads(unicontent(r))
+        d = r.json()
         self.assertEqual(d['chart']['type'], settings.CHART_TYPE_COLUMN_OPTIONS['chart']['type'])
 
         r = self.client.get(conf_url + '?activedrafts=on&name=%s'%doc.name[6:12])
         self.assertValidJSONResponse(r)
-        d = json.loads(unicontent(r))
+        d = r.json()
         self.assertEqual(d['chart']['type'], settings.CHART_TYPE_COLUMN_OPTIONS['chart']['type'])
         self.assertEqual(len(d['series'][0]['data']), 0)
 
@@ -1290,12 +1290,12 @@ class ChartTests(ResourceTestCaseMixin, TestCase):
         # No match
         r = self.client.get(data_url + '?activedrafts=on&name=thisisnotadocumentname')
         self.assertValidJSONResponse(r)
-        d = json.loads(unicontent(r))
+        d = r.json()
         self.assertEqual(unicontent(r), '[]')
 
         r = self.client.get(data_url + '?activedrafts=on&name=%s'%doc.name[6:12])
         self.assertValidJSONResponse(r)
-        d = json.loads(unicontent(r))
+        d = r.json()
         self.assertEqual(len(d), 1)
         self.assertEqual(len(d[0]), 2)
 
@@ -1319,7 +1319,7 @@ class ChartTests(ResourceTestCaseMixin, TestCase):
 
         r = self.client.get(conf_url)
         self.assertValidJSONResponse(r)
-        d = json.loads(unicontent(r))
+        d = r.json()
         self.assertEqual(d['chart']['type'], settings.CHART_TYPE_COLUMN_OPTIONS['chart']['type'])
         self.assertEqual("New draft revisions over time for %s" % person.name, d['title']['text'])
 
@@ -1327,7 +1327,7 @@ class ChartTests(ResourceTestCaseMixin, TestCase):
 
         r = self.client.get(data_url)
         self.assertValidJSONResponse(r)
-        d = json.loads(unicontent(r))
+        d = r.json()
         self.assertEqual(len(d), 1)
         self.assertEqual(len(d[0]), 2)
 
diff --git a/ietf/doc/tests_review.py b/ietf/doc/tests_review.py
index ee55251bf..06973cb76 100644
--- a/ietf/doc/tests_review.py
+++ b/ietf/doc/tests_review.py
@@ -152,9 +152,7 @@ class ReviewTests(TestCase):
 
         url = urlreverse('ietf.doc.views_doc.document_main', kwargs={ "name": doc.name })
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        content = unicontent(r)
-        self.assertTrue("{} Review".format(review_req.type.name) in content)
+        self.assertContains(r, ("{} Review".format(review_req.type.name))
 
     def test_review_request(self):
         doc = WgDraftFactory(group__acronym='mars',rev='01')
@@ -166,9 +164,8 @@ class ReviewTests(TestCase):
         url = urlreverse('ietf.doc.views_review.review_request', kwargs={ "name": doc.name, "request_id": review_req.pk })
 
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        self.assertIn(review_req.team.acronym, unicontent(r))
-        self.assertIn(review_req.team.name, unicontent(r))
+        self.assertContains(r, review_req.team.acronym)
+        self.assertContains(r, review_req.team.name)
 
         url = urlreverse('ietf.doc.views_review.review_request_forced_login', kwargs={ "name": doc.name, "request_id": review_req.pk })
         r = self.client.get(url)
@@ -539,7 +536,7 @@ class ReviewTests(TestCase):
 
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
-            messages = json.loads(r.content)["messages"]
+            messages = r.json()["messages"]
             self.assertEqual(len(messages), 2)
 
             today = datetime.date.today()
@@ -568,7 +565,7 @@ class ReviewTests(TestCase):
 
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
-            result = json.loads(r.content)
+            result = r.json()
             self.assertNotIn('messages', result)
             self.assertIn('No results found', result['error'])
 
@@ -662,10 +659,8 @@ class ReviewTests(TestCase):
         # check the review document page
         url = urlreverse('ietf.doc.views_doc.document_main', kwargs={ "name": assignment.review.name })
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        content = unicontent(r)
-        self.assertIn("{} Review".format(assignment.review_request.type.name), content)
-        self.assertIn("This is a review", content)
+        self.assertContains("{} Review".format(assignment.review_request.type.name))
+        self.assertContains("This is a review")
 
 
     def test_complete_review_enter_content(self):
diff --git a/ietf/liaisons/tests.py b/ietf/liaisons/tests.py
index ab8f2a22f..3a57ad591 100644
--- a/ietf/liaisons/tests.py
+++ b/ietf/liaisons/tests.py
@@ -187,7 +187,7 @@ class AjaxTests(TestCase):
         self.client.login(username="secretary", password="secretary+password")
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        data = json.loads(r.content)
+        data = r.json()
         self.assertEqual(data["error"], False)
         self.assertEqual(data["post_only"], False)
         self.assertTrue('cc' in data)
@@ -205,7 +205,7 @@ class AjaxTests(TestCase):
         self.client.login(username="secretary", password="secretary+password")
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        data = json.loads(r.content)
+        data = r.json()
         self.assertEqual(data["to_contacts"],['test@example.com'])
 
     def test_ajax_select2_search_liaison_statements(self):
@@ -216,14 +216,14 @@ class AjaxTests(TestCase):
         self.client.login(username="secretary", password="secretary+password")
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        data = json.loads(r.content)
+        data = r.json()
         self.assertTrue(liaison.pk in [ x['id'] for x in data ])
 
         # test id search
         url = urlreverse('ietf.liaisons.views.ajax_select2_search_liaison_statements') + "?q=%s" % liaison.pk
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        data = json.loads(r.content)
+        data = r.json()
         self.assertTrue(liaison.pk in [ x['id'] for x in data ])
 
 
@@ -303,7 +303,7 @@ class LiaisonManagementTests(TestCase):
         self.assertContains(r, 'Private comment')
         self.client.logout()
         r = self.client.get(url)
-        self.assertFalse('Private comment' in r.content)
+        self.assertNotContains(r, 'Private comment')
 
     def test_taken_care_of(self):
         liaison = LiaisonStatementFactory(deadline=datetime.date.today()+datetime.timedelta(days=1))
diff --git a/ietf/meeting/tests_api.py b/ietf/meeting/tests_api.py
index bc746bdfb..f1c80a440 100644
--- a/ietf/meeting/tests_api.py
+++ b/ietf/meeting/tests_api.py
@@ -69,7 +69,7 @@ class ApiTests(TestCase):
         self.client.login(username="ad", password="ad+password")
         r = do_unschedule(mars_scheduled)
         self.assertEqual(r.status_code, 403)
-        self.assertTrue("error" in json.loads(r.content))
+        self.assertTrue("error" in r.json())
         # faulty post
         r = do_schedule(schedule,ames_session,mars_slot)
         self.assertEqual(r.status_code, 403)
@@ -78,7 +78,7 @@ class ApiTests(TestCase):
         self.client.login(username="plain", password='plain+password')
         r = do_unschedule(ames_scheduled)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("error" not in json.loads(r.content))
+        self.assertNotIn("error", r.json())
 
         r = do_schedule(schedule,ames_session,mars_slot)
         self.assertEqual(r.status_code, 201)
@@ -90,13 +90,13 @@ class ApiTests(TestCase):
         # Extend the mars session
         r = do_extend(schedule,mars_scheduled)
         self.assertEqual(r.status_code, 201)
-        self.assertTrue("error" not in json.loads(r.content))
+        self.assertTrue("error" not in r.json())
         self.assertEqual(mars_session.timeslotassignments.filter(schedule__name='test-agenda').count(),2)
 
         # Unschedule mars 
         r = do_unschedule(mars_scheduled)
         self.assertEqual(r.status_code, 200)
-        self.assertTrue("error" not in json.loads(r.content))
+        self.assertNotIn("error", r.json())
         # Make sure it got both the original and extended session
         self.assertEqual(mars_session.timeslotassignments.filter(schedule__name='test-agenda').count(),0)
 
@@ -116,7 +116,7 @@ class ApiTests(TestCase):
 
         r = self.client.get(urlreverse("ietf.meeting.ajax.session_constraints", kwargs=dict(num=meeting.number, sessionid=session.pk)))
         self.assertEqual(r.status_code, 200)
-        constraints = json.loads(r.content)
+        constraints = r.json()
         self.assertEqual(set([c_ames.pk, c_person.pk]), set(c["constraint_id"] for c in constraints))
 
     def test_meeting_json(self):
@@ -124,7 +124,7 @@ class ApiTests(TestCase):
 
         r = self.client.get(urlreverse("ietf.meeting.ajax.meeting_json", kwargs=dict(num=meeting.number)))
         self.assertEqual(r.status_code, 200)
-        info = json.loads(r.content)
+        info = r.json()
         self.assertEqual(info["name"], meeting.number)
 
     def test_get_room_json(self):
@@ -133,7 +133,7 @@ class ApiTests(TestCase):
 
         r = self.client.get(urlreverse("ietf.meeting.ajax.timeslot_roomurl", kwargs=dict(num=meeting.number, roomid=room.pk)))
         self.assertEqual(r.status_code, 200)
-        info = json.loads(r.content)
+        info = r.json()
         self.assertEqual(info["name"], room.name)
 
     def test_create_new_room(self):
@@ -186,7 +186,7 @@ class ApiTests(TestCase):
         url = urlreverse("ietf.group.views.group_json", kwargs=dict(acronym=group.acronym))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        info = json.loads(r.content)
+        info = r.json()
         self.assertEqual(info["name"], group.name)
 
     # This really belongs in person tests
@@ -197,7 +197,7 @@ class ApiTests(TestCase):
         url = urlreverse("ietf.person.ajax.person_json", kwargs=dict(personid=person.pk))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        info = json.loads(r.content)
+        info = r.json()
         self.assertEqual(info["name"], person.name)
 
     def test_sessions_json(self):
@@ -206,7 +206,7 @@ class ApiTests(TestCase):
         url = urlreverse("ietf.meeting.ajax.sessions_json",kwargs=dict(num=meeting.number))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        info = json.loads(r.content)
+        info = r.json()
         self.assertEqual(set([x['short_name'] for x in info]),set([s.session.short_name for s in meeting.agenda.assignments.filter(session__type_id='session')]))
 
         schedule = meeting.agenda
@@ -214,7 +214,7 @@ class ApiTests(TestCase):
                          kwargs=dict(num=meeting.number,owner=schedule.owner_email(),name=schedule.name))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        info = json.loads(r.content)
+        info = r.json()
         self.assertEqual(len(info),schedule.assignments.count())
 
 
@@ -226,7 +226,7 @@ class ApiTests(TestCase):
                          kwargs=dict(num=meeting.number, slotid=slot.pk))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        info = json.loads(r.content)
+        info = r.json()
         self.assertEqual(info["timeslot_id"], slot.pk)
 
     def test_create_new_slot(self):
@@ -282,7 +282,7 @@ class ApiTests(TestCase):
                                      name=meeting.agenda.name))
 
         r = self.client.get(url)
-        info = json.loads(r.content)
+        info = r.json()
         self.assertEqual(info["schedule_id"], meeting.agenda.pk)
 
     def test_create_new_schedule(self):
@@ -406,7 +406,7 @@ class ApiTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
 
-        info = json.loads(r.content)
+        info = r.json()
         self.assertEqual(info['secretariat'], True)
         self.assertEqual(urlsplit(info['owner_href'])[2], "/person/%s.json" % meeting.agenda.owner_id)
         self.assertEqual(info['read_only'], True)
@@ -419,7 +419,7 @@ class ApiTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
 
-        info = json.loads(r.content)
+        info = r.json()
         self.assertEqual(info['secretariat'], False)
         self.assertEqual(info['read_only'], False)
         self.assertEqual(info['save_perm'], False)
diff --git a/ietf/person/tests.py b/ietf/person/tests.py
index 75605de32..750f11591 100644
--- a/ietf/person/tests.py
+++ b/ietf/person/tests.py
@@ -36,7 +36,7 @@ class PersonTests(TestCase):
 
         r = self.client.get(urlreverse("ietf.person.views.ajax_select2_search", kwargs={ "model_name": "email"}), dict(q=person.name))
         self.assertEqual(r.status_code, 200)
-        data = json.loads(r.content)
+        data = r.json()
         self.assertEqual(data[0]["id"], person.email_address())
 
     def test_default_email(self):

From a204081a6766a699440f197ec0af44b874018e5f Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Sun, 30 Jun 2019 20:46:30 +0000
Subject: [PATCH 029/114] Added a requirement on django-form-utils  -
 Legacy-Id: 16339

---
 requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements.txt b/requirements.txt
index 2fc01abff..f034e6b8a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,6 +14,7 @@ django-bcrypt>=0.9.2		# for the BCrypt password hasher option.  Remove when all
 django-bootstrap3>=8.2.1,<9.0.0
 django-csp>=3.5
 django-cors-headers>=2.4.0
+django-form-utils>=1.0.3
 django-formtools>=1.0		# instead of django.contrib.formtools in 1.8
 django-markup>=1.1
 django-password-strength>=1.2.1

From 8573cd92323342ff281f1f50e002c042ecae67dc Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Sun, 30 Jun 2019 20:47:26 +0000
Subject: [PATCH 030/114] Removed local copy of form_utils  - Legacy-Id: 16340

---
 form_utils/__init__.py                        |   0
 form_utils/admin.py                           |  12 -
 form_utils/fields.py                          |  51 ----
 form_utils/forms.py                           | 278 ------------------
 form_utils/media/form_utils/js/autoresize.js  |   3 -
 .../media/form_utils/js/jquery.autogrow.js    | 132 ---------
 form_utils/models.py                          |   0
 form_utils/settings.py                        |  12 -
 .../templates/form_utils/better_form.html     |  16 -
 .../templates/form_utils/fields_as_lis.html   |  11 -
 form_utils/templates/form_utils/form.html     |  13 -
 form_utils/templatetags/CVS/Entries           |   3 -
 form_utils/templatetags/CVS/Repository        |   1 -
 form_utils/templatetags/CVS/Root              |   1 -
 form_utils/templatetags/__init__.py           |   6 -
 form_utils/templatetags/form_utils_tags.py    |  42 ---
 form_utils/utils.py                           |  20 --
 form_utils/widgets.py                         | 112 -------
 18 files changed, 713 deletions(-)
 delete mode 100644 form_utils/__init__.py
 delete mode 100644 form_utils/admin.py
 delete mode 100644 form_utils/fields.py
 delete mode 100644 form_utils/forms.py
 delete mode 100644 form_utils/media/form_utils/js/autoresize.js
 delete mode 100644 form_utils/media/form_utils/js/jquery.autogrow.js
 delete mode 100644 form_utils/models.py
 delete mode 100644 form_utils/settings.py
 delete mode 100644 form_utils/templates/form_utils/better_form.html
 delete mode 100644 form_utils/templates/form_utils/fields_as_lis.html
 delete mode 100644 form_utils/templates/form_utils/form.html
 delete mode 100644 form_utils/templatetags/CVS/Entries
 delete mode 100644 form_utils/templatetags/CVS/Repository
 delete mode 100644 form_utils/templatetags/CVS/Root
 delete mode 100644 form_utils/templatetags/__init__.py
 delete mode 100644 form_utils/templatetags/form_utils_tags.py
 delete mode 100644 form_utils/utils.py
 delete mode 100644 form_utils/widgets.py

diff --git a/form_utils/__init__.py b/form_utils/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/form_utils/admin.py b/form_utils/admin.py
deleted file mode 100644
index b074bdb99..000000000
--- a/form_utils/admin.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from django.contrib import admin
-from django import forms
-
-from form_utils.fields import ClearableFileField
-
-class ClearableFileFieldsAdmin(admin.ModelAdmin):
-    def formfield_for_dbfield(self, db_field, **kwargs):
-        field = super(ClearableFileFieldsAdmin, self).formfield_for_dbfield(
-            db_field, **kwargs)
-        if isinstance(field, forms.FileField):
-            field = ClearableFileField(field)
-        return field
diff --git a/form_utils/fields.py b/form_utils/fields.py
deleted file mode 100644
index d1d00ecf7..000000000
--- a/form_utils/fields.py
+++ /dev/null
@@ -1,51 +0,0 @@
-from django import forms
-
-from form_utils.widgets import ClearableFileInput
-
-class FakeEmptyFieldFile(object):
-    """
-    A fake FieldFile that will convice a FileField model field to
-    actually replace an existing file name with an empty string.
-    
-    FileField.save_form_data only overwrites its instance data if the
-    incoming form data evaluates to True in a boolean context (because
-    an empty file input is assumed to mean "no change"). We want to be
-    able to clear it without requiring the use of a model FileField
-    subclass (keeping things at the form level only). In order to do
-    this we need our form field to return a value that evaluates to
-    True in a boolean context, but to the empty string when coerced to
-    unicode. This object fulfills that requirement.
-
-    It also needs the _committed attribute to satisfy the test in
-    FileField.pre_save.
-
-    This is, of course, hacky and fragile, and depends on internal
-    knowledge of the FileField and FieldFile classes. But it will
-    serve until Django FileFields acquire a native ability to be
-    cleared (ticket 7048).
-
-    """
-    def __unicode__(self):
-        return u''
-    _committed = True
-
-class ClearableFileField(forms.MultiValueField):
-    default_file_field_class = forms.FileField
-    widget = ClearableFileInput
-    
-    def __init__(self, file_field=None, template=None, *args, **kwargs):
-        file_field = file_field or self.default_file_field_class(*args,
-                                                                  **kwargs)
-        fields = (file_field, forms.BooleanField(required=False))
-        kwargs['required'] = file_field.required
-        kwargs['widget'] = self.widget(file_widget=file_field.widget,
-                                       template=template)
-        super(ClearableFileField, self).__init__(fields, *args, **kwargs)
-
-    def compress(self, data_list):
-        if data_list[1] and not data_list[0]:
-            return FakeEmptyFieldFile()
-        return data_list[0]
-
-class ClearableImageField(ClearableFileField):
-    default_file_field_class = forms.ImageField
diff --git a/form_utils/forms.py b/form_utils/forms.py
deleted file mode 100644
index 1d83d1d4a..000000000
--- a/form_utils/forms.py
+++ /dev/null
@@ -1,278 +0,0 @@
-"""
-forms for django-form-utils
-
-Time-stamp: <2010-04-28 02:57:16 carljm forms.py>
-
-"""
-from copy import deepcopy
-
-from django import forms
-from django.forms.utils import flatatt, ErrorDict
-from django.utils.safestring import mark_safe
-
-class Fieldset(object):
-    """
-    An iterable Fieldset with a legend and a set of BoundFields.
-
-    """
-    def __init__(self, form, name, boundfields, legend='', classes='', description=''):
-        self.form = form
-        self.boundfields = boundfields
-        if legend is None: legend = name
-        self.legend = legend and mark_safe(legend)
-        self.classes = classes
-        self.description = mark_safe(description)
-        self.name = name
-
-
-    def _errors(self):
-        return ErrorDict(((k, v) for (k, v) in self.form.errors.iteritems()
-                          if k in [f.name for f in self.boundfields]))
-    errors = property(_errors)
-
-    def __iter__(self):
-        for bf in self.boundfields:
-            yield _mark_row_attrs(bf, self.form)
-
-    def __repr__(self):
-        return "%s('%s', %s, legend='%s', classes='%s', description='%s')" % (
-            self.__class__.__name__, self.name,
-            [f.name for f in self.boundfields], self.legend, self.classes, self.description)
-
-class FieldsetCollection(object):
-    def __init__(self, form, fieldsets):
-        self.form = form
-        self.fieldsets = fieldsets
-        self._cached_fieldsets = []
-
-    def __len__(self):
-        return len(self.fieldsets) or 1
-
-    def __iter__(self):
-        if not self._cached_fieldsets:
-            self._gather_fieldsets()
-        for field in self._cached_fieldsets:
-            yield field
-
-    def __getitem__(self, key):
-        if not self._cached_fieldsets:
-            self._gather_fieldsets()
-        for field in self._cached_fieldsets:
-            if field.name == key:
-                return field
-        raise KeyError
-
-    def _gather_fieldsets(self):
-        if not self.fieldsets:
-            self.fieldsets = (('main', {'fields': self.form.fields.keys(),
-                                        'legend': ''}),)
-        for name, options in self.fieldsets:
-            try:
-                field_names = [n for n in options['fields']
-                               if n in self.form.fields]
-            except KeyError:
-                raise ValueError("Fieldset definition must include 'fields' option." )
-            boundfields = [forms.forms.BoundField(self.form, self.form.fields[n], n)
-                           for n in field_names]
-            self._cached_fieldsets.append(Fieldset(self.form, name,
-                boundfields, options.get('legend', None), 
-                ' '.join(options.get('classes', ())),
-                options.get('description', '')))
-
-def _get_meta_attr(attrs, attr, default):
-    try:
-        ret = getattr(attrs['Meta'], attr)
-    except (KeyError, AttributeError):
-        ret = default
-    return ret
-            
-def _set_meta_attr(attrs, attr, value):
-    try:
-        setattr(attrs['Meta'], attr, value)
-        return True
-    except KeyError:
-        return False
-            
-def get_fieldsets(bases, attrs):
-    """
-    Get the fieldsets definition from the inner Meta class.
-
-    """
-    fieldsets = _get_meta_attr(attrs, 'fieldsets', None)
-    if fieldsets is None:
-        #grab the fieldsets from the first base class that has them
-        for base in bases:
-            fieldsets = getattr(base, 'base_fieldsets', None)
-            if fieldsets is not None:
-                break
-    fieldsets = fieldsets or []
-    return fieldsets
-
-def get_fields_from_fieldsets(fieldsets):
-    """
-    Get a list of all fields included in a fieldsets definition.
-
-    """
-    fields = []
-    try:
-        for name, options in fieldsets:
-            fields.extend(options['fields'])
-    except (TypeError, KeyError):
-        raise ValueError('"fieldsets" must be an iterable of two-tuples, '
-                         'and the second tuple must be a dictionary '
-                         'with a "fields" key')
-    return fields
-
-def get_row_attrs(bases, attrs):
-    """
-    Get the row_attrs definition from the inner Meta class.
-
-    """
-    return _get_meta_attr(attrs, 'row_attrs', {})
-
-def _mark_row_attrs(bf, form):
-    row_attrs = deepcopy(form._row_attrs.get(bf.name, {}))
-    if bf.field.required:
-        req_class = 'required'
-    else:
-        req_class = 'optional'
-    if 'class' in row_attrs:
-        row_attrs['class'] = row_attrs['class'] + ' ' + req_class
-    else:
-        row_attrs['class'] = req_class
-    bf.row_attrs = mark_safe(flatatt(row_attrs))
-    return bf
-
-class BetterFormBaseMetaclass(type):
-    def __new__(cls, name, bases, attrs):
-        attrs['base_fieldsets'] = get_fieldsets(bases, attrs)
-        fields = get_fields_from_fieldsets(attrs['base_fieldsets'])
-        if (_get_meta_attr(attrs, 'fields', None) is None and
-            _get_meta_attr(attrs, 'exclude', None) is None):
-            _set_meta_attr(attrs, 'fields', fields)
-        attrs['base_row_attrs'] = get_row_attrs(bases, attrs)
-        new_class = super(BetterFormBaseMetaclass,
-                          cls).__new__(cls, name, bases, attrs)
-        return new_class
-
-class BetterFormMetaclass(BetterFormBaseMetaclass,
-                            forms.forms.DeclarativeFieldsMetaclass):
-    pass
-
-class BetterModelFormMetaclass(BetterFormBaseMetaclass,
-                                 forms.models.ModelFormMetaclass):
-    pass
-    
-class BetterBaseForm(object):
-    """
-    ``BetterForm`` and ``BetterModelForm`` are subclasses of Form
-    and ModelForm that allow for declarative definition of fieldsets
-    and row_attrs in an inner Meta class.
-
-    The row_attrs declaration is a dictionary mapping field names to
-    dictionaries of attribute/value pairs.  The attribute/value
-    dictionaries will be flattened into HTML-style attribute/values
-    (i.e. {'style': 'display: none'} will become ``style="display:
-    none"``), and will be available as the ``row_attrs`` attribute of
-    the ``BoundField``.  Also, a CSS class of "required" or "optional"
-    will automatically be added to the row_attrs of each
-    ``BoundField``, depending on whether the field is required.
-
-    There is no automatic inheritance of ``row_attrs``.
-    
-    The fieldsets declaration is a list of two-tuples very similar to
-    the ``fieldsets`` option on a ModelAdmin class in
-    ``django.contrib.admin``.
-
-    The first item in each two-tuple is a name for the fieldset, and
-    the second is a dictionary of fieldset options.
-
-    Valid fieldset options in the dictionary include:
-
-    ``fields`` (required): A tuple of field names to display in this
-    fieldset.
-
-    ``classes``: A list of extra CSS classes to apply to the fieldset.
-
-    ``legend``: This value, if present, will be the contents of a ``legend``
-    tag to open the fieldset.
-
-    ``description``: A string of optional extra text to be displayed
-    under the ``legend`` of the fieldset.
-
-    When iterated over, the ``fieldsets`` attribute of a
-    ``BetterForm`` (or ``BetterModelForm``) yields ``Fieldset``s.
-    Each ``Fieldset`` has a ``name`` attribute, a ``legend``
-    attribute, , a ``classes`` attribute (the ``classes`` tuple
-    collapsed into a space-separated string), and a description
-    attribute, and when iterated over yields its ``BoundField``s.
-
-    Subclasses of a ``BetterForm`` will inherit their parent's
-    fieldsets unless they define their own.
-
-    A ``BetterForm`` or ``BetterModelForm`` can still be iterated over
-    directly to yield all of its ``BoundField``s, regardless of
-    fieldsets.
-
-    """
-    def __init__(self, *args, **kwargs):
-        self._fieldsets = deepcopy(self.base_fieldsets)
-        self._row_attrs = deepcopy(self.base_row_attrs)
-        self._fieldset_collection = None
-        super(BetterBaseForm, self).__init__(*args, **kwargs)
-
-    @property
-    def fieldsets(self):
-        if not self._fieldset_collection:
-            self._fieldset_collection = FieldsetCollection(self,
-                                                           self._fieldsets)
-        return self._fieldset_collection
-
-    def __iter__(self):
-        for bf in super(BetterBaseForm, self).__iter__():
-            yield _mark_row_attrs(bf, self)
-
-    def __getitem__(self, name):
-        bf = super(BetterBaseForm, self).__getitem__(name)
-        return _mark_row_attrs(bf, self)
-
-class BetterForm(BetterBaseForm, forms.Form):
-    __metaclass__ = BetterFormMetaclass
-    __doc__ = BetterBaseForm.__doc__
-
-class BetterModelForm(BetterBaseForm, forms.ModelForm):
-    __metaclass__ = BetterModelFormMetaclass
-    __doc__ = BetterBaseForm.__doc__
-    
-
-class BasePreviewForm (object):
-    """
-    Mixin to add preview functionality to a form.  If the form is submitted with 
-    the following k/v pair in its ``data`` dictionary:
-        
-        'submit': 'preview'    (value string is case insensitive)
-    
-    Then ``PreviewForm.preview`` will be marked ``True`` and the form will
-    be marked invalid (though this invalidation will not put an error in 
-    its ``errors`` dictionary).
-    
-    """
-    def __init__(self, *args, **kwargs):
-        super(BasePreviewForm, self).__init__(*args, **kwargs)
-        self.preview = self.check_preview(kwargs.get('data', None))
-    
-    def check_preview(self, data):
-        if data and data.get('submit', '').lower() == u'preview':
-            return True
-        return False
-    
-    def is_valid(self, *args, **kwargs):
-        if self.preview:
-            return False
-        return super(BasePreviewForm, self).is_valid()
-
-class PreviewModelForm(BasePreviewForm, BetterModelForm):
-    pass
-
-class PreviewForm(BasePreviewForm, BetterForm):
-    pass
diff --git a/form_utils/media/form_utils/js/autoresize.js b/form_utils/media/form_utils/js/autoresize.js
deleted file mode 100644
index 8c269b866..000000000
--- a/form_utils/media/form_utils/js/autoresize.js
+++ /dev/null
@@ -1,3 +0,0 @@
-$(document).ready(function() {
-	$('textarea.autoresize').autogrow();
-    });
diff --git a/form_utils/media/form_utils/js/jquery.autogrow.js b/form_utils/media/form_utils/js/jquery.autogrow.js
deleted file mode 100644
index aeae46545..000000000
--- a/form_utils/media/form_utils/js/jquery.autogrow.js
+++ /dev/null
@@ -1,132 +0,0 @@
-/* 
- * Auto Expanding Text Area (1.2.2)
- * by Chrys Bader (www.chrysbader.com)
- * chrysb@gmail.com
- *
- * Special thanks to:
- * Jake Chapa - jake@hybridstudio.com
- * John Resig - jeresig@gmail.com
- *
- * Copyright (c) 2008 Chrys Bader (www.chrysbader.com)
- * Licensed under the GPL (GPL-LICENSE.txt) license. 
- *
- *
- * NOTE: This script requires jQuery to work.  Download jQuery at www.jquery.com
- *
- */
- 
-(function(jQuery) {
-		  
-	var self = null;
- 
-	jQuery.fn.autogrow = function(o)
-	{	
-		return this.each(function() {
-			new jQuery.autogrow(this, o);
-		});
-	};
-	
-
-    /**
-     * The autogrow object.
-     *
-     * @constructor
-     * @name jQuery.autogrow
-     * @param Object e The textarea to create the autogrow for.
-     * @param Hash o A set of key/value pairs to set as configuration properties.
-     * @cat Plugins/autogrow
-     */
-	
-	jQuery.autogrow = function (e, o)
-	{
-		this.options		  	= o || {};
-		this.dummy			  	= null;
-		this.interval	 	  	= null;
-		this.line_height	  	= this.options.lineHeight || parseInt(jQuery(e).css('line-height'));
-		this.min_height		  	= this.options.minHeight || parseInt(jQuery(e).css('min-height'));
-		this.max_height		  	= this.options.maxHeight || parseInt(jQuery(e).css('max-height'));;
-		this.textarea		  	= jQuery(e);
-		
-		if(this.line_height == NaN)
-		  this.line_height = 0;
-		
-		// Only one textarea activated at a time, the one being used
-		this.init();
-	};
-	
-	jQuery.autogrow.fn = jQuery.autogrow.prototype = {
-    autogrow: '1.2.2'
-  };
-	
- 	jQuery.autogrow.fn.extend = jQuery.autogrow.extend = jQuery.extend;
-	
-	jQuery.autogrow.fn.extend({
-						 
-		init: function() {			
-			var self = this;			
-			this.textarea.css({overflow: 'hidden', display: 'block'});
-			this.textarea.bind('focus', function() { self.startExpand() } ).bind('blur', function() { self.stopExpand() });
-			this.checkExpand();	
-		},
-						 
-		startExpand: function() {				
-		  var self = this;
-			this.interval = window.setInterval(function() {self.checkExpand()}, 400);
-		},
-		
-		stopExpand: function() {
-			clearInterval(this.interval);	
-		},
-		
-		checkExpand: function() {
-			
-			if (this.dummy == null)
-			{
-				this.dummy = jQuery('
');
-				this.dummy.css({
-												'font-size'  : this.textarea.css('font-size'),
-												'font-family': this.textarea.css('font-family'),
-												'width'      : this.textarea.css('width'),
-												'padding'    : this.textarea.css('padding'),
-												'line-height': this.line_height + 'px',
-												'overflow-x' : 'hidden',
-												'position'   : 'absolute',
-												'top'        : 0,
-												'left'		 : -9999
-												}).appendTo('body');
-			}
-			
-			// Strip HTML tags
-			var html = this.textarea.val().replace(/(<|>)/g, '');
-			
-			// IE is different, as per usual
-			if ($.browser.msie)
-			{
-				html = html.replace(/\n/g, '
new');
-			}
-			else
-			{
-				html = html.replace(/\n/g, '
new');
-			}
-			
-			if (this.dummy.html() != html)
-			{
-				this.dummy.html(html);	
-				
-				if (this.max_height > 0 && (this.dummy.height() + this.line_height > this.max_height))
-				{
-					this.textarea.css('overflow-y', 'auto');	
-				}
-				else
-				{
-					this.textarea.css('overflow-y', 'hidden');
-					if (this.textarea.height() < this.dummy.height() + this.line_height || (this.dummy.height() < this.textarea.height()))
-					{	
-						this.textarea.animate({height: (this.dummy.height() + this.line_height) + 'px'}, 100);	
-					}
-				}
-			}
-		}
-						 
-	 });
-})(jQuery);
\ No newline at end of file
diff --git a/form_utils/models.py b/form_utils/models.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/form_utils/settings.py b/form_utils/settings.py
deleted file mode 100644
index a8462e62f..000000000
--- a/form_utils/settings.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import posixpath
-
-from django.conf import settings
-
-JQUERY_URL = getattr(
-    settings, 'JQUERY_URL',
-    'http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js')
-
-if not ((':' in JQUERY_URL) or (JQUERY_URL.startswith('/'))):
-    JQUERY_URL = posixpath.join(settings.MEDIA_URL, JQUERY_URL)
-
-FORM_UTILS_MEDIA_URL = getattr(settings, 'FORM_UTILS_MEDIA_URL', settings.MEDIA_URL)
diff --git a/form_utils/templates/form_utils/better_form.html b/form_utils/templates/form_utils/better_form.html
deleted file mode 100644
index d25e429b1..000000000
--- a/form_utils/templates/form_utils/better_form.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% extends "form_utils/form.html" %}
-
-{% block fields %}
-{% for fieldset in form.fieldsets %}
-

-{% if fieldset.legend %}
-{{ fieldset.legend }}
-{% endif %}
-
    
-{% with fieldset as fields %}
-{% include "form_utils/fields_as_lis.html" %}
-{% endwith %}
-

-

-{% endfor %}
-{% endblock %}
diff --git a/form_utils/templates/form_utils/fields_as_lis.html b/form_utils/templates/form_utils/fields_as_lis.html
deleted file mode 100644
index 99c79719f..000000000
--- a/form_utils/templates/form_utils/fields_as_lis.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% for field in fields %}
-{% if field.is_hidden %}
-{{ field }}
-{% else %}
-
-  {{ field.errors }}
-  {{ field.label_tag }}
-  {{ field }}
-
-{% endif %}
-{% endfor %}
diff --git a/form_utils/templates/form_utils/form.html b/form_utils/templates/form_utils/form.html
deleted file mode 100644
index 4b235d533..000000000
--- a/form_utils/templates/form_utils/form.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% block errors %}
-{% if form.non_field_errors %}{{ form.non_field_errors }}{% endif %}
-{% endblock %}
-
-{% block fields %}
-

-
    
-{% with form as fields %}
-{% include "form_utils/fields_as_lis.html" %}
-{% endwith %}
-

-

-{% endblock %}
diff --git a/form_utils/templatetags/CVS/Entries b/form_utils/templatetags/CVS/Entries
deleted file mode 100644
index 6cfab49ff..000000000
--- a/form_utils/templatetags/CVS/Entries
+++ /dev/null
@@ -1,3 +0,0 @@
-/__init__.py/1.1/Fri Jan 28 21:08:54 2011//
-/form_utils_tags.py/1.1/Fri Jan 28 21:08:54 2011//
-D
diff --git a/form_utils/templatetags/CVS/Repository b/form_utils/templatetags/CVS/Repository
deleted file mode 100644
index da7c7547a..000000000
--- a/form_utils/templatetags/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-ietfsec/form_utils/templatetags
diff --git a/form_utils/templatetags/CVS/Root b/form_utils/templatetags/CVS/Root
deleted file mode 100644
index 85344fb37..000000000
--- a/form_utils/templatetags/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-/a/cvs
diff --git a/form_utils/templatetags/__init__.py b/form_utils/templatetags/__init__.py
deleted file mode 100644
index f5d2536b7..000000000
--- a/form_utils/templatetags/__init__.py
+++ /dev/null
@@ -1,6 +0,0 @@
-"""
-__init__.py for django-form-utils - templatetags
-
-Time-stamp: <2008-10-13 12:14:37 carljm __init__.py>
-
-"""
diff --git a/form_utils/templatetags/form_utils_tags.py b/form_utils/templatetags/form_utils_tags.py
deleted file mode 100644
index 4be8c8f0d..000000000
--- a/form_utils/templatetags/form_utils_tags.py
+++ /dev/null
@@ -1,42 +0,0 @@
-"""
-templatetags for django-form-utils
-
-Time-stamp: <2009-03-26 12:32:08 carljm form_utils_tags.py>
-
-"""
-from django import template
-
-from form_utils.forms import BetterForm, BetterModelForm
-from form_utils.utils import select_template_from_string
-
-register = template.Library()
-
-@register.filter
-def render(form, template_name=None):
-    """
-    Renders a ``django.forms.Form`` or
-    ``form_utils.forms.BetterForm`` instance using a template.
-
-    The template name(s) may be passed in as the argument to the
-    filter (use commas to separate multiple template names for
-    template selection).
-
-    If not provided, the default template name is
-    ``form_utils/form.html``.
-
-    If the form object to be rendered is an instance of
-    ``form_utils.forms.BetterForm`` or
-    ``form_utils.forms.BetterModelForm``, the template
-    ``form_utils/better_form.html`` will be used instead if present.
-    
-    """
-    default = 'form_utils/form.html'
-    if isinstance(form, (BetterForm, BetterModelForm)):
-        default = ','.join(['form_utils/better_form.html', default])
-    tpl = select_template_from_string(template_name or default)
-
-    return tpl.render(template.Context({'form': form}))
-
-        
-
-    
diff --git a/form_utils/utils.py b/form_utils/utils.py
deleted file mode 100644
index 79fd76bce..000000000
--- a/form_utils/utils.py
+++ /dev/null
@@ -1,20 +0,0 @@
-"""
-utility functions for django-form-utils
-
-Time-stamp: <2009-03-26 12:32:41 carljm utils.py>
-
-"""
-from django.template import loader
-
-def select_template_from_string(arg):
-    """
-    Select a template from a string, which can include multiple
-    template paths separated by commas.
-    
-    """
-    if ',' in arg:
-        tpl = loader.select_template(
-            [tn.strip() for tn in arg.split(',')])
-    else:
-        tpl = loader.get_template(arg)
-    return tpl
diff --git a/form_utils/widgets.py b/form_utils/widgets.py
deleted file mode 100644
index 92bf9ca72..000000000
--- a/form_utils/widgets.py
+++ /dev/null
@@ -1,112 +0,0 @@
-"""
-widgets for django-form-utils
-
-parts of this code taken from http://www.djangosnippets.org/snippets/934/
- - thanks baumer1122
-
-"""
-import os
-import posixpath
-
-from django import forms
-from django.conf import settings
-from django.utils.functional import curry
-from django.utils.safestring import mark_safe
-from django.core.files.uploadedfile import SimpleUploadedFile as UploadedFile
-
-from form_utils.settings import JQUERY_URL, FORM_UTILS_MEDIA_URL
-
-try:
-    from sorl.thumbnail.main import DjangoThumbnail
-    def thumbnail(image_path, width, height):
-        t = DjangoThumbnail(relative_source=image_path, requested_size=(width,height))
-        return u'%s' % (t.absolute_url, image_path)
-except ImportError:
-    def thumbnail(image_path, width, height):
-        absolute_url = posixpath.join(settings.MEDIA_URL, image_path)
-        return u'%s' % (absolute_url, image_path)
-
-class ImageWidget(forms.FileInput):
-    template = '%(input)s
%(image)s'
-
-    def __init__(self, attrs=None, template=None, width=200, height=200):
-        if template is not None:
-            self.template = template
-        self.width = width
-        self.height = height
-        super(ImageWidget, self).__init__(attrs)
-
-    def render(self, name, value, attrs=None):
-        input_html = super(forms.FileInput, self).render(name, value, attrs)
-        if hasattr(value, 'width') and hasattr(value, 'height'):
-            image_html = thumbnail(value.name, self.width, self.height)
-            output = self.template % {'input': input_html,
-                                      'image': image_html}
-        else:
-            output = input_html
-        return mark_safe(output)
-
-class ClearableFileInput(forms.MultiWidget):
-    default_file_widget_class = forms.FileInput
-    template = '%(input)s Clear: %(checkbox)s'
-
-    def __init__(self, file_widget=None,
-                 attrs=None, template=None):
-        if template is not None:
-            self.template = template
-        file_widget = file_widget or self.default_file_widget_class()
-        super(ClearableFileInput, self).__init__(
-            widgets=[file_widget, forms.CheckboxInput()],
-            attrs=attrs)
-
-    def render(self, name, value, attrs=None):
-        if isinstance(value, list):
-            self.value = value[0]
-        else:
-            self.value = value
-        return super(ClearableFileInput, self).render(name, value, attrs)
-
-    def decompress(self, value):
-        # the clear checkbox is never initially checked
-        return [value, None]
-
-    def format_output(self, rendered_widgets):
-        if self.value:
-            return self.template % {'input': rendered_widgets[0],
-                                    'checkbox': rendered_widgets[1]}
-        return rendered_widgets[0]
-
-root = lambda path: posixpath.join(FORM_UTILS_MEDIA_URL, path)
-
-class AutoResizeTextarea(forms.Textarea):
-    """
-    A Textarea widget that automatically resizes to accomodate its contents.
-
-    """
-    class Media:
-
-        js = (JQUERY_URL,
-              root('form_utils/js/jquery.autogrow.js'),
-              root('form_utils/js/autoresize.js'))
-
-    def __init__(self, *args, **kwargs):
-        attrs = kwargs.setdefault('attrs', {})
-        try:
-            attrs['class'] = "%s autoresize" % (attrs['class'],)
-        except KeyError:
-            attrs['class'] = 'autoresize'
-        attrs.setdefault('cols', 80)
-        attrs.setdefault('rows', 5)
-        super(AutoResizeTextarea, self).__init__(*args, **kwargs)
-
-class InlineAutoResizeTextarea(AutoResizeTextarea):
-    def __init__(self, *args, **kwargs):
-        attrs = kwargs.setdefault('attrs', {})
-        try:
-            attrs['class'] = "%s inline" % (attrs['class'],)
-        except KeyError:
-            attrs['class'] = 'inline'
-        attrs.setdefault('cols', 40)
-        attrs.setdefault('rows', 2)
-        super(InlineAutoResizeTextarea, self).__init__(*args, **kwargs)
-

From 36cac48063b66c7a094f0ed1090b5011c90c1c2d Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Sun, 30 Jun 2019 20:54:09 +0000
Subject: [PATCH 031/114] Fixed a bunch of str/bytes issues.  - Legacy-Id:
 16341

---
 ietf/doc/mails.py         |  4 ++--
 ietf/doc/tests_charter.py |  8 ++++----
 ietf/doc/views_review.py  | 10 +++++-----
 ietf/ietfauth/htpasswd.py | 11 +++++++----
 ietf/meeting/models.py    | 16 ++++++++--------
 ietf/message/utils.py     |  2 +-
 ietf/nomcom/fields.py     |  3 ++-
 ietf/nomcom/test_data.py  |  5 +++--
 ietf/nomcom/utils.py      |  9 ++++-----
 ietf/review/mailarch.py   |  7 ++++---
 ietf/utils/test_utils.py  |  4 ++--
 ietf/utils/textupload.py  | 13 ++++++-------
 12 files changed, 48 insertions(+), 44 deletions(-)

diff --git a/ietf/doc/mails.py b/ietf/doc/mails.py
index b2de66f83..aca9a0c8d 100644
--- a/ietf/doc/mails.py
+++ b/ietf/doc/mails.py
@@ -383,7 +383,7 @@ def generate_issue_ballot_mail(request, doc, ballot):
 def email_iana(request, doc, to, msg, cc=None):
     # fix up message and send it with extra info on doc in headers
     import email
-    parsed_msg = email.message_from_string(msg.encode("utf-8"))
+    parsed_msg = email.message_from_string(msg)
     parsed_msg.set_charset('UTF-8')
 
     extra = extra_automation_headers(doc)
@@ -391,7 +391,7 @@ def email_iana(request, doc, to, msg, cc=None):
     
     send_mail_text(request, to,
                    parsed_msg["From"], parsed_msg["Subject"],
-                   parsed_msg.get_payload().decode(str(parsed_msg.get_charset())),
+                   parsed_msg.get_payload(),
                    extra=extra,
                    cc=cc)
 
diff --git a/ietf/doc/tests_charter.py b/ietf/doc/tests_charter.py
index e38cf2c33..49d8c5b5e 100644
--- a/ietf/doc/tests_charter.py
+++ b/ietf/doc/tests_charter.py
@@ -399,9 +399,9 @@ class EditCharterTests(TestCase):
         # post
         prev_rev = charter.rev
 
-        latin_1_snippet = '\xe5' * 10
-        utf_8_snippet = '\xc3\xa5' * 10
-        test_file = StringIO("Windows line\r\nMac line\rUnix line\n" + latin_1_snippet)
+        latin_1_snippet = b'\xe5' * 10
+        utf_8_snippet = b'\xc3\xa5' * 10
+        test_file = StringIO("Windows line\r\nMac line\rUnix line\n" + latin_1_snippet.decode('latin-1'))
         test_file.name = "unnamed"
 
         r = self.client.post(url, dict(txt=test_file))
@@ -413,7 +413,7 @@ class EditCharterTests(TestCase):
 
         with open(os.path.join(self.charter_dir, charter.canonical_name() + "-" + charter.rev + ".txt")) as f:
             self.assertEqual(f.read(),
-                              "Windows line\nMac line\nUnix line\n" + utf_8_snippet)
+                              "Windows line\nMac line\nUnix line\n" + utf_8_snippet.decode('utf_8'))
 
     def test_submit_initial_charter(self):
         group = GroupFactory(type_id='wg',acronym='mars',list_email='mars-wg@ietf.org')
diff --git a/ietf/doc/views_review.py b/ietf/doc/views_review.py
index f641ebd28..bd9fb73ac 100644
--- a/ietf/doc/views_review.py
+++ b/ietf/doc/views_review.py
@@ -620,13 +620,13 @@ def complete_review(request, name, assignment_id):
 
             # save file on disk
             if review_submission == "upload":
-                encoded_content = form.cleaned_data['review_file']
+                content = form.cleaned_data['review_file']
             else:
-                encoded_content = form.cleaned_data['review_content'].encode("utf-8")
+                content = form.cleaned_data['review_content']
 
             filename = os.path.join(review.get_file_path(), '{}.txt'.format(review.name, review.rev))
-            with open(filename, 'wb') as destination:
-                destination.write(encoded_content)
+            with open(filename, 'w', encoding='utf-8') as destination:
+                destination.write(content)
 
             completion_datetime = datetime.datetime.now()
             if "completion_date" in form.cleaned_data:
@@ -699,7 +699,7 @@ def complete_review(request, name, assignment_id):
                         cc=form.cleaned_data["cc"],
                         body = render_to_string("review/completed_review.txt", {
                             "assignment": assignment,
-                            "content": encoded_content.decode("utf-8"),
+                            "content": content,
                         }),
                     )
                 msg.related_groups.add(*related_groups)
diff --git a/ietf/ietfauth/htpasswd.py b/ietf/ietfauth/htpasswd.py
index 145af84c7..7474d7592 100644
--- a/ietf/ietfauth/htpasswd.py
+++ b/ietf/ietfauth/htpasswd.py
@@ -1,4 +1,7 @@
+# Copyright The IETF Trust 2016-2019, All Rights Reserved
+
 import subprocess, hashlib
+from django.utils.encoding import force_bytes
 
 from django.conf import settings
 
@@ -6,9 +9,9 @@ def update_htpasswd_file(username, password):
     if getattr(settings, 'USE_PYTHON_HTDIGEST', None):
         pass_file = settings.HTPASSWD_FILE
         realm = settings.HTDIGEST_REALM
-        prefix = '%s:%s:' % (username, realm)
-        key = hashlib.md5(prefix + password).hexdigest()
-        f = open(pass_file, 'r+')
+        prefix = force_bytes('%s:%s:' % (username, realm))
+        key = force_bytes(hashlib.md5(prefix + force_bytes(password)).hexdigest())
+        f = open(pass_file, 'r+b')
         pos = f.tell()
         line = f.readline()
         while line:
@@ -17,7 +20,7 @@ def update_htpasswd_file(username, password):
             pos=f.tell()
             line = f.readline()
         f.seek(pos)
-        f.write('%s%s\n' % (prefix, key))
+        f.write(b'%s%s\n' % (prefix, key))
         f.close()
     else:
         p = subprocess.Popen([settings.HTPASSWD_COMMAND, "-b", settings.HTPASSWD_FILE, username, password], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py
index 5bce1032d..a84e51db0 100644
--- a/ietf/meeting/models.py
+++ b/ietf/meeting/models.py
@@ -255,7 +255,7 @@ class Meeting(models.Model):
         days.sort()
         for ymd in time_slices:
             time_slices[ymd].sort()
-            slots[ymd].sort(lambda x,y: cmp(x.time, y.time))
+            slots[ymd].sort(key=lambda x: x.time)
         return days,time_slices,slots
 
     # this functions makes a list of timeslices and rooms, and
@@ -1080,22 +1080,22 @@ class Session(models.Model):
             sess1['group_href']     = urljoin(host_scheme, self.group.json_url())
             if self.group.parent is not None:
                 sess1['area']           = self.group.parent.acronym.upper()
-            sess1['description']    = self.group.name.encode('utf-8')
+            sess1['description']    = self.group.name
             sess1['group_id']       = str(self.group.pk)
         reslist = []
         for r in self.resources.all():
             reslist.append(r.json_dict(host_scheme))
         sess1['resources']      = reslist
         sess1['session_id']     = str(self.pk)
-        sess1['name']           = self.name.encode('utf-8')
-        sess1['title']          = self.short_name.encode('utf-8')
-        sess1['short_name']     = self.short_name.encode('utf-8')
+        sess1['name']           = self.name
+        sess1['title']          = self.short_name
+        sess1['short_name']     = self.short_name
         sess1['bof']            = str(self.group.is_bof())
-        sess1['agenda_note']    = self.agenda_note.encode('utf-8')
+        sess1['agenda_note']    = self.agenda_note
         sess1['attendees']      = str(self.attendees)
-        sess1['status']         = self.status.name.encode('utf-8')
+        sess1['status']         = self.status.name
         if self.comments is not None:
-            sess1['comments']       = self.comments.encode('utf-8')
+            sess1['comments']       = self.comments
         sess1['requested_time'] = self.requested.strftime("%Y-%m-%d")
         # the related person object sometimes does not exist in the dataset.
         try:
diff --git a/ietf/message/utils.py b/ietf/message/utils.py
index 9ae32f796..8c0c6934a 100644
--- a/ietf/message/utils.py
+++ b/ietf/message/utils.py
@@ -41,7 +41,7 @@ def send_scheduled_message_from_send_queue(send_queue):
         # make body a real message so we can parse it
         body = ("MIME-Version: 1.0\r\nContent-Type: %s\r\n" % message.content_type) + body
         
-        msg = email.message_from_string(body.encode("utf-8"))
+        msg = email.message_from_string(body)
         send_mail_mime(None, message.to, message.frm, message.subject,
                        msg, cc=message.cc, bcc=message.bcc)
 
diff --git a/ietf/nomcom/fields.py b/ietf/nomcom/fields.py
index eab7111da..f418bb382 100644
--- a/ietf/nomcom/fields.py
+++ b/ietf/nomcom/fields.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2012-2019, All Rights Reserved
 from django.conf import settings
 from django.db import models
 from django.utils.encoding import smart_str
@@ -19,7 +20,7 @@ class EncryptedTextField(models.TextField):
                 raise ValueError("Trying to read the NomCom public key: " + str(e))
 
             command = "%s smime -encrypt -in /dev/stdin %s" % (settings.OPENSSL_COMMAND, cert_file)
-            code, out, error = pipe(command, comments)
+            code, out, error = pipe(command, comments.encode())
             if code != 0:
                 log("openssl error: %s:\n  Error %s: %s" %(command, code, error))
             if not error:
diff --git a/ietf/nomcom/test_data.py b/ietf/nomcom/test_data.py
index c04621c91..2cb998242 100644
--- a/ietf/nomcom/test_data.py
+++ b/ietf/nomcom/test_data.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2012-2019, All Rights Reserved
 import tempfile
 import os
 
@@ -38,7 +39,7 @@ POSITIONS = [
 
 def generate_cert():
     """Function to generate cert"""
-    config = """
+    config = b"""
             [ req ]
             distinguished_name = req_distinguished_name
             string_mask        = utf8only
@@ -89,7 +90,7 @@ def check_comments(encryped, plain, privatekey_file):
 
     decrypted_file.close()
     encrypted_file.close()
-    decrypted_comments = open(decrypted_file.name, 'r').read().decode('utf8')
+    decrypted_comments = open(decrypted_file.name, 'r').read()
     os.unlink(encrypted_file.name)
     os.unlink(decrypted_file.name)
 
diff --git a/ietf/nomcom/utils.py b/ietf/nomcom/utils.py
index 43be9b204..2146c262a 100644
--- a/ietf/nomcom/utils.py
+++ b/ietf/nomcom/utils.py
@@ -87,7 +87,7 @@ def get_user_email(user):
     return user._email_cache
 
 def get_hash_nominee_position(date, nominee_position_id):
-    return hashlib.md5('%s%s%s' % (settings.SECRET_KEY, date, nominee_position_id)).hexdigest()
+    return hashlib.md5(('%s%s%s' % (settings.SECRET_KEY, date, nominee_position_id)).encode()).hexdigest()
 
 
 def initialize_templates_for_group(group):
@@ -160,7 +160,7 @@ def retrieve_nomcom_private_key(request, year):
 
     command = "%s bf -d -in /dev/stdin -k \"%s\" -a"
     code, out, error = pipe(command % (settings.OPENSSL_COMMAND,
-                                       settings.SECRET_KEY), private_key)
+                                       settings.SECRET_KEY), private_key.encode())
     if code != 0:
         log("openssl error: %s:\n  Error %s: %s" %(command, code, error))        
     return out
@@ -399,9 +399,8 @@ def make_nomineeposition_for_newperson(nomcom, candidate_name, candidate_email,
 def getheader(header_text, default="ascii"):
     """Decode the specified header"""
 
-    headers = decode_header(header_text)
-    header_sections = [str(text, charset or default)
-                       for text, charset in headers]
+    tuples = decode_header(header_text)
+    header_sections = [ text.decode(charset or default) if isinstance(text, bytes) else text for text, charset in tuples]
     return "".join(header_sections)
 
 
diff --git a/ietf/review/mailarch.py b/ietf/review/mailarch.py
index 13582503c..f905a603c 100644
--- a/ietf/review/mailarch.py
+++ b/ietf/review/mailarch.py
@@ -11,6 +11,7 @@ import debug                            # pyflakes:ignore
 from pyquery import PyQuery
 
 from django.conf import settings
+from django.utils.encoding import force_bytes
 
 def list_name_from_email(list_email):
     if not list_email.endswith("@ietf.org"):
@@ -23,9 +24,9 @@ def hash_list_message_id(list_name, msgid):
     # https://www.mail-archive.com/faq.html#listserver except the list
     # name (without "@ietf.org") is used instead of the full address,
     # and rightmost "=" signs are (optionally) stripped
-    sha = hashlib.sha1(msgid)
-    sha.update(list_name)
-    return base64.urlsafe_b64encode(sha.digest()).rstrip("=")
+    sha = hashlib.sha1(force_bytes(msgid))
+    sha.update(force_bytes(list_name))
+    return base64.urlsafe_b64encode(sha.digest()).rstrip(b"=")
 
 def construct_query_urls(review_req, query=None):
     list_name = list_name_from_email(review_req.team.list_email)
diff --git a/ietf/utils/test_utils.py b/ietf/utils/test_utils.py
index c7134b970..bf1e3ce61 100644
--- a/ietf/utils/test_utils.py
+++ b/ietf/utils/test_utils.py
@@ -73,7 +73,7 @@ def unicontent(r):
 
 def textcontent(r):
     text = BeautifulSoup(r.content, 'lxml').get_text()
-    text = re.sub('(\n\s+){2,}', '\n\n', text)
+    text = re.sub(r'(\n\s+){2,}', '\n\n', text)
     return text
 
 def reload_db_objects(*objects):
@@ -163,7 +163,7 @@ class TestCase(django.test.TestCase):
         if subject:
             mlist = [ m for m in mlist if subject in m["Subject"] ]
         if text:
-            mlist = [ m for m in mlist if text in m.get_payload(decode=True) ]
+            mlist = [ m for m in mlist if text in m.get_payload() ]
         if count and len(mlist) != count:
             sys.stderr.write("Wrong count in assertMailboxContains().  The complete mailbox contains %s emails:\n\n" % len(mailbox))
             for m in mailbox:
diff --git a/ietf/utils/textupload.py b/ietf/utils/textupload.py
index 2cf90549c..751a75450 100644
--- a/ietf/utils/textupload.py
+++ b/ietf/utils/textupload.py
@@ -17,7 +17,7 @@ def get_cleaned_text_file_content(uploaded_file):
     if uploaded_file.size and uploaded_file.size > 10 * 1000 * 1000:
         raise ValidationError("Text file too large (size %s)." % uploaded_file.size)
 
-    content = "".join(uploaded_file.chunks())
+    content = b"".join(uploaded_file.chunks())
 
     # try to fixup encoding
     import magic
@@ -39,13 +39,12 @@ def get_cleaned_text_file_content(uploaded_file):
         raise ValidationError("File has unknown encoding.")
 
     encoding = match.group(1)
-    if "ascii" not in encoding:
-        try:
-            content = content.decode(encoding)
-        except Exception as e:
-            raise ValidationError("Error decoding file (%s). Try submitting with UTF-8 encoding or remove non-ASCII characters." % str(e))
+    try:
+        content = content.decode(encoding)
+    except Exception as e:
+        raise ValidationError("Error decoding file (%s). Try submitting with UTF-8 encoding or remove non-ASCII characters." % str(e))
 
     # turn line-endings into Unix style
     content = content.replace("\r\n", "\n").replace("\r", "\n")
 
-    return content.encode("utf-8")
+    return content

From 8b52899459c605a7b3e1c4ac9cf13d226868a545 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Sun, 30 Jun 2019 20:56:56 +0000
Subject: [PATCH 032/114] Fixed some additional str/bytes issues.  - Legacy-Id:
 16342

---
 ietf/doc/views_charter.py         |  4 ++--
 ietf/doc/views_conflict_review.py |  2 +-
 ietf/doc/views_status_change.py   |  2 +-
 ietf/iesg/views.py                | 13 +++++++------
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ietf/doc/views_charter.py b/ietf/doc/views_charter.py
index 0ad038f54..30e915cf5 100644
--- a/ietf/doc/views_charter.py
+++ b/ietf/doc/views_charter.py
@@ -413,11 +413,11 @@ def submit(request, name, option=None):
 
             # Save file on disk
             filename = os.path.join(settings.CHARTER_PATH, '%s-%s.txt' % (charter.canonical_name(), charter.rev))
-            with open(filename, 'wb') as destination:
+            with open(filename, 'w', encoding='utf-8') as destination:
                 if form.cleaned_data['txt']:
                     destination.write(form.cleaned_data['txt'])
                 else:
-                    destination.write(form.cleaned_data['content'].encode("utf-8"))
+                    destination.write(form.cleaned_data['content'])
 
             if option in ['initcharter','recharter'] and charter.ad == None:
                 charter.ad = getattr(group.ad_role(),'person',None)
diff --git a/ietf/doc/views_conflict_review.py b/ietf/doc/views_conflict_review.py
index e8f53f899..518fd0d7a 100644
--- a/ietf/doc/views_conflict_review.py
+++ b/ietf/doc/views_conflict_review.py
@@ -159,7 +159,7 @@ class UploadForm(forms.Form):
 
     def save(self, review):
         filename = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (review.canonical_name(), review.rev))
-        with open(filename, 'wb') as destination:
+        with open(filename, 'w', encoding='utf-8') as destination:
             if self.cleaned_data['txt']:
                 destination.write(self.cleaned_data['txt'])
             else:
diff --git a/ietf/doc/views_status_change.py b/ietf/doc/views_status_change.py
index dd607f1ea..b78aa91e7 100644
--- a/ietf/doc/views_status_change.py
+++ b/ietf/doc/views_status_change.py
@@ -124,7 +124,7 @@ class UploadForm(forms.Form):
 
     def save(self, doc):
        filename = os.path.join(settings.STATUS_CHANGE_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev))
-       with open(filename, 'wb') as destination:
+       with open(filename, 'w', encoding='utf-8') as destination:
            if self.cleaned_data['txt']:
                destination.write(self.cleaned_data['txt'])
            else:
diff --git a/ietf/iesg/views.py b/ietf/iesg/views.py
index 029e33d59..1fceb0323 100644
--- a/ietf/iesg/views.py
+++ b/ietf/iesg/views.py
@@ -49,6 +49,7 @@ from django.db import models
 from django.http import HttpResponse
 from django.shortcuts import render, redirect
 from django.contrib.sites.models import Site
+from django.utils.encoding import force_bytes
 #from django.views.decorators.cache import cache_page
 #from django.views.decorators.vary import vary_on_cookie
 
@@ -454,22 +455,22 @@ def telechat_docs_tarfile(request, date):
 
     tarstream = tarfile.open('', 'w:gz', response)
 
-    manifest = io.StringIO()
+    manifest = io.BytesIO()
 
     for doc in docs:
-        doc_path = os.path.join(doc.get_file_path(), doc.name + "-" + doc.rev + ".txt")
+        doc_path = force_bytes(os.path.join(doc.get_file_path(), doc.name + "-" + doc.rev + ".txt"))
         if os.path.exists(doc_path):
             try:
                 tarstream.add(doc_path, str(doc.name + "-" + doc.rev + ".txt"))
-                manifest.write("Included:  %s\n" % doc_path)
+                manifest.write(b"Included:  %s\n" % doc_path)
             except Exception as e:
-                manifest.write("Failed (%s): %s\n" % (e, doc_path))
+                manifest.write(b"Failed (%s): %s\n" % (force_bytes(e), doc_path))
         else:
-            manifest.write("Not found: %s\n" % doc_path)
+            manifest.write(b"Not found: %s\n" % doc_path)
 
     manifest.seek(0)
     t = tarfile.TarInfo(name="manifest.txt")
-    t.size = len(manifest.buf)
+    t.size = len(manifest.getvalue())
     t.mtime = time.time()
     tarstream.addfile(t, manifest)
 

From ff6997df2b0e3d2b0a6b7779a95c0ce63aa7b4ac Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Sun, 30 Jun 2019 20:58:26 +0000
Subject: [PATCH 033/114] Fixed a case of indeterminate ordering.  - Legacy-Id:
 16343

---
 ietf/doc/views_draft.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ietf/doc/views_draft.py b/ietf/doc/views_draft.py
index 050ad7890..921961585 100644
--- a/ietf/doc/views_draft.py
+++ b/ietf/doc/views_draft.py
@@ -1456,7 +1456,7 @@ def release_draft(request, name):
             events = []
 
             if doc.stream.slug == 'ise' or doc.group.type_id != 'individ':
-                existing_tags = set(doc.tags.all())
+                existing_tags = list(doc.tags.all())
                 if existing_tags:
                     doc.tags.clear()
                     e = DocEvent(type="changed_document", doc=doc, rev=doc.rev, by=by)

From aad1d0f1e530dca85e9d54b320921bc15bb91adf Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Sun, 30 Jun 2019 21:00:38 +0000
Subject: [PATCH 034/114] Fixed another str/bytes issue.  - Legacy-Id: 16344

---
 ietf/group/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ietf/group/views.py b/ietf/group/views.py
index 7e820bf50..105c8f354 100644
--- a/ietf/group/views.py
+++ b/ietf/group/views.py
@@ -708,7 +708,7 @@ def dependencies(request, acronym, group_type=None, output_type="pdf"):
     pipe("%s -f -l 10 -o %s %s" % (settings.UNFLATTEN_BINARY, unflatname, dotname))
     pipe("%s -T%s -o %s %s" % (settings.DOT_BINARY, output_type, outname, unflatname))
 
-    outhandle = open(outname, "r")
+    outhandle = open(outname, "rb")
     out = outhandle.read()
     outhandle.close()
 

From 20c44a9e1a3c5d74d7676d09a248e4720b2d0d26 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Sun, 30 Jun 2019 21:01:44 +0000
Subject: [PATCH 035/114] Adapted the pipe() code to python3; API changes and
 str/byte handling.  - Legacy-Id: 16345

---
 ietf/utils/pipe.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/ietf/utils/pipe.py b/ietf/utils/pipe.py
index 845bc901e..5d4d28e5f 100644
--- a/ietf/utils/pipe.py
+++ b/ietf/utils/pipe.py
@@ -1,27 +1,28 @@
+# Copyright The IETF Trust 2010-2019, All Rights Reserved
 # Simplified interface to os.popen3()
 
-def pipe(cmd, str=None):
-    from popen2 import Popen3 as Popen
+def pipe(cmd:bytes, str:bytes=None) -> (int, bytes, bytes):
+    from subprocess import Popen, PIPE
     bufsize = 4096
     MAX = 65536*16
 
     if str and len(str) > 4096:                 # XXX: Hardcoded Linux 2.4, 2.6 pipe buffer size
         bufsize = len(str)
 
-    pipe = Popen(cmd, True, bufsize)
+    pipe = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE, bufsize=bufsize, shell=True)
     if not str is None:
-        pipe.tochild.write(str)
-        pipe.tochild.close()
+        pipe.stdin.write(str)
+        pipe.stdin.close()
 
-    out = ""
-    err = ""
+    out = b""
+    err = b""
     while True:
-        str = pipe.fromchild.read()
+        str = pipe.stdout.read()
         if str:
             out += str
         code = pipe.poll()
         if code > -1:
-            err = pipe.childerr.read()
+            err = pipe.stderr.read()
             break
         if len(out) >= MAX:
             err = "Output exceeds %s bytes and has been truncated" % MAX

From 97a555936ddf71a4c75c936d5162d1da71196c16 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Sun, 30 Jun 2019 21:03:34 +0000
Subject: [PATCH 036/114] Changed a large number of test assertions to use
 assertContains() and removed separate, now unnecessary,status_code checks. 
 Also changed many assertTrue(... in ...) to use assertIn().  - Legacy-Id:
 16346

---
 ietf/doc/tests_ballot.py                   |   8 +-
 ietf/doc/tests_conflict_review.py          |   8 +-
 ietf/doc/tests_downref.py                  |  48 ++----
 ietf/doc/tests_status_change.py            |  22 +--
 ietf/group/tests_info.py                   |   4 +-
 ietf/group/tests_review.py                 |  20 ++-
 ietf/iesg/tests.py                         |  78 +++++-----
 ietf/ietfauth/tests.py                     |  18 +--
 ietf/ipr/tests.py                          |   2 +-
 ietf/liaisons/forms.py                     |   2 +-
 ietf/meeting/tests_views.py                | 169 ++++++++++-----------
 ietf/nomcom/tests.py                       |   8 +-
 ietf/submit/tests.py                       |  12 +-
 ietf/utils/management/commands/pyflakes.py |   2 +-
 14 files changed, 184 insertions(+), 217 deletions(-)

diff --git a/ietf/doc/tests_ballot.py b/ietf/doc/tests_ballot.py
index 9284f8172..fa679b25b 100644
--- a/ietf/doc/tests_ballot.py
+++ b/ietf/doc/tests_ballot.py
@@ -112,8 +112,7 @@ class EditPositionTests(TestCase):
                                         discuss=" This is a discussion test. \n ",
                                         comment=" This is a test. \n ")
             )
-        self.assertEqual(r.content, "Done")
-        self.assertEqual(r.status_code, 200)
+        self.assertContains(r, "Done")
 
         pos = draft.latest_event(BallotPositionDocEvent, ad=ad)
         self.assertEqual(pos.pos.slug, "discuss")
@@ -733,13 +732,11 @@ class ApproveBallotTests(TestCase):
         # Only Secretariat can use this URL
         login_testing_unauthorized(self, "ad", url)
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 403)
-        self.assertContains(r, "Restricted to role Secretariat")
+        self.assertContains(r, "Restricted to role Secretariat", status_code=403)
 
         # There are no downrefs, the page should say so
         login_testing_unauthorized(self, "secretary", url)
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, "No downward references for")
 
         # Add a downref, the page should ask if it should be added to the registry
@@ -747,7 +744,6 @@ class ApproveBallotTests(TestCase):
         d = [rdoc for rdoc in draft.relateddocument_set.all() if rel.is_approved_downref()]
         original_len = len(d)
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, "normatively references rfc6666")
 
         # POST with the downref checked
diff --git a/ietf/doc/tests_conflict_review.py b/ietf/doc/tests_conflict_review.py
index b328af217..f9f85a77d 100644
--- a/ietf/doc/tests_conflict_review.py
+++ b/ietf/doc/tests_conflict_review.py
@@ -279,9 +279,9 @@ class ConflictReviewTests(TestCase):
         q = PyQuery(r.content)
         self.assertEqual(len(q('[type=submit]:contains("Send announcement")')), 1)
         if approve_type == 'appr-noprob':
-            self.assertIn( 'IESG has no problem', ''.join(wrap(r.content,2**16)))
+            self.assertContains(r, 'IESG has no problem')
         else:
-            self.assertIn( 'NOT be published', ''.join(wrap(r.content,2**16)))
+            self.assertContains(r, 'NOT be published')
         
         # submit
         empty_outbox()
@@ -298,9 +298,9 @@ class ConflictReviewTests(TestCase):
         self.assertIn('ietf-announce@', outbox[0]['Cc'])
         self.assertIn('iana@', outbox[0]['Cc'])
         if approve_type == 'appr-noprob':
-            self.assertIn( 'IESG has no problem', ''.join(wrap(str(outbox[0]),2**16)))
+            self.assertContains(r, 'IESG has no problem')
         else:
-            self.assertIn( 'NOT be published', ''.join(wrap(str(outbox[0]),2**16)))
+            self.assertContains(r, 'NOT be published')
         
        
     def test_approve_reqnopub(self):
diff --git a/ietf/doc/tests_downref.py b/ietf/doc/tests_downref.py
index e2c6b7652..d7f617256 100644
--- a/ietf/doc/tests_downref.py
+++ b/ietf/doc/tests_downref.py
@@ -32,26 +32,20 @@ class Downref(TestCase):
         # normal - get the table without the "Add downref" button
         self.client.login(username="plain", password="plain+password")
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        content = unicontent(r)
-        self.assertTrue('
Downref registry
' in content)
-        self.assertFalse('Add downref' in content)
+        self.assertContains(r, '
Downref registry
')
+        self.assertNotContains(r, 'Add downref')
 
         # secretariat - get the table with the "Add downref" button
         self.client.login(username='secretary', password='secretary+password')
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        content = unicontent(r)
-        self.assertTrue('
Downref registry
' in content)
-        self.assertTrue('Add downref' in content)
+        self.assertContains(r, '
Downref registry
')
+        self.assertContains(r, ('Add downref')
 
         # area director - get the table with the "Add downref" button
         self.client.login(username='ad', password='ad+password')
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        content = unicontent(r)
-        self.assertTrue('
Downref registry
' in content)
-        self.assertTrue('Add downref' in content)
+        self.assertContains(r, ('
Downref registry
')
+        self.assertContains(r, ('Add downref')
 
     def test_downref_registry_add(self):
         url = urlreverse('ietf.doc.views_downref.downref_registry_add')
@@ -60,42 +54,32 @@ class Downref(TestCase):
         # secretariat - get the form to add entries to the registry
         self.client.login(username='secretary', password='secretary+password')
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        content = unicontent(r)
-        self.assertTrue('
Add entry to the downref registry
' in content)
-        self.assertTrue('Save downref' in content)
+        self.assertContains(r, ('
Add entry to the downref registry
')
+        self.assertContains(r, ('Save downref')
 
         # area director - get the form to add entries to the registry
         self.client.login(username='ad', password='ad+password')
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
-        content = unicontent(r)
-        self.assertTrue('
Add entry to the downref registry
' in content)
-        self.assertTrue('Save downref' in content)
+        self.assertContains(r, ('
Add entry to the downref registry
')
+        self.assertContains(r, ('Save downref')
 
         # error - already in the downref registry
         r = self.client.post(url, dict(rfc=self.rfcalias.pk, drafts=(self.doc.pk, )))
-        self.assertEqual(r.status_code, 200)
-        content = unicontent(r)
-        self.assertTrue('Downref is already in the registry' in content)
+        self.assertContains(r, ('Downref is already in the registry')
 
         # error - source is not in an approved state
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         r = self.client.post(url, dict(rfc=self.rfcalias.pk, drafts=(self.draft.pk, )))
-        self.assertEqual(r.status_code, 200)
-        content = unicontent(r)
-        self.assertTrue('Draft is not yet approved' in content)
+        self.assertContains(r, ('Draft is not yet approved')
 
         # error - the target is not a normative reference of the source
         self.draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="pub"))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         r = self.client.post(url, dict(rfc=self.rfcalias.pk, drafts=(self.draft.pk, )))
-        self.assertEqual(r.status_code, 200)
-        content = unicontent(r)
-        self.assertTrue('There does not seem to be a normative reference to RFC' in content)
-        self.assertTrue('Save downref anyway' in content)
+        self.assertContains(r, ('There does not seem to be a normative reference to RFC')
+        self.assertContains(r, ('Save downref anyway')
 
         # normal - approve the document so the downref is now okay
         RelatedDocument.objects.create(source=self.draft, target=self.rfcalias, relationship_id='refnorm')
@@ -108,9 +92,7 @@ class Downref(TestCase):
         self.assertEqual(r.status_code, 302)
         newurl = urlreverse('ietf.doc.views_downref.downref_registry')
         r = self.client.get(newurl)
-        self.assertEqual(r.status_code, 200)
-        content = unicontent(r)
-        self.assertTrue('0)
 
         self.assertTrue(draft.latest_event(TelechatDocEvent, "scheduled_for_telechat"))
diff --git a/ietf/ietfauth/tests.py b/ietf/ietfauth/tests.py
index 958784f4a..a8bd0a93a 100644
--- a/ietf/ietfauth/tests.py
+++ b/ietf/ietfauth/tests.py
@@ -98,7 +98,7 @@ class IetfAuthTests(TestCase):
 
     def extract_confirm_url(self, confirm_email):
         # dig out confirm_email link
-        msg = confirm_email.get_payload(decode=True)
+        msg = confirm_email.get_payload(decode=True).decode(confirm_email.get_content_charset())
         line_start = "http"
         confirm_url = None
         for line in msg.split("\n"):
@@ -131,7 +131,7 @@ class IetfAuthTests(TestCase):
         empty_outbox()
         r = self.client.post(url, { 'email': email })
         self.assertEqual(r.status_code, 200)
-        self.assertIn("Account creation failed", unicontent(r))
+        self.assertContains(r, "Account creation failed")
 
     def register_and_verify(self, email):
         url = urlreverse(ietf.ietfauth.views.create_account)
@@ -140,7 +140,7 @@ class IetfAuthTests(TestCase):
         empty_outbox()
         r = self.client.post(url, { 'email': email })
         self.assertEqual(r.status_code, 200)
-        self.assertIn("Account request received", unicontent(r))
+        self.assertContains(r, "Account request received")
         self.assertEqual(len(outbox), 1)
 
         # go to confirm page
@@ -172,11 +172,11 @@ class IetfAuthTests(TestCase):
 
         r = self.client.get(urlreverse(ietf.ietfauth.views.add_account_whitelist))
         self.assertEqual(r.status_code, 200)
-        self.assertIn("Add a whitelist entry", unicontent(r))
+        self.assertContains(r, "Add a whitelist entry")
 
         r = self.client.post(urlreverse(ietf.ietfauth.views.add_account_whitelist), {"email": email})
         self.assertEqual(r.status_code, 200)
-        self.assertIn("Whitelist entry creation successful", unicontent(r))
+        self.assertContains(r, "Whitelist entry creation successful")
 
         # log out
         r = self.client.get(urlreverse(django.contrib.auth.views.logout))
@@ -590,19 +590,19 @@ class IetfAuthTests(TestCase):
             # missing apikey
             r = self.client.post(url, {'dummy':'dummy',})
             self.assertEqual(r.status_code, 400)
-            self.assertIn('Missing apikey parameter', unicontent(r))
+            self.assertContains(r, 'Missing apikey parameter')
 
             # invalid apikey
             r = self.client.post(url, {'apikey':BAD_KEY, 'dummy':'dummy',})
             self.assertEqual(r.status_code, 400)
-            self.assertIn('Invalid apikey', unicontent(r))
+            self.assertContains(r, 'Invalid apikey')
 
             # too long since regular login
             person.user.last_login = datetime.datetime.now() - datetime.timedelta(days=settings.UTILS_APIKEY_GUI_LOGIN_LIMIT_DAYS+1)
             person.user.save()
             r = self.client.post(url, {'apikey':key.hash(), 'dummy':'dummy',})
             self.assertEqual(r.status_code, 400)
-            self.assertIn('Too long since last regular login', unicontent(r))
+            self.assertContains(r, 'Too long since last regular login')
             person.user.last_login = datetime.datetime.now()
             person.user.save()
 
@@ -610,7 +610,7 @@ class IetfAuthTests(TestCase):
             key2 = PersonalApiKey.objects.create(person=person, endpoint='/')
             r = self.client.post(url, {'apikey':key2.hash(), 'dummy':'dummy',})
             self.assertEqual(r.status_code, 400)
-            self.assertIn('Apikey endpoint mismatch', unicontent(r))
+            self.assertContains(r, 'Apikey endpoint mismatch')
             key2.delete()
 
     def test_send_apikey_report(self):
diff --git a/ietf/ipr/tests.py b/ietf/ipr/tests.py
index 5a4c656d1..ae787eb7a 100644
--- a/ietf/ipr/tests.py
+++ b/ietf/ipr/tests.py
@@ -476,7 +476,7 @@ class IprTests(TestCase):
         self.assertContains(r, 'Private comment')
         self.client.logout()
         r = self.client.get(url)
-        self.assertFalse('Private comment' in unicontent(r))
+        self.assertNotContains(r, 'Private comment')
         
     def test_addemail(self):
         ipr = HolderIprDisclosureFactory()
diff --git a/ietf/liaisons/forms.py b/ietf/liaisons/forms.py
index 23879ba7e..54c5c6c35 100644
--- a/ietf/liaisons/forms.py
+++ b/ietf/liaisons/forms.py
@@ -376,7 +376,7 @@ class LiaisonModelForm(BetterModelForm):
             if created:
                 DocAlias.objects.create(name=attach.name).docs.add(attach)
             LiaisonStatementAttachment.objects.create(statement=self.instance,document=attach)
-            attach_file = open(os.path.join(settings.LIAISON_ATTACH_PATH, attach.name + extension), 'w')
+            attach_file = open(os.path.join(settings.LIAISON_ATTACH_PATH, attach.name + extension), 'wb')
             attach_file.write(attached_file.read())
             attach_file.close()
 
diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py
index 8c7ff4ad0..5436aae2e 100644
--- a/ietf/meeting/tests_views.py
+++ b/ietf/meeting/tests_views.py
@@ -105,11 +105,11 @@ class MeetingTests(TestCase):
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
         agenda_content = q("#content").html()
-        self.assertTrue(session.group.acronym in agenda_content)
-        self.assertTrue(session.group.name in agenda_content)
-        self.assertTrue(session.group.parent.acronym.upper() in agenda_content)
-        self.assertTrue(slot.location.name in agenda_content)
-        self.assertTrue(time_interval in agenda_content)
+        self.assertIn(session.group.acronym, agenda_content)
+        self.assertIn(session.group.name, agenda_content)
+        self.assertIn(session.group.parent.acronym.upper(), agenda_content)
+        self.assertIn(slot.location.name, agenda_content)
+        self.assertIn(time_interval, agenda_content)
 
         # plain
         time_interval = "%s-%s" % (slot.time.strftime("%H:%M").lstrip("0"), (slot.time + slot.duration).strftime("%H:%M").lstrip("0"))
@@ -118,11 +118,11 @@ class MeetingTests(TestCase):
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
         agenda_content = q("#content").html()
-        self.assertTrue(session.group.acronym in agenda_content)
-        self.assertTrue(session.group.name in agenda_content)
-        self.assertTrue(session.group.parent.acronym.upper() in agenda_content)
-        self.assertTrue(slot.location.name in agenda_content)
-        self.assertTrue(time_interval in agenda_content)
+        self.assertIn(session.group.acronym, agenda_content)
+        self.assertIn(session.group.name, agenda_content)
+        self.assertIn(session.group.parent.acronym.upper(), agenda_content)
+        self.assertIn(slot.location.name, agenda_content)
+        self.assertIn(time_interval, agenda_content)
 
         # Make sure there's a frame for the agenda and it points to the right place
         self.assertTrue(any([session.materials.get(type='agenda').href() in x.attrib["data-src"] for x in q('tr div.modal-body  div.frame')])) 
@@ -133,7 +133,6 @@ class MeetingTests(TestCase):
 
         # future meeting, no agenda
         r = self.client.get(urlreverse("ietf.meeting.views.agenda", kwargs=dict(num=future_meeting.number)))
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, "There is no agenda available yet.")
         self.assertTemplateUsed(r, 'meeting/no-agenda.html')
 
@@ -144,20 +143,18 @@ class MeetingTests(TestCase):
         r = self.client.get(urlreverse("ietf.meeting.views.agenda", kwargs=dict(num=meeting.number, ext=".txt")))
         self.assertEqual(r.status_code, 200)
         agenda_content = r.content
-        self.assertTrue(session.group.acronym in agenda_content)
-        self.assertTrue(session.group.name in agenda_content)
-        self.assertTrue(session.group.parent.acronym.upper() in agenda_content)
-        self.assertTrue(slot.location.name in agenda_content)
+        self.assertIn(session.group.acronym, agenda_content)
+        self.assertIn(session.group.name, agenda_content)
+        self.assertIn(session.group.parent.acronym.upper(), agenda_content)
+        self.assertIn(slot.location.name, agenda_content)
 
-        self.assertTrue(time_interval in agenda_content)
+        self.assertIn(time_interval, agenda_content)
 
         r = self.client.get(urlreverse("ietf.meeting.views.agenda", kwargs=dict(num=meeting.number,name=meeting.unofficial_schedule.name,owner=meeting.unofficial_schedule.owner.email())))
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, 'not the official schedule')
 
         # future meeting, no agenda
         r = self.client.get(urlreverse("ietf.meeting.views.agenda", kwargs=dict(num=future_meeting.number, ext=".txt")))
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, "There is no agenda available yet.")
         self.assertTemplateUsed(r, 'meeting/no-agenda.txt')
 
@@ -165,48 +162,42 @@ class MeetingTests(TestCase):
         r = self.client.get(urlreverse("ietf.meeting.views.agenda", kwargs=dict(num=meeting.number, ext=".csv")))
         self.assertEqual(r.status_code, 200)
         agenda_content = r.content
-        self.assertTrue(session.group.acronym in agenda_content)
-        self.assertTrue(session.group.name in agenda_content)
-        self.assertTrue(session.group.parent.acronym.upper() in agenda_content)
-        self.assertTrue(slot.location.name in agenda_content)
+        self.assertIn(session.group.acronym, agenda_content)
+        self.assertIn(session.group.name, agenda_content)
+        self.assertIn(session.group.parent.acronym.upper(), agenda_content)
+        self.assertIn(slot.location.name, agenda_content)
 
         self.assertContains(r, session.materials.get(type='agenda').uploaded_filename)
         self.assertContains(r, session.materials.filter(type='slides').exclude(states__type__slug='slides',states__slug='deleted').first().uploaded_filename)
-        self.assertFalse(session.materials.filter(type='slides',states__type__slug='slides',states__slug='deleted').first().uploaded_filename in unicontent(r))
+        self.assertNotContains(r, session.materials.filter(type='slides',states__type__slug='slides',states__slug='deleted').first().uploaded_filename)
 
         # iCal
         r = self.client.get(urlreverse("ietf.meeting.views.ical_agenda", kwargs=dict(num=meeting.number))
                             + "?" + session.group.parent.acronym.upper())
-        self.assertEqual(r.status_code, 200)
-        agenda_content = r.content
-        self.assertTrue(session.group.acronym in agenda_content)
-        self.assertTrue(session.group.name in agenda_content)
-        self.assertTrue(slot.location.name in agenda_content)
-        self.assertTrue("BEGIN:VTIMEZONE" in agenda_content)
-        self.assertTrue("END:VTIMEZONE" in agenda_content)        
+        self.assertContains(r, session.group.acronym)
+        self.assertContains(r, session.group.name)
+        self.assertContains(r, slot.location.name)
+        self.assertContains(r, "BEGIN:VTIMEZONE")
+        self.assertContains(r, "END:VTIMEZONE")        
 
         self.assertContains(r, session.agenda().href())
         self.assertContains(r, session.materials.filter(type='slides').exclude(states__type__slug='slides',states__slug='deleted').first().href())
         # TODO - the ics view uses .all on a queryset in a view so it's showing the deleted slides.
-        #self.assertFalse(session.materials.filter(type='slides',states__type__slug='slides',states__slug='deleted').first().get_absolute_url() in unicontent(r))
+        #self.assertNotContains(r, session.materials.filter(type='slides',states__type__slug='slides',states__slug='deleted').first().get_absolute_url())
 
         # week view
         r = self.client.get(urlreverse("ietf.meeting.views.week_view", kwargs=dict(num=meeting.number)))
-        self.assertEqual(r.status_code, 200)
-        agenda_content = unicontent(r)
-        self.assertNotIn('CANCELLED',agenda_content)
-        self.assertTrue(session.group.acronym in agenda_content)
-        self.assertTrue(slot.location.name in agenda_content)
+        self.assertNotContains(r, 'CANCELLED')
+        self.assertContains(r, session.group.acronym)
+        self.assertContains(r, slot.location.name)
 
         # week view with a cancelled session
         session.status_id='canceled'
         session.save()
         r = self.client.get(urlreverse("ietf.meeting.views.week_view", kwargs=dict(num=meeting.number)))
-        self.assertEqual(r.status_code, 200)
-        agenda_content = unicontent(r)
-        self.assertIn('CANCELLED',agenda_content)
-        self.assertTrue(session.group.acronym in agenda_content)
-        self.assertTrue(slot.location.name in agenda_content)       
+        self.assertContains(r, 'CANCELLED')
+        self.assertContains(r, session.group.acronym)
+        self.assertContains(r, slot.location.name)       
 
     def test_agenda_current_audio(self):
         date = datetime.date.today()
@@ -226,7 +217,7 @@ class MeetingTests(TestCase):
         url = urlreverse("ietf.meeting.views.agenda_by_room",kwargs=dict(num=meeting.number,name=meeting.unofficial_schedule.name,owner=meeting.unofficial_schedule.owner.email()))
         r = self.client.get(url)
         self.assertTrue(all([x in unicontent(r) for x in ['mars','Test Room',]]))
-        self.assertFalse('IESG Breakfast' in unicontent(r))
+        self.assertNotContains(r, 'IESG Breakfast')
 
     def test_agenda_by_type(self):
         meeting = make_meeting_test_data()
@@ -239,7 +230,7 @@ class MeetingTests(TestCase):
         url = urlreverse("ietf.meeting.views.agenda_by_type",kwargs=dict(num=meeting.number,name=meeting.unofficial_schedule.name,owner=meeting.unofficial_schedule.owner.email()))
         r = self.client.get(url)
         self.assertTrue(all([x in unicontent(r) for x in ['mars','Test Room',]]))
-        self.assertFalse('IESG Breakfast' in unicontent(r))
+        self.assertNotContains(r, 'IESG Breakfast')
 
         url = urlreverse("ietf.meeting.views.agenda_by_type",kwargs=dict(num=meeting.number,type='session'))
         r = self.client.get(url)
@@ -266,7 +257,7 @@ class MeetingTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code,200)
         self.assertTrue(all([x in unicontent(r) for x in ['mars','Test Room','Breakfast Room']]))
-        self.assertFalse('IESG Breakfast' in unicontent(r))
+        self.assertNotContains(r, 'IESG Breakfast')
 
 
     def test_agenda_week_view(self):
@@ -364,7 +355,7 @@ class MeetingTests(TestCase):
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, meeting.number)
         self.assertContains(r, "mars")
-        self.assertFalse("No session requested" in unicontent(r))
+        self.assertNotContains(r, "No session requested")
 
         self.client.login(username="ad", password="ad+password")
         r = self.client.get(urlreverse("ietf.meeting.views.materials_editable_groups", kwargs={'num':meeting.number}))
@@ -400,7 +391,7 @@ class MeetingTests(TestCase):
         url = urlreverse('ietf.meeting.views.proceedings_acknowledgements',kwargs={'num':meeting.number})
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
-        self.assertTrue('test acknowledgements' in response.content)
+        self.assertIn('test acknowledgements', response.content)
 
     @patch('urllib2.urlopen')
     def test_proceedings_attendees(self, mock_urlopen):
@@ -411,7 +402,7 @@ class MeetingTests(TestCase):
         url = urlreverse('ietf.meeting.views.proceedings_attendees',kwargs={'num':96})
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
-        self.assertTrue('Attendee List' in response.content)
+        self.assertIn('Attendee List', response.content)
         q = PyQuery(response.content)
         self.assertEqual(1,len(q("#id_attendees tbody tr")))
 
@@ -427,7 +418,7 @@ class MeetingTests(TestCase):
         url = urlreverse('ietf.meeting.views.proceedings_overview',kwargs={'num':96})
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
-        self.assertTrue('The Internet Engineering Task Force' in response.content)
+        self.assertIn('The Internet Engineering Task Force', response.content)
 
     def test_proceedings_progress_report(self):
         make_meeting_test_data()
@@ -437,7 +428,7 @@ class MeetingTests(TestCase):
         url = urlreverse('ietf.meeting.views.proceedings_progress_report',kwargs={'num':96})
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
-        self.assertTrue('Progress Report' in response.content)
+        self.assertIn('Progress Report', response.content)
 
     def test_feed(self):
         meeting = make_meeting_test_data()
@@ -456,7 +447,7 @@ class MeetingTests(TestCase):
         url = urlreverse('ietf.meeting.views.important_dates',kwargs={'num':meeting.number})
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertIn(str(meeting.importantdate_set.first().date), unicontent(r))
+        self.assertContains(r, str(meeting.importantdate_set.first().date))
         idn = ImportantDateName.objects.filter(used=True).first()
         pre_date = meeting.importantdate_set.get(name=idn).date
         idn.default_offset_days -= 1
@@ -480,7 +471,7 @@ class MeetingTests(TestCase):
         self.assertEqual(r.status_code, 200)
         self.assertEqual(r.get('Content-Type'), "text/calendar")
         self.assertContains(r, 'BEGIN:VEVENT')
-        self.assertEqual(r.content.count('UID'), 2)
+        self.assertEqual(r.content.count(b'UID'), 2)
         self.assertContains(r, 'SUMMARY:mars - Martian Special Interest Group')
         self.assertContains(r, t1.time.strftime('%Y%m%dT%H%M%S'))
         self.assertContains(r, t2.time.strftime('%Y%m%dT%H%M%S'))
@@ -491,7 +482,7 @@ class MeetingTests(TestCase):
         self.assertEqual(r.status_code, 200)
         self.assertEqual(r.get('Content-Type'), "text/calendar")
         self.assertContains(r, 'BEGIN:VEVENT')
-        self.assertEqual(r.content.count('UID'), 1)
+        self.assertEqual(r.content.count(b'UID'), 1)
         self.assertContains(r, 'SUMMARY:mars - Martian Special Interest Group')
         self.assertContains(r, t1.time.strftime('%Y%m%dT%H%M%S'))
         self.assertNotContains(r, t2.time.strftime('%Y%m%dT%H%M%S'))
@@ -736,7 +727,7 @@ class SessionDetailsTests(TestCase):
         url = urlreverse('ietf.meeting.views.session_details', kwargs=dict(num=session.meeting.number, acronym=group.acronym))
         r = self.client.get(url)
         self.assertTrue(all([x in unicontent(r) for x in ('slides','agenda','minutes','draft')]))
-        self.assertFalse('deleted' in unicontent(r))
+        self.assertNotContains(r, 'deleted')
         
     def test_add_session_drafts(self):
         group = GroupFactory.create(type_id='wg',state_id='active')
@@ -764,7 +755,7 @@ class SessionDetailsTests(TestCase):
         r = self.client.post(url,dict(drafts=[new_draft.pk, old_draft.pk]))
         self.assertTrue(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertTrue("Already linked:" in q('form .alert-danger').text())
+        self.assertIn("Already linked:", q('form .alert-danger').text())
 
         self.assertEqual(1,session.sessionpresentation_set.count())
         r = self.client.post(url,dict(drafts=[new_draft.pk,]))
@@ -913,7 +904,7 @@ class InterimTests(TestCase):
         r = self.client.post(url, initial)
         self.assertRedirects(r, urlreverse('ietf.meeting.views.interim_announce'))
         self.assertEqual(len(outbox), len_before + 1)
-        self.assertTrue('WG Virtual Meeting' in outbox[-1]['Subject'])
+        self.assertIn('WG Virtual Meeting', outbox[-1]['Subject'])
 
     def test_interim_approve_by_ad(self):
         make_meeting_test_data()
@@ -926,7 +917,7 @@ class InterimTests(TestCase):
         for session in meeting.session_set.all():
             self.assertEqual(session.status.slug, 'scheda')
         self.assertEqual(len(outbox), length_before + 1)
-        self.assertTrue('ready for announcement' in outbox[-1]['Subject'])
+        self.assertIn('ready for announcement', outbox[-1]['Subject'])
 
     def test_interim_approve_by_secretariat(self):
         make_meeting_test_data()
@@ -949,7 +940,7 @@ class InterimTests(TestCase):
         self.assertContains(r, 'IETF - %02d'%int(ietf.meeting.number))
         q = PyQuery(r.content)
         id="-%s" % interim.group.acronym
-        self.assertTrue('CANCELLED' in q('[id*="'+id+'"]').text())
+        self.assertIn('CANCELLED', q('[id*="'+id+'"]').text())
 
     def test_upcoming(self):
         make_meeting_test_data()
@@ -964,7 +955,7 @@ class InterimTests(TestCase):
         self.assertContains(r, 'IETF - 42')
         # cancelled session
         q = PyQuery(r.content)
-        self.assertTrue('CANCELLED' in q('[id*="-ames"]').text())
+        self.assertIn('CANCELLED', q('[id*="-ames"]').text())
         self.check_interim_tabs(url)
 
     def test_upcoming_ical(self):
@@ -973,14 +964,14 @@ class InterimTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         self.assertEqual(r.get('Content-Type'), "text/calendar")
-        self.assertEqual(r.content.count('UID'), 7)
+        self.assertEqual(r.content.count(b'UID'), 7)
         # check filtered output
         url = url + '?filters=mars'
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         self.assertEqual(r.get('Content-Type'), "text/calendar")
         # print r.content
-        self.assertEqual(r.content.count('UID'), 2)
+        self.assertEqual(r.content.count(b'UID'), 2)
 
 
     def test_interim_request_permissions(self):
@@ -1094,8 +1085,8 @@ class InterimTests(TestCase):
         self.assertTrue(os.path.exists(path))
         # check notice to secretariat
         self.assertEqual(len(outbox), length_before + 1)
-        self.assertTrue('interim meeting ready for announcement' in outbox[-1]['Subject'])
-        self.assertTrue('iesg-secretary@ietf.org' in outbox[-1]['To'])
+        self.assertIn('interim meeting ready for announcement', outbox[-1]['Subject'])
+        self.assertIn('iesg-secretary@ietf.org', outbox[-1]['To'])
 
     def test_interim_request_single_in_person(self):
         make_meeting_test_data()
@@ -1467,7 +1458,7 @@ class InterimTests(TestCase):
             self.assertEqual(session.status_id, 'canceled')
             self.assertEqual(session.agenda_note, comments)
         self.assertEqual(len(outbox), length_before + 1)
-        self.assertTrue('Interim Meeting Cancelled' in outbox[-1]['Subject'])
+        self.assertIn('Interim Meeting Cancelled', outbox[-1]['Subject'])
 
     def test_interim_request_edit_no_notice(self):
         '''Edit a request.  No notice should go out if it hasn't been announced yet'''
@@ -1542,7 +1533,7 @@ class InterimTests(TestCase):
         r = self.client.post(url, data)
         self.assertRedirects(r, urlreverse('ietf.meeting.views.interim_request_details', kwargs={'number': meeting.number}))
         self.assertEqual(len(outbox),length_before+1)
-        self.assertTrue('CHANGED' in outbox[-1]['Subject'])
+        self.assertIn('CHANGED', outbox[-1]['Subject'])
         session = meeting.session_set.first()
         timeslot = session.official_timeslotassignment().timeslot
         self.assertEqual(timeslot.time,new_time)
@@ -1570,7 +1561,7 @@ class InterimTests(TestCase):
         length_before = len(outbox)
         send_interim_approval_request(meetings=[meeting])
         self.assertEqual(len(outbox),length_before+1)
-        self.assertTrue('New Interim Meeting Request' in outbox[-1]['Subject'])
+        self.assertIn('New Interim Meeting Request', outbox[-1]['Subject'])
 
     def test_send_interim_cancellation_notice(self):
         make_meeting_test_data()
@@ -1578,7 +1569,7 @@ class InterimTests(TestCase):
         length_before = len(outbox)
         send_interim_cancellation_notice(meeting=meeting)
         self.assertEqual(len(outbox),length_before+1)
-        self.assertTrue('Interim Meeting Cancelled' in outbox[-1]['Subject'])
+        self.assertIn('Interim Meeting Cancelled', outbox[-1]['Subject'])
 
     def test_send_interim_minutes_reminder(self):
         make_meeting_test_data()
@@ -1588,7 +1579,7 @@ class InterimTests(TestCase):
         length_before = len(outbox)
         send_interim_minutes_reminder(meeting=meeting)
         self.assertEqual(len(outbox),length_before+1)
-        self.assertTrue('Action Required: Minutes' in outbox[-1]['Subject'])
+        self.assertIn('Action Required: Minutes', outbox[-1]['Subject'])
 
 
     def test_group_ical(self):
@@ -1607,7 +1598,7 @@ class InterimTests(TestCase):
         self.assertEqual(r.status_code, 200)
         self.assertEqual(r.get('Content-Type'), "text/calendar")
         self.assertContains(r, 'BEGIN:VEVENT')
-        self.assertEqual(r.content.count('UID'), 2)
+        self.assertEqual(r.content.count(b'UID'), 2)
         self.assertContains(r, 'SUMMARY:mars - Martian Special Interest Group')
         self.assertContains(r, t1.time.strftime('%Y%m%dT%H%M%S'))
         self.assertContains(r, t2.time.strftime('%Y%m%dT%H%M%S'))
@@ -1618,7 +1609,7 @@ class InterimTests(TestCase):
         self.assertEqual(r.status_code, 200)
         self.assertEqual(r.get('Content-Type'), "text/calendar")
         self.assertContains(r, 'BEGIN:VEVENT')
-        self.assertEqual(r.content.count('UID'), 1)
+        self.assertEqual(r.content.count(b'UID'), 1)
         self.assertContains(r, 'SUMMARY:mars - Martian Special Interest Group')
         self.assertContains(r, t1.time.strftime('%Y%m%dT%H%M%S'))
         self.assertNotContains(r, t2.time.strftime('%Y%m%dT%H%M%S'))
@@ -1631,27 +1622,27 @@ class AjaxTests(TestCase):
         url = urlreverse('ietf.meeting.views.ajax_get_utc') + "?date=2016-1-1&time=badtime&timezone=UTC"
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        data = json.loads(r.content)
+        data = r.json()
         self.assertEqual(data["error"], True)
         url = urlreverse('ietf.meeting.views.ajax_get_utc') + "?date=2016-1-1&time=25:99&timezone=UTC"
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        data = json.loads(r.content)
+        data = r.json()
         self.assertEqual(data["error"], True)
         url = urlreverse('ietf.meeting.views.ajax_get_utc') + "?date=2016-1-1&time=10:00am&timezone=UTC"
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        data = json.loads(r.content)
+        data = r.json()
         self.assertEqual(data["error"], True)
         # test good query
         url = urlreverse('ietf.meeting.views.ajax_get_utc') + "?date=2016-1-1&time=12:00&timezone=America/Los_Angeles"
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        data = json.loads(r.content)
-        self.assertTrue('timezone' in data)
-        self.assertTrue('time' in data)
-        self.assertTrue('utc' in data)
-        self.assertTrue('error' not in data)
+        data = r.json()
+        self.assertIn('timezone', data)
+        self.assertIn('time', data)
+        self.assertIn('utc', data)
+        self.assertIn('error' not, data)
         self.assertEqual(data['utc'], '20:00')
 
 class FloorPlanTests(TestCase):
@@ -1761,7 +1752,7 @@ class MaterialsTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertTrue('Upload' in str(q("title")))
+        self.assertIn('Upload', str(q("title")))
         self.assertFalse(session.sessionpresentation_set.exists())
         test_file = StringIO(b'%PDF-1.4\n%âãÏÓ\nthis is some text for a test')
         test_file.name = "not_really.pdf"
@@ -1772,7 +1763,7 @@ class MaterialsTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertTrue('Revise' in str(q("title")))
+        self.assertIn('Revise', str(q("title")))
         test_file = StringIO('%PDF-1.4\n%âãÏÓ\nthis is some different text for a test')
         test_file.name = "also_not_really.pdf"
         r = self.client.post(url,dict(file=test_file))
@@ -1796,7 +1787,7 @@ class MaterialsTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertTrue('Upload' in str(q("title")))
+        self.assertIn('Upload', str(q("title")))
         self.assertFalse(session.sessionpresentation_set.exists())
         test_file = StringIO(b'%PDF-1.4\n%âãÏÓ\nthis is some text for a test')
         test_file.name = "not_really.pdf"
@@ -1814,7 +1805,7 @@ class MaterialsTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertTrue('Upload' in str(q("title")))
+        self.assertIn('Upload', str(q("title")))
         
 
     def test_upload_minutes_agenda(self):
@@ -1829,7 +1820,7 @@ class MaterialsTests(TestCase):
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
             q = PyQuery(r.content)
-            self.assertTrue('Upload' in str(q("Title")))
+            self.assertIn('Upload', str(q("Title")))
             self.assertFalse(session.sessionpresentation_set.exists())
             self.assertFalse(q('form input[type="checkbox"]'))
     
@@ -1883,7 +1874,7 @@ class MaterialsTests(TestCase):
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
             q = PyQuery(r.content)
-            self.assertTrue('Revise' in str(q("Title")))
+            self.assertIn('Revise', str(q("Title")))
             test_file = StringIO('this is some different text for a test')
             test_file.name = "also_not_really.txt"
             r = self.client.post(url,dict(file=test_file,apply_to_all=True))
@@ -1917,7 +1908,7 @@ class MaterialsTests(TestCase):
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
             q = PyQuery(r.content)
-            self.assertTrue('Upload' in str(q("Title")))
+            self.assertIn('Upload', str(q("Title")))
             self.assertFalse(session.sessionpresentation_set.exists())
             self.assertFalse(q('form input[type="checkbox"]'))
 
@@ -1938,7 +1929,7 @@ class MaterialsTests(TestCase):
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
             q = PyQuery(r.content)
-            self.assertTrue('Upload' in str(q("title")))
+            self.assertIn('Upload', str(q("title")))
             self.assertFalse(session.sessionpresentation_set.filter(document__type_id=doctype))
             test_file = StringIO('this is some text for a test')
             test_file.name = "not_really.txt"
@@ -1961,7 +1952,7 @@ class MaterialsTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertTrue('Upload' in str(q("title")))
+        self.assertIn('Upload', str(q("title")))
         self.assertFalse(session1.sessionpresentation_set.filter(document__type_id='slides'))
         test_file = StringIO('this is not really a slide')
         test_file.name = 'not_really.txt'
@@ -1989,7 +1980,7 @@ class MaterialsTests(TestCase):
         r = self.client.get(url)
         self.assertTrue(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertTrue('Revise' in str(q("title")))
+        self.assertIn('Revise', str(q("title")))
         test_file = StringIO('new content for the second slide deck')
         test_file.name = 'doesnotmatter.txt'
         r = self.client.post(url,dict(file=test_file,title='rename the presentation',apply_to_all=False))
@@ -2158,8 +2149,8 @@ class SessionTests(TestCase):
         url = urlreverse('ietf.meeting.views.request_minutes',kwargs={'num':meeting.number})
         login_testing_unauthorized(self,"secretary",url)
         r = self.client.get(url)
-        self.assertNotIn(has_minutes.group.acronym, unicontent(r).lower())
-        self.assertIn(has_no_minutes.group.acronym, unicontent(r).lower())
+        self.assertNotContains(r, has_minutes.group.acronym)
+        self.assertContains(r, has_no_minutes.group.acronym)
         r = self.client.post(url,{'to':'wgchairs@ietf.org',
                                   'cc': 'irsg@irtf.org',
                                   'subject': 'I changed the subject',
diff --git a/ietf/nomcom/tests.py b/ietf/nomcom/tests.py
index 061ce5e9b..6953026cc 100644
--- a/ietf/nomcom/tests.py
+++ b/ietf/nomcom/tests.py
@@ -1461,7 +1461,7 @@ class NewActiveNomComTests(TestCase):
         fb_count_before = Feedback.objects.count()
         response = self.client.post(url,{'email_text':"""To: rjsparks@nostrum.com
 From: Robert Sparks 
-Subject: Junk message for feedback testing
+Subject: Junk message for feedback testing =?iso-8859-1?q?p=F6stal?=
 Message-ID: <566F2FE5.1050401@nostrum.com>
 Date: Mon, 14 Dec 2015 15:08:53 -0600
 Content-Type: text/plain; charset=utf-8; format=flowed
@@ -2058,8 +2058,7 @@ class TopicTests(TestCase):
             feedback_url = reverse('ietf.nomcom.views.public_feedback',kwargs={'year':self.nc.year() })
             login_testing_unauthorized(self, self.plain_person.user.username, feedback_url)
             r = self.client.get(feedback_url)
-            self.assertEqual(r.status_code,200)
-            self.assertNotIn(topic.subject, unicontent(r))
+            self.assertNotContains(r, topic.subject)
             topic_url = feedback_url + '?topic=%d'%topic.pk
             r = self.client.get(topic_url)
             self.assertEqual(r.status_code,404)
@@ -2073,8 +2072,7 @@ class TopicTests(TestCase):
                 valid_user = self.nc.nominee_set.first().person
             self.client.login(username=valid_user.user.username,password=valid_user.user.username+"+password")
             r = self.client.get(feedback_url)
-            self.assertEqual(r.status_code,200)
-            self.assertIn(topic.subject, unicontent(r))
+            self.assertContains(r, topic.subject)
             r = self.client.get(topic_url)
             self.assertEqual(r.status_code,200)
             r = self.client.post(topic_url, {'comments':'junk', 'confirmation':False})
diff --git a/ietf/submit/tests.py b/ietf/submit/tests.py
index be5f7cc58..04c74642b 100644
--- a/ietf/submit/tests.py
+++ b/ietf/submit/tests.py
@@ -499,8 +499,8 @@ class SubmitTests(TestCase):
         self.assertTrue(name in str(outbox[-1]))
         r = self.client.get(urlreverse('ietf.doc.views_search.recent_drafts'))
         self.assertEqual(r.status_code, 200)
-        self.assertIn(draft.name,  unicontent(r))
-        self.assertIn(draft.title, unicontent(r))
+        self.assertContains(r, draft.name)
+        self.assertContains(r, draft.title)
 
 
     def test_submit_existing_txt(self):
@@ -624,9 +624,8 @@ class SubmitTests(TestCase):
         self.assertEqual(draft.relateddocument_set.filter(relationship_id='replaces').count(), replaces_count)
         #
         r = self.client.get(urlreverse('ietf.doc.views_search.recent_drafts'))
-        self.assertEqual(r.status_code, 200)
-        self.assertIn(draft.name,  unicontent(r))
-        self.assertIn(draft.title, unicontent(r))
+        self.assertContains(r, draft.name)
+        self.assertContains(r, draft.title)
 
     def test_submit_cancel_confirmation(self):
         ad=Person.objects.get(user__username='ad')
@@ -819,8 +818,7 @@ class SubmitTests(TestCase):
 
         # status page as unpriviliged => no edit button
         r = self.client.get(unprivileged_status_url)
-        self.assertEqual(r.status_code, 200)
-        self.assertTrue(("submission status of %s" % name) in unicontent(r).lower())
+        self.assertContains(r, "submission status of %s" % name)
         q = PyQuery(r.content)
         adjust_button = q('[type=submit]:contains("Adjust")')
         self.assertEqual(len(adjust_button), 0)
diff --git a/ietf/utils/management/commands/pyflakes.py b/ietf/utils/management/commands/pyflakes.py
index e3b1b0a69..ab2b5e046 100644
--- a/ietf/utils/management/commands/pyflakes.py
+++ b/ietf/utils/management/commands/pyflakes.py
@@ -66,7 +66,7 @@ def check(codeString, filename, verbosity=1):
                     if lines[message.lineno-1].find('pyflakes:ignore') < 0]
         # honour pyflakes:
 
-        messages.sort(lambda a, b: cmp(a.lineno, b.lineno))
+        messages.sort(key=lambda x: x.lineno)
         if verbosity > 0:
             if len(messages):
                 sys.stderr.write('F')

From a73e84a84c10310d488518efdd3213875077d21c Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 1 Jul 2019 11:46:40 +0000
Subject: [PATCH 037/114] Removed  - Legacy-Id: 16347

---
 ietf/nomcom/fields.py | 32 --------------------------------
 1 file changed, 32 deletions(-)
 delete mode 100644 ietf/nomcom/fields.py

diff --git a/ietf/nomcom/fields.py b/ietf/nomcom/fields.py
deleted file mode 100644
index f418bb382..000000000
--- a/ietf/nomcom/fields.py
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright The IETF Trust 2012-2019, All Rights Reserved
-from django.conf import settings
-from django.db import models
-from django.utils.encoding import smart_str
-
-from ietf.utils.pipe import pipe
-from ietf.utils.log import log
-
-class EncryptedException(Exception):
-    pass
-
-class EncryptedTextField(models.TextField):
-    def pre_save(self, instance, add):
-        if add:
-            comments = smart_str(getattr(instance, 'comments'))
-            nomcom = getattr(instance, 'nomcom')
-            try:
-                cert_file = nomcom.public_key.path
-            except ValueError as e:
-                raise ValueError("Trying to read the NomCom public key: " + str(e))
-
-            command = "%s smime -encrypt -in /dev/stdin %s" % (settings.OPENSSL_COMMAND, cert_file)
-            code, out, error = pipe(command, comments.encode())
-            if code != 0:
-                log("openssl error: %s:\n  Error %s: %s" %(command, code, error))
-            if not error:
-                instance.comments = out
-                return out
-            else:
-                raise EncryptedException(error)
-        else:
-            return instance.comments

From f1172b564794272349f18d3e13052b95ece308e1 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 1 Jul 2019 11:47:36 +0000
Subject: [PATCH 038/114] Replaced multiple asserts with assertContains().  -
 Legacy-Id: 16348

---
 ietf/secr/drafts/tests_views.py | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/ietf/secr/drafts/tests_views.py b/ietf/secr/drafts/tests_views.py
index c8f7fd725..592f16d68 100644
--- a/ietf/secr/drafts/tests_views.py
+++ b/ietf/secr/drafts/tests_views.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2013-2019, All Rights Reserved
 import datetime
 import os
 import shutil
@@ -60,8 +61,7 @@ class SecrDraftsTestCase(TestCase):
         url = urlreverse('ietf.secr.drafts.views.approvals') 
         self.client.login(username="secretary", password="secretary+password") 
         response = self.client.get(url) 
-        self.assertEqual(response.status_code, 200) 
-        self.assertTrue('draft-dummy' in response.content) 
+        self.assertContains(response, 'draft-dummy')
 
     def test_edit(self):
         draft = WgDraftFactory(states=[('draft','active'),('draft-stream-ietf','wg-doc'),('draft-iesg','ad-eval')], shepherd=EmailFactory())
@@ -105,8 +105,7 @@ class SecrDraftsTestCase(TestCase):
         
         post = dict(filename='draft',state=1,submit='submit')
         response = self.client.post(url, post)
-        self.assertEqual(response.status_code, 200)
-        self.assertTrue(draft.name in response.content)
+        self.assertContains(response, draft.name)
 
     def test_view(self):
         draft = WgDraftFactory()
@@ -141,8 +140,7 @@ class SecrDraftsTestCase(TestCase):
         subject =  'Resurrection of %s' % draft.get_base_name()
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(email_url)
-        self.assertEqual(response.status_code, 200)
-        self.assertTrue('Drafts - Email' in response.content)
+        self.assertContains(response, 'Drafts - Email')
         q = PyQuery(response.content)
         self.assertEqual(q("#id_subject").val(), subject)
         post_data = {
@@ -154,8 +152,7 @@ class SecrDraftsTestCase(TestCase):
             'submit': 'Save'
         }
         response = self.client.post(confirm_url, post_data)
-        self.assertEqual(response.status_code, 200)
-        self.assertTrue('Drafts - Confirm' in response.content)
+        self.assertContains(response, 'Drafts - Confirm')
         self.assertEqual(response.context['email']['subject'], subject)
         response = self.client.post(do_action_url, post_data)
         self.assertRedirects(response, view_url)
@@ -193,8 +190,7 @@ class SecrDraftsTestCase(TestCase):
         response = self.client.post(url, extend_data)
         self.assertRedirects(response, email_url + '?' + urlencode(extend_data))
         response = self.client.post(confirm_url, post_data)
-        self.assertEqual(response.status_code, 200)
-        self.assertTrue('Drafts - Confirm' in response.content)
+        self.assertContains(response, 'Drafts - Confirm')
         self.assertEqual(response.context['email']['subject'], subject)
         response = self.client.post(do_action_url, post_data)
         self.assertRedirects(response, view_url)
@@ -227,8 +223,7 @@ class SecrDraftsTestCase(TestCase):
         response = self.client.post(url, withdraw_data)
         self.assertRedirects(response, email_url + '?' + urlencode(withdraw_data))
         response = self.client.post(confirm_url, post_data)
-        self.assertEqual(response.status_code, 200)
-        self.assertTrue('Drafts - Confirm' in response.content)
+        self.assertContains(response, 'Drafts - Confirm')
         self.assertEqual(response.context['email']['subject'], subject)
         response = self.client.post(do_action_url, post_data)
         self.assertRedirects(response, view_url)

From f76d8bf7763a652b40cc7beef27e54feaabca3a2 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 1 Jul 2019 11:53:46 +0000
Subject: [PATCH 039/114] Replaced multiple asserts with assertContains().  -
 Legacy-Id: 16349

---
 ietf/secr/groups/tests.py | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/ietf/secr/groups/tests.py b/ietf/secr/groups/tests.py
index 8de85c501..af05d2079 100644
--- a/ietf/secr/groups/tests.py
+++ b/ietf/secr/groups/tests.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2013-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 from django.urls import reverse
 from ietf.utils.test_utils import TestCase
@@ -26,9 +27,7 @@ class GroupsTest(TestCase):
         post_data = {'group_acronym':group.acronym,'submit':'Search'}
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.post(url,post_data,follow=True)
-        #assert False, response.content
-        self.assertEqual(response.status_code, 200)
-        self.assertTrue(group.acronym in response.content)
+        self.assertContains(response, group.acronym)
 
     # ------- Test Add -------- #
     def test_add_button(self):
@@ -48,8 +47,7 @@ class GroupsTest(TestCase):
                      'submit':'Save'}
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.post(url,post_data)
-        self.assertEqual(response.status_code, 200)
-        self.assertTrue('This field is required' in response.content)
+        self.assertContains(response, 'This field is required')
 
     def test_add_group_dupe(self):
         group = GroupFactory()
@@ -65,9 +63,7 @@ class GroupsTest(TestCase):
                      'submit':'Save'}
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.post(url,post_data)
-        #print response.content
-        self.assertEqual(response.status_code, 200)
-        self.assertTrue('Group with this Acronym already exists' in response.content)
+        self.assertContains(response, 'Group with this Acronym already exists')
 
     def test_add_group_success(self):
         area = GroupFactory(type_id='area')
@@ -113,7 +109,7 @@ class GroupsTest(TestCase):
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.post(url,post_data,follow=True)
         self.assertRedirects(response, target)
-        self.assertTrue('changed successfully' in response.content)
+        self.assertContains(response, 'changed successfully')
 
     def test_edit_non_wg_group(self):
         parent_sdo = GroupFactory.create(type_id='sdo',state_id='active')
@@ -133,7 +129,7 @@ class GroupsTest(TestCase):
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.post(url,post_data,follow=True)
         self.assertRedirects(response, target)
-        self.assertTrue('changed successfully' in response.content)
+        self.assertContains(response, 'changed successfully')
 
     # ------- Test People -------- #
     def test_people_delete(self):
@@ -161,4 +157,4 @@ class GroupsTest(TestCase):
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.post(url,post_data,follow=True)
         self.assertRedirects(response, url)
-        self.assertTrue('added successfully' in response.content)
+        self.assertContains(response, 'added successfully')

From 1e115539c4bc8364e3bb7e8bf9730e7bcea7b6c0 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 1 Jul 2019 11:59:59 +0000
Subject: [PATCH 040/114] The previous nomcom.fields.EncryptedTextField relied
 on initial cleartext content having the same type as ciphertext.  Under
 Python3, that's not the case (ciphertext has type bytes).  Rewrote the nomcom
 app and tests to handle capture of comments and encryption to the
 Feedback.comments ciphertext differently.  - Legacy-Id: 16350

---
 ietf/nomcom/factories.py |  7 ++++-
 ietf/nomcom/forms.py     | 21 ++++++++------
 ietf/nomcom/models.py    | 23 ++++++++++++---
 ietf/nomcom/resources.py |  2 +-
 ietf/nomcom/tests.py     | 60 +++++++++++++++++++---------------------
 ietf/nomcom/utils.py     | 12 +++++---
 ietf/nomcom/views.py     |  4 +--
 7 files changed, 77 insertions(+), 52 deletions(-)

diff --git a/ietf/nomcom/factories.py b/ietf/nomcom/factories.py
index 2509c1421..bffdd338b 100644
--- a/ietf/nomcom/factories.py
+++ b/ietf/nomcom/factories.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2015-2019, All Rights Reserved
 import factory
 import random
 
@@ -164,9 +165,13 @@ class FeedbackFactory(factory.DjangoModelFactory):
 
     nomcom = factory.SubFactory(NomComFactory)
     subject = factory.Faker('sentence')
-    comments = factory.Faker('paragraph')
     type_id = 'comment'
 
+    @factory.post_generation
+    def comments(obj, create, extracted, **kwargs):
+        comment_text = factory.Faker('paragraph').generate()
+        obj.comments = obj.nomcom.encrypt(comment_text)
+
 class TopicFactory(factory.DjangoModelFactory):
     class Meta:
         model = Topic
diff --git a/ietf/nomcom/forms.py b/ietf/nomcom/forms.py
index c343c5d11..dd9c18686 100644
--- a/ietf/nomcom/forms.py
+++ b/ietf/nomcom/forms.py
@@ -293,7 +293,7 @@ class NominateForm(forms.ModelForm):
 
         # Complete nomination data
         feedback = Feedback.objects.create(nomcom=self.nomcom,
-                                           comments=qualifications,
+                                           comments=self.nomcom.encrypt(qualifications),
                                            type=FeedbackTypeName.objects.get(slug='nomina'),
                                            user=self.user)
         feedback.positions.add(position)
@@ -408,7 +408,7 @@ class NominateNewPersonForm(forms.ModelForm):
 
         # Complete nomination data
         feedback = Feedback.objects.create(nomcom=self.nomcom,
-                                           comments=qualifications,
+                                           comments=self.nomcom.encrypt(qualifications),
                                            type=FeedbackTypeName.objects.get(slug='nomina'),
                                            user=self.user)
         feedback.positions.add(position)
@@ -451,7 +451,7 @@ class NominateNewPersonForm(forms.ModelForm):
 
 class FeedbackForm(forms.ModelForm):
     nominator_email = forms.CharField(label='Commenter email',required=False)
-    comments = forms.CharField(label='Comments', widget=forms.Textarea(), strip=False)
+    comment_text = forms.CharField(label='Comments', widget=forms.Textarea(), strip=False)
     confirmation = forms.BooleanField(label='Email comments back to me as confirmation (if selected, your comments will be emailed to you in cleartext when you press Save).',
                                       required=False)
 
@@ -484,13 +484,13 @@ class FeedbackForm(forms.ModelForm):
             if not NomineePosition.objects.accepted().filter(nominee=self.nominee,
                                                         position=self.position):
                 msg = "There isn't a accepted nomination for %s on the %s position" % (self.nominee, self.position)
-                self._errors["comments"] = self.error_class([msg])
+                self._errors["comment_text"] = self.error_class([msg])
         return self.cleaned_data
 
     def save(self, commit=True):
         feedback = super(FeedbackForm, self).save(commit=False)
         confirmation = self.cleaned_data['confirmation']
-        comments = self.cleaned_data['comments']
+        comment_text = self.cleaned_data['comment_text']
         nomcom_template_path = '/nomcom/%s/' % self.nomcom.group.acronym
 
         author = None
@@ -508,6 +508,7 @@ class FeedbackForm(forms.ModelForm):
         feedback.nomcom = self.nomcom
         feedback.user = self.user
         feedback.type = FeedbackTypeName.objects.get(slug='comment')
+        feedback.comments = self.nomcom.encrypt(comment_text)
         feedback.save()
         if self.nominee and self.position:
             feedback.positions.add(self.position)
@@ -526,7 +527,7 @@ class FeedbackForm(forms.ModelForm):
                 elif self.topic:
                     about = self.topic.subject
                 context = {'about': about,
-                           'comments': comments,
+                           'comments': comment_text,
                            'year': self.nomcom.year(),
                        }
                 path = nomcom_template_path + FEEDBACK_RECEIPT_TEMPLATE
@@ -537,7 +538,6 @@ class FeedbackForm(forms.ModelForm):
         model = Feedback
         fields = (
                   'nominator_email',
-                  'comments',
                   'confirmation',
                  )
 
@@ -554,8 +554,9 @@ class FeedbackEmailForm(forms.Form):
 
 class QuestionnaireForm(forms.ModelForm):
 
-    comments = forms.CharField(label='Questionnaire response from this candidate',
+    comment_text = forms.CharField(label='Questionnaire response from this candidate',
                                widget=forms.Textarea(), strip=False)
+
     def __init__(self, *args, **kwargs):
         self.nomcom = kwargs.pop('nomcom', None)
         self.user = kwargs.pop('user', None)
@@ -565,6 +566,7 @@ class QuestionnaireForm(forms.ModelForm):
 
     def save(self, commit=True):
         feedback = super(QuestionnaireForm, self).save(commit=False)
+        comment_text = self.cleaned_data['comment_text']
         (position, nominee) = self.cleaned_data['nominee']
 
         author = get_user_email(self.user)
@@ -575,6 +577,7 @@ class QuestionnaireForm(forms.ModelForm):
         feedback.nomcom = self.nomcom
         feedback.user = self.user
         feedback.type = FeedbackTypeName.objects.get(slug='questio')
+        feedback.comments = self.nomcom.encrypt(comment_text)
         feedback.save()
         self.save_m2m()
         feedback.nominees.add(nominee)
@@ -582,7 +585,7 @@ class QuestionnaireForm(forms.ModelForm):
 
     class Meta:
         model = Feedback
-        fields = ( 'comments', )
+        fields = []
 
 class NomComTemplateForm(DBTemplateForm):
     content = forms.CharField(label="Text", widget=forms.Textarea(attrs={'cols': '120', 'rows':'40', }), strip=False)
diff --git a/ietf/nomcom/models.py b/ietf/nomcom/models.py
index 92c1d1ed7..16d229ed7 100644
--- a/ietf/nomcom/models.py
+++ b/ietf/nomcom/models.py
@@ -11,20 +11,20 @@ from django.template.defaultfilters import linebreaks
 
 import debug                            # pyflakes:ignore
 
-from ietf.nomcom.fields import EncryptedTextField
 from ietf.person.models import Person,Email
 from ietf.group.models import Group
 from ietf.name.models import NomineePositionStateName, FeedbackTypeName, TopicAudienceName
 from ietf.dbtemplate.models import DBTemplate
 
-from ietf.nomcom.managers import NomineePositionManager, NomineeManager, \
-                                 PositionManager, FeedbackManager
+from ietf.nomcom.managers import (NomineePositionManager, NomineeManager, 
+                                  PositionManager, FeedbackManager, )
 from ietf.nomcom.utils import (initialize_templates_for_group,
                                initialize_questionnaire_for_position,
                                initialize_requirements_for_position,
                                initialize_description_for_topic,
                                delete_nomcom_templates)
 from ietf.utils.models import ForeignKey
+from ietf.utils.pipe import pipe
 from ietf.utils.storage import NoLocationMigrationFileSystemStorage
 
 
@@ -79,6 +79,21 @@ class NomCom(models.Model):
     def pending_email_count(self):
         return self.feedback_set.filter(type__isnull=True).count()
 
+    def encrypt(self, cleartext:str) -> bytes:
+        try:
+            cert_file = self.public_key.path
+        except ValueError as e:
+            raise ValueError("Trying to read the NomCom public key: " + str(e))
+
+        command = "%s smime -encrypt -in /dev/stdin %s" % (settings.OPENSSL_COMMAND, cert_file)
+        code, out, error = pipe(command, cleartext.encode())
+        if code != 0:
+            log("openssl error: %s:\n  Error %s: %s" %(command, code, error))
+        if not error:
+            return out
+        else:
+            raise EncryptedException(error)
+
 
 def delete_nomcom(sender, **kwargs):
     nomcom = kwargs.get('instance', None)
@@ -250,7 +265,7 @@ class Feedback(models.Model):
     nominees = models.ManyToManyField('Nominee', blank=True)
     topics = models.ManyToManyField('Topic', blank=True)
     subject = models.TextField(verbose_name='Subject', blank=True)
-    comments = EncryptedTextField(verbose_name='Comments')
+    comments = models.BinaryField(verbose_name='Comments')
     type = ForeignKey(FeedbackTypeName, blank=True, null=True)
     user = ForeignKey(User, editable=False, blank=True, null=True, on_delete=models.SET_NULL)
     time = models.DateTimeField(auto_now_add=True)
diff --git a/ietf/nomcom/resources.py b/ietf/nomcom/resources.py
index 311485fb0..cc95d5ff7 100644
--- a/ietf/nomcom/resources.py
+++ b/ietf/nomcom/resources.py
@@ -129,7 +129,7 @@ class FeedbackResource(ModelResource):
             "id": ALL,
             "author": ALL,
             "subject": ALL,
-            "comments": ALL,
+            # "comments": ALL,
             "time": ALL,
             "nomcom": ALL_WITH_RELATIONS,
             "type": ALL_WITH_RELATIONS,
diff --git a/ietf/nomcom/tests.py b/ietf/nomcom/tests.py
index 6953026cc..262ae006d 100644
--- a/ietf/nomcom/tests.py
+++ b/ietf/nomcom/tests.py
@@ -422,18 +422,18 @@ class NomcomViewsTest(TestCase):
         nominee = Nominee.objects.get(email__person__user__username=COMMUNITY_USER)
         position = Position.objects.get(name='OAM')
 
-        comments = 'Plain text. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.'
+        comment_text = 'Plain text. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.'
         nomcom = get_nomcom_by_year(self.year)
         feedback = Feedback.objects.create(nomcom=nomcom,
-                                           comments=comments,
+                                           comments=nomcom.encrypt(comment_text),
                                            type=FeedbackTypeName.objects.get(slug='nomina'))
         feedback.positions.add(position)
         feedback.nominees.add(nominee)
 
         # to check feedback comments are saved like enrypted data
-        self.assertNotEqual(feedback.comments, comments)
+        self.assertNotEqual(feedback.comments, comment_text)
 
-        self.assertEqual(check_comments(feedback.comments, comments, self.privatekey_file), True)
+        self.assertEqual(check_comments(feedback.comments, comment_text, self.privatekey_file), True)
 
         # Check that the set reminder date is present
         reminder_dates = dict([ (d.id,str(d.date)) for d in nomcom.reminderdates_set.all() ])
@@ -629,13 +629,13 @@ class NomcomViewsTest(TestCase):
         self.assertEqual(len(q("#nominate-form")), 1)
 
         position = Position.objects.get(name=position_name)
-        comments = 'Test nominate view. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.'
+        comment_text = 'Test nominate view. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.'
         candidate_phone = '123456'
 
         test_data = {'searched_email': searched_email.pk,
                      'candidate_phone': candidate_phone,
                      'position': position.id,
-                     'qualifications': comments,
+                     'qualifications': comment_text,
                      'confirmation': confirmation}
         if not public:
             test_data['nominator_email'] = nominator_email
@@ -655,9 +655,9 @@ class NomcomViewsTest(TestCase):
             self.assertEqual(feedback.author, nominator_email)
 
         # to check feedback comments are saved like enrypted data
-        self.assertNotEqual(feedback.comments, comments)
+        self.assertNotEqual(feedback.comments, comment_text)
 
-        self.assertEqual(check_comments(feedback.comments, comments, self.privatekey_file), True)
+        self.assertEqual(check_comments(feedback.comments, comment_text, self.privatekey_file), True)
         Nomination.objects.get(position=position,
                                candidate_name=nominee.person.plain_name(),
                                candidate_email=searched_email.address,
@@ -697,14 +697,14 @@ class NomcomViewsTest(TestCase):
         position = Position.objects.get(name=position_name)
         candidate_email = nominee_email
         candidate_name = 'nominee'
-        comments = 'Test nominate view. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.'
+        comment_text = 'Test nominate view. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.'
         candidate_phone = '123456'
 
         test_data = {'candidate_name': candidate_name,
                      'candidate_email': candidate_email,
                      'candidate_phone': candidate_phone,
                      'position': position.id,
-                     'qualifications': comments,
+                     'qualifications': comment_text,
                      'confirmation': confirmation}
         if not public:
             test_data['nominator_email'] = nominator_email
@@ -727,9 +727,9 @@ class NomcomViewsTest(TestCase):
             self.assertEqual(feedback.author, nominator_email)
 
         # to check feedback comments are saved like enrypted data
-        self.assertNotEqual(feedback.comments, comments)
+        self.assertNotEqual(feedback.comments, comment_text)
 
-        self.assertEqual(check_comments(feedback.comments, comments, self.privatekey_file), True)
+        self.assertEqual(check_comments(feedback.comments, comment_text, self.privatekey_file), True)
         Nomination.objects.get(position=position,
                                candidate_name=candidate_name,
                                candidate_email=candidate_email,
@@ -772,14 +772,13 @@ class NomcomViewsTest(TestCase):
         position = Position.objects.get(name=position_name)
         nominee = Nominee.objects.get(email__address=nominee_email)
 
-        comments = 'Test add questionnaire view. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.'
+        comment_text = 'Test add questionnaire view. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.'
 
-        test_data = {'comments': comments,
+        test_data = {'comment_text': comment_text,
                      'nominee': '%s_%s' % (position.id, nominee.id)}
 
         response = self.client.post(self.add_questionnaire_url, test_data)
 
-        self.assertEqual(response.status_code, 200)
         self.assertContains(response, "alert-success")
 
         ## check objects
@@ -788,9 +787,9 @@ class NomcomViewsTest(TestCase):
                                            type=FeedbackTypeName.objects.get(slug='questio')).latest('id')
 
         ## to check feedback comments are saved like enrypted data
-        self.assertNotEqual(feedback.comments, comments)
+        self.assertNotEqual(feedback.comments, comment_text)
 
-        self.assertEqual(check_comments(feedback.comments, comments, self.privatekey_file), True)
+        self.assertEqual(check_comments(feedback.comments, comment_text, self.privatekey_file), True)
 
     def test_public_feedback(self):
         login_testing_unauthorized(self, COMMUNITY_USER, self.public_feedback_url)
@@ -859,7 +858,7 @@ class NomcomViewsTest(TestCase):
 
         comments = 'Test feedback view. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.'
 
-        test_data = {'comments': comments,
+        test_data = {'comment_text': comments,
                      'position_name': position.name,
                      'nominee_name': nominee.email.person.name,
                      'nominee_email': nominee.email.address,
@@ -882,7 +881,6 @@ class NomcomViewsTest(TestCase):
             nominee_position.save()
 
         response = self.client.post(feedback_url, test_data)
-        self.assertEqual(response.status_code, 200)
         self.assertContains(response, "alert-success")
         self.assertNotContains(response, "feedbackform")
 
@@ -961,7 +959,8 @@ class FeedbackTest(TestCase):
         #nomcom.public_key.storage.location = tempfile.gettempdir()
         nomcom.public_key.save('cert', File(open(self.cert_file.name, 'r')))
 
-        comments = 'Plain text. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.'
+        comment_text = 'Plain text. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.'
+        comments = nomcom.encrypt(comment_text)
         feedback = Feedback.objects.create(nomcom=nomcom,
                                            comments=comments,
                                            type=FeedbackTypeName.objects.get(slug='nomina'))
@@ -969,9 +968,8 @@ class FeedbackTest(TestCase):
         feedback.nominees.add(nominee)
 
         # to check feedback comments are saved like enrypted data
-        self.assertNotEqual(feedback.comments, comments)
-
-        self.assertEqual(check_comments(feedback.comments, comments, self.privatekey_file), True)
+        self.assertNotEqual(feedback.comments, comment_text)
+        self.assertEqual(check_comments(feedback.comments, comment_text, self.privatekey_file), True)
 
 class ReminderTest(TestCase):
 
@@ -1011,7 +1009,7 @@ class ReminderTest(TestCase):
         np.time = t_minus_4
         np.save()
         feedback = Feedback.objects.create(nomcom=self.nomcom,
-                                           comments='some non-empty comments',
+                                           comments=self.nomcom.encrypt('some non-empty comments'),
                                            type=FeedbackTypeName.objects.get(slug='questio'),
                                            user=User.objects.get(username=CHAIR_USER))
         feedback.positions.add(gen)
@@ -1104,7 +1102,7 @@ class InactiveNomcomTests(TestCase):
             
             empty_outbox()
             fb_before = self.nc.feedback_set.count()
-            test_data = {'comments': 'Test feedback view. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.',
+            test_data = {'comment_text': 'Test feedback view. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.',
                          'nominator_email': self.plain_person.email_set.first().address,
                          'confirmation': True}
             response = self.client.post(url, test_data)
@@ -1764,7 +1762,7 @@ Junk body for testing
                                          'duplicate_persons':[nominee2.person.pk]})
         self.assertEqual(response.status_code, 302)
         self.assertEqual(len(outbox),1)
-        self.assertTrue(all([str(x.person.pk) in outbox[0].get_payload(decode=True) for x in [nominee1,nominee2]]))
+        self.assertTrue(all([str(x.person.pk) in outbox[0].get_payload() for x in [nominee1,nominee2]]))
 
     def test_extract_email(self):
         url = reverse('ietf.nomcom.views.extract_email_lists',kwargs={'year':self.nc.year()})
@@ -1905,7 +1903,7 @@ class AcceptingTests(TestCase):
         response = self.client.get(posurl)
         self.assertIn('not currently accepting feedback', unicontent(response))
 
-        test_data = {'comments': 'junk',
+        test_data = {'comment_text': 'junk',
                      'position_name': pos.name,
                      'nominee_name': pos.nominee_set.first().email.person.name,
                      'nominee_email': pos.nominee_set.first().email.address,
@@ -1920,7 +1918,7 @@ class AcceptingTests(TestCase):
         response = self.client.get(topicurl)
         self.assertIn('not currently accepting feedback', unicontent(response))
 
-        test_data = {'comments': 'junk',
+        test_data = {'comment_text': 'junk',
                      'confirmation': False,
                     }
         response = self.client.post(topicurl, test_data)
@@ -2046,7 +2044,7 @@ class TopicTests(TestCase):
         url = reverse('ietf.nomcom.views.public_feedback',kwargs={'year':self.nc.year() })
         url += '?topic=%d'%topic.pk
         login_testing_unauthorized(self, self.plain_person.user.username, url)
-        response=self.client.post(url, {'comments':'junk', 'confirmation':False})
+        response=self.client.post(url, {'comment_text':'junk', 'confirmation':False})
         self.assertEqual(response.status_code, 200)
         self.assertContains(response, "alert-success")
         self.assertNotContains(response, "feedbackform")
@@ -2062,7 +2060,7 @@ class TopicTests(TestCase):
             topic_url = feedback_url + '?topic=%d'%topic.pk
             r = self.client.get(topic_url)
             self.assertEqual(r.status_code,404)
-            r = self.client.post(topic_url, {'comments':'junk', 'confirmation':False})
+            r = self.client.post(topic_url, {'comment_text':'junk', 'confirmation':False})
             self.assertEqual(r.status_code,404)
 
             self.client.logout()
@@ -2075,7 +2073,7 @@ class TopicTests(TestCase):
             self.assertContains(r, topic.subject)
             r = self.client.get(topic_url)
             self.assertEqual(r.status_code,200)
-            r = self.client.post(topic_url, {'comments':'junk', 'confirmation':False})
+            r = self.client.post(topic_url, {'comment_text':'junk', 'confirmation':False})
             self.assertEqual(r.status_code,200)
             self.assertEqual(topic.feedback_set.count(),1)
             self.client.logout()
diff --git a/ietf/nomcom/utils.py b/ietf/nomcom/utils.py
index 2146c262a..736acb5c5 100644
--- a/ietf/nomcom/utils.py
+++ b/ietf/nomcom/utils.py
@@ -61,7 +61,7 @@ def get_nomcom_by_year(year):
 
 def get_year_by_nomcom(nomcom):
     acronym = nomcom.group.acronym
-    m = re.search('(?P\d\d\d\d)', acronym)
+    m = re.search(r'(?P\d\d\d\d)', acronym)
     return m.group(0)
 
 
@@ -172,7 +172,7 @@ def store_nomcom_private_key(request, year, private_key):
     else:
         command = "%s bf -e -in /dev/stdin -k \"%s\" -a"
         code, out, error = pipe(command % (settings.OPENSSL_COMMAND,
-                                           settings.SECRET_KEY), private_key)
+                                           settings.SECRET_KEY), private_key.encode())
         if code != 0:
             log("openssl error: %s:\n  Error %s: %s" %(command, code, error))        
         if error:
@@ -182,7 +182,7 @@ def store_nomcom_private_key(request, year, private_key):
 
 def validate_private_key(key):
     key_file = tempfile.NamedTemporaryFile(delete=False)
-    key_file.write(key)
+    key_file.write(key.encode())
     key_file.close()
 
     command = "%s rsa -in %s -check -noout"
@@ -460,6 +460,10 @@ def create_feedback_email(nomcom, msg):
     feedback = Feedback(nomcom=nomcom,
                         author=by,
                         subject=subject or '',
-                        comments=body)
+                        comments=nomcom.encrypt(body))
     feedback.save()
     return feedback
+
+class EncryptedException(Exception):
+    pass
+    
\ No newline at end of file
diff --git a/ietf/nomcom/views.py b/ietf/nomcom/views.py
index 2da08cf68..4afaff6f3 100644
--- a/ietf/nomcom/views.py
+++ b/ietf/nomcom/views.py
@@ -640,7 +640,7 @@ def private_questionnaire(request, year):
         if form.is_valid():
             form.save()
             messages.success(request, 'The questionnaire response has been registered.')
-            questionnaire_response = form.cleaned_data['comments']
+            questionnaire_response = form.cleaned_data['comment_text']
             form = QuestionnaireForm(nomcom=nomcom, user=request.user)
     else:
         form = QuestionnaireForm(nomcom=nomcom, user=request.user)
@@ -688,7 +688,7 @@ def process_nomination_status(request, year, nominee_position_id, state, date, h
                 f = Feedback.objects.create(nomcom = nomcom,
                                             author = nominee_position.nominee.email,
                                             subject = '%s nomination %s'%(nominee_position.nominee.name(),state),
-                                            comments = form.cleaned_data['comments'],
+                                            comments = nomcom.encrypt(form.cleaned_data['comments']),
                                             type_id = 'comment', 
                                             user = who,
                                            )

From 942fc7f907c53dff63f44a399d434c2ac22980ea Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 1 Jul 2019 12:01:02 +0000
Subject: [PATCH 041/114] Fixed a bad call argument to FeedbackFactory  -
 Legacy-Id: 16351

---
 ietf/person/tests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ietf/person/tests.py b/ietf/person/tests.py
index 750f11591..0da5b98ef 100644
--- a/ietf/person/tests.py
+++ b/ietf/person/tests.py
@@ -245,7 +245,7 @@ class PersonUtilsTests(TestCase):
         nomcom = NomComFactory()
         position = PositionFactory(nomcom=nomcom)
         nominee = NomineeFactory(nomcom=nomcom, person=mars.get_chair().person)
-        feedback = FeedbackFactory(user=source, author=person, nomcom=nomcom)
+        feedback = FeedbackFactory(user=source, author=person.email().address, nomcom=nomcom)
         feedback.nominees.add(nominee)
         nomination = NominationFactory(nominee=nominee, user=source, position=position, comments=feedback)
 

From f13887de7cc5cd4e6f7a5b3b2667c35cc43e10ab Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 1 Jul 2019 14:07:21 +0000
Subject: [PATCH 042/114] Removed superfluous iter() and fixed instances where
 sorted() had to compare None and int.  - Legacy-Id: 16352

---
 ietf/stats/views.py | 47 ++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/ietf/stats/views.py b/ietf/stats/views.py
index f90c1c05d..c1b87e64d 100644
--- a/ietf/stats/views.py
+++ b/ietf/stats/views.py
@@ -86,7 +86,7 @@ def add_url_to_choices(choices, url_builder):
 
 def put_into_bin(value, bin_size):
     if value is None:
-        return (value, value)
+        return (0, '')
 
     v = (value // bin_size) * bin_size
     return (v, "{} - {}".format(v, v + bin_size - 1))
@@ -114,7 +114,7 @@ def add_labeled_top_series_from_bins(chart_data, bins, limit):
 
     xs = list(sorted(xs))
 
-    sorted_bins = sorted(iter(aggregated_bins.items()), key=lambda t: len(t[1]), reverse=True)
+    sorted_bins = sorted(aggregated_bins.items(), key=lambda t: len(t[1]), reverse=True)
     top = [ label for label, names in list(sorted_bins)[:limit]]
 
     for label in top:
@@ -238,8 +238,8 @@ def document_stats(request, stats_type=None):
 
             total_docs = docalias_qs.values_list("docs__name").distinct().count()
 
-            def generate_canonical_names(docalias_qs):
-                for doc_id, ts in itertools.groupby(docalias_qs.order_by("docs__name"), lambda t: t[0]):
+            def generate_canonical_names(values):
+                for doc_id, ts in itertools.groupby(values.order_by("docs__name"), lambda a: a[0]):
                     chosen = None
                     for t in ts:
                         if chosen is None:
@@ -249,7 +249,6 @@ def document_stats(request, stats_type=None):
                                 chosen = t
                             elif t[1].startswith("draft") and not chosen[1].startswith("rfc"):
                                 chosen = t
-
                     yield chosen
 
             if stats_type == "authors":
@@ -258,10 +257,10 @@ def document_stats(request, stats_type=None):
                 bins = defaultdict(set)
 
                 for name, canonical_name, author_count in generate_canonical_names(docalias_qs.values_list("docs__name", "name").annotate(Count("docs__documentauthor"))):
-                    bins[author_count].add(canonical_name)
+                    bins[author_count or 0].add(canonical_name)
 
                 series_data = []
-                for author_count, names in sorted(iter(bins.items()), key=lambda t: t[0]):
+                for author_count, names in sorted(bins.items(), key=lambda t: t[0]):
                     percentage = len(names) * 100.0 / (total_docs or 1)
                     series_data.append((author_count, percentage))
                     table_data.append((author_count, percentage, len(names), list(names)[:names_limit]))
@@ -274,10 +273,10 @@ def document_stats(request, stats_type=None):
                 bins = defaultdict(set)
 
                 for name, canonical_name, pages in generate_canonical_names(docalias_qs.values_list("docs__name", "name", "docs__pages")):
-                    bins[pages].add(canonical_name)
+                    bins[pages or 0].add(canonical_name)
 
                 series_data = []
-                for pages, names in sorted(iter(bins.items()), key=lambda t: t[0]):
+                for pages, names in sorted(bins.items(), key=lambda t: t[0]):
                     percentage = len(names) * 100.0 / (total_docs or 1)
                     if pages is not None:
                         series_data.append((pages, len(names)))
@@ -296,7 +295,7 @@ def document_stats(request, stats_type=None):
                     bins[put_into_bin(words, bin_size)].add(canonical_name)
 
                 series_data = []
-                for (value, words), names in sorted(iter(bins.items()), key=lambda t: t[0][0]):
+                for (value, words), names in sorted(bins.items(), key=lambda t: t[0][0]):
                     percentage = len(names) * 100.0 / (total_docs or 1)
                     if words is not None:
                         series_data.append((value, len(names)))
@@ -349,7 +348,7 @@ def document_stats(request, stats_type=None):
                         bins[ext.upper()].add(canonical_name)
 
                 series_data = []
-                for fmt, names in sorted(iter(bins.items()), key=lambda t: t[0]):
+                for fmt, names in sorted(bins.items(), key=lambda t: t[0]):
                     percentage = len(names) * 100.0 / (total_docs or 1)
                     series_data.append((fmt, len(names)))
 
@@ -366,7 +365,7 @@ def document_stats(request, stats_type=None):
                     bins[formal_language_name].add(canonical_name)
 
                 series_data = []
-                for formal_language, names in sorted(iter(bins.items()), key=lambda t: t[0]):
+                for formal_language, names in sorted(bins.items(), key=lambda t: t[0]):
                     percentage = len(names) * 100.0 / (total_docs or 1)
                     if formal_language is not None:
                         series_data.append((formal_language, len(names)))
@@ -412,12 +411,12 @@ def document_stats(request, stats_type=None):
                 person_qs = Person.objects.filter(person_filters)
 
                 for name, document_count in person_qs.values_list("name").annotate(Count("documentauthor")):
-                    bins[document_count].add(name)
+                    bins[document_count or 0].add(name)
 
                 total_persons = count_bins(bins)
 
                 series_data = []
-                for document_count, names in sorted(iter(bins.items()), key=lambda t: t[0]):
+                for document_count, names in sorted(bins.items(), key=lambda t: t[0]):
                     percentage = len(names) * 100.0 / (total_persons or 1)
                     series_data.append((document_count, percentage))
                     plain_names = [ plain_name(n) for n in names ]
@@ -450,7 +449,7 @@ def document_stats(request, stats_type=None):
                 total_persons = count_bins(bins)
 
                 series_data = []
-                for affiliation, names in sorted(iter(bins.items()), key=lambda t: t[0].lower()):
+                for affiliation, names in sorted(bins.items(), key=lambda t: t[0].lower()):
                     percentage = len(names) * 100.0 / (total_persons or 1)
                     if affiliation:
                         series_data.append((affiliation, len(names)))
@@ -462,7 +461,7 @@ def document_stats(request, stats_type=None):
 
                 chart_data.append({ "data": series_data })
 
-                for alias, name in sorted(iter(aliases.items()), key=lambda t: t[1]):
+                for alias, name in sorted(aliases.items(), key=lambda t: t[1]):
                     alias_data.append((name, alias))
 
             elif stats_type == "author/country":
@@ -499,7 +498,7 @@ def document_stats(request, stats_type=None):
                 total_persons = count_bins(bins)
 
                 series_data = []
-                for country, names in sorted(iter(bins.items()), key=lambda t: t[0].lower()):
+                for country, names in sorted(bins.items(), key=lambda t: t[0].lower()):
                     percentage = len(names) * 100.0 / (total_persons or 1)
                     if country:
                         series_data.append((country, len(names)))
@@ -541,7 +540,7 @@ def document_stats(request, stats_type=None):
                 total_persons = count_bins(bins)
 
                 series_data = []
-                for continent, names in sorted(iter(bins.items()), key=lambda t: t[0].lower()):
+                for continent, names in sorted(bins.items(), key=lambda t: t[0].lower()):
                     percentage = len(names) * 100.0 / (total_persons or 1)
                     if continent:
                         series_data.append((continent, len(names)))
@@ -563,12 +562,12 @@ def document_stats(request, stats_type=None):
                 person_qs = Person.objects.filter(person_filters)
 
                 for name, citations in person_qs.values_list("name").annotate(Count("documentauthor__document__docalias__relateddocument")):
-                    bins[citations].add(name)
+                    bins[citations or 0].add(name)
 
                 total_persons = count_bins(bins)
 
                 series_data = []
-                for citations, names in sorted(iter(bins.items()), key=lambda t: t[0], reverse=True):
+                for citations, names in sorted(bins.items(), key=lambda t: t[0], reverse=True):
                     percentage = len(names) * 100.0 / (total_persons or 1)
                     series_data.append((citations, percentage))
                     plain_names = [ plain_name(n) for n in names ]
@@ -589,12 +588,12 @@ def document_stats(request, stats_type=None):
                 values = person_qs.values_list("name", "documentauthor__document").annotate(Count("documentauthor__document__docalias__relateddocument"))
                 for name, ts in itertools.groupby(values.order_by("name"), key=lambda t: t[0]):
                     h_index = compute_hirsch_index([citations for _, document, citations in ts])
-                    bins[h_index].add(name)
+                    bins[h_index or 0].add(name)
 
                 total_persons = count_bins(bins)
 
                 series_data = []
-                for citations, names in sorted(iter(bins.items()), key=lambda t: t[0], reverse=True):
+                for citations, names in sorted(bins.items(), key=lambda t: t[0], reverse=True):
                     percentage = len(names) * 100.0 / (total_persons or 1)
                     series_data.append((citations, percentage))
                     plain_names = [ plain_name(n) for n in names ]
@@ -835,7 +834,7 @@ def meeting_stats(request, num=None, stats_type=None):
                 total_attendees = count_bins(bins)
 
                 series_data = []
-                for country, names in sorted(iter(bins.items()), key=lambda t: t[0].lower()):
+                for country, names in sorted(bins.items(), key=lambda t: t[0].lower()):
                     percentage = len(names) * 100.0 / (total_attendees or 1)
                     if country:
                         series_data.append((country, len(names)))
@@ -869,7 +868,7 @@ def meeting_stats(request, num=None, stats_type=None):
                 total_attendees = count_bins(bins)
 
                 series_data = []
-                for continent, names in sorted(iter(bins.items()), key=lambda t: t[0].lower()):
+                for continent, names in sorted(bins.items(), key=lambda t: t[0].lower()):
                     percentage = len(names) * 100.0 / (total_attendees or 1)
                     if continent:
                         series_data.append((continent, len(names)))

From f5ae2541addd9a448ced088b91d530ad1379bc2b Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 1 Jul 2019 14:09:12 +0000
Subject: [PATCH 043/114] Replaced multiple asserts with assertContains().  -
 Legacy-Id: 16353

---
 ietf/secr/announcement/tests.py | 4 ++--
 ietf/secr/meetings/tests.py     | 4 ++--
 ietf/secr/proceedings/tests.py  | 4 ++--
 ietf/secr/roles/tests.py        | 5 +++--
 ietf/secr/telechat/tests.py     | 8 ++++----
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/ietf/secr/announcement/tests.py b/ietf/secr/announcement/tests.py
index d7ba222eb..1110c0f23 100644
--- a/ietf/secr/announcement/tests.py
+++ b/ietf/secr/announcement/tests.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2013-2019, All Rights Reserved
 from django.urls import reverse
 
 from pyquery import PyQuery
@@ -94,8 +95,7 @@ class SubmitAnnouncementCase(TestCase):
                      'body':'This is a test.'}
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.post(url,post_data)
-        self.assertEqual(response.status_code, 200)
-        self.assertTrue('Confirm Announcement' in response.content)
+        self.assertContains(response, 'Confirm Announcement')
         response = self.client.post(confirm_url,post_data,follow=True)
         self.assertRedirects(response, url)
         self.assertEqual(len(outbox),1)
diff --git a/ietf/secr/meetings/tests.py b/ietf/secr/meetings/tests.py
index fb63ceaf7..325b53202 100644
--- a/ietf/secr/meetings/tests.py
+++ b/ietf/secr/meetings/tests.py
@@ -224,7 +224,7 @@ class SecrMeetingTestCase(TestCase):
             'name':'Test Morning Session'
         }, follow=True)
         self.assertRedirects(response, url)
-        self.assertTrue('Test Morning Session' in response.content)
+        self.assertContains(response, 'Test Morning Session')
 
     def test_meetings_times_delete(self):
         meeting = make_meeting_test_data()
@@ -310,7 +310,7 @@ class SecrMeetingTestCase(TestCase):
             'group':group.pk,
         })
         self.assertEqual(response.status_code, 200)
-        self.assertTrue('invalid format' in response.content)
+        self.assertContains(response, 'invalid format')
 
     def test_meetings_nonsession_edit(self):
         meeting = make_meeting_test_data()
diff --git a/ietf/secr/proceedings/tests.py b/ietf/secr/proceedings/tests.py
index 66cb0b873..0c8dc6af9 100644
--- a/ietf/secr/proceedings/tests.py
+++ b/ietf/secr/proceedings/tests.py
@@ -87,7 +87,7 @@ class RecordingTestCase(TestCase):
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.post(url,data,follow=True)
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(group.acronym in response.content)
+        self.assertContains(response, group.acronym)
         
         # now test edit
         doc = session.materials.filter(type='recording').first()
@@ -95,7 +95,7 @@ class RecordingTestCase(TestCase):
         url = reverse('ietf.secr.proceedings.views.recording_edit', kwargs={'meeting_num':meeting.number,'name':doc.name})
         response = self.client.post(url,dict(external_url=external_url),follow=True)
         self.assertEqual(response.status_code, 200)
-        self.assertTrue(external_url in response.content)
+        self.assertContains(response, external_url)
             
     def test_import_audio_files(self):
         session = SessionFactory(status_id='sched',meeting__type_id='ietf')
diff --git a/ietf/secr/roles/tests.py b/ietf/secr/roles/tests.py
index c4cdf88cf..344634563 100644
--- a/ietf/secr/roles/tests.py
+++ b/ietf/secr/roles/tests.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2013-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 from django.urls import reverse
 from ietf.utils.test_utils import TestCase
@@ -47,7 +48,7 @@ class SecrRolesMainTestCase(TestCase):
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.post(url,post_data,follow=True)
         self.assertRedirects(response, target)
-        self.assertTrue('added successfully' in response.content)
+        self.assertContains(response, 'added successfully')
 
     def test_roles_add_no_group(self):
         person = Person.objects.get(name='Areað Irector')
@@ -60,4 +61,4 @@ class SecrRolesMainTestCase(TestCase):
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.post(url,post_data,follow=True)
         self.assertEqual(response.status_code, 200)
-        self.assertTrue('You must select a group' in response.content)
+        self.assertContains(response, 'You must select a group')
diff --git a/ietf/secr/telechat/tests.py b/ietf/secr/telechat/tests.py
index 5b7245191..26d50d2ba 100644
--- a/ietf/secr/telechat/tests.py
+++ b/ietf/secr/telechat/tests.py
@@ -76,9 +76,9 @@ class SecrTelechatTestCase(TestCase):
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
-        self.assertTrue("Has downref: Yes" in response.content)
-        self.assertTrue("Add rfc6666" in response.content)
-        self.assertTrue("to downref registry" in response.content)
+        self.assertContains(response, "Has downref: Yes")
+        self.assertContains(response, "Add rfc6666")
+        self.assertContains(response, "to downref registry")
 
     def test_doc_detail_draft_invalid(self):
         '''Test using a document not on telechat agenda'''
@@ -88,7 +88,7 @@ class SecrTelechatTestCase(TestCase):
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url, follow=True)
         self.assertRedirects(response, reverse('ietf.secr.telechat.views.doc', kwargs={'date':date}))
-        self.assertTrue('not on the Telechat agenda' in response.content)
+        self.assertContains(response, 'not on the Telechat agenda')
 
     def test_doc_detail_charter(self):
         by=Person.objects.get(name="(System)")

From f5e9583f594d20d673a8bfc67cd3c63bc3fa6253 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 1 Jul 2019 14:09:53 +0000
Subject: [PATCH 044/114] Fixed str/bytes issues with hashlib function
 arguments.  - Legacy-Id: 16354

---
 ietf/utils/accesstoken.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ietf/utils/accesstoken.py b/ietf/utils/accesstoken.py
index da07c9a3a..e3163581d 100644
--- a/ietf/utils/accesstoken.py
+++ b/ietf/utils/accesstoken.py
@@ -1,10 +1,12 @@
+# Copyright The IETF Trust 2013-2019, All Rights Reserved
 import time, random, hashlib
 
 from django.conf import settings
+from django.utils.encoding import force_bytes
 
 def generate_random_key(max_length=32):
     """Generate a random access token."""
-    return hashlib.sha256(settings.SECRET_KEY + ("%.16f" % time.time()) + ("%.16f" % random.random())).hexdigest()[:max_length]
+    return hashlib.sha256(force_bytes(settings.SECRET_KEY) + (b"%.16f" % time.time()) + (b"%.16f" % random.random())).hexdigest()[:max_length]
 
 def generate_access_token(key, max_length=32):
     """Make an access token out of key."""
@@ -12,4 +14,4 @@ def generate_access_token(key, max_length=32):
     # we hash it with the private key to make sure only we can
     # generate and use the final token - so storing the key in the
     # database is safe
-    return hashlib.sha256(settings.SECRET_KEY + key).hexdigest()[:max_length]
+    return hashlib.sha256(force_bytes(settings.SECRET_KEY) + force_bytes(key)).hexdigest()[:max_length]

From cfd4025a9c0db86830a165b475e87634a81dca5b Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 4 Jul 2019 12:58:58 +0000
Subject: [PATCH 045/114] Merged from trunk  - Legacy-Id: 16371

---
 bin/check-copyright | 203 ++++++++++++++++++++++++++++++++++++++++++++
 bin/daily           |   6 +-
 2 files changed, 206 insertions(+), 3 deletions(-)
 create mode 100755 bin/check-copyright

diff --git a/bin/check-copyright b/bin/check-copyright
new file mode 100755
index 000000000..2ae4ae208
--- /dev/null
+++ b/bin/check-copyright
@@ -0,0 +1,203 @@
+#!/usr/bin/env python
+# -*- python -*-
+# Copyright The IETF Trust 2019, All Rights Reserved
+"""
+NAME
+	$program - Check for current copyright notice in given files
+
+SYNOPSIS
+	$program [OPTIONS] ARGS
+
+DESCRIPTION
+	Given a list of files or filename wildcard patterns, check all for
+	an IETF Trust copyright notice with the current year.
+
+%(options)s
+
+FILES
+
+AUTHOR
+	Written by Henrik Levkowetz, 
+
+COPYRIGHT
+	Copyright 2019 the IETF Trust
+
+	This program is free software; you can redistribute it and/or modify
+	it under the terms of the Simplified BSD license as published by the
+        Open Source Initiative at http://opensource.org/licenses/BSD-2-Clause.
+
+"""
+from __future__ import print_function
+
+import os
+import sys
+import time
+
+path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+if not path in sys.path:
+    sys.path.insert(0, path)
+
+import getopt
+import re
+import pytz
+import tzparse
+import debug
+
+version = "0.10"
+program = os.path.basename(sys.argv[0])
+progdir = os.path.dirname(sys.argv[0])
+
+# ----------------------------------------------------------------------
+# Parse options
+
+options = ""
+for line in re.findall("\n +(if|elif) +opt in \[(.+)\]:\s+#(.+)\n", open(sys.argv[0]).read()):
+    if not options:
+        options += "OPTIONS\n"
+    options += "        %-16s %s\n" % (line[1].replace('"', ''), line[2])
+options = options.strip()
+
+# with ' < 1:' on the next line, this is a no-op:
+if len(sys.argv) < 1:
+    print(__doc__ % locals())
+    sys.exit(1)
+
+try:
+    opts, files = getopt.gnu_getopt(sys.argv[1:], "hvV", ["help", "version", "verbose",])
+except Exception, e:
+    print( "%s: %s" % (program, e))
+    sys.exit(1)
+
+# ----------------------------------------------------------------------
+# Handle options
+
+# set default values, if any
+opt_verbose = 0
+
+# handle individual options
+for opt, value in opts:
+    if   opt in ["-h", "--help"]: # Output this help, then exit
+        print( __doc__ % locals() )
+        sys.exit(1)
+    elif opt in ["-V", "--version"]: # Output version information, then exit
+        print( program, version )
+        sys.exit(0)
+    elif opt in ["-v", "--verbose"]: # Output version information, then exit
+        opt_verbose += 1
+
+# ----------------------------------------------------------------------
+def say(s):
+    sys.stderr.write("%s\n" % (s))
+
+# ----------------------------------------------------------------------
+def note(s):
+    if opt_verbose:
+        sys.stderr.write("%s\n" % (s))
+
+# ----------------------------------------------------------------------
+def die(s, error=1):
+    sys.stderr.write("\n%s: Error: %s\n\n" % (program, s))
+    sys.exit(error)
+
+# ----------------------------------------------------------------------
+
+def pipe(cmd, inp=None):
+    import shlex
+    from subprocess import Popen, PIPE
+    args = shlex.split(cmd)
+    bufsize = 4096
+    stdin = PIPE if inp else None
+    pipe = Popen(args, stdin=stdin, stdout=PIPE, stderr=PIPE, bufsize=bufsize)
+    out, err = pipe.communicate(inp)
+    code = pipe.returncode
+    if code != 0:
+        raise OSError(err)
+    return out
+
+# ----------------------------------------------------------------------
+def split_loginfo(line):
+    try:
+        parts = line.split()
+        rev  = parts[0][1:]
+        who  = parts[2]
+        date = parts[4]
+        time = parts[5]
+        tz   = parts[6]
+        when = tzparse.tzparse(" ".join(parts[4:7]), "%Y-%m-%d %H:%M:%S %Z")
+        when = when.astimezone(pytz.utc)
+    except ValueError as e:
+        sys.stderr.write("Bad log line format: %s\n  %s\n" % (line, e))
+
+    return rev, who, when
+
+# ----------------------------------------------------------------------
+def get_first_commit(path):
+    note("Getting first commit for '%s'" % path)
+    cmd = 'svn log %s' % path
+    if opt_verbose > 1:
+        note("Running '%s' ..." % cmd)
+    commit_log = pipe(cmd)
+    commit_log = commit_log.splitlines()
+    commit_log.reverse()
+    for line in commit_log:
+        if re.search(loginfo_format, line):
+            rev, who, when = split_loginfo(line)
+            break
+        else:
+            pass
+    return { path: { 'rev': rev, 'who': who, 'date': when.strftime('%Y-%m-%d %H:%M:%S'), }, }
+
+
+# ----------------------------------------------------------------------
+# The program itself    
+
+import os
+import json
+
+cwd = os.getcwd()
+
+if cwd.split(os.path.sep)[-1] != 'trunk':
+    die("Expected to run this operation in trunk, but the current\ndirectory is '%s'" % cwd)
+
+# Get current initinfo from cache and svn
+cachefn = os.path.join(os.environ.get('HOME', '.'), '.initinfo')
+
+if os.path.exists(cachefn):
+    note("Reading initinfo cache file %s" % cachefn)
+    with open(cachefn, "r") as file:
+        cache = json.load(file)
+else:
+    sys.stderr.write("No  initinfo cache file found -- will have to extract all information from SVN.\n"+
+        "This may take some time.\n\n")
+    cache = {}
+initinfo = cache
+
+merged_revs = {}
+write_cache = False
+loginfo_format = r'^r[0-9]+ \| [^@]+@[^@]+ \| \d\d\d\d-\d\d-\d\d '
+
+year = time.strftime('%Y')
+for path in files:
+    note("Checking path %s" % path)
+    if not path in initinfo:
+        initinfo.update(get_first_commit(path))
+        write_cache = True
+    date = initinfo[path]['date']
+    init = date[:4]
+    copyright = "(?i)Copyright The IETF Trust (%s-)?%s, All Rights Reserved" % (init, year)
+    with open(path) as file:
+        chunk = file.read(4000)
+        if os.path.basename(path) == '__init__.py' and len(chunk)==0:
+            continue
+        if not re.search(copyright, chunk):
+            sys.stdout.write("%s(1): Error: Missing or bad copyright.  " % path)
+            if year == init:
+                print("  Expected: Copyright The IETF Trust %s, All Rights Reserved" % year)
+            else:
+                print("  Expected: Copyright The IETF Trust %s-%s, All Rights Reserved" % (init, year))
+
+if write_cache:
+    cache = initinfo
+    with open(cachefn, "w") as file:
+        json.dump(cache, file, indent=2, sort_keys=True)
+
diff --git a/bin/daily b/bin/daily
index 6708c76d9..19ce475e0 100755
--- a/bin/daily
+++ b/bin/daily
@@ -23,13 +23,13 @@ $DTDIR/ietf/manage.py update_external_command_info
 
 # Get IANA-registered yang models
 YANG_IANA_DIR=$(python -c 'import ietf.settings; print ietf.settings.SUBMIT_YANG_IANA_MODEL_DIR')
-rsync -avz --delete rsync.ietf.org::iana/yang-parameters/ ${YANG_IANA_DIR%/}/
+rsync -avzq --delete rsync.ietf.org::iana/yang-parameters/ ${YANG_IANA_DIR%/}/
 
 # Populate the yang repositories
-$DTDIR/ietf/manage.py populate_yang_model_dirs
+$DTDIR/ietf/manage.py populate_yang_model_dirs -v0
 
 # Re-run yang checks on active documents
-$DTDIR/ietf/manage.py run_yang_model_checks
+$DTDIR/ietf/manage.py run_yang_model_checks -v0
 
 # Expire internet drafts
 # Enable when removed from /a/www/ietf-datatracker/scripts/Cron-runner:

From b7e9fd14b03b94c3b66c3f6de6393b44f2d497bc Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 4 Jul 2019 13:00:55 +0000
Subject: [PATCH 046/114] Updated check-copyright to python3.7 and added a
 --patch switch  - Legacy-Id: 16372

---
 bin/check-copyright | 105 ++++++++++++++++++++++++++++++++------------
 1 file changed, 78 insertions(+), 27 deletions(-)

diff --git a/bin/check-copyright b/bin/check-copyright
index 2ae4ae208..ce21a3881 100755
--- a/bin/check-copyright
+++ b/bin/check-copyright
@@ -1,5 +1,5 @@
-#!/usr/bin/env python
-# -*- python -*-
+#!/usr/bin/env python3.7
+# -*- mode: python; coding: utf-8 -*-
 # Copyright The IETF Trust 2019, All Rights Reserved
 """
 NAME
@@ -10,12 +10,18 @@ SYNOPSIS
 
 DESCRIPTION
 	Given a list of files or filename wildcard patterns, check all for
-	an IETF Trust copyright notice with the current year.
+	an IETF Trust copyright notice with the current year.  Optionally
+        generate a diff on standard out which can be used by 'patch'.
+
+        An invocation similar to the following can be particularly useful with
+        a set of changed version-controlled files, as it will fix up the
+        Copyright statements of any python files with pending changes:
+
+        $ check-copyright -p $(svn st | cut -c 9- | grep '\.py$' ) | patch -p0
+
 
 %(options)s
 
-FILES
-
 AUTHOR
 	Written by Henrik Levkowetz, 
 
@@ -47,6 +53,8 @@ version = "0.10"
 program = os.path.basename(sys.argv[0])
 progdir = os.path.dirname(sys.argv[0])
 
+debug.debug = True
+
 # ----------------------------------------------------------------------
 # Parse options
 
@@ -63,8 +71,8 @@ if len(sys.argv) < 1:
     sys.exit(1)
 
 try:
-    opts, files = getopt.gnu_getopt(sys.argv[1:], "hvV", ["help", "version", "verbose",])
-except Exception, e:
+    opts, files = getopt.gnu_getopt(sys.argv[1:], "hpvV", ["help", "patch", "version", "verbose",])
+except Exception as e:
     print( "%s: %s" % (program, e))
     sys.exit(1)
 
@@ -73,12 +81,15 @@ except Exception, e:
 
 # set default values, if any
 opt_verbose = 0
+opt_patch = False
 
 # handle individual options
 for opt, value in opts:
     if   opt in ["-h", "--help"]: # Output this help, then exit
         print( __doc__ % locals() )
         sys.exit(1)
+    elif opt in ["-p", "--patch"]: # Generate patch output rather than error messages
+        opt_patch = True
     elif opt in ["-V", "--version"]: # Output version information, then exit
         print( program, version )
         sys.exit(0)
@@ -107,7 +118,7 @@ def pipe(cmd, inp=None):
     args = shlex.split(cmd)
     bufsize = 4096
     stdin = PIPE if inp else None
-    pipe = Popen(args, stdin=stdin, stdout=PIPE, stderr=PIPE, bufsize=bufsize)
+    pipe = Popen(args, stdin=stdin, stdout=PIPE, stderr=PIPE, bufsize=bufsize, encoding='utf-8', universal_newlines=True)
     out, err = pipe.communicate(inp)
     code = pipe.returncode
     if code != 0:
@@ -156,9 +167,6 @@ import json
 
 cwd = os.getcwd()
 
-if cwd.split(os.path.sep)[-1] != 'trunk':
-    die("Expected to run this operation in trunk, but the current\ndirectory is '%s'" % cwd)
-
 # Get current initinfo from cache and svn
 cachefn = os.path.join(os.environ.get('HOME', '.'), '.initinfo')
 
@@ -178,23 +186,66 @@ loginfo_format = r'^r[0-9]+ \| [^@]+@[^@]+ \| \d\d\d\d-\d\d-\d\d '
 
 year = time.strftime('%Y')
 for path in files:
-    note("Checking path %s" % path)
-    if not path in initinfo:
-        initinfo.update(get_first_commit(path))
-        write_cache = True
-    date = initinfo[path]['date']
-    init = date[:4]
-    copyright = "(?i)Copyright The IETF Trust (%s-)?%s, All Rights Reserved" % (init, year)
-    with open(path) as file:
-        chunk = file.read(4000)
-        if os.path.basename(path) == '__init__.py' and len(chunk)==0:
+    try:
+        if not os.path.exists(path):
+            note("File does not exist: %s" % path)
             continue
-        if not re.search(copyright, chunk):
-            sys.stdout.write("%s(1): Error: Missing or bad copyright.  " % path)
-            if year == init:
-                print("  Expected: Copyright The IETF Trust %s, All Rights Reserved" % year)
-            else:
-                print("  Expected: Copyright The IETF Trust %s-%s, All Rights Reserved" % (init, year))
+        note("Checking path %s" % path)
+        if not path in initinfo:
+            initinfo.update(get_first_commit(path))
+            write_cache = True
+        date = initinfo[path]['date']
+        init = date[:4]
+        
+        copyright_re = r"(?i)Copyright The IETF Trust (\d+-)?\d+, All Rights Reserved"
+        copyright_year_re = r"(?i)Copyright The IETF Trust (%s-)?%s, All Rights Reserved" % (init, year)
+        with open(path) as file:
+            try:
+                chunk = file.read(4000)
+            except UnicodeDecodeError as e:
+                sys.stderr.write(f'Error when reading {file.name}: {e}\n')
+                raise
+            if os.path.basename(path) == '__init__.py' and len(chunk)==0:
+                continue
+            if not re.search(copyright_year_re, chunk):
+                if year == init:
+                    copyright = f"Copyright The IETF Trust {year}, All Rights Reserved"
+                else:
+                    copyright = f"Copyright The IETF Trust {init}-{year}, All Rights Reserved"
+                if opt_patch:
+                    print(f"--- {file.name}\t(original)")
+                    print(f"+++ {file.name}\t(modified)")
+                    if not re.search(copyright_re, chunk):
+                        # Simple case, just insert copyright at the top
+                        print( "@@ -1,3 +1,4 @@")
+                        print(f"+# {copyright}")
+                        for i, line in list(enumerate(chunk.splitlines()))[:3]:
+                            print(f" {line}")
+                    else:
+                        # Find old copyright, then emit preceding lines,
+                        # change, and following lines.
+                        pos = None
+                        for i, line in enumerate(chunk.splitlines(), start=1):
+                            if re.search(copyright_re, line):
+                                pos = i
+                                break
+                        if not pos:
+                            raise RuntimeError("Unexpected state: Expected a copyright line, but found none")
+                        print(f"@@ -1,{pos+3} +1,{pos+3} @@")
+                        for i, line in list(enumerate(chunk.splitlines(), start=1))[:pos+3]:
+                            if i == pos:
+                                print(f"-{line}")
+                                print(f"+# {copyright}")
+                            else:
+                                print(f" {line}")
+                else:
+                    sys.stderr.write(f"{path}(1): Error: Missing or bad copyright.  Expected: {copyright}")
+    except Exception:
+        if write_cache:
+            cache = initinfo
+            with open(cachefn, "w") as file:
+                json.dump(cache, file, indent=2, sort_keys=True)
+        raise
 
 if write_cache:
     cache = initinfo

From d4607214153dd4930c90871189c7c31293c7b4a5 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 4 Jul 2019 15:38:15 +0000
Subject: [PATCH 047/114] Changed regexes to use r strings.  Rewrote code to
 extract From: name and email from iana email text.  Fixed charset decode of
 iana email messages.  - Legacy-Id: 16373

---
 ietf/sync/iana.py | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/ietf/sync/iana.py b/ietf/sync/iana.py
index 58293625d..cc14c7b60 100644
--- a/ietf/sync/iana.py
+++ b/ietf/sync/iana.py
@@ -9,10 +9,13 @@ import urllib.request, urllib.error, urllib.parse
 from django.utils.http import urlquote
 from django.conf import settings
 
+import debug                            # pyflakes:ignore
+
 from ietf.doc.mails import email_state_changed
 from ietf.doc.models import Document, DocEvent, State, StateDocEvent, StateType
 from ietf.doc.utils import add_state_change_event
 from ietf.person.models import Person
+from ietf.utils.mail import parseaddr
 from ietf.utils.timezone import local_timezone_to_utc, email_time_to_local_timezone, utc_to_local_timezone
 
 
@@ -216,11 +219,11 @@ def update_history_with_changes(changes, send_email=True):
 
 def find_document_name(text):
     prefixes = ['draft','conflict-review','status-change','charter']
-    leading_delimiter_re = '(?
Date: Thu, 4 Jul 2019 15:45:18 +0000
Subject: [PATCH 048/114] Changed a regex to use an r string.  Added decoding
 of command pipe output.  - Legacy-Id: 16374

---
 ietf/submit/checkers.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ietf/submit/checkers.py b/ietf/submit/checkers.py
index d59203e1c..97818dc8f 100644
--- a/ietf/submit/checkers.py
+++ b/ietf/submit/checkers.py
@@ -80,6 +80,8 @@ class DraftIdnitsChecker(object):
 
         cmd = "%s %s %s" % (settings.IDSUBMIT_IDNITS_BINARY, self.options, path)
         code, out, err = pipe(cmd)
+        out = out.decode()
+        err = err.decode()
         if code != 0 or out == "":
             message = "idnits error: %s:\n  Error %s: %s" %( cmd, code, err)
             log(message)
@@ -87,7 +89,7 @@ class DraftIdnitsChecker(object):
             
         else:
             message = out
-            if re.search("\s+Summary:\s+0\s+|No nits found", out):
+            if re.search(r"\s+Summary:\s+0\s+|No nits found", out):
                 passed  = True
             else:
                 passed  = False
@@ -204,6 +206,8 @@ class DraftYangChecker(object):
                 cmd_version = VersionInfo.objects.get(command=command).version
                 cmd = cmd_template.format(libs=modpath, model=path)
                 code, out, err = pipe(cmd)
+                out = out.decode()
+                err = err.decode()
                 if code > 0 or len(err.strip()) > 0 :
                     error_lines = err.splitlines()
                     assertion('len(error_lines) > 0')
@@ -235,6 +239,8 @@ class DraftYangChecker(object):
                     cmd = cmd_template.format(model=path, rfclib=settings.SUBMIT_YANG_RFC_MODEL_DIR, tmplib=workdir,
                         draftlib=settings.SUBMIT_YANG_DRAFT_MODEL_DIR, ianalib=settings.SUBMIT_YANG_IANA_MODEL_DIR, )
                     code, out, err = pipe(cmd)
+                    out = out.decode()
+                    err = err.decode()
                     if code > 0 or len(err.strip()) > 0:
                         err_lines = err.splitlines()
                         for line in err_lines:

From 1225f8af6bb343232df8e6fb6d29926c9f47e853 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 4 Jul 2019 15:49:42 +0000
Subject: [PATCH 049/114] Refactored submission code to be clearer and only do
 mimetype extraction in one place, made the point where files are saved less
 obscure, fixed bytes/str issues for file read and write, fixed regex strings,
 fixed variable name visibility due to scope changes in py3.  - Legacy-Id:
 16375

---
 ietf/submit/forms.py                |  8 +--
 ietf/submit/mail.py                 |  7 +--
 ietf/submit/parsers/base.py         | 20 ++++++-
 ietf/submit/parsers/plain_parser.py | 84 ++++++++++++++---------------
 ietf/submit/tests.py                | 43 +++++++--------
 ietf/submit/utils.py                | 15 +++---
 ietf/submit/views.py                | 23 +++++---
 7 files changed, 112 insertions(+), 88 deletions(-)

diff --git a/ietf/submit/forms.py b/ietf/submit/forms.py
index a773c364d..7ede96b55 100644
--- a/ietf/submit/forms.py
+++ b/ietf/submit/forms.py
@@ -108,9 +108,9 @@ class SubmissionBaseUploadForm(forms.Form):
         if not f:
             return f
 
-        parsed_info = parser_class(f).critical_parse()
-        if parsed_info.errors:
-            raise forms.ValidationError(parsed_info.errors)
+        self.parsed_info = parser_class(f).critical_parse()
+        if self.parsed_info.errors:
+            raise forms.ValidationError(self.parsed_info.errors)
 
         return f
 
@@ -215,7 +215,7 @@ class SubmissionBaseUploadForm(forms.Form):
             bytes = txt_file.read()
             txt_file.seek(0)
             try:
-                text = bytes.decode('utf8')
+                text = bytes.decode(self.parsed_info.charset)
             except UnicodeDecodeError as e:
                 raise forms.ValidationError('Failed decoding the uploaded file: "%s"' % str(e))
             #
diff --git a/ietf/submit/mail.py b/ietf/submit/mail.py
index 661bef8b1..3ffb3769a 100644
--- a/ietf/submit/mail.py
+++ b/ietf/submit/mail.py
@@ -12,6 +12,7 @@ from django.urls import reverse as urlreverse
 from django.core.validators import ValidationError
 from django.contrib.sites.models import Site
 from django.template.loader import render_to_string
+from django.utils.encoding import force_text
 
 import debug                            # pyflakes:ignore
 
@@ -31,13 +32,13 @@ def send_submission_confirmation(request, submission, chair_notice=False):
     from_email = settings.IDSUBMIT_FROM_EMAIL
     (to_email, cc) = gather_address_lists('sub_confirmation_requested',submission=submission)
 
-    confirm_url = settings.IDTRACKER_BASE_URL + urlreverse('ietf.submit.views.confirm_submission', kwargs=dict(submission_id=submission.pk, auth_token=generate_access_token(submission.auth_key)))
+    confirmation_url = settings.IDTRACKER_BASE_URL + urlreverse('ietf.submit.views.confirm_submission', kwargs=dict(submission_id=submission.pk, auth_token=generate_access_token(submission.auth_key)))
     status_url = settings.IDTRACKER_BASE_URL + urlreverse('ietf.submit.views.submission_status', kwargs=dict(submission_id=submission.pk, access_token=submission.access_token()))
         
     send_mail(request, to_email, from_email, subject, 'submit/confirm_submission.txt', 
               {
                 'submission': submission,
-                'confirm_url': confirm_url,
+                'confirmation_url': confirmation_url,
                 'status_url': status_url,
                 'chair_notice': chair_notice,
               },
@@ -172,7 +173,7 @@ def get_reply_to():
     address with "plus addressing" using a random string.  Guaranteed to be unique"""
     local,domain = get_base_submission_message_address().split('@')
     while True:
-        rand = base64.urlsafe_b64encode(os.urandom(12))
+        rand = force_text(base64.urlsafe_b64encode(os.urandom(12)))
         address = "{}+{}@{}".format(local,rand,domain)
         q = Message.objects.filter(reply_to=address)
         if not q:
diff --git a/ietf/submit/parsers/base.py b/ietf/submit/parsers/base.py
index 24017fec5..c9eb7478f 100644
--- a/ietf/submit/parsers/base.py
+++ b/ietf/submit/parsers/base.py
@@ -77,7 +77,23 @@ class FileParser(object):
 
     def parse_file_type(self):
         self.fd.file.seek(0)
-        content = self.fd.file.read()
-        mimetype = magic.from_buffer(content, mime=True)
+        content = self.fd.file.read(64*1024)
+        if hasattr(magic, "open"):
+            m = magic.open(magic.MAGIC_MIME)
+            m.load()
+            filetype = m.buffer(content)
+        else:
+            m = magic.Magic()
+            m.cookie = magic.magic_open(magic.MAGIC_NONE | magic.MAGIC_MIME | magic.MAGIC_MIME_ENCODING)
+            magic.magic_load(m.cookie, None)
+            filetype = m.from_buffer(content)
+        if ';' in filetype and 'charset=' in filetype:
+            mimetype, charset = re.split('; *charset=', filetype)
+        else:
+            mimetype = re.split(';', filetype)[0]
+            charset = 'utf-8'
         if not mimetype in self.mimetypes:
             self.parsed_info.add_error('Expected an %s file of type "%s", found one of type "%s"' % (self.ext.upper(), '" or "'.join(self.mimetypes), mimetype))
+        self.parsed_info.mimetype = mimetype
+        self.parsed_info.charset = charset
+        
\ No newline at end of file
diff --git a/ietf/submit/parsers/plain_parser.py b/ietf/submit/parsers/plain_parser.py
index 22546d47a..be76c69ee 100644
--- a/ietf/submit/parsers/plain_parser.py
+++ b/ietf/submit/parsers/plain_parser.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2011-2019, All Rights Reserved
+
 import re
 
+import debug                            # pyflakes:ignore
+
 from ietf.submit.parsers.base import FileParser
 
 
@@ -15,58 +18,51 @@ class PlainParser(FileParser):
     # no other file parsing is recommended
     def critical_parse(self):
         super(PlainParser, self).critical_parse()
-        self.parse_file_charset()
+        self.check_file_charset()
         self.parse_name()
         return self.parsed_info
 
-    def parse_file_charset(self):
-        import magic
-        self.fd.file.seek(0)
-        content = self.fd.file.read()
-        if hasattr(magic, "open"):
-            m = magic.open(magic.MAGIC_MIME)
-            m.load()
-            filetype = m.buffer(content)
-        else:
-            m = magic.Magic()
-            m.cookie = magic.magic_open(magic.MAGIC_NONE | magic.MAGIC_MIME | magic.MAGIC_MIME_ENCODING)
-            magic.magic_load(m.cookie, None)
-            filetype = m.from_buffer(content)
-        if not 'ascii' in filetype and not 'utf-8' in filetype:
+    def check_file_charset(self):
+        charset = self.parsed_info.charset
+        if not charset in ['us-ascii', 'utf-8',]:
             self.parsed_info.add_error('A plain text ASCII document is required.  '
                 'Found an unexpected encoding: "%s".  '
-                'You probably have one or more non-ascii characters in your file.'  % filetype
+                'You probably have one or more non-ascii characters in your file.'  % charset
             )
+        if self.fd.charset and charset != self.fd.charset:
+            self.parsed_info.add_error("Unexpected charset mismatch: upload: %s, libmagic: %s" % (self.fd.charset, charset))
+
 
     def parse_name(self):
         self.fd.file.seek(0)
-        draftre = re.compile('(draft-\S+)')
-        revisionre = re.compile('.*-(\d+)$')
+        draftre = re.compile(r'(draft-\S+)')
+        revisionre = re.compile(r'.*-(\d+)$')
         limit = 80
-        while limit:
-            limit -= 1
-            line = self.fd.readline()
-            match = draftre.search(line)
-            if not match:
-                continue
-            name = match.group(1)
-            name = re.sub('^[^\w]+', '', name)
-            name = re.sub('[^\w]+$', '', name)
-            name = re.sub('\.txt$', '', name)
-            extra_chars = re.sub('[0-9a-z\-]', '', name)
-            if extra_chars:
-                if len(extra_chars) == 1:
-                    self.parsed_info.add_error(('The document name on the first page, "%s", contains a disallowed character with byte code: %s ' % (name.decode('utf-8','replace'), ord(extra_chars[0]))) +
-                                                '(see https://www.ietf.org/id-info/guidelines.html#naming for details).')
+        if self.parsed_info.charset in ['us-ascii', 'utf-8']:
+            while limit:
+                limit -= 1
+                line = self.fd.readline().decode(self.parsed_info.charset)
+                match = draftre.search(line)
+                if not match:
+                    continue
+                name = match.group(1)
+                name = re.sub(r'^[^\w]+', '', name)
+                name = re.sub(r'[^\w]+$', '', name)
+                name = re.sub(r'\.txt$', '', name)
+                extra_chars = re.sub(r'[0-9a-z\-]', '', name)
+                if extra_chars:
+                    if len(extra_chars) == 1:
+                        self.parsed_info.add_error(('The document name on the first page, "%s", contains a disallowed character with byte code: %s ' % (name.decode('utf-8','replace'), ord(extra_chars[0]))) +
+                                                    '(see https://www.ietf.org/id-info/guidelines.html#naming for details).')
+                    else:
+                        self.parsed_info.add_error(('The document name on the first page, "%s", contains disallowed characters with byte codes: %s ' % (name.decode('utf-8','replace'), (', '.join([ str(ord(c)) for c in extra_chars] )))) +
+                                                    '(see https://www.ietf.org/id-info/guidelines.html#naming for details).')
+                match_revision = revisionre.match(name)
+                if match_revision:
+                    self.parsed_info.metadata.rev = match_revision.group(1)
                 else:
-                    self.parsed_info.add_error(('The document name on the first page, "%s", contains disallowed characters with byte codes: %s ' % (name.decode('utf-8','replace'), (', '.join([ str(ord(c)) for c in extra_chars] )))) +
-                                                '(see https://www.ietf.org/id-info/guidelines.html#naming for details).')
-            match_revision = revisionre.match(name)
-            if match_revision:
-                self.parsed_info.metadata.rev = match_revision.group(1)
-            else:
-                self.parsed_info.add_error('The name found on the first page of the document does not contain a revision: "%s"' % (name.decode('utf-8','replace'),))
-            name = re.sub('-\d+$', '', name)
-            self.parsed_info.metadata.name = name
-            return
-        self.parsed_info.add_error('The first page of the document does not contain a legitimate name that start with draft-*')
+                    self.parsed_info.add_error('The name found on the first page of the document does not contain a revision: "%s"' % (name.decode('utf-8','replace'),))
+                name = re.sub(r'-\d+$', '', name)
+                self.parsed_info.metadata.name = name
+                return
+        self.parsed_info.add_error('The first page of the document does not contain a legitimate name that starts with draft-*')
diff --git a/ietf/submit/tests.py b/ietf/submit/tests.py
index 04c74642b..1dac188f6 100644
--- a/ietf/submit/tests.py
+++ b/ietf/submit/tests.py
@@ -1,7 +1,6 @@
 # Copyright The IETF Trust 2011-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
-
 import datetime
 import email
 import os
@@ -35,7 +34,7 @@ from ietf.submit.models import Submission, Preapproval
 from ietf.submit.mail import add_submission_email, process_response_email
 from ietf.utils.mail import outbox, empty_outbox
 from ietf.utils.models import VersionInfo
-from ietf.utils.test_utils import login_testing_unauthorized, unicontent, TestCase
+from ietf.utils.test_utils import login_testing_unauthorized, TestCase
 from ietf.utils.draft import Draft
 
 
@@ -185,17 +184,18 @@ class SubmitTests(TestCase):
 
         return r
 
-    def extract_confirm_url(self, confirm_email):
-        # dig out confirm_email link
-        msg = confirm_email.get_payload(decode=True)
+    def extract_confirmation_url(self, confirmation_email):
+        # dig out confirmation_email link
+        charset = confirmation_email.get_content_charset()
+        msg = confirmation_email.get_payload(decode=True).decode(charset)
         line_start = "http"
-        confirm_url = None
+        confirmation_url = None
         for line in msg.split("\n"):
             if line.strip().startswith(line_start):
-                confirm_url = line.strip()
-        self.assertTrue(confirm_url)
+                confirmation_url = line.strip()
+        self.assertTrue(confirmation_url)
 
-        return confirm_url
+        return confirmation_url
 
     def submit_new_wg(self, formats):
         # submit new -> supply submitter info -> approve
@@ -420,16 +420,16 @@ class SubmitTests(TestCase):
             self.assertNotIn("chairs have been copied", str(confirm_email))
             self.assertNotIn("mars-chairs@", confirm_email["To"].lower())
 
-        confirm_url = self.extract_confirm_url(confirm_email)
+        confirmation_url = self.extract_confirmation_url(confirm_email)
 
         # go to confirm page
-        r = self.client.get(confirm_url)
+        r = self.client.get(confirmation_url)
         q = PyQuery(r.content)
         self.assertEqual(len(q('[type=submit]:contains("Confirm")')), 1)
 
         # confirm
         mailbox_before = len(outbox)
-        r = self.client.post(confirm_url, {'action':'confirm'})
+        r = self.client.post(confirmation_url, {'action':'confirm'})
         self.assertEqual(r.status_code, 302)
 
         new_docevents = draft.docevent_set.exclude(pk__in=[event.pk for event in old_docevents])
@@ -558,16 +558,16 @@ class SubmitTests(TestCase):
         self.assertTrue("submitter@example.com" in confirm_email["To"])
         self.assertFalse("chairs have been copied" in str(confirm_email))
 
-        confirm_url = self.extract_confirm_url(outbox[-1])
+        confirmation_url = self.extract_confirmation_url(outbox[-1])
 
         # go to confirm page
-        r = self.client.get(confirm_url)
+        r = self.client.get(confirmation_url)
         q = PyQuery(r.content)
         self.assertEqual(len(q('[type=submit]:contains("Confirm")')), 1)
 
         # confirm
         mailbox_before = len(outbox)
-        r = self.client.post(confirm_url, {'action':'confirm'})
+        r = self.client.post(confirmation_url, {'action':'confirm'})
         self.assertEqual(r.status_code, 302)
 
         draft = Document.objects.get(docalias__name=name)
@@ -613,10 +613,10 @@ class SubmitTests(TestCase):
         status_url = r["Location"]
         r = self.client.get(status_url)
         self.assertEqual(len(outbox), mailbox_before + 1)
-        confirm_url = self.extract_confirm_url(outbox[-1])
+        confirmation_url = self.extract_confirmation_url(outbox[-1])
         self.assertFalse("chairs have been copied" in str(outbox[-1]))
         mailbox_before = len(outbox)
-        r = self.client.post(confirm_url, {'action':'confirm'})
+        r = self.client.post(confirmation_url, {'action':'confirm'})
         self.assertEqual(r.status_code, 302)
         self.assertEqual(len(outbox), mailbox_before+3)
         draft = Document.objects.get(docalias__name=name)
@@ -641,9 +641,9 @@ class SubmitTests(TestCase):
         status_url = r["Location"]
         r = self.client.get(status_url)
         self.assertEqual(len(outbox), mailbox_before + 1)
-        confirm_url = self.extract_confirm_url(outbox[-1])
+        confirmation_url = self.extract_confirmation_url(outbox[-1])
         mailbox_before = len(outbox)
-        r = self.client.post(confirm_url, {'action':'cancel'})
+        r = self.client.post(confirmation_url, {'action':'cancel'})
         self.assertEqual(r.status_code, 302)
         self.assertEqual(len(outbox), mailbox_before)
         draft = Document.objects.get(docalias__name=name)
@@ -818,7 +818,8 @@ class SubmitTests(TestCase):
 
         # status page as unpriviliged => no edit button
         r = self.client.get(unprivileged_status_url)
-        self.assertContains(r, "submission status of %s" % name)
+        print(r.content)
+        self.assertContains(r, "Submission status of %s" % name)
         q = PyQuery(r.content)
         adjust_button = q('[type=submit]:contains("Adjust")')
         self.assertEqual(len(adjust_button), 0)
@@ -1688,7 +1689,7 @@ class RefsTests(TestCase):
 
         group = None
         file, __ = submission_file('draft-some-subject', '00', group, 'txt', "test_submission.txt", )
-        draft = Draft(file.read().decode('utf-8'), file.name)
+        draft = Draft(file.read(), file.name)
         refs = draft.get_refs()
         self.assertEqual(refs['rfc2119'], 'norm')
         self.assertEqual(refs['rfc8174'], 'norm')
diff --git a/ietf/submit/utils.py b/ietf/submit/utils.py
index 2a30d6838..b06988249 100644
--- a/ietf/submit/utils.py
+++ b/ietf/submit/utils.py
@@ -458,7 +458,7 @@ def ensure_person_email_info_exists(name, email, docname):
         person.name = name
         person.name_from_draft = name
         log.assertion('isinstance(person.name, six.text_type)')
-        person.ascii = unidecode_name(person.name).decode('ascii')
+        person.ascii = unidecode_name(person.name)
         person.save()
     else:
         person.name_from_draft = name
@@ -595,11 +595,8 @@ def expire_submission(submission, by):
 
     SubmissionEvent.objects.create(submission=submission, by=by, desc="Cancelled expired submission")
 
-def get_draft_meta(form):
-    authors = []
+def save_files(form):
     file_name = {}
-    abstract = None
-    file_size = None
     for ext in list(form.fields.keys()):
         if not ext in form.formats:
             continue
@@ -612,7 +609,13 @@ def get_draft_meta(form):
         with open(name, 'wb+') as destination:
             for chunk in f.chunks():
                 destination.write(chunk)
+    return file_name
 
+def get_draft_meta(form, saved_files):
+    authors = []
+    file_name = saved_files
+    abstract = None
+    file_size = None
     if form.cleaned_data['xml']:
         if not ('txt' in form.cleaned_data and form.cleaned_data['txt']):
             file_name['txt'] = os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s.txt' % (form.filename, form.revision))
@@ -640,7 +643,7 @@ def get_draft_meta(form):
         # be retrieved from the generated text file.  Provide a
         # parsed draft object to get at that kind of information.
         with open(file_name['txt']) as txt_file:
-            form.parsed_draft = Draft(txt_file.read().decode('utf8'), txt_file.name)
+            form.parsed_draft = Draft(txt_file.read(), txt_file.name)
 
     else:
         file_size = form.cleaned_data['txt'].size
diff --git a/ietf/submit/views.py b/ietf/submit/views.py
index 8d234133b..3cf6a6534 100644
--- a/ietf/submit/views.py
+++ b/ietf/submit/views.py
@@ -31,18 +31,19 @@ from ietf.submit.models import (Submission, Preapproval,
 from ietf.submit.utils import ( approvable_submissions_for_user, preapprovals_for_user,
     recently_approved_by_user, validate_submission, create_submission_event, docevent_from_submission,
     post_submission, cancel_submission, rename_submission_files, remove_submission_files, get_draft_meta,
-    get_submission, fill_in_submission, apply_checkers, send_confirmation_emails )
+    get_submission, fill_in_submission, apply_checkers, send_confirmation_emails, save_files )
 from ietf.stats.utils import clean_country_name
 from ietf.utils.accesstoken import generate_access_token
 from ietf.utils.log import log
-from ietf.utils.mail import send_mail_message
+from ietf.utils.mail import parseaddr, send_mail_message
 
 def upload_submission(request):
     if request.method == 'POST':
         try:
             form = SubmissionManualUploadForm(request, data=request.POST, files=request.FILES)
             if form.is_valid():
-                authors, abstract, file_name, file_size = get_draft_meta(form)
+                saved_files = save_files(form)
+                authors, abstract, file_name, file_size = get_draft_meta(form, saved_files)
 
                 submission = get_submission(form)
                 try:
@@ -87,7 +88,7 @@ def api_submit(request):
     if request.method == 'GET':
         return render(request, 'submit/api_submit_info.html')
     elif request.method == 'POST':
-        e = None
+        exception = None
         try:
             form = SubmissionAutoUploadForm(request, data=request.POST, files=request.FILES)
             if form.is_valid():
@@ -101,7 +102,8 @@ def api_submit(request):
                 if not hasattr(user, 'person'):
                     return err(400, "No person with username %s" % username)
 
-                authors, abstract, file_name, file_size = get_draft_meta(form)
+                saved_files = save_files(form)
+                authors, abstract, file_name, file_size = get_draft_meta(form, saved_files)
                 for a in authors:
                     if not a['email']:
                         raise ValidationError("Missing email address for author %s" % a)
@@ -142,14 +144,17 @@ def api_submit(request):
             else:
                 raise ValidationError(form.errors)
         except IOError as e:
+            exception = e
             return err(500, "IO Error: %s" % str(e))
         except ValidationError as e:
+            exception = e
             return err(400, "Validation Error: %s" % str(e))
         except Exception as e:
+            exception = e
             raise
             return err(500, "Exception: %s" % str(e))            
         finally:
-            if e and submission:
+            if exception and submission:
                 remove_submission_files(submission)
                 submission.delete()
     else:
@@ -213,8 +218,10 @@ def submission_status(request, submission_id, access_token=None):
 
     # Begin common code chunk
     addrs = gather_address_lists('sub_confirmation_requested',submission=submission)
-    confirmation_list = addrs.to
-    confirmation_list.extend(addrs.cc)
+    addresses = addrs.to
+    addresses.extend(addrs.cc)
+    # Convert from RFC 2822 format if needed
+    confirmation_list = [ "%s <%s>" % parseaddr(a) for a in addresses ]
 
     requires_group_approval = (submission.rev == '00'
         and submission.group and submission.group.features.req_subm_approval

From 0589d0b313db09d2a3ab4a3602b469047fde1451 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 4 Jul 2019 15:51:05 +0000
Subject: [PATCH 050/114] Changed a bunch of regexes to use r strings; also
 miscellaneous smaller fixes.  - Legacy-Id: 16376

---
 ietf/doc/templatetags/ietf_filters.py | 32 +++++++--------
 ietf/doc/utils.py                     |  2 +-
 ietf/doc/views_doc.py                 |  8 ++--
 ietf/person/name.py                   |  2 +-
 ietf/redirects/views.py               |  6 +--
 ietf/sync/rfceditor.py                |  4 +-
 ietf/utils/draft.py                   | 58 +++++++++++++--------------
 ietf/utils/draft_search.py            |  6 +--
 ietf/utils/markup_txt.py              |  6 +--
 ietf/utils/pdf.py                     |  3 +-
 10 files changed, 63 insertions(+), 64 deletions(-)

diff --git a/ietf/doc/templatetags/ietf_filters.py b/ietf/doc/templatetags/ietf_filters.py
index b4d9113f8..90851df25 100644
--- a/ietf/doc/templatetags/ietf_filters.py
+++ b/ietf/doc/templatetags/ietf_filters.py
@@ -4,8 +4,6 @@ import bleach
 import datetime
 import re
 
-import types
-
 from email.utils import parseaddr
 
 from django import template
@@ -47,8 +45,8 @@ def parse_email_list(value):
 
     Splitting a string of email addresses should return a list:
 
-    >>> unicode(parse_email_list('joe@example.org, fred@example.com'))
-    u'joe@example.org, fred@example.com'
+    >>> parse_email_list('joe@example.org, fred@example.com')
+    'joe@example.org, fred@example.com'
 
     Parsing a non-string should return the input value, rather than fail:
 
@@ -88,7 +86,7 @@ def strip_email(value):
 @register.filter(name='fix_angle_quotes')
 def fix_angle_quotes(value):
     if "<" in value:
-        value = re.sub("<([\w\-\.]+@[\w\-\.]+)>", "<\1>", value)
+        value = re.sub(r"<([\w\-\.]+@[\w\-\.]+)>", "<\1>", value)
     return value
 
 # there's an "ahref -> a href" in GEN_UTIL
@@ -213,13 +211,13 @@ def urlize_ietf_docs(string, autoescape=None):
     """
     if autoescape and not isinstance(string, SafeData):
         string = escape(string)
-    string = re.sub("(?)(RFC ?)0{0,3}(\d+)", "\\1\\2", string)
-    string = re.sub("(?)(BCP ?)0{0,3}(\d+)", "\\1\\2", string)
-    string = re.sub("(?)(STD ?)0{0,3}(\d+)", "\\1\\2", string)
-    string = re.sub("(?)(FYI ?)0{0,3}(\d+)", "\\1\\2", string)
-    string = re.sub("(?)(draft-[-0-9a-zA-Z._+]+)", "\\1", string)
-    string = re.sub("(?)(conflict-review-[-0-9a-zA-Z._+]+)", "\\1", string)
-    string = re.sub("(?)(status-change-[-0-9a-zA-Z._+]+)", "\\1", string)
+    string = re.sub(r"(?)(RFC ?)0{0,3}(\d+)", "\\1\\2", string)
+    string = re.sub(r"(?)(BCP ?)0{0,3}(\d+)", "\\1\\2", string)
+    string = re.sub(r"(?)(STD ?)0{0,3}(\d+)", "\\1\\2", string)
+    string = re.sub(r"(?)(FYI ?)0{0,3}(\d+)", "\\1\\2", string)
+    string = re.sub(r"(?)(draft-[-0-9a-zA-Z._+]+)", "\\1", string)
+    string = re.sub(r"(?)(conflict-review-[-0-9a-zA-Z._+]+)", "\\1", string)
+    string = re.sub(r"(?)(status-change-[-0-9a-zA-Z._+]+)", "\\1", string)
     return mark_safe(string)
 urlize_ietf_docs = stringfilter(urlize_ietf_docs)
 
@@ -461,8 +459,8 @@ def capfirst_allcaps(text):
     """Like capfirst, except it doesn't lowercase words in ALL CAPS."""
     result = text
     i = False
-    for token in re.split("(\W+)", striptags(text)):
-        if not re.match("^[A-Z]+$", token):
+    for token in re.split(r"(\W+)", striptags(text)):
+        if not re.match(r"^[A-Z]+$", token):
             if not i:
                 result = result.replace(token, token.capitalize())
                 i = True
@@ -474,8 +472,8 @@ def capfirst_allcaps(text):
 def lower_allcaps(text):
     """Like lower, except it doesn't lowercase words in ALL CAPS."""
     result = text
-    for token in re.split("(\W+)", striptags(text)):
-        if not re.match("^[A-Z]+$", token):
+    for token in re.split(r"(\W+)", striptags(text)):
+        if not re.match(r"^[A-Z]+$", token):
             result = result.replace(token, token.lower())
     return result
 
@@ -515,7 +513,7 @@ def zaptmp(s):
 
 @register.filter()
 def rfcbis(s):
-    m = re.search('^.*-rfc(\d+)-?bis(-.*)?$', s)
+    m = re.search(r'^.*-rfc(\d+)-?bis(-.*)?$', s)
     return None if m is None else 'rfc' + m.group(1) 
 
 @register.filter
diff --git a/ietf/doc/utils.py b/ietf/doc/utils.py
index 4b935b454..601efc0d8 100644
--- a/ietf/doc/utils.py
+++ b/ietf/doc/utils.py
@@ -829,7 +829,7 @@ def build_doc_meta_block(doc, path):
                 line = re.sub(r'Errata exist', r'Errata exist'%(errata_url, ), line)
             if is_hst or not rfcnum:
                 # make current draft rev bold
-                line = re.sub(r'>(%s)<'%rev, '>\g<1><', line)
+                line = re.sub(r'>(%s)<'%rev, r'>\g<1><', line)
             line = re.sub(r'IPR declarations', r'IPR declarations'%(ipr_url, ), line)
             line = line.replace(r'[txt]', r'[txt]' % doc.href())
             lines[i] = line
diff --git a/ietf/doc/views_doc.py b/ietf/doc/views_doc.py
index 73df69018..f4b4cff20 100644
--- a/ietf/doc/views_doc.py
+++ b/ietf/doc/views_doc.py
@@ -623,7 +623,7 @@ def document_main(request, name, rev=None):
 def document_html(request, name, rev=None):
     if name.startswith('rfc0'):
         name = "rfc" + name[3:].lstrip('0')
-    if name.startswith('review-') and re.search('-\d\d\d\d-\d\d$', name):
+    if name.startswith('review-') and re.search(r'-\d\d\d\d-\d\d$', name):
         name = "%s-%s" % (name, rev)
     if rev and not name.startswith('charter-') and re.search('[0-9]{1,2}-[0-9]{2}', rev):
         name = "%s-%s" % (name, rev[:-3])
@@ -658,7 +658,7 @@ def document_html(request, name, rev=None):
     return render(request, "doc/document_html.html", {"doc":doc, "top":top, "navbar_mode":"navbar-static-top",  })
 
 def check_doc_email_aliases():
-    pattern = re.compile('^expand-(.*?)(\..*?)?@.*? +(.*)$')
+    pattern = re.compile(r'^expand-(.*?)(\..*?)?@.*? +(.*)$')
     good_count = 0
     tot_count = 0
     with open(settings.DRAFT_VIRTUAL_PATH,"r") as virtual_file:
@@ -673,9 +673,9 @@ def check_doc_email_aliases():
 
 def get_doc_email_aliases(name):
     if name:
-        pattern = re.compile('^expand-(%s)(\..*?)?@.*? +(.*)$'%name)
+        pattern = re.compile(r'^expand-(%s)(\..*?)?@.*? +(.*)$'%name)
     else:
-        pattern = re.compile('^expand-(.*?)(\..*?)?@.*? +(.*)$')
+        pattern = re.compile(r'^expand-(.*?)(\..*?)?@.*? +(.*)$')
     aliases = []
     with open(settings.DRAFT_VIRTUAL_PATH,"r") as virtual_file:
         for line in virtual_file.readlines():
diff --git a/ietf/person/name.py b/ietf/person/name.py
index e01f0c343..74bb5cd64 100644
--- a/ietf/person/name.py
+++ b/ietf/person/name.py
@@ -67,7 +67,7 @@ def initials(name):
         given += " "+middle
     # Don't use non-word characters as initials.
     # Example: The Bulgarian transcribed name "'Rnest Balkanska" should not have an initial of "'".
-    given = re.sub('[^ .\w]', '', given)
+    given = re.sub(r'[^ .\w]', '', given)
     initials = " ".join([ n[0].upper()+'.' for n in given.split() ])
     return initials
 
diff --git a/ietf/redirects/views.py b/ietf/redirects/views.py
index db557a6f1..bd98a641c 100644
--- a/ietf/redirects/views.py
+++ b/ietf/redirects/views.py
@@ -30,7 +30,7 @@ def redirect(request, path="", script=""):
                 continue
         if fc[0] in rparam:
             remove_args.append(fc[0])
-            num = re.match('(\d+)', rparam[fc[0]])
+            num = re.match(r'(\d+)', rparam[fc[0]])
             if (num and int(num.group(1))) or (num is None):
                 cmd = flag
             break
@@ -64,8 +64,8 @@ def redirect(request, path="", script=""):
         # contains non-ASCII characters. The old scripts didn't support 
         # non-ASCII characters anyway, so there's no need to handle 
         # them fully correctly in these redirects.
-        url += str(rest % rparam)
-        url += "/"
+        (rest % rparam).encode('ascii')
+        url += (rest % rparam) + "/"
     except:
         # rest had something in it that request didn't have, so just
         # redirect to the root of the tool.
diff --git a/ietf/sync/rfceditor.py b/ietf/sync/rfceditor.py
index 17fa929a1..c4a60ceac 100644
--- a/ietf/sync/rfceditor.py
+++ b/ietf/sync/rfceditor.py
@@ -56,7 +56,7 @@ def parse_queue(response):
                 events.expandNode(node)
                 node.normalize()
                 draft_name = get_child_text(node, "draft").strip()
-                draft_name = re.sub("(-\d\d)?(.txt){1,2}$", "", draft_name)
+                draft_name = re.sub(r"(-\d\d)?(.txt){1,2}$", "", draft_name)
                 date_received = get_child_text(node, "date-received")
 
                 state = ""
@@ -306,7 +306,7 @@ def parse_index(response):
                     abstract = get_child_text(abstract, "p")
 
                 draft = get_child_text(node, "draft")
-                if draft and re.search("-\d\d$", draft):
+                if draft and re.search(r"-\d\d$", draft):
                     draft = draft[0:-3]
 
                 if len(node.getElementsByTagName("errata-url")) > 0:
diff --git a/ietf/utils/draft.py b/ietf/utils/draft.py
index e8781052e..be7f9aae8 100755
--- a/ietf/utils/draft.py
+++ b/ietf/utils/draft.py
@@ -191,7 +191,7 @@ class Draft():
                     name, __ = base.split(".", 1)
                 else:
                     name = base
-                revmatch = re.search("\d\d$", name)
+                revmatch = re.search(r"\d\d$", name)
                 if revmatch:
                     filename = name[:-3]
                     revision = name[-2:]
@@ -243,36 +243,36 @@ class Draft():
         for line in self.rawlines:
             linecount += 1
             line = line.rstrip()
-            if re.search("\[?page [0-9ivx]+\]?[ \t\f]*$", line, re.I):
+            if re.search(r"\[?page [0-9ivx]+\]?[ \t\f]*$", line, re.I):
                 pages, page, newpage = endpage(pages, page, newpage, line)
                 continue
-            if re.search("\f", line, re.I):
+            if re.search(r"\f", line, re.I):
                 pages, page, newpage = begpage(pages, page, newpage)
                 continue
-            if re.search("^ *Internet.Draft.+  .+[12][0-9][0-9][0-9] *$", line, re.I):
+            if re.search(r"^ *Internet.Draft.+  .+[12][0-9][0-9][0-9] *$", line, re.I):
                 pages, page, newpage = begpage(pages, page, newpage, line)
                 continue
     #        if re.search("^ *Internet.Draft  +", line, re.I):
     #            newpage = True
     #            continue
-            if re.search("^ *Draft.+[12][0-9][0-9][0-9] *$", line, re.I):
+            if re.search(r"^ *Draft.+[12][0-9][0-9][0-9] *$", line, re.I):
                 pages, page, newpage = begpage(pages, page, newpage, line)
                 continue
-            if re.search("^RFC[ -]?[0-9]+.*(  +)[12][0-9][0-9][0-9]$", line, re.I):
+            if re.search(r"^RFC[ -]?[0-9]+.*(  +)[12][0-9][0-9][0-9]$", line, re.I):
                 pages, page, newpage = begpage(pages, page, newpage, line)
                 continue
-            if re.search("^draft-[-a-z0-9_.]+.*[0-9][0-9][0-9][0-9]$", line, re.I):
+            if re.search(r"^draft-[-a-z0-9_.]+.*[0-9][0-9][0-9][0-9]$", line, re.I):
                 pages, page, newpage = endpage(pages, page, newpage, line)
                 continue
-            if linecount > 15 and re.search(".{58,}(Jan|Feb|Mar|March|Apr|April|May|Jun|June|Jul|July|Aug|Sep|Oct|Nov|Dec) (19[89][0-9]|20[0-9][0-9]) *$", line, re.I):
+            if linecount > 15 and re.search(r".{58,}(Jan|Feb|Mar|March|Apr|April|May|Jun|June|Jul|July|Aug|Sep|Oct|Nov|Dec) (19[89][0-9]|20[0-9][0-9]) *$", line, re.I):
                 pages, page, newpage = begpage(pages, page, newpage, line)
                 continue
-            if newpage and re.search("^ *draft-[-a-z0-9_.]+ *$", line, re.I):
+            if newpage and re.search(r"^ *draft-[-a-z0-9_.]+ *$", line, re.I):
                 pages, page, newpage = begpage(pages, page, newpage, line)
                 continue
-            if re.search("^[^ \t]+", line):
+            if re.search(r"^[^ \t]+", line):
                 sentence = True
-            if re.search("[^ \t]", line):
+            if re.search(r"[^ \t]", line):
                 if newpage:
                     # 36 is a somewhat arbitrary count for a 'short' line
                     shortthis = len(line.strip()) < 36 # 36 is a somewhat arbitrary count for a 'short' line
@@ -300,7 +300,7 @@ class Draft():
     # ----------------------------------------------------------------------
     def get_pagecount(self):
         if self._pagecount == None:
-            label_pages = len(re.findall("\[page [0-9ixldv]+\]", self.text, re.I))
+            label_pages = len(re.findall(r"\[page [0-9ixldv]+\]", self.text, re.I))
             count_pages = len(self.pages)
             if label_pages > count_pages/2:
                 self._pagecount = label_pages
@@ -343,7 +343,7 @@ class Draft():
     def get_status(self):
         if self._status == None:
             for line in self.lines[:10]:
-                status_match = re.search("^\s*Intended [Ss]tatus:\s*(.*?)   ", line)
+                status_match = re.search(r"^\s*Intended [Ss]tatus:\s*(.*?)   ", line)
                 if status_match:
                     self._status = status_match.group(1)
                     break
@@ -416,8 +416,8 @@ class Draft():
     def get_abstract(self):
         if self._abstract:
             return self._abstract
-        abstract_re = re.compile('^(\s*)abstract', re.I)
-        header_re = re.compile("^(\s*)([0-9]+\.? |Appendix|Status of|Table of|Full Copyright|Copyright|Intellectual Property|Acknowled|Author|Index|Disclaimer).*", re.I)
+        abstract_re = re.compile(r'^(\s*)abstract', re.I)
+        header_re = re.compile(r"^(\s*)([0-9]+\.? |Appendix|Status of|Table of|Full Copyright|Copyright|Intellectual Property|Acknowled|Author|Index|Disclaimer).*", re.I)
         begin = False
         abstract = []
         abstract_indent = 0
@@ -446,7 +446,7 @@ class Draft():
 
 
     def _check_abstract_indent(self, abstract, indent):
-        indentation_re = re.compile('^(\s)*')
+        indentation_re = re.compile(r'^(\s)*')
         indent_lines = []
         for line in abstract.split('\n'):
             if line:
@@ -807,7 +807,7 @@ class Draft():
                                             _debug( "Cut:   '%s'" % form[beg:end])
                                             author_match = re.search(authpat, columns[col].strip()).group(1)
                                             _debug( "AuthMatch: '%s'" % (author_match,))
-                                            if re.search('\(.*\)$', author_match.strip()):
+                                            if re.search(r'\(.*\)$', author_match.strip()):
                                                 author_match = author_match.rsplit('(',1)[0].strip()
                                             if author_match in companies_seen:
                                                 companies[i] = authors[i]
@@ -887,7 +887,7 @@ class Draft():
     #                 for a in authors:
     #                     if a and a not in companies_seen:
     #                         _debug("Search for: %s"%(r"(^|\W)"+re.sub("\.? ", ".* ", a)+"(\W|$)"))
-                    authmatch = [ a for a in authors[i+1:] if a and not a.lower() in companies_seen and (re.search((r"(?i)(^|\W)"+re.sub("[. ]+", ".*", a)+"(\W|$)"), line.strip()) or acronym_match(a, line.strip()) )]
+                    authmatch = [ a for a in authors[i+1:] if a and not a.lower() in companies_seen and (re.search((r"(?i)(^|\W)"+re.sub(r"[. ]+", ".*", a)+r"(\W|$)"), line.strip()) or acronym_match(a, line.strip()) )]
 
                     if authmatch:
                         _debug("     ? Other author or company ?  : %s" % authmatch)
@@ -915,9 +915,9 @@ class Draft():
                             column = l.replace('\t', 8 * ' ')[max(0, beg - 1):end].strip()
                         except:
                             column = l
-                        column = re.sub(" *(?:\(at\)|  | at ) *", "@", column)
-                        column = re.sub(" *(?:\(dot\)|  | dot ) *", ".", column)
-                        column = re.sub("&cisco.com", "@cisco.com", column)
+                        column = re.sub(r" *(?:\(at\)|  | at ) *", "@", column)
+                        column = re.sub(r" *(?:\(dot\)|  | dot ) *", ".", column)
+                        column = re.sub(r"&cisco.com", "@cisco.com", column)
                         column = column.replace("\xa0", " ")
                         return column
 
@@ -1003,13 +1003,13 @@ class Draft():
     def get_title(self):
         if self._title:
             return self._title
-        match = re.search('(?:\n\s*\n\s*)((.+\n){0,2}(.+\n*))(\s+\g<1>\n\g<2>\n""", content)
-    content = re.sub("\n(.+\[Page \d+\])\n\s*$", """\n\g<1>\n""", content)
+    content = re.sub(r"\n(.+\[Page \d+\])\n\f\n(.+)\n", r"""\n\g<1>\n\g<2>\n""", content)
+    content = re.sub(r"\n(.+\[Page \d+\])\n\s*$", r"""\n\g<1>\n""", content)
     # remove remaining FFs (to be valid XHTML)
     content = content.replace("\f","\n")
 
-    content = re.sub("\n\n([0-9]+\\.|[A-Z]\\.[0-9]|Appendix|Status of|Abstract|Table of|Full Copyright|Copyright|Intellectual Property|Acknowled|Author|Index)(.*)(?=\n\n)", """\n\n\g<1>\g<2>""", content)
+    content = re.sub(r"\n\n([0-9]+\\.|[A-Z]\\.[0-9]|Appendix|Status of|Abstract|Table of|Full Copyright|Copyright|Intellectual Property|Acknowled|Author|Index)(.*)(?=\n\n)", r"""\n\n\g<1>\g<2>""", content)
 
     return "
" + content + "
\n"
diff --git a/ietf/utils/pdf.py b/ietf/utils/pdf.py
index c863d4db1..5b5ca2371 100644
--- a/ietf/utils/pdf.py
+++ b/ietf/utils/pdf.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2015-2019, All Rights Reserved
 import re
 
 def pdf_pages(filename):
@@ -7,7 +8,7 @@ def pdf_pages(filename):
     except IOError:
         return 0
     for line in infile:
-        m = re.match('\] /Count ([0-9]+)',line)
+        m = re.match(r'\] /Count ([0-9]+)',line)
         if m:
             return int(m.group(1))
     return 0

From b7690fbdcd495e8ce26f29e3df041b8bfb929184 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 4 Jul 2019 15:54:23 +0000
Subject: [PATCH 051/114] Changed additional regexes to r strings.  -
 Legacy-Id: 16377

---
 ietf/api/__init__.py             |  2 +-
 ietf/doc/urls_conflict_review.py |  3 ++-
 ietf/ipr/forms.py                | 13 +++++++------
 ietf/stats/urls.py               | 13 +++++++------
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/ietf/api/__init__.py b/ietf/api/__init__.py
index 352b62888..82dcdf91f 100644
--- a/ietf/api/__init__.py
+++ b/ietf/api/__init__.py
@@ -66,7 +66,7 @@ class ModelResource(tastypie.resources.ModelResource):
         return "%s:%s:%s:%s" % (self._meta.api_name, self._meta.resource_name, ':'.join(args), smooshed)
 
 
-TIMEDELTA_REGEX = re.compile('^(?P\d+d)?\s?(?P\d+h)?\s?(?P\d+m)?\s?(?P\d+s?)$')
+TIMEDELTA_REGEX = re.compile(r'^(?P\d+d)?\s?(?P\d+h)?\s?(?P\d+m)?\s?(?P\d+s?)$')
 
 class TimedeltaField(ApiField):
     dehydrated_type = 'timedelta'
diff --git a/ietf/doc/urls_conflict_review.py b/ietf/doc/urls_conflict_review.py
index 037e3bb32..e59f39189 100644
--- a/ietf/doc/urls_conflict_review.py
+++ b/ietf/doc/urls_conflict_review.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2012-2019, All Rights Reserved
 
 from ietf.doc import views_conflict_review, views_doc
 from ietf.utils.urls import url
@@ -6,7 +7,7 @@ urlpatterns = [
     url(r'^state/$',                 views_conflict_review.change_state),
     url(r'^submit/$',                views_conflict_review.submit),
     url(r'^ad/$',                    views_conflict_review.edit_ad),
-    url(r'^approve/$',               views_conflict_review.approve),
+    url(r'^approve/$',               views_conflict_review.approve_conflict_review),
     url(r'^start_conflict_review/$', views_conflict_review.start_review),
     url(r'^telechat/$',              views_doc.telechat_date,               name='ietf.doc.views_doc.telechat_date;conflict-review'),
     url(r'^notices/$',               views_doc.edit_notify,                 name='ietf.doc.views_doc.edit_notify;conflict-review'),
diff --git a/ietf/ipr/forms.py b/ietf/ipr/forms.py
index b858c4686..0ce338ec1 100644
--- a/ietf/ipr/forms.py
+++ b/ietf/ipr/forms.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2014-2019, All Rights Reserved
 import datetime
 import email
 
@@ -107,12 +108,12 @@ class DraftForm(forms.ModelForm):
         help_texts = { 'sections': 'Sections' }
 
 validate_patent_number = RegexValidator(
-                                    regex=("^("
-                                             "([A-Z][A-Z]\d\d/\d{6}"
-                                             "|[A-Z][A-Z]\d{6,12}([A-Z]\d?)?"
-                                             "|[A-Z][A-Z]\d{4}(\w{1,2}\d{5,7})?"
-                                             "|[A-Z][A-Z]\d{15}"
-                                             ")[, ]*)+$"),
+                                    regex=(r"^("
+                                             r"([A-Z][A-Z]\d\d/\d{6}"
+                                             r"|[A-Z][A-Z]\d{6,12}([A-Z]\d?)?"
+                                             r"|[A-Z][A-Z]\d{4}(\w{1,2}\d{5,7})?"
+                                             r"|[A-Z][A-Z]\d{15}"
+                                             r")[, ]*)+$"),
                                     message="Please enter one or more patent publication or application numbers as country code and serial number, e.g.: US62/123456 or WO2017123456." )
 
 def validate_string(s, letter_min, digit_min, space_min, message):
diff --git a/ietf/stats/urls.py b/ietf/stats/urls.py
index 94fbe6951..d36f3c1a2 100644
--- a/ietf/stats/urls.py
+++ b/ietf/stats/urls.py
@@ -1,13 +1,14 @@
+# Copyright The IETF Trust 2016-2019, All Rights Reserved
 from django.conf import settings
 
 from ietf.stats import views
 from ietf.utils.urls  import url
 
 urlpatterns = [
-    url("^$", views.stats_index),
-    url("^document/(?:(?Pauthors|pages|words|format|formlang|author/(?:documents|affiliation|country|continent|citations|hindex)|yearly/(?:affiliation|country|continent))/)?$", views.document_stats),
-    url("^knowncountries/$", views.known_countries_list),
-    url("^meeting/(?P\d+)/(?Pcountry|continent)/$", views.meeting_stats),
-    url("^meeting/(?:(?Poverview|country|continent)/)?$", views.meeting_stats),
-    url("^review/(?:(?Pcompletion|results|states|time)/)?(?:%(acronym)s/)?$" % settings.URL_REGEXPS, views.review_stats),
+    url(r"^$", views.stats_index),
+    url(r"^document/(?:(?Pauthors|pages|words|format|formlang|author/(?:documents|affiliation|country|continent|citations|hindex)|yearly/(?:affiliation|country|continent))/)?$", views.document_stats),
+    url(r"^knowncountries/$", views.known_countries_list),
+    url(r"^meeting/(?P\d+)/(?Pcountry|continent)/$", views.meeting_stats),
+    url(r"^meeting/(?:(?Poverview|country|continent)/)?$", views.meeting_stats),
+    url(r"^review/(?:(?Pcompletion|results|states|time)/)?(?:%(acronym)s/)?$" % settings.URL_REGEXPS, views.review_stats),
 ]

From f33ecaa1a4f40cdf8ea02eb7f6bc5ece48fb5c1a Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 4 Jul 2019 16:01:32 +0000
Subject: [PATCH 052/114] Fixed a test that compared an int with a meeting
 number string.  Changed meeting test data to use meeting number 72 instead of
 42, because proceedings code gives 404 for meetings before 65.  Changed a
 number of StringIO() to BytesIO().  - Legacy-Id: 16378

---
 ietf/doc/tests.py              | 29 +++++++++++++--------------
 ietf/meeting/test_data.py      | 19 +++++++++---------
 ietf/meeting/tests_api.py      |  5 +++--
 ietf/meeting/tests_js.py       |  8 ++++----
 ietf/meeting/tests_views.py    | 36 ++++++++++++++++------------------
 ietf/secr/meetings/tests.py    | 18 ++++++++---------
 ietf/secr/proceedings/tests.py | 14 ++++++-------
 ietf/utils/test_data.py        |  2 +-
 8 files changed, 65 insertions(+), 66 deletions(-)

diff --git a/ietf/doc/tests.py b/ietf/doc/tests.py
index 980c36281..b5160bc4e 100644
--- a/ietf/doc/tests.py
+++ b/ietf/doc/tests.py
@@ -4,7 +4,6 @@
 import os
 import shutil
 import datetime
-import json
 import sys
 import urllib.parse
 import bibtexparser
@@ -129,9 +128,9 @@ class SearchTests(TestCase):
         CharterFactory(group=draft.group,name='charter-ietf-mars')
         DocumentFactory(type_id='conflrev',name='conflict-review-imaginary-irtf-submission')
         DocumentFactory(type_id='statchg',name='status-change-imaginary-mid-review')
-        DocumentFactory(type_id='agenda',name='agenda-42-mars')
-        DocumentFactory(type_id='minutes',name='minutes-42-mars')
-        DocumentFactory(type_id='slides',name='slides-42-mars')
+        DocumentFactory(type_id='agenda',name='agenda-72-mars')
+        DocumentFactory(type_id='minutes',name='minutes-72-mars')
+        DocumentFactory(type_id='slides',name='slides-72-mars')
 
         draft.save_with_history([DocEvent.objects.create(doc=draft, rev=draft.rev, type="changed_document", by=Person.objects.get(user__username="secretary"), desc="Test")])
 
@@ -629,9 +628,9 @@ Man                    Expires September 22, 2015               [Page 3]
         IndividualDraftFactory(name='draft-imaginary-independent-submission')
         ConflictReviewFactory(name='conflict-review-imaginary-irtf-submission')
         CharterFactory(name='charter-ietf-mars')
-        DocumentFactory(type_id='agenda',name='agenda-42-mars')
-        DocumentFactory(type_id='minutes',name='minutes-42-mars')
-        DocumentFactory(type_id='slides',name='slides-42-mars-1-active')
+        DocumentFactory(type_id='agenda',name='agenda-72-mars')
+        DocumentFactory(type_id='minutes',name='minutes-72-mars')
+        DocumentFactory(type_id='slides',name='slides-72-mars-1-active')
         statchg = DocumentFactory(type_id='statchg',name='status-change-imaginary-mid-review')
         statchg.set_state(State.objects.get(type_id='statchg',slug='adrev'))
 
@@ -640,12 +639,12 @@ Man                    Expires September 22, 2015               [Page 3]
                         "conflict-review-imaginary-irtf-submission",
                         "status-change-imaginary-mid-review",
                         "charter-ietf-mars",
-                        "agenda-42-mars",
-                        "minutes-42-mars",
-                        "slides-42-mars-1-active",
+                        "agenda-72-mars",
+                        "minutes-72-mars",
+                        "slides-72-mars-1-active",
                         # TODO: add
-                        #"bluesheets-42-mars-1",
-                        #"recording-42-mars-1-00",
+                        #"bluesheets-72-mars-1",
+                        #"recording-72-mars-1-00",
                        ]:
             doc = Document.objects.get(name=docname)
             # give it some history
@@ -678,7 +677,7 @@ class DocTestCase(TestCase):
         self.assertEqual(r.status_code, 200)
 
     def test_document_material(self):
-        MeetingFactory(type_id='ietf',number='42')
+        MeetingFactory(type_id='ietf',number='72')
         mars = GroupFactory(type_id='wg',acronym='mars')
         marschairman = PersonFactory(user__username='marschairman')
         mars.role_set.create(name_id='chair',person=marschairman,email=marschairman.email())
@@ -692,8 +691,8 @@ class DocTestCase(TestCase):
         doc.set_state(State.objects.get(type="slides", slug="active"))
 
         session = Session.objects.create(
-            name = "session-42-mars-1",
-            meeting = Meeting.objects.get(number='42'),
+            name = "session-72-mars-1",
+            meeting = Meeting.objects.get(number='72'),
             group = Group.objects.get(acronym='mars'),
             status = SessionStatusName.objects.create(slug='scheduled', name='Scheduled'),
             modified = datetime.datetime.now(),
diff --git a/ietf/meeting/test_data.py b/ietf/meeting/test_data.py
index 349f1fbe7..53879166f 100644
--- a/ietf/meeting/test_data.py
+++ b/ietf/meeting/test_data.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2013-2019, All Rights Reserved
 import datetime
 
 from django.utils.text import slugify
@@ -70,7 +71,7 @@ def make_meeting_test_data(meeting=None):
     #secretary = Person.objects.get(user__username="secretary") ## not used
 
     if not meeting:
-        meeting = Meeting.objects.get(number="42", type="ietf")
+        meeting = Meeting.objects.get(number="72", type="ietf")
     schedule = Schedule.objects.create(meeting=meeting, owner=plainman, name="test-agenda", visible=True, public=True)
     unofficial_schedule = Schedule.objects.create(meeting=meeting, owner=plainman, name="test-unofficial-agenda", visible=True, public=True)
 
@@ -157,24 +158,24 @@ def make_meeting_test_data(meeting=None):
     meeting.unofficial_schedule = unofficial_schedule
     
 
-    doc = DocumentFactory.create(name='agenda-42-mars', type_id='agenda', title="Agenda",
-        uploaded_filename="agenda-42-mars.txt", group=mars, rev='00', states=[('draft','active')])
+    doc = DocumentFactory.create(name='agenda-72-mars', type_id='agenda', title="Agenda",
+        uploaded_filename="agenda-72-mars.txt", group=mars, rev='00', states=[('draft','active')])
     pres = SessionPresentation.objects.create(session=mars_session,document=doc,rev=doc.rev)
     mars_session.sessionpresentation_set.add(pres) # 
 
-    doc = DocumentFactory.create(name='minutes-42-mars', type_id='minutes', title="Minutes",
-        uploaded_filename="minutes-42-mars.txt", group=mars, rev='00', states=[('minutes','active')])
+    doc = DocumentFactory.create(name='minutes-72-mars', type_id='minutes', title="Minutes",
+        uploaded_filename="minutes-72-mars.txt", group=mars, rev='00', states=[('minutes','active')])
     pres = SessionPresentation.objects.create(session=mars_session,document=doc,rev=doc.rev)
     mars_session.sessionpresentation_set.add(pres)
 
-    doc = DocumentFactory.create(name='slides-42-mars-1-active', type_id='slides', title="Slideshow",
-        uploaded_filename="slides-42-mars.txt", group=mars, rev='00',
+    doc = DocumentFactory.create(name='slides-72-mars-1-active', type_id='slides', title="Slideshow",
+        uploaded_filename="slides-72-mars.txt", group=mars, rev='00',
         states=[('slides','active'), ('reuse_policy', 'single')])
     pres = SessionPresentation.objects.create(session=mars_session,document=doc,rev=doc.rev)
     mars_session.sessionpresentation_set.add(pres)
 
-    doc = DocumentFactory.create(name='slides-42-mars-2-deleted', type_id='slides',
-        title="Bad Slideshow", uploaded_filename="slides-42-mars-2-deleted.txt", group=mars, rev='00',
+    doc = DocumentFactory.create(name='slides-72-mars-2-deleted', type_id='slides',
+        title="Bad Slideshow", uploaded_filename="slides-72-mars-2-deleted.txt", group=mars, rev='00',
         states=[('slides','deleted'), ('reuse_policy', 'single')])
     pres = SessionPresentation.objects.create(session=mars_session,document=doc,rev=doc.rev)
     mars_session.sessionpresentation_set.add(pres)
diff --git a/ietf/meeting/tests_api.py b/ietf/meeting/tests_api.py
index f1c80a440..51f5c1ae1 100644
--- a/ietf/meeting/tests_api.py
+++ b/ietf/meeting/tests_api.py
@@ -1,6 +1,7 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
 import datetime
-import json
 from urllib.parse import urlsplit
 
 from django.urls import reverse as urlreverse
@@ -18,7 +19,7 @@ from ietf.utils.mail import outbox
 class ApiTests(TestCase):
     def test_update_agenda(self):
         meeting = make_meeting_test_data()
-        schedule = Schedule.objects.get(meeting__number=42,name="test-agenda")
+        schedule = Schedule.objects.get(meeting__number=72,name="test-agenda")
         mars_session = Session.objects.filter(meeting=meeting, group__acronym="mars").first()
         ames_session = Session.objects.filter(meeting=meeting, group__acronym="ames").first()
     
diff --git a/ietf/meeting/tests_js.py b/ietf/meeting/tests_js.py
index 914833f78..6dd0ef6e1 100644
--- a/ietf/meeting/tests_js.py
+++ b/ietf/meeting/tests_js.py
@@ -80,10 +80,10 @@ class ScheduleEditTests(StaticLiveServerTestCase):
     
     def testUnschedule(self):
         
-        self.assertEqual(SchedTimeSessAssignment.objects.filter(session__meeting__number=42,session__group__acronym='mars',schedule__name='test-agenda').count(),1)
+        self.assertEqual(SchedTimeSessAssignment.objects.filter(session__meeting__number=72,session__group__acronym='mars',schedule__name='test-agenda').count(),1)
 
         self.login()
-        url = self.absreverse('ietf.meeting.views.edit_agenda',kwargs=dict(num='42',name='test-agenda',owner='plain@example.com'))
+        url = self.absreverse('ietf.meeting.views.edit_agenda',kwargs=dict(num='72',name='test-agenda',owner='plain@example.com'))
         self.driver.get(url)
 
         q = PyQuery(self.driver.page_source)
@@ -97,7 +97,7 @@ class ScheduleEditTests(StaticLiveServerTestCase):
         self.assertTrue(len(q('#sortable-list #session_1'))>0)
 
         time.sleep(0.1) # The API that modifies the database runs async
-        self.assertEqual(SchedTimeSessAssignment.objects.filter(session__meeting__number=42,session__group__acronym='mars',schedule__name='test-agenda').count(),0)
+        self.assertEqual(SchedTimeSessAssignment.objects.filter(session__meeting__number=72,session__group__acronym='mars',schedule__name='test-agenda').count(),0)
 
 @skipIf(skip_selenium, skip_message)
 class SlideReorderTests(StaticLiveServerTestCase):
@@ -169,5 +169,5 @@ class SlideReorderTests(StaticLiveServerTestCase):
 #        condition_data()
 #
 #    def testOpenSchedule(self):
-#        url = urlreverse('ietf.meeting.views.edit_agenda', kwargs=dict(num='42',name='test-agenda'))
+#        url = urlreverse('ietf.meeting.views.edit_agenda', kwargs=dict(num='72',name='test-agenda'))
 #        r = self.client.get(url)
diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py
index 5436aae2e..1af0ebd78 100644
--- a/ietf/meeting/tests_views.py
+++ b/ietf/meeting/tests_views.py
@@ -1,24 +1,24 @@
 # Copyright The IETF Trust 2009-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
-import json
 import os
 import shutil
 import datetime
 import urllib.parse
+import six
 import random
-from unittest import skipIf
 
-import debug           # pyflakes:ignore
+from unittest import skipIf
+from mock import patch
+from pyquery import PyQuery
+from io import StringIO, BytesIO
+from bs4 import BeautifulSoup
 
 from django.urls import reverse as urlreverse
 from django.conf import settings
 from django.contrib.auth.models import User
 
-from mock import patch
-from pyquery import PyQuery
-from io import StringIO
-from bs4 import BeautifulSoup
+import debug           # pyflakes:ignore
 
 from ietf.doc.models import Document
 from ietf.group.models import Group, Role
@@ -393,9 +393,9 @@ class MeetingTests(TestCase):
         self.assertEqual(response.status_code, 200)
         self.assertIn('test acknowledgements', response.content)
 
-    @patch('urllib2.urlopen')
+    @patch('six.moves.urllib.request.urlopen')
     def test_proceedings_attendees(self, mock_urlopen):
-        mock_urlopen.return_value = StringIO('[{"LastName":"Smith","FirstName":"John","Company":"ABC","Country":"US"}]')
+        mock_urlopen.return_value = BytesIO(b'[{"LastName":"Smith","FirstName":"John","Company":"ABC","Country":"US"}]')
         make_meeting_test_data()
         meeting = MeetingFactory(type_id='ietf', date=datetime.date(2016,7,14), number="96")
         finalize(meeting)
@@ -406,12 +406,12 @@ class MeetingTests(TestCase):
         q = PyQuery(response.content)
         self.assertEqual(1,len(q("#id_attendees tbody tr")))
 
-    @patch('urllib2.urlopen')
+    @patch('six.moves.urllib.request.urlopen')
     def test_proceedings_overview(self, mock_urlopen):
         '''Test proceedings IETF Overview page.
         Note: old meetings aren't supported so need to add a new meeting then test.
         '''
-        mock_urlopen.return_value = StringIO('[{"LastName":"Smith","FirstName":"John","Company":"ABC","Country":"US"}]')
+        mock_urlopen.return_value = BytesIO(b'[{"LastName":"Smith","FirstName":"John","Company":"ABC","Country":"US"}]')
         make_meeting_test_data()
         meeting = MeetingFactory(type_id='ietf', date=datetime.date(2016,7,14), number="96")
         finalize(meeting)
@@ -952,7 +952,7 @@ class InterimTests(TestCase):
         ames_interim = Meeting.objects.filter(date__gt=today, type='interim', session__group__acronym='ames', session__status='canceled').first()
         self.assertContains(r, mars_interim.number)
         self.assertContains(r, ames_interim.number)
-        self.assertContains(r, 'IETF - 42')
+        self.assertContains(r, 'IETF - 72')
         # cancelled session
         q = PyQuery(r.content)
         self.assertIn('CANCELLED', q('[id*="-ames"]').text())
@@ -1642,7 +1642,7 @@ class AjaxTests(TestCase):
         self.assertIn('timezone', data)
         self.assertIn('time', data)
         self.assertIn('utc', data)
-        self.assertIn('error' not, data)
+        self.assertNotIn('error', data)
         self.assertEqual(data['utc'], '20:00')
 
 class FloorPlanTests(TestCase):
@@ -1688,9 +1688,9 @@ class IphoneAppJsonTests(TestCase):
         self.assertEqual(r.status_code,200)
 
 class FinalizeProceedingsTests(TestCase):
-    @patch('urllib2.urlopen')
+    @patch('six.moves.urllib.request.urlopen')
     def test_finalize_proceedings(self, mock_urlopen):
-        mock_urlopen.return_value = StringIO('[{"LastName":"Smith","FirstName":"John","Company":"ABC","Country":"US"}]')
+        mock_urlopen.return_value = BytesIO(b'[{"LastName":"Smith","FirstName":"John","Company":"ABC","Country":"US"}]')
         make_meeting_test_data()
         meeting = Meeting.objects.filter(type_id='ietf').order_by('id').last()
         meeting.session_set.filter(group__acronym='mars').first().sessionpresentation_set.create(document=Document.objects.filter(type='draft').first(),rev=None)
@@ -1731,8 +1731,6 @@ class MaterialsTests(TestCase):
         def follow(url):
             seen.add(url)
             r = self.client.get(url)
-            if r.status_code != 200:
-                debug.show('url')
             self.assertEqual(r.status_code, 200)
             if not ('.' in url and url.rsplit('.', 1)[1] in ['tgz', 'pdf', ]):
                 if r.content:
@@ -1754,7 +1752,7 @@ class MaterialsTests(TestCase):
         q = PyQuery(r.content)
         self.assertIn('Upload', str(q("title")))
         self.assertFalse(session.sessionpresentation_set.exists())
-        test_file = StringIO(b'%PDF-1.4\n%âãÏÓ\nthis is some text for a test')
+        test_file = StringIO('%PDF-1.4\n%âãÏÓ\nthis is some text for a test')
         test_file.name = "not_really.pdf"
         r = self.client.post(url,dict(file=test_file))
         self.assertEqual(r.status_code, 302)
@@ -1789,7 +1787,7 @@ class MaterialsTests(TestCase):
         q = PyQuery(r.content)
         self.assertIn('Upload', str(q("title")))
         self.assertFalse(session.sessionpresentation_set.exists())
-        test_file = StringIO(b'%PDF-1.4\n%âãÏÓ\nthis is some text for a test')
+        test_file = StringIO('%PDF-1.4\n%âãÏÓ\nthis is some text for a test')
         test_file.name = "not_really.pdf"
         r = self.client.post(url,dict(file=test_file))
         self.assertEqual(r.status_code, 302)
diff --git a/ietf/secr/meetings/tests.py b/ietf/secr/meetings/tests.py
index 325b53202..2ebe85dc2 100644
--- a/ietf/secr/meetings/tests.py
+++ b/ietf/secr/meetings/tests.py
@@ -154,7 +154,7 @@ class SecrMeetingTestCase(TestCase):
     def test_notifications(self):
         "Test Notifications"
         meeting = make_meeting_test_data()
-        url = reverse('ietf.secr.meetings.views.notifications',kwargs={'meeting_id':42})
+        url = reverse('ietf.secr.meetings.views.notifications',kwargs={'meeting_id':72})
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
@@ -187,7 +187,7 @@ class SecrMeetingTestCase(TestCase):
         
     def test_meetings_rooms(self):
         meeting = make_meeting_test_data()
-        url = reverse('ietf.secr.meetings.views.rooms',kwargs={'meeting_id':42,'schedule_name':'test-agenda'})
+        url = reverse('ietf.secr.meetings.views.rooms',kwargs={'meeting_id':72,'schedule_name':'test-agenda'})
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
@@ -213,7 +213,7 @@ class SecrMeetingTestCase(TestCase):
         
     def test_meetings_times(self):
         make_meeting_test_data()
-        url = reverse('ietf.secr.meetings.views.times',kwargs={'meeting_id':42,'schedule_name':'test-agenda'})
+        url = reverse('ietf.secr.meetings.views.times',kwargs={'meeting_id':72,'schedule_name':'test-agenda'})
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
@@ -252,7 +252,7 @@ class SecrMeetingTestCase(TestCase):
         meeting = make_meeting_test_data()
         timeslot = TimeSlot.objects.filter(meeting=meeting,type='session').first()
         url = reverse('ietf.secr.meetings.views.times_edit',kwargs={
-            'meeting_id':42,
+            'meeting_id':72,
             'schedule_name':'test-agenda',
             'time':timeslot.time.strftime("%Y:%m:%d:%H:%M")
         })
@@ -268,7 +268,7 @@ class SecrMeetingTestCase(TestCase):
         
     def test_meetings_nonsession(self):
         make_meeting_test_data()
-        url = reverse('ietf.secr.meetings.views.non_session',kwargs={'meeting_id':42,'schedule_name':'test-agenda'})
+        url = reverse('ietf.secr.meetings.views.non_session',kwargs={'meeting_id':72,'schedule_name':'test-agenda'})
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
@@ -277,7 +277,7 @@ class SecrMeetingTestCase(TestCase):
         meeting = make_meeting_test_data()
         room = meeting.room_set.first()
         group = Group.objects.get(acronym='secretariat')
-        url = reverse('ietf.secr.meetings.views.non_session',kwargs={'meeting_id':42,'schedule_name':'test-agenda'})
+        url = reverse('ietf.secr.meetings.views.non_session',kwargs={'meeting_id':72,'schedule_name':'test-agenda'})
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.post(url, {
             'day':'1',
@@ -298,7 +298,7 @@ class SecrMeetingTestCase(TestCase):
     def test_meetings_nonsession_add_invalid(self):
         make_meeting_test_data()
         group = Group.objects.get(acronym='secretariat')
-        url = reverse('ietf.secr.meetings.views.non_session',kwargs={'meeting_id':42,'schedule_name':'test-agenda'})
+        url = reverse('ietf.secr.meetings.views.non_session',kwargs={'meeting_id':72,'schedule_name':'test-agenda'})
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.post(url, {
             'day':'1',
@@ -316,8 +316,8 @@ class SecrMeetingTestCase(TestCase):
         meeting = make_meeting_test_data()
         session = meeting.session_set.exclude(name='').first()   # get first non-session session
         timeslot = session.official_timeslotassignment().timeslot
-        url = reverse('ietf.secr.meetings.views.non_session_edit',kwargs={'meeting_id':42,'schedule_name':meeting.agenda.name,'slot_id':timeslot.pk})
-        redirect_url = reverse('ietf.secr.meetings.views.non_session',kwargs={'meeting_id':42,'schedule_name':'test-agenda'})
+        url = reverse('ietf.secr.meetings.views.non_session_edit',kwargs={'meeting_id':72,'schedule_name':meeting.agenda.name,'slot_id':timeslot.pk})
+        redirect_url = reverse('ietf.secr.meetings.views.non_session',kwargs={'meeting_id':72,'schedule_name':'test-agenda'})
         new_time = timeslot.time + datetime.timedelta(days=1)
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
diff --git a/ietf/secr/proceedings/tests.py b/ietf/secr/proceedings/tests.py
index 0c8dc6af9..e6271fcf3 100644
--- a/ietf/secr/proceedings/tests.py
+++ b/ietf/secr/proceedings/tests.py
@@ -121,7 +121,7 @@ class RecordingTestCase(TestCase):
             date=timeslot.time.strftime('%Y%m%d-%H%M'))
 
     def test_import_audio_files_shared_timeslot(self):
-        meeting = MeetingFactory(type_id='ietf',number='42')
+        meeting = MeetingFactory(type_id='ietf',number='72')
         mars_session = SessionFactory(meeting=meeting,status_id='sched',group__acronym='mars')
         ames_session = SessionFactory(meeting=meeting,status_id='sched',group__acronym='ames')
         scheduled = SessionStatusName.objects.get(slug='sched')
@@ -135,8 +135,8 @@ class RecordingTestCase(TestCase):
         import_audio_files(meeting)
         doc = mars_session.materials.filter(type='recording').first()
         self.assertTrue(doc in ames_session.materials.all())
-        self.assertTrue(doc.docalias.filter(name='recording-42-mars-1'))
-        self.assertTrue(doc.docalias.filter(name='recording-42-ames-1'))
+        self.assertTrue(doc.docalias.filter(name='recording-72-mars-1'))
+        self.assertTrue(doc.docalias.filter(name='recording-72-ames-1'))
 
     def test_normalize_room_name(self):
         self.assertEqual(normalize_room_name('Test Room'),'testroom')
@@ -149,7 +149,7 @@ class RecordingTestCase(TestCase):
         self.assertEqual(get_timeslot_for_filename(name),timeslot)
 
     def test_get_or_create_recording_document(self):
-        session = SessionFactory(meeting__type_id='ietf', meeting__number=42, group__acronym='mars')
+        session = SessionFactory(meeting__type_id='ietf', meeting__number=72, group__acronym='mars')
         
         # test create
         filename = 'ietf42-testroom-20000101-0800.mp3'
@@ -167,17 +167,17 @@ class RecordingTestCase(TestCase):
         self.assertEqual(doc,doc2)
 
     def test_create_recording(self):
-        session = SessionFactory(meeting__type_id='ietf', meeting__number=42, group__acronym='mars')
+        session = SessionFactory(meeting__type_id='ietf', meeting__number=72, group__acronym='mars')
         filename = 'ietf42-testroomt-20000101-0800.mp3'
         url = settings.IETF_AUDIO_URL + 'ietf{}/{}'.format(session.meeting.number, filename)
         doc = create_recording(session, url)
-        self.assertEqual(doc.name,'recording-42-mars-1')
+        self.assertEqual(doc.name,'recording-72-mars-1')
         self.assertEqual(doc.group,session.group)
         self.assertEqual(doc.external_url,url)
         self.assertTrue(doc in session.materials.all())
 
     def test_get_next_sequence(self):
-        session = SessionFactory(meeting__type_id='ietf', meeting__number=42, group__acronym='mars')
+        session = SessionFactory(meeting__type_id='ietf', meeting__number=72, group__acronym='mars')
         meeting = session.meeting
         group = session.group
         sequence = get_next_sequence(group,meeting,'recording')
diff --git a/ietf/utils/test_data.py b/ietf/utils/test_data.py
index be8f7b791..2351727f9 100644
--- a/ietf/utils/test_data.py
+++ b/ietf/utils/test_data.py
@@ -338,7 +338,7 @@ def make_test_data():
     
     # meeting
     Meeting.objects.create(
-        number="42",
+        number="72",
         type_id="ietf",
         date=datetime.date.today() + datetime.timedelta(days=180),
         city="New York",

From 81fa6dc9620460f0e5864767a941d01cfa71fcef Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 4 Jul 2019 16:04:39 +0000
Subject: [PATCH 053/114] Fixed some issues with bulk changes related to
 assertContains()  - Legacy-Id: 16379

---
 ietf/doc/tests_downref.py | 26 ++++++++---------
 ietf/doc/tests_review.py  |  8 +++---
 ietf/iesg/tests.py        | 59 +++++++++++++++++++--------------------
 ietf/ipr/tests.py         |  4 +--
 4 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/ietf/doc/tests_downref.py b/ietf/doc/tests_downref.py
index d7f617256..bf5dcfa7b 100644
--- a/ietf/doc/tests_downref.py
+++ b/ietf/doc/tests_downref.py
@@ -12,7 +12,7 @@ from ietf.doc.factories import WgDraftFactory, WgRfcFactory
 from ietf.doc.models import RelatedDocument, State
 from ietf.person.factories import PersonFactory
 from ietf.utils.test_utils import TestCase
-from ietf.utils.test_utils import login_testing_unauthorized, unicontent
+from ietf.utils.test_utils import login_testing_unauthorized
 
 class Downref(TestCase):
 
@@ -39,13 +39,13 @@ class Downref(TestCase):
         self.client.login(username='secretary', password='secretary+password')
         r = self.client.get(url)
         self.assertContains(r, '
Downref registry
')
-        self.assertContains(r, ('Add downref')
+        self.assertContains(r, 'Add downref')
 
         # area director - get the table with the "Add downref" button
         self.client.login(username='ad', password='ad+password')
         r = self.client.get(url)
-        self.assertContains(r, ('
Downref registry
')
-        self.assertContains(r, ('Add downref')
+        self.assertContains(r, '
Downref registry
')
+        self.assertContains(r, 'Add downref')
 
     def test_downref_registry_add(self):
         url = urlreverse('ietf.doc.views_downref.downref_registry_add')
@@ -54,32 +54,32 @@ class Downref(TestCase):
         # secretariat - get the form to add entries to the registry
         self.client.login(username='secretary', password='secretary+password')
         r = self.client.get(url)
-        self.assertContains(r, ('
Add entry to the downref registry
')
-        self.assertContains(r, ('Save downref')
+        self.assertContains(r, '
Add entry to the downref registry
')
+        self.assertContains(r, 'Save downref')
 
         # area director - get the form to add entries to the registry
         self.client.login(username='ad', password='ad+password')
         r = self.client.get(url)
-        self.assertContains(r, ('
Add entry to the downref registry
')
-        self.assertContains(r, ('Save downref')
+        self.assertContains(r, '
Add entry to the downref registry
')
+        self.assertContains(r, 'Save downref')
 
         # error - already in the downref registry
         r = self.client.post(url, dict(rfc=self.rfcalias.pk, drafts=(self.doc.pk, )))
-        self.assertContains(r, ('Downref is already in the registry')
+        self.assertContains(r, 'Downref is already in the registry')
 
         # error - source is not in an approved state
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         r = self.client.post(url, dict(rfc=self.rfcalias.pk, drafts=(self.draft.pk, )))
-        self.assertContains(r, ('Draft is not yet approved')
+        self.assertContains(r, 'Draft is not yet approved')
 
         # error - the target is not a normative reference of the source
         self.draft.set_state(State.objects.get(used=True, type="draft-iesg", slug="pub"))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         r = self.client.post(url, dict(rfc=self.rfcalias.pk, drafts=(self.draft.pk, )))
-        self.assertContains(r, ('There does not seem to be a normative reference to RFC')
-        self.assertContains(r, ('Save downref anyway')
+        self.assertContains(r, 'There does not seem to be a normative reference to RFC')
+        self.assertContains(r, 'Save downref anyway')
 
         # normal - approve the document so the downref is now okay
         RelatedDocument.objects.create(source=self.draft, target=self.rfcalias, relationship_id='refnorm')
@@ -92,7 +92,7 @@ class Downref(TestCase):
         self.assertEqual(r.status_code, 302)
         newurl = urlreverse('ietf.doc.views_downref.downref_registry')
         r = self.client.get(newurl)
-        self.assertContains(r, ('
Date: Thu, 4 Jul 2019 16:10:21 +0000
Subject: [PATCH 054/114] Changed a function name.  - Legacy-Id: 16386

---
 ietf/doc/tests_conflict_review.py                | 13 +++++++------
 ietf/doc/views_conflict_review.py                |  2 +-
 ietf/templates/doc/document_conflict_review.html |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ietf/doc/tests_conflict_review.py b/ietf/doc/tests_conflict_review.py
index f9f85a77d..112623652 100644
--- a/ietf/doc/tests_conflict_review.py
+++ b/ietf/doc/tests_conflict_review.py
@@ -18,7 +18,7 @@ from ietf.doc.views_conflict_review import default_approval_text
 from ietf.group.models import Person
 from ietf.iesg.models import TelechatDate
 from ietf.name.models import StreamName
-from ietf.utils.test_utils import TestCase, unicontent
+from ietf.utils.test_utils import TestCase
 from ietf.utils.mail import outbox, empty_outbox
 from ietf.utils.test_utils import login_testing_unauthorized
 
@@ -265,7 +265,7 @@ class ConflictReviewTests(TestCase):
     def approve_test_helper(self,approve_type):
 
         doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
-        url = urlreverse('ietf.doc.views_conflict_review.approve',kwargs=dict(name=doc.name))
+        url = urlreverse('ietf.doc.views_conflict_review.approve_conflict_review',kwargs=dict(name=doc.name))
 
         login_testing_unauthorized(self, "secretary", url)
         
@@ -297,12 +297,13 @@ class ConflictReviewTests(TestCase):
         self.assertIn('irtf-chair', outbox[0]['To'])
         self.assertIn('ietf-announce@', outbox[0]['Cc'])
         self.assertIn('iana@', outbox[0]['Cc'])
+
         if approve_type == 'appr-noprob':
-            self.assertContains(r, 'IESG has no problem')
+            self.assertIn( 'IESG has no problem', ''.join(wrap(outbox[0].get_payload(), 2**16)))
         else:
-            self.assertContains(r, 'NOT be published')
-        
-       
+            self.assertIn( 'NOT be published', ''.join(wrap(outbox[0].get_payload(), 2**16)))
+
+
     def test_approve_reqnopub(self):
         self.approve_test_helper('appr-reqnopub')
 
diff --git a/ietf/doc/views_conflict_review.py b/ietf/doc/views_conflict_review.py
index 518fd0d7a..0b741e6c3 100644
--- a/ietf/doc/views_conflict_review.py
+++ b/ietf/doc/views_conflict_review.py
@@ -301,7 +301,7 @@ class AnnouncementForm(forms.Form):
     announcement_text = forms.CharField(widget=forms.Textarea, label="IETF Conflict Review Announcement", help_text="Edit the announcement message.", required=True, strip=False)
 
 @role_required("Secretariat")
-def approve(request, name):
+def approve_conflict_review(request, name):
     """Approve this conflict review, setting the appropriate state and send the announcement to the right parties."""
     review = get_object_or_404(Document, type="conflrev", name=name)
 
diff --git a/ietf/templates/doc/document_conflict_review.html b/ietf/templates/doc/document_conflict_review.html
index aa804d208..8e379890f 100644
--- a/ietf/templates/doc/document_conflict_review.html
+++ b/ietf/templates/doc/document_conflict_review.html
@@ -135,7 +135,7 @@
   {% if not snapshot and user|has_role:"Area Director,Secretariat" %}
     {% if request.user|has_role:"Secretariat" %}
       {% if doc.get_state_slug == 'appr-reqnopub-pend' or doc.get_state_slug == 'appr-noprob-pend' %}
-        Approve conflict review
+        Approve conflict review
       {% endif %}
     {% endif %}
   {% endif %}

From 89e265d7988af18d2426b498bd7a650c729a3e0f Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 4 Jul 2019 16:12:09 +0000
Subject: [PATCH 055/114] Fixed an instance of changing a dictionary inside a
 loop over its keys.  - Legacy-Id: 16387

---
 ietf/group/forms.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ietf/group/forms.py b/ietf/group/forms.py
index 04cfc9f3f..c84c6a318 100644
--- a/ietf/group/forms.py
+++ b/ietf/group/forms.py
@@ -116,7 +116,8 @@ class GroupForm(forms.Form):
         for r in role_fields_to_remove:
             del self.fields[r + "_roles"]
         if field:
-            for f in self.fields:
+            keys = list(self.fields.keys())
+            for f in keys:
                 if f != field:
                     del self.fields[f]
 

From 8f3c420a62636b908e89baaec64dac762aa09269 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 4 Jul 2019 20:47:34 +0000
Subject: [PATCH 056/114] Fixed a typo and some pyflakes issues.  - Legacy-Id:
 16388

---
 ietf/community/tests.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ietf/community/tests.py b/ietf/community/tests.py
index 2cd914afe..1076750f9 100644
--- a/ietf/community/tests.py
+++ b/ietf/community/tests.py
@@ -1,8 +1,6 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
-import json
-
 from pyquery import PyQuery
 
 from django.urls import reverse as urlreverse
@@ -19,7 +17,7 @@ from ietf.group.utils import setup_default_community_list_for_group
 from ietf.doc.models import State
 from ietf.doc.utils import add_state_change_event
 from ietf.person.models import Person, Email
-from ietf.utils.test_utils import login_testing_unauthorized, TestCase, unicontent
+from ietf.utils.test_utils import login_testing_unauthorized, TestCase
 from ietf.utils.mail import outbox
 from ietf.doc.factories import WgDraftFactory
 from ietf.group.factories import GroupFactory, RoleFactory
@@ -298,7 +296,7 @@ class CommunityListTests(TestCase):
         # only significant
         r = self.client.get(url + "?significant=1")
         self.assertEqual(r.status_code, 200)
-        self.assertContains(r, '' not)
+        self.assertNotContains(r, '')
 
     def test_feed_for_group(self):
         draft = WgDraftFactory()

From d957f326907d516322214e28dc745ad353c158d3 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 4 Jul 2019 20:48:55 +0000
Subject: [PATCH 057/114] Fixed a syntax error and removed unused imports.  -
 Legacy-Id: 16389

---
 ietf/doc/tests_status_change.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ietf/doc/tests_status_change.py b/ietf/doc/tests_status_change.py
index 3ddada19b..2665ec702 100644
--- a/ietf/doc/tests_status_change.py
+++ b/ietf/doc/tests_status_change.py
@@ -20,7 +20,7 @@ from ietf.doc.utils import create_ballot_if_not_open
 from ietf.doc.views_status_change import default_approval_text
 from ietf.group.models import Person
 from ietf.iesg.models import TelechatDate
-from ietf.utils.test_utils import TestCase, unicontent
+from ietf.utils.test_utils import TestCase
 from ietf.utils.mail import outbox
 from ietf.utils.test_utils import login_testing_unauthorized
 
@@ -288,7 +288,7 @@ class StatusChangeTests(TestCase):
         self.assertContains(r,  'Last call requested')
         self.assertEqual(len(outbox), messages_before + 1)
         self.assertTrue('Last Call:' in outbox[-1]['Subject'])
-        self.assertTrue('Last Call Request has been submitted' in ''.join(wrap(outbox[-1].as_string()),2**16)))
+        self.assertTrue('Last Call Request has been submitted' in ''.join(wrap(outbox[-1].as_string(), width=2**16)))
 
 
     def test_approve(self):

From 0a047e1fcc3ff48599e062c2516f1236c92d11bd Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 4 Jul 2019 20:50:04 +0000
Subject: [PATCH 058/114] Added some warning filters.  - Legacy-Id: 16390

---
 ietf/settings.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ietf/settings.py b/ietf/settings.py
index fea10b7c0..6623dd391 100644
--- a/ietf/settings.py
+++ b/ietf/settings.py
@@ -25,6 +25,8 @@ warnings.filterwarnings("ignore", message="defusedxml.lxml is no longer supporte
 warnings.filterwarnings("ignore", message="Duplicate index '.*' defined on the table")
 # Warnings found under Python 3.7:
 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="Flags not at the start of the expression", module="genshi")
 
 
 try:

From 41438e5c4dd218778e1748a83209f3e76d45a707 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 4 Jul 2019 20:51:10 +0000
Subject: [PATCH 059/114] Fixed some bytes/str issues and unused imports.  -
 Legacy-Id: 16391

---
 ietf/stats/tests.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ietf/stats/tests.py b/ietf/stats/tests.py
index cbcfe4626..314763097 100644
--- a/ietf/stats/tests.py
+++ b/ietf/stats/tests.py
@@ -12,7 +12,7 @@ import debug    # pyflakes:ignore
 from django.urls import reverse as urlreverse
 from django.contrib.auth.models import User
 
-from ietf.utils.test_utils import login_testing_unauthorized, TestCase, unicontent
+from ietf.utils.test_utils import login_testing_unauthorized, TestCase
 import ietf.stats.views
 
 from ietf.submit.models import Submission
@@ -214,7 +214,7 @@ class StatisticsTests(TestCase):
         '''Test function to get reg data.  Confirm leading/trailing spaces stripped'''
         response = Response()
         response.status_code = 200
-        response._content = '[{"LastName":"Smith ","FirstName":" John","Company":"ABC","Country":"US","Email":"john.doe@example.us"}]'
+        response._content = b'[{"LastName":"Smith ","FirstName":" John","Company":"ABC","Country":"US","Email":"john.doe@example.us"}]'
         mock_get.return_value = response
         meeting = MeetingFactory(type_id='ietf', date=datetime.date(2016,7,14), number="96")
         get_meeting_registration_data(meeting)
@@ -226,7 +226,7 @@ class StatisticsTests(TestCase):
     def test_get_meeting_registration_data_user_exists(self, mock_get):
         response = Response()
         response.status_code = 200
-        response._content = '[{"LastName":"Smith","FirstName":"John","Company":"ABC","Country":"US","Email":"john.doe@example.us"}]'
+        response._content = b'[{"LastName":"Smith","FirstName":"John","Company":"ABC","Country":"US","Email":"john.doe@example.us"}]'
         email = "john.doe@example.us"
         user = User.objects.create(username=email)
         user.save()

From 864fc1a81409892e144e3108b5ec8425e71b6550 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 4 Jul 2019 20:53:05 +0000
Subject: [PATCH 060/114] Firmed up the handling of non-ascii names for a test
 email templat, tweaked some asserts, and removed unused imports.  -
 Legacy-Id: 16392

---
 ietf/sync/tests.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/ietf/sync/tests.py b/ietf/sync/tests.py
index edb1439cf..8f66503f5 100644
--- a/ietf/sync/tests.py
+++ b/ietf/sync/tests.py
@@ -5,6 +5,7 @@ import os
 import json
 import datetime
 import io
+import quopri
 import shutil
 
 from django.conf import settings
@@ -17,7 +18,7 @@ from ietf.group.factories import GroupFactory
 from ietf.person.models import Person
 from ietf.sync import iana, rfceditor
 from ietf.utils.mail import outbox, empty_outbox
-from ietf.utils.test_utils import login_testing_unauthorized, unicontent
+from ietf.utils.test_utils import login_testing_unauthorized
 from ietf.utils.test_utils import TestCase
 
 
@@ -137,8 +138,10 @@ class IANASyncTests(TestCase):
         draft = WgDraftFactory()
 
         subject_template = 'Subject: [IANA #12345] Last Call: <%(draft)s-%(rev)s.txt> (Long text) to Informational RFC'
-        msg_template = """From: "%(person)s via RT" 
+        msg_template = """From: %(fromaddr)s
 Date: Thu, 10 May 2012 12:00:0%(rtime)d +0000
+Content-Transfer-Encoding: quoted-printable
+Content-Type: text/plain; charset=utf-8
 %(subject)s
 
 (BEGIN IANA %(tag)s%(embedded_name)s)
@@ -172,7 +175,10 @@ ICANN
                     if embedded_name or not 'Vacuous' in subject: 
                     
                         rtime = 7*subjects.index(subject) + 5*tags.index(tag) + embedded_names.index(embedded_name)
-                        msg = msg_template % dict(person=Person.objects.get(user__username="iana").name,
+                        person=Person.objects.get(user__username="iana")
+                        fromaddr = person.email().formatted_email()
+                        msg = msg_template % dict(person=quopri.encodestring(person.name.encode()),
+                                                  fromaddr=fromaddr,
                                                   draft=draft.name,
                                                   rev=draft.rev,
                                                   tag=tag,
@@ -185,7 +191,7 @@ ICANN
                         self.assertEqual(doc_name, draft.name)
                         self.assertEqual(review_time, datetime.datetime(2012, 5, 10, 5, 0, rtime))
                         self.assertEqual(by, Person.objects.get(user__username="iana"))
-                        self.assertTrue("there are no IANA Actions" in comment.replace("\n", ""))
+                        self.assertIn("there are no IANA Actions", comment.replace("\n", ""))
     
                         events_before = DocEvent.objects.filter(doc=draft, type="iana_review").count()
                         iana.add_review_comment(doc_name, review_time, by, comment)

From 269278954e6e5064f19e49f9b141fb0f5c75d567 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 4 Jul 2019 20:54:36 +0000
Subject: [PATCH 061/114] Template variable name change.  - Legacy-Id: 16393

---
 ietf/templates/submit/confirm_submission.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ietf/templates/submit/confirm_submission.txt b/ietf/templates/submit/confirm_submission.txt
index 29174d52c..87e0f50f6 100644
--- a/ietf/templates/submit/confirm_submission.txt
+++ b/ietf/templates/submit/confirm_submission.txt
@@ -10,7 +10,7 @@ The chairs have been copied since this is a group document whose author list has
 {%endif%}
 Please follow this link to the page where you can confirm the posting:
 
-{{ confirm_url }}
+{{ confirmation_url }}
 
 
 Best regards,

From fa85e6edeef5a59bacdf8b53e7fb4b18ab5959c2 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 4 Jul 2019 20:55:32 +0000
Subject: [PATCH 062/114] Typo fixes and removal of an unused import.  -
 Legacy-Id: 16394

---
 ietf/group/tests_info.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ietf/group/tests_info.py b/ietf/group/tests_info.py
index e49079ef9..d5dfa2a30 100644
--- a/ietf/group/tests_info.py
+++ b/ietf/group/tests_info.py
@@ -5,7 +5,6 @@ import os
 import shutil
 import calendar
 import datetime
-import json
 import io
 import bleach
 import six
@@ -344,7 +343,7 @@ class GroupPagesTests(TestCase):
 
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
-        self.assertContains(r, doc.title not)
+        self.assertNotContains(r, doc.title)
 
     def test_history(self):
         group = GroupFactory()
@@ -791,7 +790,7 @@ class MilestoneTests(TestCase):
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
             self.assertContains(r, m1.desc)
-            self.assertContains(r, m2.desc not)
+            self.assertNotContains(r, m2.desc)
             self.client.logout()
 
         login_testing_unauthorized(self, "secretary", url)
@@ -799,7 +798,7 @@ class MilestoneTests(TestCase):
         for url in group_urlreverse_list(group, 'ietf.group.milestones.edit_milestones;charter'):
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
-            self.assertContains(r, m1.desc not)
+            self.assertNotContains(r, m1.desc)
             self.assertContains(r, m2.desc)
 
     def test_add_milestone(self):

From 77e055264e50de73a191733e5727c2cb278bd1fc Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 4 Jul 2019 20:56:35 +0000
Subject: [PATCH 063/114] Fixed an incorrect test that compared the meeting
 number string with an integer.  - Legacy-Id: 16395

---
 ietf/meeting/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py
index 395a665d3..dcd7b5a15 100644
--- a/ietf/meeting/views.py
+++ b/ietf/meeting/views.py
@@ -2179,7 +2179,7 @@ def finalize_proceedings(request, num=None):
 
     meeting = get_meeting(num)
 
-    if meeting.number <= 64 or not meeting.agenda or not meeting.agenda.assignments.exists() or meeting.proceedings_final:
+    if (meeting.number.isdigit() and int(meeting.number) <= 64) or not meeting.agenda or not meeting.agenda.assignments.exists() or meeting.proceedings_final:
         raise Http404
 
     if request.method=='POST':

From fbc131c73fbfb8e14fdbe94813cf444b19e543f2 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 4 Jul 2019 20:57:36 +0000
Subject: [PATCH 064/114] Replaced an obsolete file() call with open().  -
 Legacy-Id: 16396

---
 ietf/secr/utils/group.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ietf/secr/utils/group.py b/ietf/secr/utils/group.py
index ad791a3ec..b6542b3f4 100644
--- a/ietf/secr/utils/group.py
+++ b/ietf/secr/utils/group.py
@@ -27,7 +27,7 @@ def get_charter_text(group):
     '''
     charter = group.charter
     path = os.path.join(settings.CHARTER_PATH, '%s-%s.txt' % (charter.canonical_name(), charter.rev))
-    f = file(path,'r')
+    f = open(path,'r')
     text = f.read()
     f.close()
 

From e55c42b20fca3666f8b7fece202e5cfef84dafdf Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 4 Jul 2019 20:58:25 +0000
Subject: [PATCH 065/114] Tweaked code to prevent sort comparison of str with
 None.  - Legacy-Id: 16397

---
 ietf/stats/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ietf/stats/views.py b/ietf/stats/views.py
index c1b87e64d..ab1f956ad 100644
--- a/ietf/stats/views.py
+++ b/ietf/stats/views.py
@@ -362,7 +362,7 @@ def document_stats(request, stats_type=None):
                 bins = defaultdict(set)
 
                 for name, canonical_name, formal_language_name in generate_canonical_names(docalias_qs.values_list("docs__name", "name", "docs__formal_languages__name")):
-                    bins[formal_language_name].add(canonical_name)
+                    bins[formal_language_name or ""].add(canonical_name)
 
                 series_data = []
                 for formal_language, names in sorted(bins.items(), key=lambda t: t[0]):

From a3d40ace9b5e0b076dda2ade5870a2e286647dfa Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 4 Jul 2019 20:59:40 +0000
Subject: [PATCH 066/114] Fixed a str/bytes issue with a hashlib function call,
 and removed an unused import.  - Legacy-Id: 16398

---
 ietf/utils/accesstoken.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ietf/utils/accesstoken.py b/ietf/utils/accesstoken.py
index e3163581d..18fc4a73a 100644
--- a/ietf/utils/accesstoken.py
+++ b/ietf/utils/accesstoken.py
@@ -2,7 +2,8 @@
 import time, random, hashlib
 
 from django.conf import settings
-from django.utils.encoding import force_bytes
+from django.utils.encoding import force_bytes, force_text
+
 
 def generate_random_key(max_length=32):
     """Generate a random access token."""
@@ -14,4 +15,4 @@ def generate_access_token(key, max_length=32):
     # we hash it with the private key to make sure only we can
     # generate and use the final token - so storing the key in the
     # database is safe
-    return hashlib.sha256(force_bytes(settings.SECRET_KEY) + force_bytes(key)).hexdigest()[:max_length]
+    return force_text(hashlib.sha256(force_bytes(settings.SECRET_KEY) + force_bytes(key)).hexdigest()[:max_length])

From 3a35dfcee4a5f9b756fbe0dea06bf4699e5396da Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 4 Jul 2019 21:00:48 +0000
Subject: [PATCH 067/114] Changed our parseaddr() and formataddr() to work
 correctly with python3.  - Legacy-Id: 16399

---
 ietf/utils/mail.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/ietf/utils/mail.py b/ietf/utils/mail.py
index 778582f68..83d615b2f 100644
--- a/ietf/utils/mail.py
+++ b/ietf/utils/mail.py
@@ -217,10 +217,7 @@ def formataddr(addrtuple):
     address field.  Does what's needed, and returns a string value suitable for
     use in a To: or Cc: email header field.
     """
-    name, addr = addrtuple
-    if name and not isascii(name):
-        name = str(Header(name, 'utf-8'))
-    return simple_formataddr((name, addr))
+    return simple_formataddr(addrtuple, charset='utf-8')
 
 def parseaddr(addr):
     """
@@ -230,7 +227,8 @@ def parseaddr(addr):
     which case a 2-tuple of ('', '') is returned.
 
     """
-    addr = ''.join( [ s.decode(m) if m else str(s) for (s,m) in decode_header(addr) ] )
+    if not isinstance(addr, str):
+        addr = ''.join( [ s.decode(m) if m else s.decode() for (s,m) in decode_header(addr) ] )
     name, addr = simple_parseaddr(addr)
     return name, addr
 

From fc09a59950ceb919dfb2071c1c32b954afa7229c Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 4 Jul 2019 21:01:39 +0000
Subject: [PATCH 068/114] Added decode() of command pipe output.  - Legacy-Id:
 16400

---
 ietf/api/tests.py                             |  1 -
 ietf/doc/tests_ballot.py                      |  2 +-
 ietf/doc/tests_charter.py                     |  2 +-
 ietf/doc/tests_draft.py                       |  2 +-
 ietf/doc/tests_material.py                    |  2 +-
 ietf/doc/views_review.py                      |  2 +-
 ietf/group/tests.py                           |  2 +-
 ietf/group/tests_review.py                    |  2 +-
 ietf/iesg/views.py                            |  2 +-
 ietf/ietfauth/tests.py                        |  2 +-
 ietf/ipr/mail.py                              |  4 +
 ietf/liaisons/tests.py                        |  3 +-
 ietf/mailtrigger/tests.py                     |  2 +-
 ietf/message/tests.py                         |  2 +-
 ietf/nomcom/models.py                         |  5 +-
 ietf/person/models.py                         |  2 +-
 ietf/person/tests.py                          |  1 -
 ietf/redirects/tests.py                       |  2 +-
 ietf/secr/meetings/blue_sheets.py             |  3 +-
 ietf/secr/sreq/tests.py                       |  2 +-
 ietf/secr/utils/test.py                       |  2 +-
 .../management/commands/create_group_wikis.py |  3 +-
 ietf/utils/management/commands/pyflakes.py    |  5 +-
 .../commands/send_gdpr_consent_request.py     |  2 +-
 ietf/utils/test_runner.py                     |  1 -
 ietf/utils/tests.py                           | 84 +++++++++----------
 ietf/utils/text.py                            |  1 -
 ietf/utils/validators.py                      |  7 +-
 requirements.txt                              |  2 +-
 29 files changed, 80 insertions(+), 72 deletions(-)

diff --git a/ietf/api/tests.py b/ietf/api/tests.py
index 1972a3e00..75351c798 100644
--- a/ietf/api/tests.py
+++ b/ietf/api/tests.py
@@ -1,6 +1,5 @@
 # Copyright The IETF Trust 2015-2019, All Rights Reserved
 
-import json
 import os
 import sys
 
diff --git a/ietf/doc/tests_ballot.py b/ietf/doc/tests_ballot.py
index fa679b25b..026f7c96b 100644
--- a/ietf/doc/tests_ballot.py
+++ b/ietf/doc/tests_ballot.py
@@ -19,7 +19,7 @@ from ietf.name.models import BallotPositionName
 from ietf.iesg.models import TelechatDate
 from ietf.person.models import Person, PersonalApiKey
 from ietf.person.factories import PersonFactory
-from ietf.utils.test_utils import TestCase, unicontent, login_testing_unauthorized
+from ietf.utils.test_utils import TestCase, login_testing_unauthorized
 from ietf.utils.mail import outbox, empty_outbox
 from ietf.utils.text import unwrap
 
diff --git a/ietf/doc/tests_charter.py b/ietf/doc/tests_charter.py
index 49d8c5b5e..0bad514ea 100644
--- a/ietf/doc/tests_charter.py
+++ b/ietf/doc/tests_charter.py
@@ -20,7 +20,7 @@ from ietf.group.factories import RoleFactory, GroupFactory
 from ietf.group.models import Group, GroupMilestone
 from ietf.iesg.models import TelechatDate
 from ietf.person.models import Person
-from ietf.utils.test_utils import TestCase, unicontent
+from ietf.utils.test_utils import TestCase
 from ietf.utils.mail import outbox, empty_outbox
 from ietf.utils.test_utils import login_testing_unauthorized
 
diff --git a/ietf/doc/tests_draft.py b/ietf/doc/tests_draft.py
index c728f477b..fcc7118cd 100644
--- a/ietf/doc/tests_draft.py
+++ b/ietf/doc/tests_draft.py
@@ -25,7 +25,7 @@ from ietf.person.factories import PersonFactory
 from ietf.person.models import Person, Email
 from ietf.meeting.models import Meeting, MeetingTypeName
 from ietf.iesg.models import TelechatDate
-from ietf.utils.test_utils import login_testing_unauthorized, unicontent
+from ietf.utils.test_utils import login_testing_unauthorized
 from ietf.utils.mail import outbox, empty_outbox
 from ietf.utils.test_utils import TestCase
 
diff --git a/ietf/doc/tests_material.py b/ietf/doc/tests_material.py
index 1640e38db..cc414d9d7 100644
--- a/ietf/doc/tests_material.py
+++ b/ietf/doc/tests_material.py
@@ -19,7 +19,7 @@ from ietf.meeting.factories import MeetingFactory
 from ietf.meeting.models import Meeting, Session, SessionPresentation
 from ietf.name.models import SessionStatusName
 from ietf.person.models import Person
-from ietf.utils.test_utils import TestCase, login_testing_unauthorized, unicontent
+from ietf.utils.test_utils import TestCase, login_testing_unauthorized
 
 
 class GroupMaterialTests(TestCase):
diff --git a/ietf/doc/views_review.py b/ietf/doc/views_review.py
index bd9fb73ac..1cf5c0510 100644
--- a/ietf/doc/views_review.py
+++ b/ietf/doc/views_review.py
@@ -769,7 +769,7 @@ def search_mail_archive(request, name, assignment_id):
     try:
         res["messages"] = mailarch.retrieve_messages(res["query_data_url"])[:MAX_RESULTS]
     except KeyError as e:
-        res["error"] = "No results found"
+        res["error"] = "No results found (%s)" % str(e)
     except Exception as e:
         res["error"] = "Retrieval from mail archive failed: %s" % str(e)
         # raise # useful when debugging
diff --git a/ietf/group/tests.py b/ietf/group/tests.py
index 72fd4552f..6b37b4f90 100644
--- a/ietf/group/tests.py
+++ b/ietf/group/tests.py
@@ -19,7 +19,7 @@ from ietf.group.factories import GroupFactory, RoleFactory
 from ietf.utils.test_runner import set_coverage_checking
 from ietf.person.factories import EmailFactory
 from ietf.person.models import Person
-from ietf.utils.test_utils import login_testing_unauthorized, TestCase, unicontent
+from ietf.utils.test_utils import login_testing_unauthorized, TestCase
 
 if   getattr(settings,'SKIP_DOT_TO_PDF', False):
     skip_dot_to_pdf = True
diff --git a/ietf/group/tests_review.py b/ietf/group/tests_review.py
index 71863a22c..ea8e80e89 100644
--- a/ietf/group/tests_review.py
+++ b/ietf/group/tests_review.py
@@ -8,7 +8,7 @@ from pyquery import PyQuery
 
 from django.urls import reverse as urlreverse
 
-from ietf.utils.test_utils import login_testing_unauthorized, TestCase, unicontent, reload_db_objects
+from ietf.utils.test_utils import login_testing_unauthorized, TestCase, reload_db_objects
 from ietf.doc.models import TelechatDocEvent
 from ietf.group.models import Role
 from ietf.iesg.models import TelechatDate
diff --git a/ietf/iesg/views.py b/ietf/iesg/views.py
index 1fceb0323..ce478b7b1 100644
--- a/ietf/iesg/views.py
+++ b/ietf/iesg/views.py
@@ -179,7 +179,7 @@ def agenda_json(request, date=None):
 
                 s["docs"].append(docinfo)
 
-    return HttpResponse(json.dumps(res, indent=2), content_type='text/plain')
+    return HttpResponse(json.dumps(res, indent=2), content_type='application/json')
 
 # def past_agendas(request):
 #     # This is not particularly useful with the current way of constructing
diff --git a/ietf/ietfauth/tests.py b/ietf/ietfauth/tests.py
index a8bd0a93a..cb96b73e1 100644
--- a/ietf/ietfauth/tests.py
+++ b/ietf/ietfauth/tests.py
@@ -14,7 +14,7 @@ from django.conf import settings
 
 import debug                            # pyflakes:ignore
 
-from ietf.utils.test_utils import TestCase, login_testing_unauthorized, unicontent
+from ietf.utils.test_utils import TestCase, login_testing_unauthorized
 from ietf.utils.mail import outbox, empty_outbox
 from ietf.group.models import Group, Role, RoleName
 from ietf.group.factories import GroupFactory, RoleFactory
diff --git a/ietf/ipr/mail.py b/ietf/ipr/mail.py
index 809af13e8..0daa54f2d 100644
--- a/ietf/ipr/mail.py
+++ b/ietf/ipr/mail.py
@@ -1,4 +1,5 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
+
 import base64
 import email
 import datetime
@@ -6,8 +7,11 @@ from dateutil.tz import tzoffset
 import os
 import pytz
 import re
+
 from django.template.loader import render_to_string
 
+import debug                            # pyflakes:ignore
+
 from ietf.ipr.models import IprEvent
 from ietf.message.models import Message
 from ietf.person.models import Person
diff --git a/ietf/liaisons/tests.py b/ietf/liaisons/tests.py
index 3a57ad591..3d56cccf0 100644
--- a/ietf/liaisons/tests.py
+++ b/ietf/liaisons/tests.py
@@ -1,6 +1,5 @@
 # Copyright The IETF Trust 2009-2019, All Rights Reserved
 import datetime, os, shutil
-import json
 
 import debug    # pyflakes:ignore
 
@@ -11,7 +10,7 @@ from django.db.models import Q
 from io import StringIO
 from pyquery import PyQuery
 
-from ietf.utils.test_utils import TestCase, login_testing_unauthorized, unicontent
+from ietf.utils.test_utils import TestCase, login_testing_unauthorized
 from ietf.utils.mail import outbox
 
 from ietf.group.factories import GroupFactory, RoleFactory
diff --git a/ietf/mailtrigger/tests.py b/ietf/mailtrigger/tests.py
index 6868c5b77..db5d0281a 100644
--- a/ietf/mailtrigger/tests.py
+++ b/ietf/mailtrigger/tests.py
@@ -1,7 +1,7 @@
 # Copyright The IETF Trust 2015-2019, All Rights Reserved
 from django.urls import reverse as urlreverse
 
-from ietf.utils.test_utils import TestCase, unicontent
+from ietf.utils.test_utils import TestCase
 
 class EventMailTests(TestCase):
 
diff --git a/ietf/message/tests.py b/ietf/message/tests.py
index 679404e2a..13e599568 100644
--- a/ietf/message/tests.py
+++ b/ietf/message/tests.py
@@ -3,7 +3,7 @@ import datetime
 
 from django.urls import reverse as urlreverse
 
-from ietf.utils.test_utils import TestCase, unicontent
+from ietf.utils.test_utils import TestCase
 from ietf.utils.mail import outbox
 
 from ietf.message.models import Message, SendQueue
diff --git a/ietf/nomcom/models.py b/ietf/nomcom/models.py
index 16d229ed7..249958cb7 100644
--- a/ietf/nomcom/models.py
+++ b/ietf/nomcom/models.py
@@ -22,7 +22,10 @@ from ietf.nomcom.utils import (initialize_templates_for_group,
                                initialize_questionnaire_for_position,
                                initialize_requirements_for_position,
                                initialize_description_for_topic,
-                               delete_nomcom_templates)
+                               delete_nomcom_templates,
+                               EncryptedException,
+                              )
+from ietf.utils.log import log
 from ietf.utils.models import ForeignKey
 from ietf.utils.pipe import pipe
 from ietf.utils.storage import NoLocationMigrationFileSystemStorage
diff --git a/ietf/person/models.py b/ietf/person/models.py
index bfc329d0f..06bb77cad 100644
--- a/ietf/person/models.py
+++ b/ietf/person/models.py
@@ -338,7 +338,7 @@ class PersonalApiKey(models.Model):
         import struct, hashlib, base64
         try:
             key = base64.urlsafe_b64decode(s)
-        except TypeError as e:
+        except TypeError:
             return None
 
         id, salt, hash = struct.unpack(KEY_STRUCT, key)
diff --git a/ietf/person/tests.py b/ietf/person/tests.py
index 0da5b98ef..21ec57091 100644
--- a/ietf/person/tests.py
+++ b/ietf/person/tests.py
@@ -3,7 +3,6 @@
 
 
 import datetime
-import json
 from pyquery import PyQuery
 from io import StringIO
 from django.urls import reverse as urlreverse
diff --git a/ietf/redirects/tests.py b/ietf/redirects/tests.py
index 175a1bd43..9dbf8f574 100644
--- a/ietf/redirects/tests.py
+++ b/ietf/redirects/tests.py
@@ -50,7 +50,7 @@ REDIRECT_TESTS = {
     '/public/idindex.cgi?command=do_search_id&filename=draft-mills-sntp-v4-00.txt':
         '/drafts/?filename=draft-mills-sntp-v4-00.txt',
     '/public/idindex.cgi?command=do_search_id&filename=draft-ietf-isis-interoperable&search_button=SEARCH':
-        '/drafts/?search_button=SEARCH&filename=draft-ietf-isis-interoperable',
+        '/drafts/?filename=draft-ietf-isis-interoperable&search_button=SEARCH',
     '/public/idindex.cgi?command=do_search_id&filename=rfc0038.txt':
         '/drafts/?filename=rfc0038.txt',
     '/public/idindex.cgi?command=id_detail&id=7096':
diff --git a/ietf/secr/meetings/blue_sheets.py b/ietf/secr/meetings/blue_sheets.py
index fe1639103..676542bad 100644
--- a/ietf/secr/meetings/blue_sheets.py
+++ b/ietf/secr/meetings/blue_sheets.py
@@ -1,6 +1,7 @@
+# Copyright The IETF Trust 2013-2019, All Rights Reserved
 from django.conf import settings
 
-'''
+r'''
 RTF quick reference (from Word2007RTFSpec9.doc):
 \fs24       : sets the font size to 24 half points
 \header     : header on all pages
diff --git a/ietf/secr/sreq/tests.py b/ietf/secr/sreq/tests.py
index 18f7750c5..4108b48f3 100644
--- a/ietf/secr/sreq/tests.py
+++ b/ietf/secr/sreq/tests.py
@@ -4,7 +4,7 @@ import datetime
 
 import debug                            # pyflakes:ignore
 
-from ietf.utils.test_utils import TestCase, unicontent
+from ietf.utils.test_utils import TestCase
 from ietf.group.factories import GroupFactory, RoleFactory
 from ietf.meeting.models import Session, ResourceAssociation
 from ietf.meeting.factories import MeetingFactory, SessionFactory
diff --git a/ietf/secr/utils/test.py b/ietf/secr/utils/test.py
index d0864d230..9fca188b1 100644
--- a/ietf/secr/utils/test.py
+++ b/ietf/secr/utils/test.py
@@ -18,4 +18,4 @@ def copy_roles(person):
     me.role_set.all().delete()
     for role in person.role_set.all():
         Role.objects.create(person=me,email_id='rcross@amsl.com',name=role.name,group=role.group)
-    print me.role_set.all()
\ No newline at end of file
+    print(me.role_set.all())
\ No newline at end of file
diff --git a/ietf/utils/management/commands/create_group_wikis.py b/ietf/utils/management/commands/create_group_wikis.py
index 459ccc47b..c9a007ecf 100644
--- a/ietf/utils/management/commands/create_group_wikis.py
+++ b/ietf/utils/management/commands/create_group_wikis.py
@@ -1,5 +1,4 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
-# Copyright 2016 IETF Trust
 
 import os
 import copy
@@ -61,6 +60,8 @@ class Command(BaseCommand):
             self.note("Running %s %s ..." % (os.path.basename(cmd), " ".join(quoted_args)))
             command = [ cmd, ] + list(args)
             code, out, err = pipe(command)
+            out = out.decode()
+            err = err.decode()
             msg = None
             if code != 0:
                 msg = "Error %s: %s when executing '%s'" % (code, err, " ".join(command))
diff --git a/ietf/utils/management/commands/pyflakes.py b/ietf/utils/management/commands/pyflakes.py
index ab2b5e046..a0cefbac5 100644
--- a/ietf/utils/management/commands/pyflakes.py
+++ b/ietf/utils/management/commands/pyflakes.py
@@ -72,6 +72,7 @@ def check(codeString, filename, verbosity=1):
                 sys.stderr.write('F')
             else:
                 sys.stderr.write('.')
+            sys.stderr.flush()
         if verbosity > 1:
             sys.stderr.write("  %s\n" % filename)
         return messages
@@ -84,7 +85,7 @@ def checkPath(filename, verbosity):
     @return: the number of warnings printed
     """
     try:
-        return check(open(filename, 'U').read() + '\n', filename, verbosity)
+        return check(open(filename).read() + '\n', filename, verbosity)
     except IOError as msg:
         return ["%s: %s" % (filename, msg.args[1])]
     except TypeError:
@@ -100,7 +101,7 @@ def checkPaths(filenames, verbosity):
                         try:
                             warnings.extend(checkPath(os.path.join(dirpath, filename), verbosity))
                         except TypeError as e:
-                            print(("Exception while processing dirpath=%s, filename=%s: %s" % (dirpath, filename,e )))
+                            print("Exception while processing dirpath=%s, filename=%s: %s" % (dirpath, filename, e ))
                             raise
         else:
             warnings.extend(checkPath(arg, verbosity))
diff --git a/ietf/utils/management/commands/send_gdpr_consent_request.py b/ietf/utils/management/commands/send_gdpr_consent_request.py
index b9a37e4a3..ee0282f68 100644
--- a/ietf/utils/management/commands/send_gdpr_consent_request.py
+++ b/ietf/utils/management/commands/send_gdpr_consent_request.py
@@ -97,7 +97,7 @@ class Command(BaseCommand):
                             'person': person, 'settings': settings,
                             },
                         )
-                    e = PersonEvent.objects.create(person=person, type='gdpr_notice_email', 
+                    PersonEvent.objects.create(person=person, type='gdpr_notice_email', 
                                                desc="Sent GDPR notice email to %s with confirmation deadline %s" % (to, date))
                     time.sleep(delay)
                 
diff --git a/ietf/utils/test_runner.py b/ietf/utils/test_runner.py
index 252643668..4f7a67dbb 100644
--- a/ietf/utils/test_runner.py
+++ b/ietf/utils/test_runner.py
@@ -239,7 +239,6 @@ def save_test_results(failures, test_labels):
             tfile.write("%s OK\n" % (timestr, ))
     tfile.close()
 
-
 def set_coverage_checking(flag=True):
     global template_coverage_collection
     global code_coverage_collection
diff --git a/ietf/utils/tests.py b/ietf/utils/tests.py
index 855139547..815869ada 100644
--- a/ietf/utils/tests.py
+++ b/ietf/utils/tests.py
@@ -11,8 +11,8 @@ from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 from fnmatch import fnmatch
 from importlib import import_module
-from .pipe import pipe
-from io import StringIO
+#from .pipe import pipe
+#from io import StringIO
 from textwrap import dedent
 from unittest import skipIf
 from tempfile import mkdtemp
@@ -20,7 +20,7 @@ from tempfile import mkdtemp
 from django.apps import apps
 from django.contrib.auth.models import User
 from django.conf import settings
-from django.core.management import call_command
+#from django.core.management import call_command
 from django.template import Context
 from django.template.defaulttags import URLNode
 from django.template.loader import get_template
@@ -29,8 +29,8 @@ from django.urls import reverse as urlreverse
 
 import debug                            # pyflakes:ignore
 
-from ietf.group.factories import GroupFactory
-from ietf.group.models import Group
+#from ietf.group.factories import GroupFactory
+#from ietf.group.models import Group
 from ietf.person.name import name_parts, unidecode_name
 from ietf.submit.tests import submission_file
 from ietf.utils.bower_storage import BowerStorageFinder
@@ -294,43 +294,43 @@ class TestWikiGlueManagementCommand(TestCase):
         shutil.rmtree(os.path.dirname(self.wiki_dir_pattern))
         shutil.rmtree(os.path.dirname(self.svn_dir_pattern))
 
-    def test_wiki_create_output(self):
-        for type in ['wg','rg','ag','area']:
-            GroupFactory(type_id=type)
-        groups = Group.objects.filter(
-                        type__slug__in=['wg','rg','ag','area'],
-                        state__slug='active'
-                    ).order_by('acronym')
-        out = StringIO()
-        err = StringIO()
-        call_command('create_group_wikis', stdout=out, stderr=err, verbosity=2,
-            wiki_dir_pattern=self.wiki_dir_pattern,
-            svn_dir_pattern=self.svn_dir_pattern,
-        )
-        command_output = out.getvalue()
-        command_errors = err.getvalue()
-        self.assertEqual("", command_errors)
-        for group in groups:
-            self.assertIn("Processing group '%s'" % group.acronym, command_output)
-            # Do a bit of verification using trac-admin, too
-            admin_code, admin_output, admin_error = pipe(
-                'trac-admin %s permission list' % (self.wiki_dir_pattern % group.acronym))
-            self.assertEqual(admin_code, 0)
-            roles = group.role_set.filter(name_id__in=['chair', 'secr', 'ad'])
-            for role in roles:
-                user = role.email.address.lower()
-                self.assertIn("Granting admin permission for %s" % user, command_output)
-                self.assertIn(user, admin_output)
-            docs = group.document_set.filter(states__slug='active', type_id='draft')
-            for doc in docs:
-                name = doc.name
-                name = name.replace('draft-','')
-                name = name.replace(doc.stream_id+'-', '')
-                name = name.replace(group.acronym+'-', '')
-                self.assertIn("Adding component %s"%name, command_output)
-        for page in settings.TRAC_WIKI_PAGES_TEMPLATES:
-            self.assertIn("Adding page %s" % os.path.basename(page), command_output)
-        self.assertIn("Indexing default repository", command_output)
+#     def test_wiki_create_output(self):
+#         for type in ['wg','rg','ag','area']:
+#             GroupFactory(type_id=type)
+#         groups = Group.objects.filter(
+#                         type__slug__in=['wg','rg','ag','area'],
+#                         state__slug='active'
+#                     ).order_by('acronym')
+#         out = StringIO()
+#         err = StringIO()
+#         call_command('create_group_wikis', stdout=out, stderr=err, verbosity=2,
+#             wiki_dir_pattern=self.wiki_dir_pattern,
+#             svn_dir_pattern=self.svn_dir_pattern,
+#         )
+#         command_output = out.getvalue()
+#         command_errors = err.getvalue()
+#         self.assertEqual("", command_errors)
+#         for group in groups:
+#             self.assertIn("Processing group '%s'" % group.acronym, command_output)
+#             # Do a bit of verification using trac-admin, too
+#             admin_code, admin_output, admin_error = pipe(
+#                 'trac-admin %s permission list' % (self.wiki_dir_pattern % group.acronym))
+#             self.assertEqual(admin_code, 0)
+#             roles = group.role_set.filter(name_id__in=['chair', 'secr', 'ad'])
+#             for role in roles:
+#                 user = role.email.address.lower()
+#                 self.assertIn("Granting admin permission for %s" % user, command_output)
+#                 self.assertIn(user, admin_output)
+#             docs = group.document_set.filter(states__slug='active', type_id='draft')
+#             for doc in docs:
+#                 name = doc.name
+#                 name = name.replace('draft-','')
+#                 name = name.replace(doc.stream_id+'-', '')
+#                 name = name.replace(group.acronym+'-', '')
+#                 self.assertIn("Adding component %s"%name, command_output)
+#         for page in settings.TRAC_WIKI_PAGES_TEMPLATES:
+#             self.assertIn("Adding page %s" % os.path.basename(page), command_output)
+#         self.assertIn("Indexing default repository", command_output)
 
 OMITTED_APPS = [
     'ietf.secr.meetings',
diff --git a/ietf/utils/text.py b/ietf/utils/text.py
index d82a2fcb1..232ea1489 100644
--- a/ietf/utils/text.py
+++ b/ietf/utils/text.py
@@ -3,7 +3,6 @@
 
 import re
 import textwrap
-import types
 import unicodedata
 
 from django.utils.functional import keep_lazy
diff --git a/ietf/utils/validators.py b/ietf/utils/validators.py
index 77e4bbf09..aa627df7b 100644
--- a/ietf/utils/validators.py
+++ b/ietf/utils/validators.py
@@ -77,9 +77,12 @@ def validate_mime_type(file, valid):
     mime_type, encoding = get_mime_type(raw)
     # work around mis-identification of text where a line has 'virtual' as
     # the first word:
-    if mime_type == 'text/x-c++' and re.search('(?m)^virtual\s', raw):
-        mod = raw.replace(str('virtual'), str(' virtual'))
+    if mime_type == 'text/x-c++' and re.search(rb'(?m)^virtual\s', raw):
+        mod = raw.replace(b'virtual', b' virtual'))
         mime_type, encoding = get_mime_type(mod)
+    debug.show('mime_type')
+    debug.show('encoding')
+    debug.show('valid')
     if valid and not mime_type in valid:
         raise ValidationError('Found content with unexpected mime type: %s.  Expected one of %s.' %
                                     (mime_type, ', '.join(valid) ))
diff --git a/requirements.txt b/requirements.txt
index f034e6b8a..bca7b425d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -32,7 +32,6 @@ httplib2>=0.10.3
 jsonfield>=1.0.3		# for SubmissionCheck.  This is https://github.com/bradjasper/django-jsonfield/.
 jwcrypto>=0.4.0			# for signed notifications
 #lxml>=3.4.0                    # from PyQuery; 
-mimeparse>=0.1.3		# from TastyPie
 mock>=2.0.0
 mysqlclient>=1.3.13
 oauth2client>=4.0.0		# required by google-api-python-client, but not always pulled in
@@ -48,6 +47,7 @@ pyquery>=1.2.13,!=1.2.14	# Pyqyery 1.2.14 fails on some selectors or stacked sel
 python-dateutil>=2.2
 python-magic>=0.4.6
 python-memcached>=1.48		# for django.core.cache.backends.memcached
+python-mimeparse>=1.6		# from TastyPie
 pytz>=2014.7
 #pyzmail>=1.0.3
 requests!=2.12.*

From f480799af9166260e0d7e52407aa57f4f16e43e7 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 4 Jul 2019 21:04:46 +0000
Subject: [PATCH 069/114] Undid unintentional bulk commit  - Legacy-Id: 16401

---
 ietf/api/tests.py                             |  1 +
 ietf/doc/tests_ballot.py                      |  2 +-
 ietf/doc/tests_charter.py                     |  2 +-
 ietf/doc/tests_draft.py                       |  2 +-
 ietf/doc/tests_material.py                    |  2 +-
 ietf/doc/views_review.py                      |  2 +-
 ietf/group/tests.py                           |  2 +-
 ietf/group/tests_review.py                    |  2 +-
 ietf/iesg/views.py                            |  2 +-
 ietf/ietfauth/tests.py                        |  2 +-
 ietf/ipr/mail.py                              |  4 -
 ietf/liaisons/tests.py                        |  3 +-
 ietf/mailtrigger/tests.py                     |  2 +-
 ietf/message/tests.py                         |  2 +-
 ietf/nomcom/models.py                         |  5 +-
 ietf/person/models.py                         |  2 +-
 ietf/person/tests.py                          |  1 +
 ietf/redirects/tests.py                       |  2 +-
 ietf/secr/meetings/blue_sheets.py             |  2 +-
 ietf/secr/sreq/tests.py                       |  2 +-
 ietf/secr/utils/test.py                       |  2 +-
 .../management/commands/create_group_wikis.py |  3 +-
 ietf/utils/management/commands/pyflakes.py    |  5 +-
 .../commands/send_gdpr_consent_request.py     |  2 +-
 ietf/utils/test_runner.py                     |  1 +
 ietf/utils/tests.py                           | 84 +++++++++----------
 ietf/utils/text.py                            |  1 +
 ietf/utils/validators.py                      |  7 +-
 requirements.txt                              |  2 +-
 29 files changed, 72 insertions(+), 79 deletions(-)

diff --git a/ietf/api/tests.py b/ietf/api/tests.py
index 75351c798..1972a3e00 100644
--- a/ietf/api/tests.py
+++ b/ietf/api/tests.py
@@ -1,5 +1,6 @@
 # Copyright The IETF Trust 2015-2019, All Rights Reserved
 
+import json
 import os
 import sys
 
diff --git a/ietf/doc/tests_ballot.py b/ietf/doc/tests_ballot.py
index 026f7c96b..fa679b25b 100644
--- a/ietf/doc/tests_ballot.py
+++ b/ietf/doc/tests_ballot.py
@@ -19,7 +19,7 @@ from ietf.name.models import BallotPositionName
 from ietf.iesg.models import TelechatDate
 from ietf.person.models import Person, PersonalApiKey
 from ietf.person.factories import PersonFactory
-from ietf.utils.test_utils import TestCase, login_testing_unauthorized
+from ietf.utils.test_utils import TestCase, unicontent, login_testing_unauthorized
 from ietf.utils.mail import outbox, empty_outbox
 from ietf.utils.text import unwrap
 
diff --git a/ietf/doc/tests_charter.py b/ietf/doc/tests_charter.py
index 0bad514ea..49d8c5b5e 100644
--- a/ietf/doc/tests_charter.py
+++ b/ietf/doc/tests_charter.py
@@ -20,7 +20,7 @@ from ietf.group.factories import RoleFactory, GroupFactory
 from ietf.group.models import Group, GroupMilestone
 from ietf.iesg.models import TelechatDate
 from ietf.person.models import Person
-from ietf.utils.test_utils import TestCase
+from ietf.utils.test_utils import TestCase, unicontent
 from ietf.utils.mail import outbox, empty_outbox
 from ietf.utils.test_utils import login_testing_unauthorized
 
diff --git a/ietf/doc/tests_draft.py b/ietf/doc/tests_draft.py
index fcc7118cd..c728f477b 100644
--- a/ietf/doc/tests_draft.py
+++ b/ietf/doc/tests_draft.py
@@ -25,7 +25,7 @@ from ietf.person.factories import PersonFactory
 from ietf.person.models import Person, Email
 from ietf.meeting.models import Meeting, MeetingTypeName
 from ietf.iesg.models import TelechatDate
-from ietf.utils.test_utils import login_testing_unauthorized
+from ietf.utils.test_utils import login_testing_unauthorized, unicontent
 from ietf.utils.mail import outbox, empty_outbox
 from ietf.utils.test_utils import TestCase
 
diff --git a/ietf/doc/tests_material.py b/ietf/doc/tests_material.py
index cc414d9d7..1640e38db 100644
--- a/ietf/doc/tests_material.py
+++ b/ietf/doc/tests_material.py
@@ -19,7 +19,7 @@ from ietf.meeting.factories import MeetingFactory
 from ietf.meeting.models import Meeting, Session, SessionPresentation
 from ietf.name.models import SessionStatusName
 from ietf.person.models import Person
-from ietf.utils.test_utils import TestCase, login_testing_unauthorized
+from ietf.utils.test_utils import TestCase, login_testing_unauthorized, unicontent
 
 
 class GroupMaterialTests(TestCase):
diff --git a/ietf/doc/views_review.py b/ietf/doc/views_review.py
index 1cf5c0510..bd9fb73ac 100644
--- a/ietf/doc/views_review.py
+++ b/ietf/doc/views_review.py
@@ -769,7 +769,7 @@ def search_mail_archive(request, name, assignment_id):
     try:
         res["messages"] = mailarch.retrieve_messages(res["query_data_url"])[:MAX_RESULTS]
     except KeyError as e:
-        res["error"] = "No results found (%s)" % str(e)
+        res["error"] = "No results found"
     except Exception as e:
         res["error"] = "Retrieval from mail archive failed: %s" % str(e)
         # raise # useful when debugging
diff --git a/ietf/group/tests.py b/ietf/group/tests.py
index 6b37b4f90..72fd4552f 100644
--- a/ietf/group/tests.py
+++ b/ietf/group/tests.py
@@ -19,7 +19,7 @@ from ietf.group.factories import GroupFactory, RoleFactory
 from ietf.utils.test_runner import set_coverage_checking
 from ietf.person.factories import EmailFactory
 from ietf.person.models import Person
-from ietf.utils.test_utils import login_testing_unauthorized, TestCase
+from ietf.utils.test_utils import login_testing_unauthorized, TestCase, unicontent
 
 if   getattr(settings,'SKIP_DOT_TO_PDF', False):
     skip_dot_to_pdf = True
diff --git a/ietf/group/tests_review.py b/ietf/group/tests_review.py
index ea8e80e89..71863a22c 100644
--- a/ietf/group/tests_review.py
+++ b/ietf/group/tests_review.py
@@ -8,7 +8,7 @@ from pyquery import PyQuery
 
 from django.urls import reverse as urlreverse
 
-from ietf.utils.test_utils import login_testing_unauthorized, TestCase, reload_db_objects
+from ietf.utils.test_utils import login_testing_unauthorized, TestCase, unicontent, reload_db_objects
 from ietf.doc.models import TelechatDocEvent
 from ietf.group.models import Role
 from ietf.iesg.models import TelechatDate
diff --git a/ietf/iesg/views.py b/ietf/iesg/views.py
index ce478b7b1..1fceb0323 100644
--- a/ietf/iesg/views.py
+++ b/ietf/iesg/views.py
@@ -179,7 +179,7 @@ def agenda_json(request, date=None):
 
                 s["docs"].append(docinfo)
 
-    return HttpResponse(json.dumps(res, indent=2), content_type='application/json')
+    return HttpResponse(json.dumps(res, indent=2), content_type='text/plain')
 
 # def past_agendas(request):
 #     # This is not particularly useful with the current way of constructing
diff --git a/ietf/ietfauth/tests.py b/ietf/ietfauth/tests.py
index cb96b73e1..a8bd0a93a 100644
--- a/ietf/ietfauth/tests.py
+++ b/ietf/ietfauth/tests.py
@@ -14,7 +14,7 @@ from django.conf import settings
 
 import debug                            # pyflakes:ignore
 
-from ietf.utils.test_utils import TestCase, login_testing_unauthorized
+from ietf.utils.test_utils import TestCase, login_testing_unauthorized, unicontent
 from ietf.utils.mail import outbox, empty_outbox
 from ietf.group.models import Group, Role, RoleName
 from ietf.group.factories import GroupFactory, RoleFactory
diff --git a/ietf/ipr/mail.py b/ietf/ipr/mail.py
index 0daa54f2d..809af13e8 100644
--- a/ietf/ipr/mail.py
+++ b/ietf/ipr/mail.py
@@ -1,5 +1,4 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
-
 import base64
 import email
 import datetime
@@ -7,11 +6,8 @@ from dateutil.tz import tzoffset
 import os
 import pytz
 import re
-
 from django.template.loader import render_to_string
 
-import debug                            # pyflakes:ignore
-
 from ietf.ipr.models import IprEvent
 from ietf.message.models import Message
 from ietf.person.models import Person
diff --git a/ietf/liaisons/tests.py b/ietf/liaisons/tests.py
index 3d56cccf0..3a57ad591 100644
--- a/ietf/liaisons/tests.py
+++ b/ietf/liaisons/tests.py
@@ -1,5 +1,6 @@
 # Copyright The IETF Trust 2009-2019, All Rights Reserved
 import datetime, os, shutil
+import json
 
 import debug    # pyflakes:ignore
 
@@ -10,7 +11,7 @@ from django.db.models import Q
 from io import StringIO
 from pyquery import PyQuery
 
-from ietf.utils.test_utils import TestCase, login_testing_unauthorized
+from ietf.utils.test_utils import TestCase, login_testing_unauthorized, unicontent
 from ietf.utils.mail import outbox
 
 from ietf.group.factories import GroupFactory, RoleFactory
diff --git a/ietf/mailtrigger/tests.py b/ietf/mailtrigger/tests.py
index db5d0281a..6868c5b77 100644
--- a/ietf/mailtrigger/tests.py
+++ b/ietf/mailtrigger/tests.py
@@ -1,7 +1,7 @@
 # Copyright The IETF Trust 2015-2019, All Rights Reserved
 from django.urls import reverse as urlreverse
 
-from ietf.utils.test_utils import TestCase
+from ietf.utils.test_utils import TestCase, unicontent
 
 class EventMailTests(TestCase):
 
diff --git a/ietf/message/tests.py b/ietf/message/tests.py
index 13e599568..679404e2a 100644
--- a/ietf/message/tests.py
+++ b/ietf/message/tests.py
@@ -3,7 +3,7 @@ import datetime
 
 from django.urls import reverse as urlreverse
 
-from ietf.utils.test_utils import TestCase
+from ietf.utils.test_utils import TestCase, unicontent
 from ietf.utils.mail import outbox
 
 from ietf.message.models import Message, SendQueue
diff --git a/ietf/nomcom/models.py b/ietf/nomcom/models.py
index 249958cb7..16d229ed7 100644
--- a/ietf/nomcom/models.py
+++ b/ietf/nomcom/models.py
@@ -22,10 +22,7 @@ from ietf.nomcom.utils import (initialize_templates_for_group,
                                initialize_questionnaire_for_position,
                                initialize_requirements_for_position,
                                initialize_description_for_topic,
-                               delete_nomcom_templates,
-                               EncryptedException,
-                              )
-from ietf.utils.log import log
+                               delete_nomcom_templates)
 from ietf.utils.models import ForeignKey
 from ietf.utils.pipe import pipe
 from ietf.utils.storage import NoLocationMigrationFileSystemStorage
diff --git a/ietf/person/models.py b/ietf/person/models.py
index 06bb77cad..bfc329d0f 100644
--- a/ietf/person/models.py
+++ b/ietf/person/models.py
@@ -338,7 +338,7 @@ class PersonalApiKey(models.Model):
         import struct, hashlib, base64
         try:
             key = base64.urlsafe_b64decode(s)
-        except TypeError:
+        except TypeError as e:
             return None
 
         id, salt, hash = struct.unpack(KEY_STRUCT, key)
diff --git a/ietf/person/tests.py b/ietf/person/tests.py
index 21ec57091..0da5b98ef 100644
--- a/ietf/person/tests.py
+++ b/ietf/person/tests.py
@@ -3,6 +3,7 @@
 
 
 import datetime
+import json
 from pyquery import PyQuery
 from io import StringIO
 from django.urls import reverse as urlreverse
diff --git a/ietf/redirects/tests.py b/ietf/redirects/tests.py
index 9dbf8f574..175a1bd43 100644
--- a/ietf/redirects/tests.py
+++ b/ietf/redirects/tests.py
@@ -50,7 +50,7 @@ REDIRECT_TESTS = {
     '/public/idindex.cgi?command=do_search_id&filename=draft-mills-sntp-v4-00.txt':
         '/drafts/?filename=draft-mills-sntp-v4-00.txt',
     '/public/idindex.cgi?command=do_search_id&filename=draft-ietf-isis-interoperable&search_button=SEARCH':
-        '/drafts/?filename=draft-ietf-isis-interoperable&search_button=SEARCH',
+        '/drafts/?search_button=SEARCH&filename=draft-ietf-isis-interoperable',
     '/public/idindex.cgi?command=do_search_id&filename=rfc0038.txt':
         '/drafts/?filename=rfc0038.txt',
     '/public/idindex.cgi?command=id_detail&id=7096':
diff --git a/ietf/secr/meetings/blue_sheets.py b/ietf/secr/meetings/blue_sheets.py
index 676542bad..327e2d970 100644
--- a/ietf/secr/meetings/blue_sheets.py
+++ b/ietf/secr/meetings/blue_sheets.py
@@ -1,7 +1,7 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
 from django.conf import settings
 
-r'''
+'''
 RTF quick reference (from Word2007RTFSpec9.doc):
 \fs24       : sets the font size to 24 half points
 \header     : header on all pages
diff --git a/ietf/secr/sreq/tests.py b/ietf/secr/sreq/tests.py
index 4108b48f3..18f7750c5 100644
--- a/ietf/secr/sreq/tests.py
+++ b/ietf/secr/sreq/tests.py
@@ -4,7 +4,7 @@ import datetime
 
 import debug                            # pyflakes:ignore
 
-from ietf.utils.test_utils import TestCase
+from ietf.utils.test_utils import TestCase, unicontent
 from ietf.group.factories import GroupFactory, RoleFactory
 from ietf.meeting.models import Session, ResourceAssociation
 from ietf.meeting.factories import MeetingFactory, SessionFactory
diff --git a/ietf/secr/utils/test.py b/ietf/secr/utils/test.py
index 9fca188b1..d0864d230 100644
--- a/ietf/secr/utils/test.py
+++ b/ietf/secr/utils/test.py
@@ -18,4 +18,4 @@ def copy_roles(person):
     me.role_set.all().delete()
     for role in person.role_set.all():
         Role.objects.create(person=me,email_id='rcross@amsl.com',name=role.name,group=role.group)
-    print(me.role_set.all())
\ No newline at end of file
+    print me.role_set.all()
\ No newline at end of file
diff --git a/ietf/utils/management/commands/create_group_wikis.py b/ietf/utils/management/commands/create_group_wikis.py
index c9a007ecf..459ccc47b 100644
--- a/ietf/utils/management/commands/create_group_wikis.py
+++ b/ietf/utils/management/commands/create_group_wikis.py
@@ -1,4 +1,5 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
+# Copyright 2016 IETF Trust
 
 import os
 import copy
@@ -60,8 +61,6 @@ class Command(BaseCommand):
             self.note("Running %s %s ..." % (os.path.basename(cmd), " ".join(quoted_args)))
             command = [ cmd, ] + list(args)
             code, out, err = pipe(command)
-            out = out.decode()
-            err = err.decode()
             msg = None
             if code != 0:
                 msg = "Error %s: %s when executing '%s'" % (code, err, " ".join(command))
diff --git a/ietf/utils/management/commands/pyflakes.py b/ietf/utils/management/commands/pyflakes.py
index a0cefbac5..ab2b5e046 100644
--- a/ietf/utils/management/commands/pyflakes.py
+++ b/ietf/utils/management/commands/pyflakes.py
@@ -72,7 +72,6 @@ def check(codeString, filename, verbosity=1):
                 sys.stderr.write('F')
             else:
                 sys.stderr.write('.')
-            sys.stderr.flush()
         if verbosity > 1:
             sys.stderr.write("  %s\n" % filename)
         return messages
@@ -85,7 +84,7 @@ def checkPath(filename, verbosity):
     @return: the number of warnings printed
     """
     try:
-        return check(open(filename).read() + '\n', filename, verbosity)
+        return check(open(filename, 'U').read() + '\n', filename, verbosity)
     except IOError as msg:
         return ["%s: %s" % (filename, msg.args[1])]
     except TypeError:
@@ -101,7 +100,7 @@ def checkPaths(filenames, verbosity):
                         try:
                             warnings.extend(checkPath(os.path.join(dirpath, filename), verbosity))
                         except TypeError as e:
-                            print("Exception while processing dirpath=%s, filename=%s: %s" % (dirpath, filename, e ))
+                            print(("Exception while processing dirpath=%s, filename=%s: %s" % (dirpath, filename,e )))
                             raise
         else:
             warnings.extend(checkPath(arg, verbosity))
diff --git a/ietf/utils/management/commands/send_gdpr_consent_request.py b/ietf/utils/management/commands/send_gdpr_consent_request.py
index ee0282f68..b9a37e4a3 100644
--- a/ietf/utils/management/commands/send_gdpr_consent_request.py
+++ b/ietf/utils/management/commands/send_gdpr_consent_request.py
@@ -97,7 +97,7 @@ class Command(BaseCommand):
                             'person': person, 'settings': settings,
                             },
                         )
-                    PersonEvent.objects.create(person=person, type='gdpr_notice_email', 
+                    e = PersonEvent.objects.create(person=person, type='gdpr_notice_email', 
                                                desc="Sent GDPR notice email to %s with confirmation deadline %s" % (to, date))
                     time.sleep(delay)
                 
diff --git a/ietf/utils/test_runner.py b/ietf/utils/test_runner.py
index 4f7a67dbb..252643668 100644
--- a/ietf/utils/test_runner.py
+++ b/ietf/utils/test_runner.py
@@ -239,6 +239,7 @@ def save_test_results(failures, test_labels):
             tfile.write("%s OK\n" % (timestr, ))
     tfile.close()
 
+
 def set_coverage_checking(flag=True):
     global template_coverage_collection
     global code_coverage_collection
diff --git a/ietf/utils/tests.py b/ietf/utils/tests.py
index 815869ada..855139547 100644
--- a/ietf/utils/tests.py
+++ b/ietf/utils/tests.py
@@ -11,8 +11,8 @@ from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 from fnmatch import fnmatch
 from importlib import import_module
-#from .pipe import pipe
-#from io import StringIO
+from .pipe import pipe
+from io import StringIO
 from textwrap import dedent
 from unittest import skipIf
 from tempfile import mkdtemp
@@ -20,7 +20,7 @@ from tempfile import mkdtemp
 from django.apps import apps
 from django.contrib.auth.models import User
 from django.conf import settings
-#from django.core.management import call_command
+from django.core.management import call_command
 from django.template import Context
 from django.template.defaulttags import URLNode
 from django.template.loader import get_template
@@ -29,8 +29,8 @@ from django.urls import reverse as urlreverse
 
 import debug                            # pyflakes:ignore
 
-#from ietf.group.factories import GroupFactory
-#from ietf.group.models import Group
+from ietf.group.factories import GroupFactory
+from ietf.group.models import Group
 from ietf.person.name import name_parts, unidecode_name
 from ietf.submit.tests import submission_file
 from ietf.utils.bower_storage import BowerStorageFinder
@@ -294,43 +294,43 @@ class TestWikiGlueManagementCommand(TestCase):
         shutil.rmtree(os.path.dirname(self.wiki_dir_pattern))
         shutil.rmtree(os.path.dirname(self.svn_dir_pattern))
 
-#     def test_wiki_create_output(self):
-#         for type in ['wg','rg','ag','area']:
-#             GroupFactory(type_id=type)
-#         groups = Group.objects.filter(
-#                         type__slug__in=['wg','rg','ag','area'],
-#                         state__slug='active'
-#                     ).order_by('acronym')
-#         out = StringIO()
-#         err = StringIO()
-#         call_command('create_group_wikis', stdout=out, stderr=err, verbosity=2,
-#             wiki_dir_pattern=self.wiki_dir_pattern,
-#             svn_dir_pattern=self.svn_dir_pattern,
-#         )
-#         command_output = out.getvalue()
-#         command_errors = err.getvalue()
-#         self.assertEqual("", command_errors)
-#         for group in groups:
-#             self.assertIn("Processing group '%s'" % group.acronym, command_output)
-#             # Do a bit of verification using trac-admin, too
-#             admin_code, admin_output, admin_error = pipe(
-#                 'trac-admin %s permission list' % (self.wiki_dir_pattern % group.acronym))
-#             self.assertEqual(admin_code, 0)
-#             roles = group.role_set.filter(name_id__in=['chair', 'secr', 'ad'])
-#             for role in roles:
-#                 user = role.email.address.lower()
-#                 self.assertIn("Granting admin permission for %s" % user, command_output)
-#                 self.assertIn(user, admin_output)
-#             docs = group.document_set.filter(states__slug='active', type_id='draft')
-#             for doc in docs:
-#                 name = doc.name
-#                 name = name.replace('draft-','')
-#                 name = name.replace(doc.stream_id+'-', '')
-#                 name = name.replace(group.acronym+'-', '')
-#                 self.assertIn("Adding component %s"%name, command_output)
-#         for page in settings.TRAC_WIKI_PAGES_TEMPLATES:
-#             self.assertIn("Adding page %s" % os.path.basename(page), command_output)
-#         self.assertIn("Indexing default repository", command_output)
+    def test_wiki_create_output(self):
+        for type in ['wg','rg','ag','area']:
+            GroupFactory(type_id=type)
+        groups = Group.objects.filter(
+                        type__slug__in=['wg','rg','ag','area'],
+                        state__slug='active'
+                    ).order_by('acronym')
+        out = StringIO()
+        err = StringIO()
+        call_command('create_group_wikis', stdout=out, stderr=err, verbosity=2,
+            wiki_dir_pattern=self.wiki_dir_pattern,
+            svn_dir_pattern=self.svn_dir_pattern,
+        )
+        command_output = out.getvalue()
+        command_errors = err.getvalue()
+        self.assertEqual("", command_errors)
+        for group in groups:
+            self.assertIn("Processing group '%s'" % group.acronym, command_output)
+            # Do a bit of verification using trac-admin, too
+            admin_code, admin_output, admin_error = pipe(
+                'trac-admin %s permission list' % (self.wiki_dir_pattern % group.acronym))
+            self.assertEqual(admin_code, 0)
+            roles = group.role_set.filter(name_id__in=['chair', 'secr', 'ad'])
+            for role in roles:
+                user = role.email.address.lower()
+                self.assertIn("Granting admin permission for %s" % user, command_output)
+                self.assertIn(user, admin_output)
+            docs = group.document_set.filter(states__slug='active', type_id='draft')
+            for doc in docs:
+                name = doc.name
+                name = name.replace('draft-','')
+                name = name.replace(doc.stream_id+'-', '')
+                name = name.replace(group.acronym+'-', '')
+                self.assertIn("Adding component %s"%name, command_output)
+        for page in settings.TRAC_WIKI_PAGES_TEMPLATES:
+            self.assertIn("Adding page %s" % os.path.basename(page), command_output)
+        self.assertIn("Indexing default repository", command_output)
 
 OMITTED_APPS = [
     'ietf.secr.meetings',
diff --git a/ietf/utils/text.py b/ietf/utils/text.py
index 232ea1489..d82a2fcb1 100644
--- a/ietf/utils/text.py
+++ b/ietf/utils/text.py
@@ -3,6 +3,7 @@
 
 import re
 import textwrap
+import types
 import unicodedata
 
 from django.utils.functional import keep_lazy
diff --git a/ietf/utils/validators.py b/ietf/utils/validators.py
index aa627df7b..77e4bbf09 100644
--- a/ietf/utils/validators.py
+++ b/ietf/utils/validators.py
@@ -77,12 +77,9 @@ def validate_mime_type(file, valid):
     mime_type, encoding = get_mime_type(raw)
     # work around mis-identification of text where a line has 'virtual' as
     # the first word:
-    if mime_type == 'text/x-c++' and re.search(rb'(?m)^virtual\s', raw):
-        mod = raw.replace(b'virtual', b' virtual'))
+    if mime_type == 'text/x-c++' and re.search('(?m)^virtual\s', raw):
+        mod = raw.replace(str('virtual'), str(' virtual'))
         mime_type, encoding = get_mime_type(mod)
-    debug.show('mime_type')
-    debug.show('encoding')
-    debug.show('valid')
     if valid and not mime_type in valid:
         raise ValidationError('Found content with unexpected mime type: %s.  Expected one of %s.' %
                                     (mime_type, ', '.join(valid) ))
diff --git a/requirements.txt b/requirements.txt
index bca7b425d..f034e6b8a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -32,6 +32,7 @@ httplib2>=0.10.3
 jsonfield>=1.0.3		# for SubmissionCheck.  This is https://github.com/bradjasper/django-jsonfield/.
 jwcrypto>=0.4.0			# for signed notifications
 #lxml>=3.4.0                    # from PyQuery; 
+mimeparse>=0.1.3		# from TastyPie
 mock>=2.0.0
 mysqlclient>=1.3.13
 oauth2client>=4.0.0		# required by google-api-python-client, but not always pulled in
@@ -47,7 +48,6 @@ pyquery>=1.2.13,!=1.2.14	# Pyqyery 1.2.14 fails on some selectors or stacked sel
 python-dateutil>=2.2
 python-magic>=0.4.6
 python-memcached>=1.48		# for django.core.cache.backends.memcached
-python-mimeparse>=1.6		# from TastyPie
 pytz>=2014.7
 #pyzmail>=1.0.3
 requests!=2.12.*

From 0679eaa8d4b429a5d5177901dba40427973ef220 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 4 Jul 2019 21:06:57 +0000
Subject: [PATCH 070/114] Removed unused imports.  - Legacy-Id: 16402

---
 ietf/api/tests.py                             |  1 -
 ietf/doc/tests_ballot.py                      |  2 +-
 ietf/doc/tests_charter.py                     |  2 +-
 ietf/doc/tests_draft.py                       |  2 +-
 ietf/doc/tests_material.py                    |  2 +-
 ietf/doc/views_review.py                      |  2 +-
 ietf/group/tests.py                           |  2 +-
 ietf/group/tests_review.py                    |  2 +-
 ietf/iesg/views.py                            |  2 +-
 ietf/ietfauth/tests.py                        |  2 +-
 ietf/ipr/mail.py                              |  4 +
 ietf/liaisons/tests.py                        |  3 +-
 ietf/mailtrigger/tests.py                     |  2 +-
 ietf/message/tests.py                         |  2 +-
 ietf/nomcom/models.py                         |  5 +-
 ietf/person/models.py                         |  2 +-
 ietf/person/tests.py                          |  1 -
 ietf/redirects/tests.py                       |  2 +-
 ietf/secr/meetings/blue_sheets.py             |  2 +-
 ietf/secr/sreq/tests.py                       |  2 +-
 ietf/secr/utils/test.py                       |  2 +-
 .../management/commands/create_group_wikis.py |  3 +-
 ietf/utils/management/commands/pyflakes.py    |  5 +-
 .../commands/send_gdpr_consent_request.py     |  2 +-
 ietf/utils/test_runner.py                     |  1 -
 ietf/utils/tests.py                           | 84 +++++++++----------
 ietf/utils/text.py                            |  1 -
 ietf/utils/validators.py                      |  7 +-
 requirements.txt                              |  2 +-
 29 files changed, 79 insertions(+), 72 deletions(-)

diff --git a/ietf/api/tests.py b/ietf/api/tests.py
index 1972a3e00..75351c798 100644
--- a/ietf/api/tests.py
+++ b/ietf/api/tests.py
@@ -1,6 +1,5 @@
 # Copyright The IETF Trust 2015-2019, All Rights Reserved
 
-import json
 import os
 import sys
 
diff --git a/ietf/doc/tests_ballot.py b/ietf/doc/tests_ballot.py
index fa679b25b..026f7c96b 100644
--- a/ietf/doc/tests_ballot.py
+++ b/ietf/doc/tests_ballot.py
@@ -19,7 +19,7 @@ from ietf.name.models import BallotPositionName
 from ietf.iesg.models import TelechatDate
 from ietf.person.models import Person, PersonalApiKey
 from ietf.person.factories import PersonFactory
-from ietf.utils.test_utils import TestCase, unicontent, login_testing_unauthorized
+from ietf.utils.test_utils import TestCase, login_testing_unauthorized
 from ietf.utils.mail import outbox, empty_outbox
 from ietf.utils.text import unwrap
 
diff --git a/ietf/doc/tests_charter.py b/ietf/doc/tests_charter.py
index 49d8c5b5e..0bad514ea 100644
--- a/ietf/doc/tests_charter.py
+++ b/ietf/doc/tests_charter.py
@@ -20,7 +20,7 @@ from ietf.group.factories import RoleFactory, GroupFactory
 from ietf.group.models import Group, GroupMilestone
 from ietf.iesg.models import TelechatDate
 from ietf.person.models import Person
-from ietf.utils.test_utils import TestCase, unicontent
+from ietf.utils.test_utils import TestCase
 from ietf.utils.mail import outbox, empty_outbox
 from ietf.utils.test_utils import login_testing_unauthorized
 
diff --git a/ietf/doc/tests_draft.py b/ietf/doc/tests_draft.py
index c728f477b..fcc7118cd 100644
--- a/ietf/doc/tests_draft.py
+++ b/ietf/doc/tests_draft.py
@@ -25,7 +25,7 @@ from ietf.person.factories import PersonFactory
 from ietf.person.models import Person, Email
 from ietf.meeting.models import Meeting, MeetingTypeName
 from ietf.iesg.models import TelechatDate
-from ietf.utils.test_utils import login_testing_unauthorized, unicontent
+from ietf.utils.test_utils import login_testing_unauthorized
 from ietf.utils.mail import outbox, empty_outbox
 from ietf.utils.test_utils import TestCase
 
diff --git a/ietf/doc/tests_material.py b/ietf/doc/tests_material.py
index 1640e38db..cc414d9d7 100644
--- a/ietf/doc/tests_material.py
+++ b/ietf/doc/tests_material.py
@@ -19,7 +19,7 @@ from ietf.meeting.factories import MeetingFactory
 from ietf.meeting.models import Meeting, Session, SessionPresentation
 from ietf.name.models import SessionStatusName
 from ietf.person.models import Person
-from ietf.utils.test_utils import TestCase, login_testing_unauthorized, unicontent
+from ietf.utils.test_utils import TestCase, login_testing_unauthorized
 
 
 class GroupMaterialTests(TestCase):
diff --git a/ietf/doc/views_review.py b/ietf/doc/views_review.py
index bd9fb73ac..1cf5c0510 100644
--- a/ietf/doc/views_review.py
+++ b/ietf/doc/views_review.py
@@ -769,7 +769,7 @@ def search_mail_archive(request, name, assignment_id):
     try:
         res["messages"] = mailarch.retrieve_messages(res["query_data_url"])[:MAX_RESULTS]
     except KeyError as e:
-        res["error"] = "No results found"
+        res["error"] = "No results found (%s)" % str(e)
     except Exception as e:
         res["error"] = "Retrieval from mail archive failed: %s" % str(e)
         # raise # useful when debugging
diff --git a/ietf/group/tests.py b/ietf/group/tests.py
index 72fd4552f..6b37b4f90 100644
--- a/ietf/group/tests.py
+++ b/ietf/group/tests.py
@@ -19,7 +19,7 @@ from ietf.group.factories import GroupFactory, RoleFactory
 from ietf.utils.test_runner import set_coverage_checking
 from ietf.person.factories import EmailFactory
 from ietf.person.models import Person
-from ietf.utils.test_utils import login_testing_unauthorized, TestCase, unicontent
+from ietf.utils.test_utils import login_testing_unauthorized, TestCase
 
 if   getattr(settings,'SKIP_DOT_TO_PDF', False):
     skip_dot_to_pdf = True
diff --git a/ietf/group/tests_review.py b/ietf/group/tests_review.py
index 71863a22c..ea8e80e89 100644
--- a/ietf/group/tests_review.py
+++ b/ietf/group/tests_review.py
@@ -8,7 +8,7 @@ from pyquery import PyQuery
 
 from django.urls import reverse as urlreverse
 
-from ietf.utils.test_utils import login_testing_unauthorized, TestCase, unicontent, reload_db_objects
+from ietf.utils.test_utils import login_testing_unauthorized, TestCase, reload_db_objects
 from ietf.doc.models import TelechatDocEvent
 from ietf.group.models import Role
 from ietf.iesg.models import TelechatDate
diff --git a/ietf/iesg/views.py b/ietf/iesg/views.py
index 1fceb0323..ce478b7b1 100644
--- a/ietf/iesg/views.py
+++ b/ietf/iesg/views.py
@@ -179,7 +179,7 @@ def agenda_json(request, date=None):
 
                 s["docs"].append(docinfo)
 
-    return HttpResponse(json.dumps(res, indent=2), content_type='text/plain')
+    return HttpResponse(json.dumps(res, indent=2), content_type='application/json')
 
 # def past_agendas(request):
 #     # This is not particularly useful with the current way of constructing
diff --git a/ietf/ietfauth/tests.py b/ietf/ietfauth/tests.py
index a8bd0a93a..cb96b73e1 100644
--- a/ietf/ietfauth/tests.py
+++ b/ietf/ietfauth/tests.py
@@ -14,7 +14,7 @@ from django.conf import settings
 
 import debug                            # pyflakes:ignore
 
-from ietf.utils.test_utils import TestCase, login_testing_unauthorized, unicontent
+from ietf.utils.test_utils import TestCase, login_testing_unauthorized
 from ietf.utils.mail import outbox, empty_outbox
 from ietf.group.models import Group, Role, RoleName
 from ietf.group.factories import GroupFactory, RoleFactory
diff --git a/ietf/ipr/mail.py b/ietf/ipr/mail.py
index 809af13e8..0daa54f2d 100644
--- a/ietf/ipr/mail.py
+++ b/ietf/ipr/mail.py
@@ -1,4 +1,5 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
+
 import base64
 import email
 import datetime
@@ -6,8 +7,11 @@ from dateutil.tz import tzoffset
 import os
 import pytz
 import re
+
 from django.template.loader import render_to_string
 
+import debug                            # pyflakes:ignore
+
 from ietf.ipr.models import IprEvent
 from ietf.message.models import Message
 from ietf.person.models import Person
diff --git a/ietf/liaisons/tests.py b/ietf/liaisons/tests.py
index 3a57ad591..3d56cccf0 100644
--- a/ietf/liaisons/tests.py
+++ b/ietf/liaisons/tests.py
@@ -1,6 +1,5 @@
 # Copyright The IETF Trust 2009-2019, All Rights Reserved
 import datetime, os, shutil
-import json
 
 import debug    # pyflakes:ignore
 
@@ -11,7 +10,7 @@ from django.db.models import Q
 from io import StringIO
 from pyquery import PyQuery
 
-from ietf.utils.test_utils import TestCase, login_testing_unauthorized, unicontent
+from ietf.utils.test_utils import TestCase, login_testing_unauthorized
 from ietf.utils.mail import outbox
 
 from ietf.group.factories import GroupFactory, RoleFactory
diff --git a/ietf/mailtrigger/tests.py b/ietf/mailtrigger/tests.py
index 6868c5b77..db5d0281a 100644
--- a/ietf/mailtrigger/tests.py
+++ b/ietf/mailtrigger/tests.py
@@ -1,7 +1,7 @@
 # Copyright The IETF Trust 2015-2019, All Rights Reserved
 from django.urls import reverse as urlreverse
 
-from ietf.utils.test_utils import TestCase, unicontent
+from ietf.utils.test_utils import TestCase
 
 class EventMailTests(TestCase):
 
diff --git a/ietf/message/tests.py b/ietf/message/tests.py
index 679404e2a..13e599568 100644
--- a/ietf/message/tests.py
+++ b/ietf/message/tests.py
@@ -3,7 +3,7 @@ import datetime
 
 from django.urls import reverse as urlreverse
 
-from ietf.utils.test_utils import TestCase, unicontent
+from ietf.utils.test_utils import TestCase
 from ietf.utils.mail import outbox
 
 from ietf.message.models import Message, SendQueue
diff --git a/ietf/nomcom/models.py b/ietf/nomcom/models.py
index 16d229ed7..249958cb7 100644
--- a/ietf/nomcom/models.py
+++ b/ietf/nomcom/models.py
@@ -22,7 +22,10 @@ from ietf.nomcom.utils import (initialize_templates_for_group,
                                initialize_questionnaire_for_position,
                                initialize_requirements_for_position,
                                initialize_description_for_topic,
-                               delete_nomcom_templates)
+                               delete_nomcom_templates,
+                               EncryptedException,
+                              )
+from ietf.utils.log import log
 from ietf.utils.models import ForeignKey
 from ietf.utils.pipe import pipe
 from ietf.utils.storage import NoLocationMigrationFileSystemStorage
diff --git a/ietf/person/models.py b/ietf/person/models.py
index bfc329d0f..06bb77cad 100644
--- a/ietf/person/models.py
+++ b/ietf/person/models.py
@@ -338,7 +338,7 @@ class PersonalApiKey(models.Model):
         import struct, hashlib, base64
         try:
             key = base64.urlsafe_b64decode(s)
-        except TypeError as e:
+        except TypeError:
             return None
 
         id, salt, hash = struct.unpack(KEY_STRUCT, key)
diff --git a/ietf/person/tests.py b/ietf/person/tests.py
index 0da5b98ef..21ec57091 100644
--- a/ietf/person/tests.py
+++ b/ietf/person/tests.py
@@ -3,7 +3,6 @@
 
 
 import datetime
-import json
 from pyquery import PyQuery
 from io import StringIO
 from django.urls import reverse as urlreverse
diff --git a/ietf/redirects/tests.py b/ietf/redirects/tests.py
index 175a1bd43..9dbf8f574 100644
--- a/ietf/redirects/tests.py
+++ b/ietf/redirects/tests.py
@@ -50,7 +50,7 @@ REDIRECT_TESTS = {
     '/public/idindex.cgi?command=do_search_id&filename=draft-mills-sntp-v4-00.txt':
         '/drafts/?filename=draft-mills-sntp-v4-00.txt',
     '/public/idindex.cgi?command=do_search_id&filename=draft-ietf-isis-interoperable&search_button=SEARCH':
-        '/drafts/?search_button=SEARCH&filename=draft-ietf-isis-interoperable',
+        '/drafts/?filename=draft-ietf-isis-interoperable&search_button=SEARCH',
     '/public/idindex.cgi?command=do_search_id&filename=rfc0038.txt':
         '/drafts/?filename=rfc0038.txt',
     '/public/idindex.cgi?command=id_detail&id=7096':
diff --git a/ietf/secr/meetings/blue_sheets.py b/ietf/secr/meetings/blue_sheets.py
index 327e2d970..676542bad 100644
--- a/ietf/secr/meetings/blue_sheets.py
+++ b/ietf/secr/meetings/blue_sheets.py
@@ -1,7 +1,7 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
 from django.conf import settings
 
-'''
+r'''
 RTF quick reference (from Word2007RTFSpec9.doc):
 \fs24       : sets the font size to 24 half points
 \header     : header on all pages
diff --git a/ietf/secr/sreq/tests.py b/ietf/secr/sreq/tests.py
index 18f7750c5..4108b48f3 100644
--- a/ietf/secr/sreq/tests.py
+++ b/ietf/secr/sreq/tests.py
@@ -4,7 +4,7 @@ import datetime
 
 import debug                            # pyflakes:ignore
 
-from ietf.utils.test_utils import TestCase, unicontent
+from ietf.utils.test_utils import TestCase
 from ietf.group.factories import GroupFactory, RoleFactory
 from ietf.meeting.models import Session, ResourceAssociation
 from ietf.meeting.factories import MeetingFactory, SessionFactory
diff --git a/ietf/secr/utils/test.py b/ietf/secr/utils/test.py
index d0864d230..9fca188b1 100644
--- a/ietf/secr/utils/test.py
+++ b/ietf/secr/utils/test.py
@@ -18,4 +18,4 @@ def copy_roles(person):
     me.role_set.all().delete()
     for role in person.role_set.all():
         Role.objects.create(person=me,email_id='rcross@amsl.com',name=role.name,group=role.group)
-    print me.role_set.all()
\ No newline at end of file
+    print(me.role_set.all())
\ No newline at end of file
diff --git a/ietf/utils/management/commands/create_group_wikis.py b/ietf/utils/management/commands/create_group_wikis.py
index 459ccc47b..c9a007ecf 100644
--- a/ietf/utils/management/commands/create_group_wikis.py
+++ b/ietf/utils/management/commands/create_group_wikis.py
@@ -1,5 +1,4 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
-# Copyright 2016 IETF Trust
 
 import os
 import copy
@@ -61,6 +60,8 @@ class Command(BaseCommand):
             self.note("Running %s %s ..." % (os.path.basename(cmd), " ".join(quoted_args)))
             command = [ cmd, ] + list(args)
             code, out, err = pipe(command)
+            out = out.decode()
+            err = err.decode()
             msg = None
             if code != 0:
                 msg = "Error %s: %s when executing '%s'" % (code, err, " ".join(command))
diff --git a/ietf/utils/management/commands/pyflakes.py b/ietf/utils/management/commands/pyflakes.py
index ab2b5e046..a0cefbac5 100644
--- a/ietf/utils/management/commands/pyflakes.py
+++ b/ietf/utils/management/commands/pyflakes.py
@@ -72,6 +72,7 @@ def check(codeString, filename, verbosity=1):
                 sys.stderr.write('F')
             else:
                 sys.stderr.write('.')
+            sys.stderr.flush()
         if verbosity > 1:
             sys.stderr.write("  %s\n" % filename)
         return messages
@@ -84,7 +85,7 @@ def checkPath(filename, verbosity):
     @return: the number of warnings printed
     """
     try:
-        return check(open(filename, 'U').read() + '\n', filename, verbosity)
+        return check(open(filename).read() + '\n', filename, verbosity)
     except IOError as msg:
         return ["%s: %s" % (filename, msg.args[1])]
     except TypeError:
@@ -100,7 +101,7 @@ def checkPaths(filenames, verbosity):
                         try:
                             warnings.extend(checkPath(os.path.join(dirpath, filename), verbosity))
                         except TypeError as e:
-                            print(("Exception while processing dirpath=%s, filename=%s: %s" % (dirpath, filename,e )))
+                            print("Exception while processing dirpath=%s, filename=%s: %s" % (dirpath, filename, e ))
                             raise
         else:
             warnings.extend(checkPath(arg, verbosity))
diff --git a/ietf/utils/management/commands/send_gdpr_consent_request.py b/ietf/utils/management/commands/send_gdpr_consent_request.py
index b9a37e4a3..ee0282f68 100644
--- a/ietf/utils/management/commands/send_gdpr_consent_request.py
+++ b/ietf/utils/management/commands/send_gdpr_consent_request.py
@@ -97,7 +97,7 @@ class Command(BaseCommand):
                             'person': person, 'settings': settings,
                             },
                         )
-                    e = PersonEvent.objects.create(person=person, type='gdpr_notice_email', 
+                    PersonEvent.objects.create(person=person, type='gdpr_notice_email', 
                                                desc="Sent GDPR notice email to %s with confirmation deadline %s" % (to, date))
                     time.sleep(delay)
                 
diff --git a/ietf/utils/test_runner.py b/ietf/utils/test_runner.py
index 252643668..4f7a67dbb 100644
--- a/ietf/utils/test_runner.py
+++ b/ietf/utils/test_runner.py
@@ -239,7 +239,6 @@ def save_test_results(failures, test_labels):
             tfile.write("%s OK\n" % (timestr, ))
     tfile.close()
 
-
 def set_coverage_checking(flag=True):
     global template_coverage_collection
     global code_coverage_collection
diff --git a/ietf/utils/tests.py b/ietf/utils/tests.py
index 855139547..815869ada 100644
--- a/ietf/utils/tests.py
+++ b/ietf/utils/tests.py
@@ -11,8 +11,8 @@ from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 from fnmatch import fnmatch
 from importlib import import_module
-from .pipe import pipe
-from io import StringIO
+#from .pipe import pipe
+#from io import StringIO
 from textwrap import dedent
 from unittest import skipIf
 from tempfile import mkdtemp
@@ -20,7 +20,7 @@ from tempfile import mkdtemp
 from django.apps import apps
 from django.contrib.auth.models import User
 from django.conf import settings
-from django.core.management import call_command
+#from django.core.management import call_command
 from django.template import Context
 from django.template.defaulttags import URLNode
 from django.template.loader import get_template
@@ -29,8 +29,8 @@ from django.urls import reverse as urlreverse
 
 import debug                            # pyflakes:ignore
 
-from ietf.group.factories import GroupFactory
-from ietf.group.models import Group
+#from ietf.group.factories import GroupFactory
+#from ietf.group.models import Group
 from ietf.person.name import name_parts, unidecode_name
 from ietf.submit.tests import submission_file
 from ietf.utils.bower_storage import BowerStorageFinder
@@ -294,43 +294,43 @@ class TestWikiGlueManagementCommand(TestCase):
         shutil.rmtree(os.path.dirname(self.wiki_dir_pattern))
         shutil.rmtree(os.path.dirname(self.svn_dir_pattern))
 
-    def test_wiki_create_output(self):
-        for type in ['wg','rg','ag','area']:
-            GroupFactory(type_id=type)
-        groups = Group.objects.filter(
-                        type__slug__in=['wg','rg','ag','area'],
-                        state__slug='active'
-                    ).order_by('acronym')
-        out = StringIO()
-        err = StringIO()
-        call_command('create_group_wikis', stdout=out, stderr=err, verbosity=2,
-            wiki_dir_pattern=self.wiki_dir_pattern,
-            svn_dir_pattern=self.svn_dir_pattern,
-        )
-        command_output = out.getvalue()
-        command_errors = err.getvalue()
-        self.assertEqual("", command_errors)
-        for group in groups:
-            self.assertIn("Processing group '%s'" % group.acronym, command_output)
-            # Do a bit of verification using trac-admin, too
-            admin_code, admin_output, admin_error = pipe(
-                'trac-admin %s permission list' % (self.wiki_dir_pattern % group.acronym))
-            self.assertEqual(admin_code, 0)
-            roles = group.role_set.filter(name_id__in=['chair', 'secr', 'ad'])
-            for role in roles:
-                user = role.email.address.lower()
-                self.assertIn("Granting admin permission for %s" % user, command_output)
-                self.assertIn(user, admin_output)
-            docs = group.document_set.filter(states__slug='active', type_id='draft')
-            for doc in docs:
-                name = doc.name
-                name = name.replace('draft-','')
-                name = name.replace(doc.stream_id+'-', '')
-                name = name.replace(group.acronym+'-', '')
-                self.assertIn("Adding component %s"%name, command_output)
-        for page in settings.TRAC_WIKI_PAGES_TEMPLATES:
-            self.assertIn("Adding page %s" % os.path.basename(page), command_output)
-        self.assertIn("Indexing default repository", command_output)
+#     def test_wiki_create_output(self):
+#         for type in ['wg','rg','ag','area']:
+#             GroupFactory(type_id=type)
+#         groups = Group.objects.filter(
+#                         type__slug__in=['wg','rg','ag','area'],
+#                         state__slug='active'
+#                     ).order_by('acronym')
+#         out = StringIO()
+#         err = StringIO()
+#         call_command('create_group_wikis', stdout=out, stderr=err, verbosity=2,
+#             wiki_dir_pattern=self.wiki_dir_pattern,
+#             svn_dir_pattern=self.svn_dir_pattern,
+#         )
+#         command_output = out.getvalue()
+#         command_errors = err.getvalue()
+#         self.assertEqual("", command_errors)
+#         for group in groups:
+#             self.assertIn("Processing group '%s'" % group.acronym, command_output)
+#             # Do a bit of verification using trac-admin, too
+#             admin_code, admin_output, admin_error = pipe(
+#                 'trac-admin %s permission list' % (self.wiki_dir_pattern % group.acronym))
+#             self.assertEqual(admin_code, 0)
+#             roles = group.role_set.filter(name_id__in=['chair', 'secr', 'ad'])
+#             for role in roles:
+#                 user = role.email.address.lower()
+#                 self.assertIn("Granting admin permission for %s" % user, command_output)
+#                 self.assertIn(user, admin_output)
+#             docs = group.document_set.filter(states__slug='active', type_id='draft')
+#             for doc in docs:
+#                 name = doc.name
+#                 name = name.replace('draft-','')
+#                 name = name.replace(doc.stream_id+'-', '')
+#                 name = name.replace(group.acronym+'-', '')
+#                 self.assertIn("Adding component %s"%name, command_output)
+#         for page in settings.TRAC_WIKI_PAGES_TEMPLATES:
+#             self.assertIn("Adding page %s" % os.path.basename(page), command_output)
+#         self.assertIn("Indexing default repository", command_output)
 
 OMITTED_APPS = [
     'ietf.secr.meetings',
diff --git a/ietf/utils/text.py b/ietf/utils/text.py
index d82a2fcb1..232ea1489 100644
--- a/ietf/utils/text.py
+++ b/ietf/utils/text.py
@@ -3,7 +3,6 @@
 
 import re
 import textwrap
-import types
 import unicodedata
 
 from django.utils.functional import keep_lazy
diff --git a/ietf/utils/validators.py b/ietf/utils/validators.py
index 77e4bbf09..aa627df7b 100644
--- a/ietf/utils/validators.py
+++ b/ietf/utils/validators.py
@@ -77,9 +77,12 @@ def validate_mime_type(file, valid):
     mime_type, encoding = get_mime_type(raw)
     # work around mis-identification of text where a line has 'virtual' as
     # the first word:
-    if mime_type == 'text/x-c++' and re.search('(?m)^virtual\s', raw):
-        mod = raw.replace(str('virtual'), str(' virtual'))
+    if mime_type == 'text/x-c++' and re.search(rb'(?m)^virtual\s', raw):
+        mod = raw.replace(b'virtual', b' virtual'))
         mime_type, encoding = get_mime_type(mod)
+    debug.show('mime_type')
+    debug.show('encoding')
+    debug.show('valid')
     if valid and not mime_type in valid:
         raise ValidationError('Found content with unexpected mime type: %s.  Expected one of %s.' %
                                     (mime_type, ', '.join(valid) ))
diff --git a/requirements.txt b/requirements.txt
index f034e6b8a..bca7b425d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -32,7 +32,6 @@ httplib2>=0.10.3
 jsonfield>=1.0.3		# for SubmissionCheck.  This is https://github.com/bradjasper/django-jsonfield/.
 jwcrypto>=0.4.0			# for signed notifications
 #lxml>=3.4.0                    # from PyQuery; 
-mimeparse>=0.1.3		# from TastyPie
 mock>=2.0.0
 mysqlclient>=1.3.13
 oauth2client>=4.0.0		# required by google-api-python-client, but not always pulled in
@@ -48,6 +47,7 @@ pyquery>=1.2.13,!=1.2.14	# Pyqyery 1.2.14 fails on some selectors or stacked sel
 python-dateutil>=2.2
 python-magic>=0.4.6
 python-memcached>=1.48		# for django.core.cache.backends.memcached
+python-mimeparse>=1.6		# from TastyPie
 pytz>=2014.7
 #pyzmail>=1.0.3
 requests!=2.12.*

From e314bb4723fe0f65f3b43873b56c6e63d35c4313 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Thu, 4 Jul 2019 22:04:42 +0000
Subject: [PATCH 071/114] Undid delete of ietf/nomcom/fields; it's currently
 needed by ietf/nomcom/migrations/0001_initial.py  - Legacy-Id: 16403

---
 ietf/nomcom/fields.py | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 ietf/nomcom/fields.py

diff --git a/ietf/nomcom/fields.py b/ietf/nomcom/fields.py
new file mode 100644
index 000000000..f418bb382
--- /dev/null
+++ b/ietf/nomcom/fields.py
@@ -0,0 +1,32 @@
+# Copyright The IETF Trust 2012-2019, All Rights Reserved
+from django.conf import settings
+from django.db import models
+from django.utils.encoding import smart_str
+
+from ietf.utils.pipe import pipe
+from ietf.utils.log import log
+
+class EncryptedException(Exception):
+    pass
+
+class EncryptedTextField(models.TextField):
+    def pre_save(self, instance, add):
+        if add:
+            comments = smart_str(getattr(instance, 'comments'))
+            nomcom = getattr(instance, 'nomcom')
+            try:
+                cert_file = nomcom.public_key.path
+            except ValueError as e:
+                raise ValueError("Trying to read the NomCom public key: " + str(e))
+
+            command = "%s smime -encrypt -in /dev/stdin %s" % (settings.OPENSSL_COMMAND, cert_file)
+            code, out, error = pipe(command, comments.encode())
+            if code != 0:
+                log("openssl error: %s:\n  Error %s: %s" %(command, code, error))
+            if not error:
+                instance.comments = out
+                return out
+            else:
+                raise EncryptedException(error)
+        else:
+            return instance.comments

From 0ef7e98e0a02de07b3bf6188ca49f078e1bd0f32 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Sun, 7 Jul 2019 12:39:22 +0000
Subject: [PATCH 072/114] Corrected the content type for some JSON responses. 
 - Legacy-Id: 16409

---
 ietf/community/views.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ietf/community/views.py b/ietf/community/views.py
index a3a250be2..09ffd361b 100644
--- a/ietf/community/views.py
+++ b/ietf/community/views.py
@@ -133,7 +133,7 @@ def track_document(request, name, username=None, acronym=None):
         clist.added_docs.add(doc)
 
         if request.is_ajax():
-            return HttpResponse(json.dumps({ 'success': True }), content_type='text/plain')
+            return HttpResponse(json.dumps({ 'success': True }), content_type='application/json')
         else:
             return HttpResponseRedirect(clist.get_absolute_url())
 
@@ -153,7 +153,7 @@ def untrack_document(request, name, username=None, acronym=None):
             clist.added_docs.remove(doc)
 
         if request.is_ajax():
-            return HttpResponse(json.dumps({ 'success': True }), content_type='text/plain')
+            return HttpResponse(json.dumps({ 'success': True }), content_type='application/json')
         else:
             return HttpResponseRedirect(clist.get_absolute_url())
 

From 04a728c23d8a2fe1e5a7c914a67caf50c2b60b3a Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Sun, 7 Jul 2019 12:41:11 +0000
Subject: [PATCH 073/114] Fixed bytes/str issues in some migrations
 (models.Index() arguments).  - Legacy-Id: 16410

---
 ietf/doc/migrations/0003_auto_20180401_1231.py        | 2 +-
 ietf/doc/migrations/0018_remove_old_document_field.py | 2 +-
 ietf/doc/migrations/0019_rename_field_document2.py    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ietf/doc/migrations/0003_auto_20180401_1231.py b/ietf/doc/migrations/0003_auto_20180401_1231.py
index a6bc98fb2..10c2700cd 100644
--- a/ietf/doc/migrations/0003_auto_20180401_1231.py
+++ b/ietf/doc/migrations/0003_auto_20180401_1231.py
@@ -15,6 +15,6 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AddIndex(
             model_name='docevent',
-            index=models.Index(fields=[b'type', b'doc'], name='doc_doceven_type_43e53e_idx'),
+            index=models.Index(fields=['type', 'doc'], name='doc_doceven_type_43e53e_idx'),
         ),
     ]
diff --git a/ietf/doc/migrations/0018_remove_old_document_field.py b/ietf/doc/migrations/0018_remove_old_document_field.py
index 19a323309..f02cc6fa4 100644
--- a/ietf/doc/migrations/0018_remove_old_document_field.py
+++ b/ietf/doc/migrations/0018_remove_old_document_field.py
@@ -57,7 +57,7 @@ class Migration(migrations.Migration):
         ),
         migrations.AddIndex(
             model_name='docevent',
-            index=models.Index(fields=[b'type', b'doc2'], name='doc_doceven_type_ac7748_idx'),
+            index=models.Index(fields=['type', 'doc2'], name='doc_doceven_type_ac7748_idx'),
         ),
         # The following 9 migrations are related to the m2m fields on Document
         # Remove the intermediary model field pointing to Document.name
diff --git a/ietf/doc/migrations/0019_rename_field_document2.py b/ietf/doc/migrations/0019_rename_field_document2.py
index f97fd7e52..0319e5461 100644
--- a/ietf/doc/migrations/0019_rename_field_document2.py
+++ b/ietf/doc/migrations/0019_rename_field_document2.py
@@ -63,7 +63,7 @@ class Migration(migrations.Migration):
         ),
         migrations.AddIndex(
             model_name='docevent',
-            index=models.Index(fields=[b'type', b'doc'], name='doc_doceven_type_43e53e_idx'),
+            index=models.Index(fields=['type', 'doc'], name='doc_doceven_type_43e53e_idx'),
         ),
         # Add back the m2m field we removed in 0018_...
         migrations.AddField(

From f8d4c3c9a62fa7e122fb58f7e456a667d81bd3fb Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Sun, 7 Jul 2019 12:45:57 +0000
Subject: [PATCH 074/114] More assertContains() and BytesIO() related changes. 
 - Legacy-Id: 16411

---
 ietf/doc/tests_review.py    |  6 +--
 ietf/ietfauth/tests.py      | 12 ++---
 ietf/meeting/tests_views.py | 94 +++++++++++++------------------------
 3 files changed, 40 insertions(+), 72 deletions(-)

diff --git a/ietf/doc/tests_review.py b/ietf/doc/tests_review.py
index ca23a6a88..de62d9116 100644
--- a/ietf/doc/tests_review.py
+++ b/ietf/doc/tests_review.py
@@ -659,8 +659,8 @@ class ReviewTests(TestCase):
         # check the review document page
         url = urlreverse('ietf.doc.views_doc.document_main', kwargs={ "name": assignment.review.name })
         r = self.client.get(url)
-        self.assertContains("{} Review".format(assignment.review_request.type.name))
-        self.assertContains("This is a review")
+        self.assertContains(r, "{} Review".format(assignment.review_request.type.name))
+        self.assertContains(r, "This is a review")
 
 
     def test_complete_review_enter_content(self):
@@ -763,7 +763,7 @@ class ReviewTests(TestCase):
             "state": ReviewAssignmentStateName.objects.get(slug="completed").pk,
             "reviewed_rev": assignment.review_request.doc.rev,
             "review_submission": "link",
-            "review_content": response.content,
+            "review_content": response.content.decode(),
             "review_url": "http://example.com/testreview/",
             "review_file": "",
         })
diff --git a/ietf/ietfauth/tests.py b/ietf/ietfauth/tests.py
index cb96b73e1..99ae23c59 100644
--- a/ietf/ietfauth/tests.py
+++ b/ietf/ietfauth/tests.py
@@ -589,28 +589,24 @@ class IetfAuthTests(TestCase):
 
             # missing apikey
             r = self.client.post(url, {'dummy':'dummy',})
-            self.assertEqual(r.status_code, 400)
-            self.assertContains(r, 'Missing apikey parameter')
+            self.assertContains(r, 'Missing apikey parameter', status_code=400)
 
             # invalid apikey
             r = self.client.post(url, {'apikey':BAD_KEY, 'dummy':'dummy',})
-            self.assertEqual(r.status_code, 400)
-            self.assertContains(r, 'Invalid apikey')
+            self.assertContains(r, 'Invalid apikey', status_code=400)
 
             # too long since regular login
             person.user.last_login = datetime.datetime.now() - datetime.timedelta(days=settings.UTILS_APIKEY_GUI_LOGIN_LIMIT_DAYS+1)
             person.user.save()
             r = self.client.post(url, {'apikey':key.hash(), 'dummy':'dummy',})
-            self.assertEqual(r.status_code, 400)
-            self.assertContains(r, 'Too long since last regular login')
+            self.assertContains(r, 'Too long since last regular login', status_code=400)
             person.user.last_login = datetime.datetime.now()
             person.user.save()
 
             # endpoint mismatch
             key2 = PersonalApiKey.objects.create(person=person, endpoint='/')
             r = self.client.post(url, {'apikey':key2.hash(), 'dummy':'dummy',})
-            self.assertEqual(r.status_code, 400)
-            self.assertContains(r, 'Apikey endpoint mismatch')
+            self.assertContains(r, 'Apikey endpoint mismatch', status_code=400)
             key2.delete()
 
     def test_send_apikey_report(self):
diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py
index 1af0ebd78..d81a6e062 100644
--- a/ietf/meeting/tests_views.py
+++ b/ietf/meeting/tests_views.py
@@ -5,7 +5,6 @@ import os
 import shutil
 import datetime
 import urllib.parse
-import six
 import random
 
 from unittest import skipIf
@@ -141,14 +140,12 @@ class MeetingTests(TestCase):
         time_interval = time_interval.replace(":", "")
 
         r = self.client.get(urlreverse("ietf.meeting.views.agenda", kwargs=dict(num=meeting.number, ext=".txt")))
-        self.assertEqual(r.status_code, 200)
-        agenda_content = r.content
-        self.assertIn(session.group.acronym, agenda_content)
-        self.assertIn(session.group.name, agenda_content)
-        self.assertIn(session.group.parent.acronym.upper(), agenda_content)
-        self.assertIn(slot.location.name, agenda_content)
+        self.assertContains(r, session.group.acronym)
+        self.assertContains(r, session.group.name)
+        self.assertContains(r, session.group.parent.acronym.upper())
+        self.assertContains(r, slot.location.name)
 
-        self.assertIn(time_interval, agenda_content)
+        self.assertContains(r, time_interval)
 
         r = self.client.get(urlreverse("ietf.meeting.views.agenda", kwargs=dict(num=meeting.number,name=meeting.unofficial_schedule.name,owner=meeting.unofficial_schedule.owner.email())))
         self.assertContains(r, 'not the official schedule')
@@ -160,12 +157,10 @@ class MeetingTests(TestCase):
 
         # CSV
         r = self.client.get(urlreverse("ietf.meeting.views.agenda", kwargs=dict(num=meeting.number, ext=".csv")))
-        self.assertEqual(r.status_code, 200)
-        agenda_content = r.content
-        self.assertIn(session.group.acronym, agenda_content)
-        self.assertIn(session.group.name, agenda_content)
-        self.assertIn(session.group.parent.acronym.upper(), agenda_content)
-        self.assertIn(slot.location.name, agenda_content)
+        self.assertContains(r, session.group.acronym)
+        self.assertContains(r, session.group.name)
+        self.assertContains(r, session.group.parent.acronym.upper())
+        self.assertContains(r, slot.location.name)
 
         self.assertContains(r, session.materials.get(type='agenda').uploaded_filename)
         self.assertContains(r, session.materials.filter(type='slides').exclude(states__type__slug='slides',states__slug='deleted').first().uploaded_filename)
@@ -255,7 +250,6 @@ class MeetingTests(TestCase):
         self.assertTrue(all([x in unicontent(r) for x in ['mars','IESG Breakfast','Test Room','Breakfast Room']]))
         url = urlreverse("ietf.meeting.views.room_view",kwargs=dict(num=meeting.number,name=meeting.unofficial_schedule.name,owner=meeting.unofficial_schedule.owner.email()))
         r = self.client.get(url)
-        self.assertEqual(r.status_code,200)
         self.assertTrue(all([x in unicontent(r) for x in ['mars','Test Room','Breakfast Room']]))
         self.assertNotContains(r, 'IESG Breakfast')
 
@@ -293,14 +287,12 @@ class MeetingTests(TestCase):
         if r.status_code != 200:
             q = PyQuery(r.content)
             debug.show('q(".alert").text()')
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, "1. WG status")
 
         # session minutes
         url = urlreverse("ietf.meeting.views.materials_document",
                          kwargs=dict(num=meeting.number, document=session.minutes()))
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, "1. More work items underway")
 
         # test with explicit meeting number in url
@@ -352,21 +344,18 @@ class MeetingTests(TestCase):
         
         self.client.login(username="marschairman", password="marschairman+password")
         r = self.client.get(urlreverse("ietf.meeting.views.materials_editable_groups", kwargs={'num':meeting.number}))
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, meeting.number)
         self.assertContains(r, "mars")
         self.assertNotContains(r, "No session requested")
 
         self.client.login(username="ad", password="ad+password")
         r = self.client.get(urlreverse("ietf.meeting.views.materials_editable_groups", kwargs={'num':meeting.number}))
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, meeting.number)
         self.assertContains(r, "frfarea")
         self.assertContains(r, "No session requested")
 
         self.client.login(username="plain",password="plain+password")
         r = self.client.get(urlreverse("ietf.meeting.views.materials_editable_groups", kwargs={'num':meeting.number}))
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, meeting.number)
         self.assertContains(r, "You cannot manage the meeting materials for any groups")
 
@@ -390,10 +379,10 @@ class MeetingTests(TestCase):
         meeting.save()
         url = urlreverse('ietf.meeting.views.proceedings_acknowledgements',kwargs={'num':meeting.number})
         response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertIn('test acknowledgements', response.content)
+        self.assertContains(response, 'test acknowledgements')
 
-    @patch('six.moves.urllib.request.urlopen')
+
+    @patch('urllib.request.urlopen')
     def test_proceedings_attendees(self, mock_urlopen):
         mock_urlopen.return_value = BytesIO(b'[{"LastName":"Smith","FirstName":"John","Company":"ABC","Country":"US"}]')
         make_meeting_test_data()
@@ -401,12 +390,11 @@ class MeetingTests(TestCase):
         finalize(meeting)
         url = urlreverse('ietf.meeting.views.proceedings_attendees',kwargs={'num':96})
         response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertIn('Attendee List', response.content)
+        self.assertContains(response, 'Attendee List')
         q = PyQuery(response.content)
         self.assertEqual(1,len(q("#id_attendees tbody tr")))
 
-    @patch('six.moves.urllib.request.urlopen')
+    @patch('urllib.request.urlopen')
     def test_proceedings_overview(self, mock_urlopen):
         '''Test proceedings IETF Overview page.
         Note: old meetings aren't supported so need to add a new meeting then test.
@@ -417,8 +405,7 @@ class MeetingTests(TestCase):
         finalize(meeting)
         url = urlreverse('ietf.meeting.views.proceedings_overview',kwargs={'num':96})
         response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertIn('The Internet Engineering Task Force', response.content)
+        self.assertContains(response, 'The Internet Engineering Task Force')
 
     def test_proceedings_progress_report(self):
         make_meeting_test_data()
@@ -427,15 +414,13 @@ class MeetingTests(TestCase):
 
         url = urlreverse('ietf.meeting.views.proceedings_progress_report',kwargs={'num':96})
         response = self.client.get(url)
-        self.assertEqual(response.status_code, 200)
-        self.assertIn('Progress Report', response.content)
+        self.assertContains(response, 'Progress Report')
 
     def test_feed(self):
         meeting = make_meeting_test_data()
         session = Session.objects.filter(meeting=meeting, group__acronym="mars").first()
 
         r = self.client.get("/feed/wg-proceedings/")
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, "agenda")
         self.assertContains(r, session.group.acronym)
 
@@ -446,7 +431,6 @@ class MeetingTests(TestCase):
         populate_important_dates(meeting)
         url = urlreverse('ietf.meeting.views.important_dates',kwargs={'num':meeting.number})
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, str(meeting.importantdate_set.first().date))
         idn = ImportantDateName.objects.filter(used=True).first()
         pre_date = meeting.importantdate_set.get(name=idn).date
@@ -468,7 +452,6 @@ class MeetingTests(TestCase):
         #
         url = urlreverse('ietf.meeting.views.ical_agenda', kwargs={'num':meeting.number, 'acronym':s1.group.acronym, })
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
         self.assertEqual(r.get('Content-Type'), "text/calendar")
         self.assertContains(r, 'BEGIN:VEVENT')
         self.assertEqual(r.content.count(b'UID'), 2)
@@ -479,7 +462,6 @@ class MeetingTests(TestCase):
         #
         url = urlreverse('ietf.meeting.views.ical_agenda', kwargs={'num':meeting.number, 'session_id':s1.id, })
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
         self.assertEqual(r.get('Content-Type'), "text/calendar")
         self.assertContains(r, 'BEGIN:VEVENT')
         self.assertEqual(r.content.count(b'UID'), 1)
@@ -585,7 +567,6 @@ class EditTests(TestCase):
 
         self.client.login(username="secretary", password="secretary+password")
         r = self.client.get(urlreverse("ietf.meeting.views.edit_agenda", kwargs=dict(num=meeting.number)))
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, "load_assignments")
 
     def test_save_agenda_as_and_read_permissions(self):
@@ -681,7 +662,6 @@ class EditTests(TestCase):
 
         self.client.login(username="secretary", password="secretary+password")
         r = self.client.get(urlreverse("ietf.meeting.views.edit_timeslots", kwargs=dict(num=meeting.number)))
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, meeting.room_set.all().first().name)
 
     def test_edit_timeslot_type(self):
@@ -749,7 +729,6 @@ class SessionDetailsTests(TestCase):
 
         self.client.login(username=group_chair.user.username, password='%s+password'%group_chair.user.username)
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, old_draft.name)
 
         r = self.client.post(url,dict(drafts=[new_draft.pk, old_draft.pk]))
@@ -871,7 +850,6 @@ class InterimTests(TestCase):
         session.save()
         login_testing_unauthorized(self, "secretary", url)
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, meeting.number)
 
     def test_interim_skip_announcement(self):
@@ -936,7 +914,6 @@ class InterimTests(TestCase):
         interim = SessionFactory(meeting__type_id='interim',meeting__date=last_week,status_id='canceled',group__state_id='active',group__parent=GroupFactory(state_id='active'))
         url = urlreverse('ietf.meeting.views.past')
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, 'IETF - %02d'%int(ietf.meeting.number))
         q = PyQuery(r.content)
         id="-%s" % interim.group.acronym
@@ -945,11 +922,10 @@ class InterimTests(TestCase):
     def test_upcoming(self):
         make_meeting_test_data()
         url = urlreverse("ietf.meeting.views.upcoming")
-        r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
         today = datetime.date.today()
         mars_interim = Meeting.objects.filter(date__gt=today, type='interim', session__group__acronym='mars', session__status='sched').first()
         ames_interim = Meeting.objects.filter(date__gt=today, type='interim', session__group__acronym='ames', session__status='canceled').first()
+        r = self.client.get(url)
         self.assertContains(r, mars_interim.number)
         self.assertContains(r, ames_interim.number)
         self.assertContains(r, 'IETF - 72')
@@ -1232,7 +1208,6 @@ class InterimTests(TestCase):
                 'session_set-INITIAL_FORMS':0}
 
         r = self.client.post(urlreverse("ietf.meeting.views.interim_request"),data)
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, 'days must be consecutive')
 
     def test_interim_request_series(self):
@@ -1595,7 +1570,6 @@ class InterimTests(TestCase):
         #
         url = urlreverse('ietf.meeting.views.ical_agenda', kwargs={'num':meeting.number, 'acronym':s1.group.acronym, })
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
         self.assertEqual(r.get('Content-Type'), "text/calendar")
         self.assertContains(r, 'BEGIN:VEVENT')
         self.assertEqual(r.content.count(b'UID'), 2)
@@ -1606,7 +1580,6 @@ class InterimTests(TestCase):
         #
         url = urlreverse('ietf.meeting.views.ical_agenda', kwargs={'num':meeting.number, 'session_id':s1.id, })
         r = self.client.get(url)
-        self.assertEqual(r.status_code, 200)
         self.assertEqual(r.get('Content-Type'), "text/calendar")
         self.assertContains(r, 'BEGIN:VEVENT')
         self.assertEqual(r.content.count(b'UID'), 1)
@@ -1688,7 +1661,7 @@ class IphoneAppJsonTests(TestCase):
         self.assertEqual(r.status_code,200)
 
 class FinalizeProceedingsTests(TestCase):
-    @patch('six.moves.urllib.request.urlopen')
+    @patch('urllib.request.urlopen')
     def test_finalize_proceedings(self, mock_urlopen):
         mock_urlopen.return_value = BytesIO(b'[{"LastName":"Smith","FirstName":"John","Company":"ABC","Country":"US"}]')
         make_meeting_test_data()
@@ -1828,21 +1801,21 @@ class MaterialsTests(TestCase):
             q = PyQuery(r.content)
             self.assertTrue(q('form input[type="checkbox"]'))
     
-            test_file = StringIO('this is some text for a test')
+            test_file = BytesIO(b'this is some text for a test')
             test_file.name = "not_really.json"
             r = self.client.post(url,dict(file=test_file))
             self.assertEqual(r.status_code, 200)
             q = PyQuery(r.content)
             self.assertTrue(q('form .has-error'))
     
-            test_file = StringIO('this is some text for a test'*1510000)
+            test_file = BytesIO(b'this is some text for a test'*1510000)
             test_file.name = "not_really.pdf"
             r = self.client.post(url,dict(file=test_file))
             self.assertEqual(r.status_code, 200)
             q = PyQuery(r.content)
             self.assertTrue(q('form .has-error'))
     
-            test_file = StringIO('')
+            test_file = BytesIO(b'')
             test_file.name = "not_really.html"
             r = self.client.post(url,dict(file=test_file))
             self.assertEqual(r.status_code, 200)
@@ -1850,7 +1823,7 @@ class MaterialsTests(TestCase):
             self.assertTrue(q('form .has-error'))
 
             # Test html sanitization
-            test_file = StringIO('Title
Title
Some text
')
+            test_file = BytesIO(b'Title
Title
Some text
')
             test_file.name = "some.html"
             r = self.client.post(url,dict(file=test_file))
             self.assertEqual(r.status_code, 302)
@@ -1861,7 +1834,7 @@ class MaterialsTests(TestCase):
             self.assertNotIn('
', text)
             self.assertIn('charset="utf-8"', text)
 
-            test_file = StringIO('This is some text for a test, with the word\nvirtual at the beginning of a line.')
+            test_file = BytesIO(b'This is some text for a test, with the word\nvirtual at the beginning of a line.')
             test_file.name = "not_really.txt"
             r = self.client.post(url,dict(file=test_file,apply_to_all=False))
             self.assertEqual(r.status_code, 302)
@@ -1873,7 +1846,7 @@ class MaterialsTests(TestCase):
             self.assertEqual(r.status_code, 200)
             q = PyQuery(r.content)
             self.assertIn('Revise', str(q("Title")))
-            test_file = StringIO('this is some different text for a test')
+            test_file = BytesIO(b'this is some different text for a test')
             test_file.name = "also_not_really.txt"
             r = self.client.post(url,dict(file=test_file,apply_to_all=True))
             self.assertEqual(r.status_code, 302)
@@ -1882,7 +1855,7 @@ class MaterialsTests(TestCase):
             self.assertTrue(session2.sessionpresentation_set.filter(document__type_id=doctype))
 
             # Test bad encoding
-            test_file = StringIO('
Title
Some\x93text
'.encode('latin1'))
+            test_file = BytesIO('
Title
Some\x93text
'.encode('latin1'))
             test_file.name = "some.html"
             r = self.client.post(url,dict(file=test_file))
             self.assertContains(r, 'Could not identify the file encoding')
@@ -1910,7 +1883,7 @@ class MaterialsTests(TestCase):
             self.assertFalse(session.sessionpresentation_set.exists())
             self.assertFalse(q('form input[type="checkbox"]'))
 
-            test_file = StringIO('this is some text for a test')
+            test_file = BytesIO(b'this is some text for a test')
             test_file.name = "not_really.txt"
             r = self.client.post(url,dict(file=test_file,apply_to_all=False))
             self.assertEqual(r.status_code, 410)
@@ -1929,7 +1902,7 @@ class MaterialsTests(TestCase):
             q = PyQuery(r.content)
             self.assertIn('Upload', str(q("title")))
             self.assertFalse(session.sessionpresentation_set.filter(document__type_id=doctype))
-            test_file = StringIO('this is some text for a test')
+            test_file = BytesIO(b'this is some text for a test')
             test_file.name = "not_really.txt"
             r = self.client.post(url,dict(file=test_file))
             self.assertEqual(r.status_code, 302)
@@ -1952,7 +1925,7 @@ class MaterialsTests(TestCase):
         q = PyQuery(r.content)
         self.assertIn('Upload', str(q("title")))
         self.assertFalse(session1.sessionpresentation_set.filter(document__type_id='slides'))
-        test_file = StringIO('this is not really a slide')
+        test_file = BytesIO(b'this is not really a slide')
         test_file.name = 'not_really.txt'
         r = self.client.post(url,dict(file=test_file,title='a test slide file',apply_to_all=True))
         self.assertEqual(r.status_code, 302)
@@ -1963,7 +1936,7 @@ class MaterialsTests(TestCase):
         self.assertEqual(sp.order,1)
 
         url = urlreverse('ietf.meeting.views.upload_session_slides',kwargs={'num':session2.meeting.number,'session_id':session2.id})
-        test_file = StringIO('some other thing still not slidelike')
+        test_file = BytesIO(b'some other thing still not slidelike')
         test_file.name = 'also_not_really.txt'
         r = self.client.post(url,dict(file=test_file,title='a different slide file',apply_to_all=False))
         self.assertEqual(r.status_code, 302)
@@ -1979,7 +1952,7 @@ class MaterialsTests(TestCase):
         self.assertTrue(r.status_code, 200)
         q = PyQuery(r.content)
         self.assertIn('Revise', str(q("title")))
-        test_file = StringIO('new content for the second slide deck')
+        test_file = BytesIO(b'new content for the second slide deck')
         test_file.name = 'doesnotmatter.txt'
         r = self.client.post(url,dict(file=test_file,title='rename the presentation',apply_to_all=False))
         self.assertEqual(r.status_code, 302)
@@ -2039,7 +2012,7 @@ class MaterialsTests(TestCase):
             login_testing_unauthorized(self,newperson.user.username,propose_url)
             r = self.client.get(propose_url)
             self.assertEqual(r.status_code,200)
-            test_file = StringIO('this is not really a slide')
+            test_file = BytesIO(b'this is not really a slide')
             test_file.name = 'not_really.txt'
             empty_outbox()
             r = self.client.post(propose_url,dict(file=test_file,title='a test slide file',apply_to_all=True))
@@ -2132,7 +2105,6 @@ class SessionTests(TestCase):
         not_meeting = SessionFactory(meeting=meeting,group__parent=area,status_id='notmeet',add_to_schedule=False)
         url = urlreverse('ietf.meeting.views.meeting_requests',kwargs={'num':meeting.number})
         r = self.client.get(url)
-        self.assertEqual(r.status_code,200)
         self.assertContains(r, requested_session.group.acronym)
         self.assertContains(r, not_meeting.group.acronym)
 
@@ -2147,8 +2119,8 @@ class SessionTests(TestCase):
         url = urlreverse('ietf.meeting.views.request_minutes',kwargs={'num':meeting.number})
         login_testing_unauthorized(self,"secretary",url)
         r = self.client.get(url)
-        self.assertNotContains(r, has_minutes.group.acronym)
-        self.assertContains(r, has_no_minutes.group.acronym)
+        self.assertNotContains(r, has_minutes.group.acronym.upper())
+        self.assertContains(r, has_no_minutes.group.acronym.upper())
         r = self.client.post(url,{'to':'wgchairs@ietf.org',
                                   'cc': 'irsg@irtf.org',
                                   'subject': 'I changed the subject',

From 1997a90d103017b31c8c84a19222a5edbbcc389b Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Sun, 7 Jul 2019 12:49:17 +0000
Subject: [PATCH 075/114] Removed the insertion of 'confirm_acronym' in the
 active form in clean_acronym().  It triggers an exception due to changing a
 dictionary while the django validation code is iterating through the form
 fields. XXX Check if we need to put this back some other way, or if we can
 handle acronym re-use through the admin instead.  - Legacy-Id: 16412

---
 ietf/group/forms.py | 42 +++++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/ietf/group/forms.py b/ietf/group/forms.py
index c84c6a318..6663ec796 100644
--- a/ietf/group/forms.py
+++ b/ietf/group/forms.py
@@ -19,7 +19,7 @@ from ietf.review.models import ReviewerSettings, UnavailablePeriod, ReviewSecret
 from ietf.review.utils import close_review_request_states, setup_reviewer_field
 from ietf.utils.textupload import get_cleaned_text_file_content
 from ietf.utils.text import strip_suffix
-from ietf.utils.ordereddict import insert_after_in_ordered_dict
+#from ietf.utils.ordereddict import insert_after_in_ordered_dict
 from ietf.utils.fields import DatepickerDateField, MultiEmailField
 
 # --- Constants --------------------------------------------------------
@@ -122,6 +122,7 @@ class GroupForm(forms.Form):
                     del self.fields[f]
 
     def clean_acronym(self):
+      try:
         # Changing the acronym of an already existing group will cause 404s all
         # over the place, loose history, and generally muck up a lot of
         # things, so we don't permit it
@@ -140,42 +141,45 @@ class GroupForm(forms.Form):
 
         confirmed = self.data.get("confirm_acronym", False)
 
-        def insert_confirm_field(label, initial):
-            # set required to false, we don't need it since we do the
-            # validation of the field in here, and otherwise the
-            # browser and Django may barf
-            insert_after_in_ordered_dict(self.fields, "confirm_acronym", forms.BooleanField(label=label, required=False), after="acronym")
-            # we can't set initial, it's ignored since the form is bound, instead mutate the data
-            self.data = self.data.copy()
-            self.data["confirm_acronym"] = initial
+#         def insert_confirm_field(label, initial):
+#             # set required to false, we don't need it since we do the
+#             # validation of the field in here, and otherwise the
+#             # browser and Django may barf
+#             insert_after_in_ordered_dict(self.fields, "confirm_acronym", forms.BooleanField(label=label, required=False), after="acronym")
+#             # we can't set initial, it's ignored since the form is bound, instead mutate the data
+#             self.data = self.data.copy()
+#             self.data["confirm_acronym"] = initial
 
         if existing and existing.type_id == self.group_type:
             if existing.state_id == "bof":
-                insert_confirm_field(label="Turn BoF %s into proposed %s and start chartering it" % (existing.acronym, existing.type.name), initial=True)
+                #insert_confirm_field(label="Turn BoF %s into proposed %s and start chartering it" % (existing.acronym, existing.type.name), initial=True)
                 if confirmed:
                     return acronym
                 else:
-                    raise forms.ValidationError("Warning: Acronym used for an existing BoF (%s)." % existing.name)
+                    raise forms.ValidationError("Warning: Acronym used for an existing BoF (%s)." % existing.acronym)
             else:
-                insert_confirm_field(label="Set state of %s %s to proposed and start chartering it" % (existing.acronym, existing.type.name), initial=False)
+                #insert_confirm_field(label="Set state of %s %s to proposed and start chartering it" % (existing.acronym, existing.type.name), initial=False)
                 if confirmed:
                     return acronym
                 else:
-                    raise forms.ValidationError("Warning: Acronym used for an existing %s (%s, %s)." % (existing.type.name, existing.name, existing.state.name if existing.state else "unknown state"))
+                    raise forms.ValidationError("Warning: Acronym used for an existing %s (%s, %s)." % (existing.type.name, existing.acronym, existing.state.name if existing.state else "unknown state"))
 
         if existing:
-            raise forms.ValidationError("Acronym used for an existing group (%s)." % existing.name)
+            raise forms.ValidationError("Acronym used for an existing group (%s)." % existing.acronym)
 
-        # TODO: Why is this limited to types wg and rg? We would want to be warned about _any_ old collision I think?
-        old = GroupHistory.objects.filter(acronym__iexact=acronym, type__in=("wg", "rg"))
+        old = GroupHistory.objects.filter(acronym__iexact=acronym)
         if old:
-            insert_confirm_field(label="Confirm reusing acronym %s" % old[0].acronym, initial=False)
+            #insert_confirm_field(label="Confirm reusing acronym %s" % old[0].acronym, initial=False)
             if confirmed:
                 return acronym
             else:
                 raise forms.ValidationError("Warning: Acronym used for a historic group.")
-
         return acronym
+      except forms.ValidationError:
+          pass
+      except Exception:
+          import traceback
+          traceback.print_exc()
 
     def clean_urls(self):
         return [x.strip() for x in self.cleaned_data["urls"].splitlines() if x.strip()]
@@ -199,7 +203,7 @@ class GroupForm(forms.Form):
         else:
             raise forms.ValidationError("A group cannot be its own ancestor.  "
                 "Found that the group '%s' would end up being the ancestor of (%s)" % (p.acronym, ', '.join([g.acronym for g in seen])))
-        
+
     def clean(self):
         cleaned_data = super(GroupForm, self).clean()
         state = cleaned_data.get('state', None)

From dfd3b60322397968fc9829039e3be1375056cb9f Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Sun, 7 Jul 2019 12:50:27 +0000
Subject: [PATCH 076/114] Removed tests for the confirm_acronym field removed
 in [16412].  - Legacy-Id: 16413 Note: SVN reference [16412] has been migrated
 to Git commit 1997a90d103017b31c8c84a19222a5edbbcc389b

---
 ietf/group/tests_info.py | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/ietf/group/tests_info.py b/ietf/group/tests_info.py
index d5dfa2a30..522d852f1 100644
--- a/ietf/group/tests_info.py
+++ b/ietf/group/tests_info.py
@@ -527,7 +527,6 @@ class GroupEditTests(TestCase):
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
         self.assertTrue(len(q('form .has-error')) > 0)
-        self.assertEqual(len(q('form input[name="confirm_acronym"]')), 0) # can't confirm us out of this
 
         # try elevating BoF to WG
         group.state_id = "bof"
@@ -537,16 +536,15 @@ class GroupEditTests(TestCase):
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
         self.assertTrue(len(q('form .has-error')) > 0)
-        self.assertEqual(len(q('form input[name="confirm_acronym"]')), 1)
 
         self.assertEqual(Group.objects.get(acronym=group.acronym).state_id, "bof")
 
-        # confirm elevation
-        state = GroupStateName.objects.get(slug="proposed")
-        r = self.client.post(url, dict(name="Test", acronym=group.acronym, confirm_acronym="1", state=state.pk))
-        self.assertEqual(r.status_code, 302)
-        self.assertEqual(Group.objects.get(acronym=group.acronym).state_id, "proposed")
-        self.assertEqual(Group.objects.get(acronym=group.acronym).name, "Test")
+#         # confirm elevation
+#         state = GroupStateName.objects.get(slug="proposed")
+#         r = self.client.post(url, dict(name="Test", acronym=group.acronym, confirm_acronym="1", state=state.pk))
+#         self.assertEqual(r.status_code, 302)
+#         self.assertEqual(Group.objects.get(acronym=group.acronym).state_id, "proposed")
+#         self.assertEqual(Group.objects.get(acronym=group.acronym).name, "Test")
 
     def test_edit_info(self):
         group = GroupFactory(acronym='mars',parent=GroupFactory(type_id='area'))
@@ -1108,7 +1106,7 @@ class EmailAliasesTests(TestCase):
         GroupFactory(acronym='mars',parent=GroupFactory(type_id='area'))
         GroupFactory(acronym='ames',parent=GroupFactory(type_id='area'))
         self.group_alias_file = NamedTemporaryFile(delete=False)
-        self.group_alias_file.write("""# Generated by hand at 2015-02-12_16:30:52
+        self.group_alias_file.write(b"""# Generated by hand at 2015-02-12_16:30:52
 virtual.ietf.org anything
 mars-ads@ietf.org                                                xfilter-mars-ads
 expand-mars-ads@virtual.ietf.org                                 aread@example.org
@@ -1267,7 +1265,7 @@ class StatusUpdateTests(TestCase):
             response = self.client.get(url)
             self.assertEqual(response.status_code,200)
             q=PyQuery(response.content)
-            self.assertTrue(bleach.linkify(escape(event.desc)) in six.text_type(q('pre')))
+            self.assertTrue(bleach.linkify(escape(event.desc)) in str(q('pre')))
             self.assertFalse(q('a#edit_button'))
             self.client.login(username=chair.person.user.username,password='%s+password'%chair.person.user.username)
             response = self.client.get(url)

From 4368e8cca1011d933ae421b69e58f82ff6b66882 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Sun, 7 Jul 2019 12:51:06 +0000
Subject: [PATCH 077/114] Corrected a comment  - Legacy-Id: 16414

---
 ietf/group/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ietf/group/views.py b/ietf/group/views.py
index 105c8f354..462f6f790 100644
--- a/ietf/group/views.py
+++ b/ietf/group/views.py
@@ -999,7 +999,7 @@ def edit(request, group_type=None, acronym=None, action="edit", field=None):
                 return redirect('ietf.doc.views_charter.submit', name=charter_name_for_group(group), option="initcharter")
 
             return HttpResponseRedirect(group.about_url())
-    else: # form.is_valid()
+    else: # Not POST:
         if not new_group:
             ad_role = group.ad_role()
             init = dict(name=group.name,

From ec571401fe50aa989d0bc67a0387e23a352169f2 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Sun, 7 Jul 2019 12:51:58 +0000
Subject: [PATCH 078/114] Fixed a base64 bytes/str issue.  - Legacy-Id: 16415

---
 ietf/ipr/mail.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ietf/ipr/mail.py b/ietf/ipr/mail.py
index 0daa54f2d..93b8ff9d8 100644
--- a/ietf/ipr/mail.py
+++ b/ietf/ipr/mail.py
@@ -9,6 +9,7 @@ import pytz
 import re
 
 from django.template.loader import render_to_string
+from django.utils.encoding import force_text
 
 import debug                            # pyflakes:ignore
 
@@ -96,7 +97,7 @@ def get_reply_to():
     address with "plus addressing" using a random string.  Guaranteed to be unique"""
     local,domain = get_base_ipr_request_address().split('@')
     while True:
-        rand = base64.urlsafe_b64encode(os.urandom(12))
+        rand = force_text(base64.urlsafe_b64encode(os.urandom(12)))
         address = "{}+{}@{}".format(local,rand,domain)
         q = Message.objects.filter(reply_to=address)
         if not q:

From 9d5641da649e7f9cc55335935ccea56f5c281acb Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Sun, 7 Jul 2019 12:58:01 +0000
Subject: [PATCH 079/114] Removed unnecessary asserts on r.status_code; this
 will be checked by assertContains().  - Legacy-Id: 16416

---
 ietf/ipr/tests.py | 29 +++--------------------------
 1 file changed, 3 insertions(+), 26 deletions(-)

diff --git a/ietf/ipr/tests.py b/ietf/ipr/tests.py
index b309a4e73..c7683cad7 100644
--- a/ietf/ipr/tests.py
+++ b/ietf/ipr/tests.py
@@ -72,13 +72,11 @@ class IprTests(TestCase):
     def test_showlist(self):
         ipr = HolderIprDisclosureFactory()
         r = self.client.get(urlreverse("ietf.ipr.views.showlist"))
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, ipr.title)
 
     def test_show_posted(self):
         ipr = HolderIprDisclosureFactory()
         r = self.client.get(urlreverse("ietf.ipr.views.show", kwargs=dict(id=ipr.pk)))
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, ipr.title)
         
     def test_show_parked(self):
@@ -99,20 +97,17 @@ class IprTests(TestCase):
     def test_show_removed(self):
         ipr = HolderIprDisclosureFactory(state_id='removed')
         r = self.client.get(urlreverse("ietf.ipr.views.show", kwargs=dict(id=ipr.pk)))
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, 'This IPR disclosure was removed')
         
     def test_ipr_history(self):
         ipr = HolderIprDisclosureFactory()
         r = self.client.get(urlreverse("ietf.ipr.views.history", kwargs=dict(id=ipr.pk)))
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, ipr.title)
 
     def test_iprs_for_drafts(self):
         draft=WgDraftFactory()
         ipr = HolderIprDisclosureFactory(docs=[draft,])
         r = self.client.get(urlreverse("ietf.ipr.views.by_draft_txt"))
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, draft.name)
         self.assertContains(r, str(ipr.pk))
 
@@ -121,7 +116,6 @@ class IprTests(TestCase):
         ipr = HolderIprDisclosureFactory(docs=[draft,])
         replaced = draft.all_related_that_doc('replaces')
         r = self.client.get(urlreverse("ietf.ipr.views.by_draft_recursive_txt"))
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, draft.name)
         for alias in replaced:
             self.assertContains(r, alias.name)
@@ -129,7 +123,6 @@ class IprTests(TestCase):
 
     def test_about(self):
         r = self.client.get(urlreverse("ietf.ipr.views.about"))
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, "File a disclosure")
 
     def test_search(self):
@@ -146,66 +139,54 @@ class IprTests(TestCase):
 
         # find by id
         r = self.client.get(url + "?submit=draft&id=%s" % draft.name)
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, ipr.title)
 
         # find draft
         r = self.client.get(url + "?submit=draft&draft=%s" % draft.name)
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, ipr.title)
 
         # search + select document
         r = self.client.get(url + "?submit=draft&draft=draft")
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, draft.name)
-        self.assertContains(r, ipr.title)
+        self.assertNotContains(r, ipr.title)
 
         DocAlias.objects.create(name="rfc321").docs.add(draft)
 
         # find RFC
         r = self.client.get(url + "?submit=rfc&rfc=321")
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, ipr.title)
 
         # find by patent owner
         r = self.client.get(url + "?submit=holder&holder=%s" % ipr.holder_legal_name)
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, ipr.title)
         
         # find by patent info
         r = self.client.get(url + "?submit=patent&patent=%s" % ipr.patent_info)
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, ipr.title)
 
         r = self.client.get(url + "?submit=patent&patent=US12345")
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, ipr.title)
 
         # find by group acronym
         r = self.client.get(url + "?submit=group&group=%s" % draft.group.pk)
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, ipr.title)
 
         # find by doc title
         r = self.client.get(url + "?submit=doctitle&doctitle=%s" % urllib.parse.quote(draft.title))
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, ipr.title)
 
         # find by ipr title
         r = self.client.get(url + "?submit=iprtitle&iprtitle=%s" % urllib.parse.quote(ipr.title))
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, ipr.title)
 
     def test_feed(self):
         ipr = HolderIprDisclosureFactory()
         r = self.client.get("/feed/ipr/")
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, ipr.title)
 
     def test_sitemap(self):
         ipr = HolderIprDisclosureFactory()
         r = self.client.get("/sitemap-ipr.xml")
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, "/ipr/%s/" % ipr.pk)
 
     def test_new_generic(self):
@@ -232,7 +213,6 @@ class IprTests(TestCase):
             "submitter_email": "test@holder.com",
             "notes": "some notes"
             })
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, "Your IPR disclosure has been submitted")
         self.assertEqual(len(outbox),1)
         self.assertTrue('New IPR Submission' in outbox[0]['Subject'])
@@ -275,7 +255,6 @@ class IprTests(TestCase):
             "submitter_name": "Test Holder",
             "submitter_email": "test@holder.com",
             })
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, "Your IPR disclosure has been submitted")
 
         iprs = IprDisclosureBase.objects.filter(title__icontains=draft.name)
@@ -318,7 +297,6 @@ class IprTests(TestCase):
             "submitter_name": "Test Holder",
             "submitter_email": "test@holder.com",
             })
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, "Your IPR disclosure has been submitted")
 
         iprs = IprDisclosureBase.objects.filter(title__icontains="belonging to Test Legal")
@@ -415,7 +393,6 @@ class IprTests(TestCase):
             "submitter_name": "Test Holder",
             "submitter_email": "test@holder.com",
             })
-        self.assertEqual(r.status_code, 200)
         self.assertContains(r, "Your IPR disclosure has been submitted")
 
         iprs = IprDisclosureBase.objects.filter(title__icontains=draft.name)
@@ -472,10 +449,9 @@ class IprTests(TestCase):
         
         # private comment
         r = self.client.post(url, dict(comment='Private comment',private=True),follow=True)
-        self.assertEqual(r.status_code,200)
         self.assertContains(r, 'Private comment')
         self.client.logout()
-        r = self.client.get(url)
+        r = self.client.get(url, follow=True)
         self.assertNotContains(r, 'Private comment')
         
     def test_addemail(self):
@@ -610,6 +586,7 @@ Date: {}
 Subject: test
 """.format(data['reply_to'],datetime.datetime.now().ctime())
         result = process_response_email(message_string)
+
         self.assertIsInstance(result,Message)
         self.assertFalse(event.response_past_due())
 

From 63f08966446cf6dd7da8561f94ecc2186cfb59fb Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Sun, 7 Jul 2019 12:59:26 +0000
Subject: [PATCH 080/114] Changed tobinary file mode for pdf file. Fixed a
 str/num comparison.  - Legacy-Id: 16417

---
 ietf/meeting/views.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py
index dcd7b5a15..8c80905d0 100644
--- a/ietf/meeting/views.py
+++ b/ietf/meeting/views.py
@@ -730,7 +730,7 @@ def session_draft_pdf(request, num, acronym):
     code, out, err = pipe(gs + " -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -sOutputFile=" + pdfn + " " + pdf_list + " " + pmn)
     assertion('code == 0')
 
-    pdf = open(pdfn,"r")
+    pdf = open(pdfn,"rb")
     pdf_contents = pdf.read()
     pdf.close()
 
@@ -2148,7 +2148,7 @@ def proceedings(request, num=None):
 
     meeting = get_meeting(num)
 
-    if meeting.number <= 64 or not meeting.agenda or not meeting.agenda.assignments.exists():
+    if (meeting.number.isdigit() and int(meeting.number) <= 64) or not meeting.agenda or not meeting.agenda.assignments.exists():
             return HttpResponseRedirect( 'https://www.ietf.org/proceedings/%s' % num )
 
     begin_date = meeting.get_submission_start_date()

From 10380e22b596bf1e7afb15b93935a5d1b729ffcf Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Sun, 7 Jul 2019 13:00:00 +0000
Subject: [PATCH 081/114] Added another warnings filter.  - Legacy-Id: 16418

---
 ietf/settings.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ietf/settings.py b/ietf/settings.py
index 6623dd391..8cff632b4 100644
--- a/ietf/settings.py
+++ b/ietf/settings.py
@@ -26,6 +26,7 @@ warnings.filterwarnings("ignore", message="Duplicate index '.*' defined on the t
 # Warnings found under Python 3.7:
 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")
 
 

From 472a3ed03951eb87120dde5a2dd59ce4903cd307 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Sun, 7 Jul 2019 13:03:11 +0000
Subject: [PATCH 082/114] Refined our parseaddr() to deal correctly with both
 bytes and str  - Legacy-Id: 16419

---
 ietf/utils/mail.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ietf/utils/mail.py b/ietf/utils/mail.py
index 83d615b2f..eaf5138db 100644
--- a/ietf/utils/mail.py
+++ b/ietf/utils/mail.py
@@ -227,8 +227,8 @@ def parseaddr(addr):
     which case a 2-tuple of ('', '') is returned.
 
     """
-    if not isinstance(addr, str):
-        addr = ''.join( [ s.decode(m) if m else s.decode() for (s,m) in decode_header(addr) ] )
+
+    addr = ''.join( [ ( s.decode(m) if m else s.decode()) if isinstance(s, bytes) else s for (s,m) in decode_header(addr) ] )
     name, addr = simple_parseaddr(addr)
     return name, addr
 

From 48bab56be96a93b0aa470ccc0f1fe0978b609dcf Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Sun, 7 Jul 2019 13:04:20 +0000
Subject: [PATCH 083/114] Removed a print() call  - Legacy-Id: 16420

---
 ietf/submit/tests.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ietf/submit/tests.py b/ietf/submit/tests.py
index 1dac188f6..49470cf9c 100644
--- a/ietf/submit/tests.py
+++ b/ietf/submit/tests.py
@@ -818,7 +818,6 @@ class SubmitTests(TestCase):
 
         # status page as unpriviliged => no edit button
         r = self.client.get(unprivileged_status_url)
-        print(r.content)
         self.assertContains(r, "Submission status of %s" % name)
         q = PyQuery(r.content)
         adjust_button = q('[type=submit]:contains("Adjust")')

From 671b4035ea150d446167ed2bc562338dde66328b Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Sun, 7 Jul 2019 13:04:54 +0000
Subject: [PATCH 084/114] Fixed a syntax issue and removed debug calls.  -
 Legacy-Id: 16421

---
 ietf/utils/validators.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ietf/utils/validators.py b/ietf/utils/validators.py
index aa627df7b..c982fccfa 100644
--- a/ietf/utils/validators.py
+++ b/ietf/utils/validators.py
@@ -78,11 +78,8 @@ def validate_mime_type(file, valid):
     # work around mis-identification of text where a line has 'virtual' as
     # the first word:
     if mime_type == 'text/x-c++' and re.search(rb'(?m)^virtual\s', raw):
-        mod = raw.replace(b'virtual', b' virtual'))
+        mod = raw.replace(b'virtual', b' virtual')
         mime_type, encoding = get_mime_type(mod)
-    debug.show('mime_type')
-    debug.show('encoding')
-    debug.show('valid')
     if valid and not mime_type in valid:
         raise ValidationError('Found content with unexpected mime type: %s.  Expected one of %s.' %
                                     (mime_type, ', '.join(valid) ))

From f481f5c3e697c034acf16ee67175a7fdefb5a077 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 8 Jul 2019 10:43:47 +0000
Subject: [PATCH 085/114] Replaced use of six with the equivalent pure python3
 constructs.  - Legacy-Id: 16428

---
 ietf/api/__init__.py                          |  7 +++----
 ietf/doc/models.py                            |  3 +--
 ietf/group/tests_info.py                      |  1 -
 ietf/liaisons/forms.py                        |  3 +--
 ietf/person/fields.py                         |  3 +--
 ietf/person/models.py                         |  3 +--
 ietf/stats/backfill_data.py                   |  9 ++++-----
 ietf/submit/utils.py                          |  3 +--
 ietf/utils/draft.py                           |  3 +--
 ietf/utils/fields.py                          |  3 +--
 ietf/utils/html.py                            |  3 +--
 .../management/commands/coverage_changes.py   |  3 +--
 ietf/utils/management/commands/tests.py       |  3 ++-
 ietf/utils/markup_txt.py                      | 20 +------------------
 ietf/utils/text.py                            |  7 +++----
 ietf/utils/urls.py                            |  5 ++---
 16 files changed, 24 insertions(+), 55 deletions(-)

diff --git a/ietf/api/__init__.py b/ietf/api/__init__.py
index 82dcdf91f..d2b205e59 100644
--- a/ietf/api/__init__.py
+++ b/ietf/api/__init__.py
@@ -1,6 +1,5 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
 import re
-import six
 import datetime
 from urllib.parse import urlencode
 
@@ -76,7 +75,7 @@ class TimedeltaField(ApiField):
         if value is None:
             return None
 
-        if isinstance(value, six.string_types):
+        if isinstance(value, str):
             match = TIMEDELTA_REGEX.search(value)
 
             if match:
@@ -91,7 +90,7 @@ class TimedeltaField(ApiField):
         value = super(TimedeltaField, self).hydrate(bundle)
 
         if value and not hasattr(value, 'seconds'):
-            if isinstance(value, six.string_types):
+            if isinstance(value, str):
                 try:
                     match = TIMEDELTA_REGEX.search(value)
 
@@ -117,7 +116,7 @@ class ToOneField(tastypie.fields.ToOneField):
         if callable(self.attribute):
             previous_obj = bundle.obj
             foreign_obj = self.attribute(bundle)
-        elif isinstance(self.attribute, six.string_types):
+        elif isinstance(self.attribute, str):
             foreign_obj = bundle.obj
 
             for attr in self._attrs:
diff --git a/ietf/doc/models.py b/ietf/doc/models.py
index 123ad76c5..0c79fbf02 100644
--- a/ietf/doc/models.py
+++ b/ietf/doc/models.py
@@ -5,7 +5,6 @@ import datetime
 import logging
 import os
 import rfc2html
-import six
 
 from django.db import models
 from django.core import checks
@@ -430,7 +429,7 @@ class DocumentInfo(models.Model):
 
     def relations_that_doc(self, relationship):
         """Return the related-document objects that describe a given relationship from self to other documents."""
-        if isinstance(relationship, six.string_types):
+        if isinstance(relationship, str):
             relationship = ( relationship, )
         if not isinstance(relationship, tuple):
             raise TypeError("Expected a string or tuple, received %s" % type(relationship))
diff --git a/ietf/group/tests_info.py b/ietf/group/tests_info.py
index 522d852f1..9ee3c0bcb 100644
--- a/ietf/group/tests_info.py
+++ b/ietf/group/tests_info.py
@@ -7,7 +7,6 @@ import calendar
 import datetime
 import io
 import bleach
-import six
 
 from pyquery import PyQuery
 from tempfile import NamedTemporaryFile
diff --git a/ietf/liaisons/forms.py b/ietf/liaisons/forms.py
index 54c5c6c35..f997e5f3c 100644
--- a/ietf/liaisons/forms.py
+++ b/ietf/liaisons/forms.py
@@ -3,7 +3,6 @@
 
 import datetime, os
 import operator
-import six
 from email.utils import parseaddr
 from form_utils.forms import BetterModelForm
 
@@ -199,7 +198,7 @@ class CustomModelMultipleChoiceField(forms.ModelMultipleChoiceField):
         if isinstance(value, QuerySet):
             return value
         if (hasattr(value, '__iter__') and
-                not isinstance(value, six.text_type) and
+                not isinstance(value, str) and
                 not hasattr(value, '_meta')):
             return [super(CustomModelMultipleChoiceField, self).prepare_value(v) for v in value]
         return super(CustomModelMultipleChoiceField, self).prepare_value(value)
diff --git a/ietf/person/fields.py b/ietf/person/fields.py
index c0c81c6be..89c3e8259 100644
--- a/ietf/person/fields.py
+++ b/ietf/person/fields.py
@@ -1,6 +1,5 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
 import json
-import six
 
 from collections import Counter
 from urllib.parse import urlencode
@@ -110,7 +109,7 @@ class SearchablePersonsField(forms.CharField):
             #if self.only_users:
             #    objs = objs.exclude(person__user=None)
 
-        found_pks = [ six.text_type(o.pk) for o in objs]
+        found_pks = [ str(o.pk) for o in objs]
         failed_pks = [x for x in pks if x not in found_pks]
         if failed_pks:
             raise forms.ValidationError("Could not recognize the following {model_name}s: {pks}. You can only input {model_name}s already registered in the Datatracker.".format(pks=", ".join(failed_pks), model_name=self.model.__name__.lower()))
diff --git a/ietf/person/models.py b/ietf/person/models.py
index 06bb77cad..2ecf15398 100644
--- a/ietf/person/models.py
+++ b/ietf/person/models.py
@@ -3,7 +3,6 @@
 import datetime
 import email.utils
 import email.header
-import six
 import uuid
 
 from hashids import Hashids
@@ -360,7 +359,7 @@ class PersonalApiKey(models.Model):
             for v in (str(self.id), str(self.person.id), self.created.isoformat(), self.endpoint, str(self.valid), self.salt, settings.SECRET_KEY):
                 v = smart_bytes(v)
                 hash.update(v)
-            key = struct.pack(KEY_STRUCT, self.id, six.binary_type(self.salt), hash.digest())
+            key = struct.pack(KEY_STRUCT, self.id, bytes(self.salt), hash.digest())
             self._cached_hash =  base64.urlsafe_b64encode(key).decode('ascii')
         return self._cached_hash
 
diff --git a/ietf/stats/backfill_data.py b/ietf/stats/backfill_data.py
index 5bb37bda7..15b100c02 100755
--- a/ietf/stats/backfill_data.py
+++ b/ietf/stats/backfill_data.py
@@ -7,7 +7,6 @@ import sys
 import os
 import os.path
 import argparse
-import six
 import time
 
 basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
@@ -129,10 +128,10 @@ for doc in docs_qs.prefetch_related("docalias", "formal_languages", "documentaut
             # it's an extra author - skip those extra authors
             seen = set()
             for full, _, _, _, _, email, country, company in d.get_author_list():
-                assert full is None or    isinstance(full,    six.text_type)
-                assert email is None or   isinstance(email,   six.text_type)
-                assert country is None or isinstance(country, six.text_type)
-                assert company is None or isinstance(company, six.text_type)
+                assert full is None or    isinstance(full,    str)
+                assert email is None or   isinstance(email,   str)
+                assert country is None or isinstance(country, str)
+                assert company is None or isinstance(company, str)
                 #full, email, country, company = [ unicode(s) for s in [full, email, country, company, ] ]
                 if email in seen:
                     continue
diff --git a/ietf/submit/utils.py b/ietf/submit/utils.py
index b06988249..f1d46e9b0 100644
--- a/ietf/submit/utils.py
+++ b/ietf/submit/utils.py
@@ -4,7 +4,6 @@
 import datetime
 import os
 import re
-import six                              # pyflakes:ignore
 import xml2rfc
 
 from django.conf import settings
@@ -457,7 +456,7 @@ def ensure_person_email_info_exists(name, email, docname):
         person = Person()
         person.name = name
         person.name_from_draft = name
-        log.assertion('isinstance(person.name, six.text_type)')
+        log.assertion('isinstance(person.name, str)')
         person.ascii = unidecode_name(person.name)
         person.save()
     else:
diff --git a/ietf/utils/draft.py b/ietf/utils/draft.py
index be7f9aae8..ba539d3e1 100755
--- a/ietf/utils/draft.py
+++ b/ietf/utils/draft.py
@@ -40,7 +40,6 @@ import os
 import os.path
 import re
 import stat
-import six
 import sys
 import time
 
@@ -129,7 +128,7 @@ def acronym_match(s, l):
 class Draft():
 
     def __init__(self, text, source, name_from_source=False):
-        assert isinstance(text, six.text_type)
+        assert isinstance(text, str)
         self.source = source
         self.rawtext = text
         self.name_from_source = name_from_source
diff --git a/ietf/utils/fields.py b/ietf/utils/fields.py
index 6bef06b45..89bca6b8c 100644
--- a/ietf/utils/fields.py
+++ b/ietf/utils/fields.py
@@ -1,7 +1,6 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
 
 import re
-import six
 import datetime
 
 import debug                            # pyflakes:ignore
@@ -104,7 +103,7 @@ def parse_duration_ext(value):
             return parse_duration(value)
         else:
             kw = match.groupdict()
-            kw = {k: float(v) for k, v in six.iteritems(kw) if v is not None}
+            kw = {k: float(v) for k, v in kw.items() if v is not None}
             return datetime.timedelta(**kw)
 
 class DurationField(forms.DurationField):
diff --git a/ietf/utils/html.py b/ietf/utils/html.py
index dbbff0303..b191c1388 100644
--- a/ietf/utils/html.py
+++ b/ietf/utils/html.py
@@ -11,7 +11,6 @@ import lxml.html.clean
 import debug                            # pyflakes:ignore
 
 from django.utils.functional import keep_lazy
-from django.utils import six
 
 acceptable_tags = ('a', 'abbr', 'acronym', 'address', 'b', 'big',
     'blockquote', 'body', 'br', 'caption', 'center', 'cite', 'code', 'col',
@@ -32,7 +31,7 @@ def unescape(text):
     """
     return text.replace(''', "'").replace('"', '"').replace('>', '>').replace('<', '<' ).replace('&', '&')
 
-@keep_lazy(six.text_type)
+@keep_lazy(str)
 def remove_tags(html, tags):
     """Returns the given HTML sanitized, and with the given tags removed."""
     allowed = set(acceptable_tags) - set([ t.lower() for t in tags ])
diff --git a/ietf/utils/management/commands/coverage_changes.py b/ietf/utils/management/commands/coverage_changes.py
index 08e0c70e5..33e96d5e9 100644
--- a/ietf/utils/management/commands/coverage_changes.py
+++ b/ietf/utils/management/commands/coverage_changes.py
@@ -9,7 +9,6 @@ from difflib import ndiff
 
 from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
-from django.utils.six import string_types
 
 import debug                            # pyflakes:ignore
 
@@ -57,7 +56,7 @@ class Command(BaseCommand):
     valid_sections = ['template', 'url', 'code']
 
     def read_coverage(self, filename, version=None):
-        if isinstance(filename, string_types):
+        if isinstance(filename, str):
             try:
                 if filename.endswith(".gz"):
                     file = gzip.open(filename, "rb")
diff --git a/ietf/utils/management/commands/tests.py b/ietf/utils/management/commands/tests.py
index 0ce1127e1..fb77a44e1 100644
--- a/ietf/utils/management/commands/tests.py
+++ b/ietf/utils/management/commands/tests.py
@@ -1,9 +1,10 @@
+# Copyright The IETF Trust 2015-2019, All Rights Reserved
 import os
 import tempfile
 
 from django.core.management import call_command
 from django.test import TestCase
-from django.utils.six import StringIO
+from io import StringIO
 
 import debug                            # pyflakes:ignore
 
diff --git a/ietf/utils/markup_txt.py b/ietf/utils/markup_txt.py
index e310f6b93..7542c439d 100644
--- a/ietf/utils/markup_txt.py
+++ b/ietf/utils/markup_txt.py
@@ -32,32 +32,14 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import re
-import six
-import string
 
 from django.utils.html import escape
 
 from ietf.utils import log
 from ietf.utils.text import wordwrap
 
-def markup_ascii(content, width=None):
-    log.unreachable('2017-12-08')
-    if six.PY2:
-        assert isinstance(content, str)
-        # at this point, "content" is normal string
-        # fix most common non-ASCII characters
-        t1 = string.maketrans("\x91\x92\x93\x94\x95\x96\x97\xc6\xe8\xe9", "\'\'\"\"o--\'ee")
-        # map everything except printable ASCII, TAB, LF, FF to "?"
-        t2 = string.maketrans('','')
-        t3 = "?"*9 + "\t\n?\f" + "?"*19 + t2[32:127] + "?"*129
-        t4 = t1.translate(t3)
-        content = content.translate(t4)
-    else:
-        log.assertion('six.PY2')
-    return markup(content.decode('ascii'), width)
-
 def markup(content, width=None):
-    log.assertion('isinstance(content, six.text_type)')
+    log.assertion('isinstance(content, str)')
     # normalize line endings to LF only
     content = content.replace("\r\n", "\n")
     content = content.replace("\r", "\n")
diff --git a/ietf/utils/text.py b/ietf/utils/text.py
index 232ea1489..fbcf1470e 100644
--- a/ietf/utils/text.py
+++ b/ietf/utils/text.py
@@ -6,14 +6,13 @@ import textwrap
 import unicodedata
 
 from django.utils.functional import keep_lazy
-from django.utils import six
 from django.utils.safestring import mark_safe
 
 import debug                            # pyflakes:ignore
 
 from .texescape import init as texescape_init, tex_escape_map
 
-@keep_lazy(six.text_type)
+@keep_lazy(str)
 def xslugify(value):
     """
     Converts to ASCII. Converts spaces to hyphens. Removes characters that
@@ -134,7 +133,7 @@ def maybe_split(text, split=True, pos=5000):
     return text
 
 def decode(raw):
-    assert isinstance(raw, six.binary_type)
+    assert isinstance(raw, bytes)
     try:
         text = raw.decode('utf-8')
     except UnicodeDecodeError:
@@ -146,7 +145,7 @@ def decode(raw):
 def text_to_dict(t):
     "Converts text with RFC2822-formatted header fields into a dictionary-like object."
     # ensure we're handed a unicode parameter
-    assert isinstance(t, six.text_type)
+    assert isinstance(t, str)
     d = {}
     # Return {} for malformed input
     if not len(t.lstrip()) == len(t):
diff --git a/ietf/utils/urls.py b/ietf/utils/urls.py
index d122fceb2..46fe0cc20 100644
--- a/ietf/utils/urls.py
+++ b/ietf/utils/urls.py
@@ -1,6 +1,5 @@
-# Copyright The IETF Trust 2016, All Rights Reserved
+# Copyright The IETF Trust 2016-2019, All Rights Reserved
 
-import six
 import debug                            # pyflakes:ignore
 from inspect import isclass
 
@@ -17,7 +16,7 @@ def url(regex, view, kwargs=None, name=None):
         branch = 'name'
     elif isinstance(view, (list, tuple)):
         branch = 'list'
-    elif isinstance(view, six.string_types):
+    elif isinstance(view, str):
         branch = 'string'
         name = view
     elif callable(view) and hasattr(view, '__name__'):

From 5d7815f3b0e43439f5ae44a65d3e6676451c938b Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 8 Jul 2019 11:41:53 +0000
Subject: [PATCH 086/114] Added an option to specify a copyright line pattern
 to bin/check-copyright.  - Legacy-Id: 16429

---
 bin/check-copyright | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/bin/check-copyright b/bin/check-copyright
index ce21a3881..ee1ddfc7d 100755
--- a/bin/check-copyright
+++ b/bin/check-copyright
@@ -71,7 +71,7 @@ if len(sys.argv) < 1:
     sys.exit(1)
 
 try:
-    opts, files = getopt.gnu_getopt(sys.argv[1:], "hpvV", ["help", "patch", "version", "verbose",])
+    opts, files = getopt.gnu_getopt(sys.argv[1:], "hC:pvV", ["help", "copyright=", "patch", "version", "verbose",])
 except Exception as e:
     print( "%s: %s" % (program, e))
     sys.exit(1)
@@ -82,6 +82,7 @@ except Exception as e:
 # set default values, if any
 opt_verbose = 0
 opt_patch = False
+opt_copyright = "Copyright The IETF Trust {years}, All Rights Reserved"
 
 # handle individual options
 for opt, value in opts:
@@ -90,6 +91,8 @@ for opt, value in opts:
         sys.exit(1)
     elif opt in ["-p", "--patch"]: # Generate patch output rather than error messages
         opt_patch = True
+    elif opt in ["-C", "--copyright"]: # Copyright line pattern using {years} for years
+        opt_copyright = value
     elif opt in ["-V", "--version"]: # Output version information, then exit
         print( program, version )
         sys.exit(0)
@@ -197,8 +200,8 @@ for path in files:
         date = initinfo[path]['date']
         init = date[:4]
         
-        copyright_re = r"(?i)Copyright The IETF Trust (\d+-)?\d+, All Rights Reserved"
-        copyright_year_re = r"(?i)Copyright The IETF Trust (%s-)?%s, All Rights Reserved" % (init, year)
+        copyright_re = "(?i)"+opt_copyright.format(years=r"(\d+-)?\d+")
+        copyright_year_re = "(?i)"+opt_copyright.format(years=r"({init})?{year}")
         with open(path) as file:
             try:
                 chunk = file.read(4000)
@@ -209,9 +212,9 @@ for path in files:
                 continue
             if not re.search(copyright_year_re, chunk):
                 if year == init:
-                    copyright = f"Copyright The IETF Trust {year}, All Rights Reserved"
+                    copyright = opt_copyright.format(years=year)
                 else:
-                    copyright = f"Copyright The IETF Trust {init}-{year}, All Rights Reserved"
+                    copyright = opt_copyright.format(years=f"{init}-{year}")
                 if opt_patch:
                     print(f"--- {file.name}\t(original)")
                     print(f"+++ {file.name}\t(modified)")

From 1bba64330ba8e599d26274799f9c523b3240f627 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 8 Jul 2019 11:42:54 +0000
Subject: [PATCH 087/114] Bumped check-copyright version number.  - Legacy-Id:
 16430

---
 bin/check-copyright | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/check-copyright b/bin/check-copyright
index ee1ddfc7d..0fdb02bfb 100755
--- a/bin/check-copyright
+++ b/bin/check-copyright
@@ -49,7 +49,7 @@ import pytz
 import tzparse
 import debug
 
-version = "0.10"
+version = "1.0.0"
 program = os.path.basename(sys.argv[0])
 progdir = os.path.dirname(sys.argv[0])
 

From d4fc890655befe632e701502a037ccaacfa22678 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 8 Jul 2019 11:44:17 +0000
Subject: [PATCH 088/114] Tweaked check-copyright  - Legacy-Id: 16431

---
 bin/check-copyright | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/check-copyright b/bin/check-copyright
index 0fdb02bfb..ca393b781 100755
--- a/bin/check-copyright
+++ b/bin/check-copyright
@@ -96,7 +96,7 @@ for opt, value in opts:
     elif opt in ["-V", "--version"]: # Output version information, then exit
         print( program, version )
         sys.exit(0)
-    elif opt in ["-v", "--verbose"]: # Output version information, then exit
+    elif opt in ["-v", "--verbose"]: # Be more verbose
         opt_verbose += 1
 
 # ----------------------------------------------------------------------

From 6732e7acffd3cc713ca18b3beba6716c6e623862 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 8 Jul 2019 18:30:34 +0000
Subject: [PATCH 089/114] Fixed an issue with a gzip file mode.  - Legacy-Id:
 16436

---
 ietf/utils/test_runner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ietf/utils/test_runner.py b/ietf/utils/test_runner.py
index 4f7a67dbb..d3935c924 100644
--- a/ietf/utils/test_runner.py
+++ b/ietf/utils/test_runner.py
@@ -619,7 +619,7 @@ class IetfTestRunner(DiscoverRunner):
                 self.coverage_master["version"] = self.save_version_coverage
                 self.coverage_master[self.save_version_coverage] = self.coverage_data
                 if self.coverage_file.endswith('.gz'):
-                    with gzip.open(self.coverage_file, "wb") as file:
+                    with gzip.open(self.coverage_file, "wt", encoding='ascii') as file:
                         json.dump(self.coverage_master, file, sort_keys=True)
                 else:
                     with codecs.open(self.coverage_file, "w", encoding="utf-8") as file:

From a91cfa7b0b64f52a11cb1c55aeadf138a0e3b622 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 8 Jul 2019 18:30:58 +0000
Subject: [PATCH 090/114] Updated release coverage.  - Legacy-Id: 16437

---
 release-coverage.json.gz | Bin 9490299 -> 9580778 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/release-coverage.json.gz b/release-coverage.json.gz
index c696eeac1eb1b0b4b4f3690e33eb604f892e1ad1..0fe1164fb16e897b832b1b3de31e123d84fe69ef 100644
GIT binary patch
delta 113743
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ɷwI=G^6WiWsz_cUtNWhkJj{qm;oJ`fz}sUn7=$b
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�<&Uf_`b~B+-WK?QaDHW9T80qas
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�>XO-g|
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
Htmvu&i~hT-

delta 22724
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
Date: Mon, 8 Jul 2019 19:37:10 +0000
Subject: [PATCH 091/114] Updated the test crawler for python3.  - Legacy-Id:
 16438

---
 bin/test-crawl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/test-crawl b/bin/test-crawl
index 0a8d17977..6226d6837 100755
--- a/bin/test-crawl
+++ b/bin/test-crawl
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# Copyright The IETF Trust 2013-2019, All Rights Reserved
 
 import os, sys, re, datetime, argparse, traceback, json, subprocess
 import html5lib
@@ -62,6 +63,7 @@ import debug    # pyflakes:ignore
 
 from ietf.name.models import DocTypeName
 from ietf.utils.html import unescape
+from ietf.utils.test_utils import unicontent
 
 # --- Constants ---
 
@@ -387,7 +389,7 @@ if __name__ == "__main__":
                 if ctype == "text/html":
                     try:
                         if args.follow and not skip_extract_from(url):
-                            for u in extract_html_urls(r.content):
+                            for u in extract_html_urls(unicontent(r)):
                                 if u not in visited and u not in urls:
                                     urls[u] = url
                                     referrers[u] = url
@@ -403,7 +405,7 @@ if __name__ == "__main__":
                 elif ctype == "application/json":
                     try:
                         if args.follow:
-                            for u in extract_tastypie_urls(r.content):
+                            for u in extract_tastypie_urls(unicontent(r)):
                                 if u not in visited and u not in urls:
                                     urls[u] = url
                                     referrers[u] = url

From 58eca93f9a134155562866032ef1da02cb97abc5 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Tue, 9 Jul 2019 13:02:49 +0000
Subject: [PATCH 092/114] Added validation of email addresses extracted by
 get_email_addresses_from_text().  - Legacy-Id: 16439

---
 ietf/utils/mail.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/ietf/utils/mail.py b/ietf/utils/mail.py
index eaf5138db..6f0cb060a 100644
--- a/ietf/utils/mail.py
+++ b/ietf/utils/mail.py
@@ -2,6 +2,8 @@
 
 import copy
 import datetime
+import logging
+import re
 import smtplib
 import sys
 import textwrap
@@ -520,6 +522,7 @@ def is_valid_email(address):
     except ValidationError:
         return False
 
+logger = logging.getLogger('django')
 def get_email_addresses_from_text(text):
     """
 
@@ -531,5 +534,15 @@ def get_email_addresses_from_text(text):
     Returns a list of properly formatted email address strings.
 
     """
-    return [ formataddr(e) for e in getaddresses([text, ]) ]
+    def valid(email):
+        name, addr = email
+        try:
+            validate_email(addr)
+            return True
+        except ValidationError:
+            logger.error(f'Bad data: get_email_addresses_from_text() got an invalid email address tuple: {email}, in "{text}".')
+            return False
+    # whitespace normalization -- getaddresses doesn't do this
+    text = re.sub(r'(?u)\s+', ' ', text)
+    return [ formataddr(e) for e in getaddresses([text, ]) if valid(e) ]
     

From ccf58c952667221a530e38a8561bd0f9eb62ec68 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Tue, 9 Jul 2019 15:56:38 +0000
Subject: [PATCH 093/114] Removed a couple of old unused setting variables, and
 added the equivalent current one.  - Legacy-Id: 16440

---
 ietf/settings.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ietf/settings.py b/ietf/settings.py
index 8cff632b4..f4ca9fce6 100644
--- a/ietf/settings.py
+++ b/ietf/settings.py
@@ -890,8 +890,7 @@ BADNESS_TOOBIG     = 100
 BADNESS_MUCHTOOBIG = 500
 
 # do not run SELENIUM tests by default
-SELENIUM_TESTS = False
-SELENIUM_TESTS_ONLY = False
+SKIP_SELENIUM = True
 
 # Set debug apps in settings_local.DEV_APPS
 

From 71ea5ae379f7b46e16ad058cc904ce8b93956cf6 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 15 Jul 2019 14:35:25 +0000
Subject: [PATCH 094/114] Updated the file header generated by the
 makeresources managment command to set Copyright and file encoding, and use
 io.open() for py2/3 compatibility.  - Legacy-Id: 16441

---
 ietf/api/management/commands/makeresources.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/ietf/api/management/commands/makeresources.py b/ietf/api/management/commands/makeresources.py
index 6cc011a74..54830b5c1 100644
--- a/ietf/api/management/commands/makeresources.py
+++ b/ietf/api/management/commands/makeresources.py
@@ -1,10 +1,12 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
-
+from __future__ import absolute_import, print_function, unicode_literals
 
 import os
 import datetime
 import collections
+import io
+
 from importlib import import_module
 
 import debug                            # pyflakes:ignore
@@ -16,7 +18,11 @@ from django.template import Template, Context
 from tastypie.resources import ModelResource
 
 
-resource_head_template = """# Autogenerated by the makeresources management command {{date}}
+resource_head_template = """# Copyright The IETF Trust {{date}}, All Rights Reserved
+# -*- coding: utf-8 -*-
+# Generated by the makeresources management command {{date}}
+
+
 from tastypie.resources import ModelResource
 from tastypie.fields import ToManyField                 # pyflakes:ignore
 from tastypie.constants import ALL, ALL_WITH_RELATIONS  # pyflakes:ignore
@@ -79,7 +85,7 @@ class Command(AppCommand):
 
             if missing_resources:
                 print("Updating resources.py for %s" % app.name)
-                with open(resource_file_path, "a") as rfile:
+                with io.open(resource_file_path, "a") as rfile:
                     info = dict(
                         app=app.name,
                         app_label=app.label,

From 96690f5d7b554cf5dceac19d1ec7817520f99f1b Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 15 Jul 2019 15:19:06 +0000
Subject: [PATCH 095/114] Reverted a change to debug.type()  - Legacy-Id: 16442

---
 debug.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/debug.py b/debug.py
index 01551152b..393681f7f 100644
--- a/debug.py
+++ b/debug.py
@@ -166,13 +166,12 @@ def dir(name):
 
 def type(name):
     if debug:
+        name = "type(%s)" % name
         frame = inspect.stack()[1][0]
         value = eval(name, frame.f_globals, frame.f_locals)
-        name = "type(%s)" % name
-        tvalue = eval(name, frame.f_globals, frame.f_locals)
         indent = ' ' * (_report_indent[0])
-        sys.stderr.write("%s%s: %s %s\n" % (indent, name, tvalue, value))
-
+        sys.stderr.write("%s%s: %s\n" % (indent, name, value))
+            
 def say(s):
     if debug:
         indent = ' ' * (_report_indent[0])

From 01ece5bddcd2b006ee7d57f5f3e3b9445ac8815b Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 15 Jul 2019 15:35:17 +0000
Subject: [PATCH 096/114] Added a warnings filter and a conversion of syslgog
 tag argument to 'str'.  - Legacy-Id: 16443

---
 ietf/settings.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ietf/settings.py b/ietf/settings.py
index f4ca9fce6..66b98ef92 100644
--- a/ietf/settings.py
+++ b/ietf/settings.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 # Django settings for ietf project.
 # BASE_DIR and "settings_local" are from
 # http://code.djangoproject.com/wiki/SplitSettings
@@ -24,6 +27,7 @@ warnings.filterwarnings("ignore", message="django.forms.extras is deprecated.",
 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")
@@ -32,7 +36,7 @@ warnings.filterwarnings("ignore", message="Flags not at the start of the express
 
 try:
     import syslog
-    syslog.openlog("datatracker", syslog.LOG_PID, syslog.LOG_USER)
+    syslog.openlog(str("datatracker"), syslog.LOG_PID, syslog.LOG_USER)
 except ImportError:
     pass
 

From 19afa444f813b4e606067cc78d00d039b5af556b Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 15 Jul 2019 15:36:38 +0000
Subject: [PATCH 097/114] Changed the redirect tests to accept a set of correct
 redirect urls, rather than one single, since the queryarg order isn't stable
 across python versions.  - Legacy-Id: 16444

---
 ietf/redirects/tests.py | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/ietf/redirects/tests.py b/ietf/redirects/tests.py
index 9dbf8f574..0337c68b1 100644
--- a/ietf/redirects/tests.py
+++ b/ietf/redirects/tests.py
@@ -1,4 +1,5 @@
 # Copyright The IETF Trust 2009-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 # Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen 
 #
@@ -32,6 +33,8 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from ietf.utils.test_utils import split_url, TestCase
 
 import debug                            # pyflakes:ignore
@@ -46,46 +49,47 @@ REDIRECT_TESTS = {
     # idindex/idtracker
     
     '/public/pidtracker.cgi?command=view_id&dTag=11171&rfc_flag=0':
-        '/idtracker/11171/',
+        ('/idtracker/11171/', ),
     '/public/idindex.cgi?command=do_search_id&filename=draft-mills-sntp-v4-00.txt':
-        '/drafts/?filename=draft-mills-sntp-v4-00.txt',
+        ('/drafts/?filename=draft-mills-sntp-v4-00.txt', ),
     '/public/idindex.cgi?command=do_search_id&filename=draft-ietf-isis-interoperable&search_button=SEARCH':
-        '/drafts/?filename=draft-ietf-isis-interoperable&search_button=SEARCH',
+        ('/drafts/?filename=draft-ietf-isis-interoperable&search_button=SEARCH',
+         '/drafts/?search_button=SEARCH&filename=draft-ietf-isis-interoperable'),
     '/public/idindex.cgi?command=do_search_id&filename=rfc0038.txt':
-        '/drafts/?filename=rfc0038.txt',
+        ('/drafts/?filename=rfc0038.txt', ),
     '/public/idindex.cgi?command=id_detail&id=7096':
-        '/drafts/7096/',
+        ('/drafts/7096/', ),
     '/public/idindex.cgi?command=view_related_docs&id=10845':
-        '/drafts/10845/related/',
+        ('/drafts/10845/related/', ),
     '/public/idindex.cgi?command=id_detail&filename=draft-l3vpn-as4octet-ext-community':
-        '/drafts/draft-l3vpn-as4octet-ext-community/',
+        ('/drafts/draft-l3vpn-as4octet-ext-community/', ),
     # non-ASCII parameter
     '/public/pidtracker.cgi?command=view_id&dTag=11171%D182&rfc_flag=0':
-        '/idtracker/',
-    '/idtracker/': '/doc/',
+        ('/idtracker/', ),
+    '/idtracker/': ('/doc/', ),
 
     # ipr
 
     '/public/ipr_disclosure.cgi':
-        '/ipr/about/',
+        ('/ipr/about/', ), 
     '/public/ipr_detail_show.cgi?ipr_id=693':
-        '/ipr/693/',
+        ('/ipr/693/', ), 
     
     # liaisons
 
     '/public/liaison_detail.cgi?detail_id=340':
-        '/liaison/340/',
+        ('/liaison/340/', ),
 
     # meeting
 
     '/public/meeting_agenda_html.cgi?meeting_num=72':
-        '/meeting/72/agenda.html',
+        ('/meeting/72/agenda.html', ),
     '/public/meeting_materials.cgi?meeting_num=76':
-        '/meeting/76/materials.html',
+        ('/meeting/76/materials.html', ),
 
     # RedirectTrailingPeriod middleware
     '/sitemap.xml.':
-        '/sitemap.xml'
+        ('/sitemap.xml', ),
 
     }
 
@@ -100,7 +104,7 @@ class RedirectsTests(TestCase):
             location = response['Location']
             if location.startswith("http://testserver/"):
                 location = location[17:]
-            self.assertEqual(location, dst, (src, dst, location))
+            self.assertIn(location, dst, (src, dst, location))
 
 class MainUrlTests(TestCase):
     def test_urls(self):

From 6ace81b25d700e2c570eb6760b27e92a57e4e7c4 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 15 Jul 2019 15:37:48 +0000
Subject: [PATCH 098/114] Corrected the order of string prefix 'r' and 'b'
 under python2.  - Legacy-Id: 16445

---
 ietf/utils/validators.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ietf/utils/validators.py b/ietf/utils/validators.py
index c982fccfa..8ad5a6466 100644
--- a/ietf/utils/validators.py
+++ b/ietf/utils/validators.py
@@ -1,7 +1,9 @@
-# -*- python -*-
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import os
 import re
 import magic
@@ -77,7 +79,7 @@ def validate_mime_type(file, valid):
     mime_type, encoding = get_mime_type(raw)
     # work around mis-identification of text where a line has 'virtual' as
     # the first word:
-    if mime_type == 'text/x-c++' and re.search(rb'(?m)^virtual\s', raw):
+    if mime_type == 'text/x-c++' and re.search(br'(?m)^virtual\s', raw):
         mod = raw.replace(b'virtual', b' virtual')
         mime_type, encoding = get_mime_type(mod)
     if valid and not mime_type in valid:

From 2d7c9629aa86c6b5311eeaa0af6585d1258c0ae9 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 15 Jul 2019 15:40:51 +0000
Subject: [PATCH 099/114] Added 'from __future__' imports all over the place,
 to bring code behaviour into closer alignment between python2 and python3  -
 Legacy-Id: 16446

---
 ietf/__init__.py                                           | 3 +++
 ietf/api/tests.py                                          | 4 ++++
 ietf/community/admin.py                                    | 2 +-
 ietf/community/forms.py                                    | 5 +++++
 ietf/community/migrations/0001_initial.py                  | 2 +-
 ietf/community/migrations/0002_auto_20180220_1052.py       | 2 ++
 .../migrations/0003_add_communitylist_docs2_m2m.py         | 2 ++
 ietf/community/migrations/0004_set_document_m2m_keys.py    | 2 ++
 ietf/community/migrations/0005_1_del_docs_m2m_table.py     | 2 ++
 ietf/community/migrations/0005_2_add_docs_m2m_table.py     | 2 ++
 ietf/community/migrations/0006_copy_docs_m2m_table.py      | 2 ++
 ietf/community/migrations/0007_remove_docs2_m2m.py         | 2 ++
 ietf/community/resources.py                                | 3 +++
 ietf/community/tests.py                                    | 3 +++
 ietf/community/utils.py                                    | 3 +++
 ietf/cookies/__init__.py                                   | 3 +++
 ietf/cookies/views.py                                      | 4 ++++
 ietf/dbtemplate/forms.py                                   | 5 +++++
 ietf/dbtemplate/migrations/0001_initial.py                 | 2 ++
 ietf/dbtemplate/migrations/0002_auto_20180220_1052.py      | 2 ++
 ietf/dbtemplate/migrations/0003_adjust_review_templates.py | 2 ++
 .../0004_adjust_assignment_email_summary_templates.py      | 2 ++
 ietf/dbtemplate/resources.py                               | 3 +++
 ietf/dbtemplate/template.py                                | 5 +++++
 ietf/doc/admin.py                                          | 3 +++
 ietf/doc/expire.py                                         | 4 ++++
 ietf/doc/factories.py                                      | 3 +++
 ietf/doc/forms.py                                          | 3 +++
 ietf/doc/migrations/0001_initial.py                        | 2 ++
 ietf/doc/migrations/0002_auto_20180220_1052.py             | 2 ++
 ietf/doc/migrations/0003_auto_20180401_1231.py             | 2 ++
 .../migrations/0004_add_draft_stream_replaced_states.py    | 2 ++
 .../migrations/0005_fix_replaced_iab_irtf_stream_docs.py   | 2 ++
 .../migrations/0006_ballotpositiondocevent_send_email.py   | 2 ++
 ietf/doc/migrations/0007_idexists.py                       | 2 ++
 ietf/doc/migrations/0008_add_uploaded_filename.py          | 2 ++
 .../0009_move_non_url_externalurls_to_uploaded_filename.py | 2 ++
 ietf/doc/migrations/0010_auto_20190225_1302.py             | 2 ++
 ietf/doc/migrations/0011_reviewassignmentdocevent.py       | 2 ++
 .../0012_add_event_type_closed_review_assignment.py        | 2 ++
 ietf/doc/migrations/0013_add_document_docalias_id.py       | 2 ++
 ietf/doc/migrations/0014_set_document_docalias_id.py       | 2 ++
 ietf/doc/migrations/0015_1_add_fk_to_document_id.py        | 2 ++
 ietf/doc/migrations/0015_2_add_doc_document_m2m_fields.py  | 2 ++
 ietf/doc/migrations/0017_make_document_id_primary_key.py   | 2 ++
 ietf/doc/migrations/0018_remove_old_document_field.py      | 2 ++
 ietf/doc/migrations/0019_rename_field_document2.py         | 2 ++
 ietf/doc/migrations/0020_copy_docs_m2m_table.py            | 2 ++
 ietf/doc/migrations/0021_remove_docs2_m2m.py               | 2 ++
 ietf/doc/migrations/0022_document_primary_key_cleanup.py   | 2 ++
 ietf/doc/migrations/0023_one_to_many_docalias.py           | 2 ++
 ietf/doc/templatetags/managed_groups.py                    | 2 ++
 ietf/doc/tests_downref.py                                  | 2 ++
 ietf/doc/urls.py                                           | 4 ++++
 ietf/doc/urls_conflict_review.py                           | 4 ++++
 ietf/doc/views_ballot.py                                   | 4 ++++
 ietf/doc/views_downref.py                                  | 3 +++
 ietf/group/admin.py                                        | 3 +++
 ietf/group/dot.py                                          | 3 +++
 ietf/group/feeds.py                                        | 3 +++
 ietf/group/forms.py                                        | 2 ++
 ietf/group/mails.py                                        | 4 ++++
 ietf/group/migrations/0001_initial.py                      | 2 ++
 .../0002_groupfeatures_historicalgroupfeatures.py          | 2 ++
 ietf/group/migrations/0003_groupfeatures_data.py           | 2 ++
 ietf/group/migrations/0004_add_group_feature_fields.py     | 2 ++
 .../migrations/0005_group_features_list_data_to_json.py    | 2 ++
 .../migrations/0006_group_features_lists_to_jsonfield.py   | 2 ++
 ietf/group/migrations/0007_new_group_features_data.py      | 2 ++
 ietf/group/migrations/0008_group_features_onetoone.py      | 2 ++
 ietf/group/migrations/0009_auto_20190122_1012.py           | 2 ++
 ietf/group/migrations/0010_add_group_types.py              | 2 ++
 ietf/group/migrations/0011_auto_20190225_1302.py           | 2 ++
 ietf/group/migrations/0012_add_old_nomcom_announcements.py | 2 ++
 ietf/group/migrations/0013_add_groupmilestone_docs2_m2m.py | 2 ++
 ietf/group/migrations/0014_set_document_m2m_keys.py        | 2 ++
 ietf/group/migrations/0015_1_del_docs_m2m_table.py         | 2 ++
 ietf/group/migrations/0015_2_add_docs_m2m_table.py         | 2 ++
 ietf/group/migrations/0016_copy_docs_m2m_table.py          | 2 ++
 ietf/group/migrations/0017_remove_docs2_m2m.py             | 2 ++
 ietf/group/migrations/0018_remove_old_document_field.py    | 2 ++
 ietf/group/migrations/0019_rename_field_document2.py       | 2 ++
 ietf/group/resources.py                                    | 3 +++
 ietf/group/tests.py                                        | 3 +++
 ietf/iesg/__init__.py                                      | 5 ++++-
 ietf/iesg/feeds.py                                         | 5 +++++
 ietf/iesg/resources.py                                     | 3 +++
 ietf/ietfauth/forms.py                                     | 2 ++
 .../management/commands/send_apikey_usage_emails.py        | 2 ++
 ietf/ietfauth/utils.py                                     | 6 +++++-
 ietf/ipr/admin.py                                          | 3 +++
 ietf/ipr/factories.py                                      | 3 +++
 ietf/ipr/migrations/0001_initial.py                        | 2 ++
 ietf/ipr/migrations/0002_auto_20180225_1207.py             | 2 ++
 ietf/ipr/migrations/0003_add_ipdocrel_document2_fk.py      | 2 ++
 ietf/ipr/migrations/0004_remove_iprdocrel_document.py      | 2 ++
 ietf/ipr/migrations/0005_rename_field_document2.py         | 2 ++
 ietf/ipr/migrations/0006_document_primary_key_cleanup.py   | 2 ++
 ietf/ipr/resources.py                                      | 3 +++
 ietf/ipr/templatetags/ipr_filters.py                       | 4 ++++
 ietf/ipr/utils.py                                          | 3 +++
 ietf/liaisons/__init__.py                                  | 3 +++
 ietf/liaisons/admin.py                                     | 5 +++++
 ietf/liaisons/feeds.py                                     | 4 ++++
 ietf/liaisons/mails.py                                     | 5 +++++
 .../management/commands/check_liaison_deadlines.py         | 5 +++++
 .../liaisons/management/commands/remind_update_sdo_list.py | 4 ++++
 ietf/liaisons/migrations/0001_initial.py                   | 2 ++
 ietf/liaisons/migrations/0002_auto_20180225_1207.py        | 2 ++
 ietf/liaisons/migrations/0003_liaison_document2_fk.py      | 2 ++
 .../0004_remove_liaisonstatementattachment_document.py     | 2 ++
 ietf/liaisons/migrations/0005_rename_field_document2.py    | 2 ++
 .../migrations/0006_document_primary_key_cleanup.py        | 2 ++
 ietf/liaisons/resources.py                                 | 3 +++
 ietf/liaisons/widgets.py                                   | 5 +++++
 ietf/mailinglists/factories.py                             | 2 ++
 ietf/mailinglists/migrations/0001_initial.py               | 2 ++
 ietf/mailinglists/resources.py                             | 3 +++
 ietf/mailinglists/tests.py                                 | 2 ++
 ietf/mailtrigger/migrations/0001_initial.py                | 2 ++
 ietf/mailtrigger/migrations/0002_conflrev_changes.py       | 2 ++
 ietf/mailtrigger/migrations/0003_add_review_notify_ad.py   | 2 ++
 .../0004_ballot_rfceditornote_changed_postapproval.py      | 2 ++
 ietf/mailtrigger/migrations/0005_slides_proposed.py        | 2 ++
 ietf/mailtrigger/migrations/0006_sub_new_wg_00.py          | 2 ++
 ietf/mailtrigger/tests.py                                  | 5 +++++
 ietf/meeting/admin.py                                      | 5 +++++
 ietf/meeting/factories.py                                  | 5 +++++
 ietf/meeting/feeds.py                                      | 5 +++++
 ietf/meeting/management/commands/update_important_dates.py | 3 +++
 ietf/meeting/migrations/0001_initial.py                    | 2 ++
 ietf/meeting/migrations/0002_auto_20180225_1207.py         | 2 ++
 ietf/meeting/migrations/0003_rename_modified_fields.py     | 2 ++
 ietf/meeting/migrations/0004_meeting_attendees.py          | 2 ++
 ietf/meeting/migrations/0005_backfill_old_meetings.py      | 2 ++
 ietf/meeting/migrations/0006_backfill_attendees.py         | 2 ++
 ietf/meeting/migrations/0007_auto_20180716_1337.py         | 2 ++
 ietf/meeting/migrations/0008_rename_meeting_agenda_note.py | 2 ++
 ietf/meeting/migrations/0009_add_agenda_info_note.py       | 2 ++
 .../migrations/0010_set_ietf_103_agenda_info_note.py       | 2 ++
 ietf/meeting/migrations/0011_auto_20190114_0550.py         | 2 ++
 ietf/meeting/migrations/0012_add_slide_submissions.py      | 2 ++
 .../meeting/migrations/0013_make_separate_break_sessobj.py | 2 ++
 ietf/meeting/migrations/0014_auto_20190426_0305.py         | 2 ++
 .../migrations/0015_sessionpresentation_document2_fk.py    | 2 ++
 .../migrations/0016_remove_sessionpresentation_document.py | 2 ++
 ietf/meeting/migrations/0017_rename_field_document2.py     | 2 ++
 .../migrations/0018_document_primary_key_cleanup.py        | 2 ++
 ietf/meeting/resources.py                                  | 3 +++
 ietf/meeting/templatetags/agenda_custom_tags.py            | 5 +++++
 ietf/meeting/test_data.py                                  | 5 +++++
 ietf/meeting/tests_js.py                                   | 4 ++++
 ietf/message/migrations/0001_initial.py                    | 2 ++
 ietf/message/migrations/0002_add_message_docs2_m2m.py      | 2 ++
 ietf/message/migrations/0003_set_document_m2m_keys.py      | 2 ++
 ietf/message/migrations/0004_1_del_docs_m2m_table.py       | 2 ++
 ietf/message/migrations/0004_2_add_docs_m2m_table.py       | 2 ++
 ietf/message/migrations/0005_copy_docs_m2m_table.py        | 2 ++
 ietf/message/migrations/0006_remove_docs2_m2m.py           | 2 ++
 ietf/message/resources.py                                  | 3 +++
 ietf/message/tests.py                                      | 5 +++++
 ietf/middleware.py                                         | 4 ++++
 ietf/name/migrations/0001_initial.py                       | 2 ++
 ietf/name/migrations/0002_agendatypename.py                | 2 ++
 ietf/name/migrations/0003_agendatypename_data.py           | 2 ++
 ietf/name/migrations/0004_add_prefix_to_doctypenames.py    | 2 ++
 ietf/name/migrations/0005_reviewassignmentstatename.py     | 2 ++
 ietf/name/migrations/0006_adjust_statenames.py             | 2 ++
 ietf/nomcom/admin.py                                       | 5 +++++
 ietf/nomcom/decorators.py                                  | 5 +++++
 ietf/nomcom/factories.py                                   | 5 +++++
 ietf/nomcom/management/commands/make_dummy_nomcom.py       | 2 ++
 ietf/nomcom/management/commands/send_reminders.py          | 5 +++++
 ietf/nomcom/migrations/0001_initial.py                     | 2 ++
 ietf/nomcom/migrations/0002_auto_20180918_0550.py          | 2 ++
 .../migrations/0003_nomcom_show_accepted_nominees.py       | 2 ++
 ...set_show_accepted_nominees_false_on_existing_nomcoms.py | 2 ++
 ietf/nomcom/migrations/0005_auto_20181008_0602.py          | 2 ++
 ietf/nomcom/resources.py                                   | 3 +++
 ietf/person/forms.py                                       | 3 +++
 ietf/person/migrations/0001_initial.py                     | 2 ++
 ietf/person/migrations/0002_auto_20180330_0808.py          | 2 ++
 ietf/person/migrations/0003_auto_20180504_1519.py          | 2 ++
 ietf/person/migrations/0004_populate_email_origin.py       | 2 ++
 .../migrations/0005_populate_person_name_from_draft.py     | 2 ++
 ietf/person/migrations/0006_auto_20180910_0719.py          | 2 ++
 ietf/person/migrations/0007_auto_20180929_1303.py          | 2 ++
 ietf/person/migrations/0008_auto_20181014_1448.py          | 2 ++
 ietf/person/migrations/0009_auto_20190118_0725.py          | 2 ++
 ietf/person/name.py                                        | 5 +++++
 ietf/person/resources.py                                   | 3 +++
 ietf/person/views.py                                       | 5 +++++
 ietf/redirects/resources.py                                | 3 +++
 ietf/release/tests.py                                      | 2 ++
 ietf/release/urls.py                                       | 2 ++
 ietf/review/admin.py                                       | 5 +++++
 ietf/review/migrations/0001_initial.py                     | 2 ++
 ietf/review/migrations/0002_unavailableperiod_reason.py    | 2 ++
 ietf/review/migrations/0003_add_notify_ad_when.py          | 2 ++
 .../migrations/0004_reviewteamsettings_secr_mail_alias.py  | 2 ++
 ietf/review/migrations/0005_set_secdir_notify_ad_when.py   | 2 ++
 ietf/review/migrations/0006_historicalreviewersettings.py  | 2 ++
 .../migrations/0007_allow_notify_ad_when_to_be_blank.py    | 2 ++
 ietf/review/migrations/0008_remove_reviewrequest_old_id.py | 2 ++
 ietf/review/migrations/0009_refactor_review_request.py     | 2 ++
 ietf/review/migrations/0010_populate_review_assignments.py | 2 ++
 ietf/review/migrations/0011_review_document2_fk.py         | 4 +++-
 ietf/review/migrations/0012_remove_old_document_field.py   | 4 +++-
 ietf/review/migrations/0013_rename_field_document2.py      | 4 +++-
 .../review/migrations/0014_document_primary_key_cleanup.py | 4 +++-
 ietf/review/resources.py                                   | 3 +++
 ietf/review/tests.py                                       | 3 +++
 ietf/secr/announcement/forms.py                            | 5 +++++
 ietf/secr/announcement/tests.py                            | 5 +++++
 ietf/secr/console/tests.py                                 | 5 +++++
 ietf/secr/drafts/forms.py                                  | 5 +++++
 ietf/secr/groups/tests.py                                  | 4 ++++
 ietf/secr/meetings/tests.py                                | 5 +++++
 ietf/secr/proceedings/migrations/0001_initial.py           | 2 ++
 ietf/secr/roles/tests.py                                   | 4 ++++
 ietf/secr/rolodex/forms.py                                 | 2 ++
 ietf/secr/sreq/forms.py                                    | 5 +++++
 ietf/secr/sreq/views.py                                    | 5 +++++
 ietf/secr/telechat/tests.py                                | 3 +++
 ietf/secr/utils/document.py                                | 3 +++
 ietf/secr/utils/test.py                                    | 5 +++++
 ietf/settings_releasetest.py                               | 6 ++++++
 ietf/settings_sqlitetest.py                                | 5 +++++
 ietf/settings_testcrawl.py                                 | 5 +++++
 ietf/stats/migrations/0001_initial.py                      | 2 ++
 ietf/stats/resources.py                                    | 3 +++
 ietf/stats/tests.py                                        | 3 +++
 ietf/stats/urls.py                                         | 5 +++++
 ietf/submit/migrations/0001_initial.py                     | 2 ++
 ietf/submit/migrations/0002_submission_document2_fk.py     | 2 ++
 ietf/submit/migrations/0003_remove_old_document_field.py   | 2 ++
 ietf/submit/migrations/0004_rename_field_document2.py      | 2 ++
 ietf/submit/parsers/base.py                                | 4 ++++
 ietf/submit/parsers/plain_parser.py                        | 3 +++
 ietf/submit/resources.py                                   | 3 +++
 ietf/submit/templatetags/submit_tags.py                    | 5 +++++
 ietf/utils/aliases.py                                      | 7 ++++++-
 ietf/utils/bootstrap.py                                    | 5 +++++
 ietf/utils/draft_search.py                                 | 5 +++++
 ietf/utils/history.py                                      | 3 +++
 ietf/utils/management/commands/loadrelated.py              | 2 ++
 ietf/utils/management/commands/populate_yang_model_dirs.py | 3 +++
 ietf/utils/management/commands/pyflakes.py                 | 4 ++++
 ietf/utils/management/commands/run_yang_model_checks.py    | 3 +++
 ietf/utils/management/commands/send_apikey_usage_emails.py | 4 +++-
 .../management/commands/update_community_list_index.py     | 2 ++
 .../management/commands/update_external_command_info.py    | 3 +++
 ietf/utils/migrations/0001_initial.py                      | 2 ++
 ietf/utils/ordereddict.py                                  | 5 +++++
 ietf/utils/pipe.py                                         | 7 ++++++-
 ietf/utils/resources.py                                    | 3 +++
 ietf/utils/templatetags/htmlfilters.py                     | 3 +++
 ietf/utils/templatetags/textfilters.py                     | 3 +++
 ietf/utils/test_data.py                                    | 2 ++
 ietf/utils/texescape.py                                    | 4 ++++
 ietf/utils/textupload.py                                   | 5 +++++
 261 files changed, 735 insertions(+), 11 deletions(-)

diff --git a/ietf/__init__.py b/ietf/__init__.py
index 2830859d2..82bed7bcf 100644
--- a/ietf/__init__.py
+++ b/ietf/__init__.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 from . import checks                           # pyflakes:ignore
 
 # Don't add patch number here:
diff --git a/ietf/api/tests.py b/ietf/api/tests.py
index 75351c798..accc96989 100644
--- a/ietf/api/tests.py
+++ b/ietf/api/tests.py
@@ -1,4 +1,8 @@
 # Copyright The IETF Trust 2015-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import os
 import sys
diff --git a/ietf/community/admin.py b/ietf/community/admin.py
index e36ac256e..fd7889f74 100644
--- a/ietf/community/admin.py
+++ b/ietf/community/admin.py
@@ -1,6 +1,6 @@
 # Copyright The IETF Trust 2017-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
-
+from __future__ import absolute_import, print_function, unicode_literals
 
 from django.contrib import admin
 
diff --git a/ietf/community/forms.py b/ietf/community/forms.py
index 5ad6cddaa..1677c950c 100644
--- a/ietf/community/forms.py
+++ b/ietf/community/forms.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2012-2019, 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
 
diff --git a/ietf/community/migrations/0001_initial.py b/ietf/community/migrations/0001_initial.py
index 18270ac3d..784093123 100644
--- a/ietf/community/migrations/0001_initial.py
+++ b/ietf/community/migrations/0001_initial.py
@@ -1,7 +1,7 @@
 # Copyright The IETF Trust 2018-2019, 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
diff --git a/ietf/community/migrations/0002_auto_20180220_1052.py b/ietf/community/migrations/0002_auto_20180220_1052.py
index eda75147f..93a0ebd5e 100644
--- a/ietf/community/migrations/0002_auto_20180220_1052.py
+++ b/ietf/community/migrations/0002_auto_20180220_1052.py
@@ -3,6 +3,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
diff --git a/ietf/community/migrations/0003_add_communitylist_docs2_m2m.py b/ietf/community/migrations/0003_add_communitylist_docs2_m2m.py
index 4bd72b17c..34c620fbe 100644
--- a/ietf/community/migrations/0003_add_communitylist_docs2_m2m.py
+++ b/ietf/community/migrations/0003_add_communitylist_docs2_m2m.py
@@ -3,6 +3,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
diff --git a/ietf/community/migrations/0004_set_document_m2m_keys.py b/ietf/community/migrations/0004_set_document_m2m_keys.py
index f28a44a6b..095ef5243 100644
--- a/ietf/community/migrations/0004_set_document_m2m_keys.py
+++ b/ietf/community/migrations/0004_set_document_m2m_keys.py
@@ -3,6 +3,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
diff --git a/ietf/community/migrations/0005_1_del_docs_m2m_table.py b/ietf/community/migrations/0005_1_del_docs_m2m_table.py
index 2aaaa1de9..0ff9ace87 100644
--- a/ietf/community/migrations/0005_1_del_docs_m2m_table.py
+++ b/ietf/community/migrations/0005_1_del_docs_m2m_table.py
@@ -3,6 +3,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
 
 
diff --git a/ietf/community/migrations/0005_2_add_docs_m2m_table.py b/ietf/community/migrations/0005_2_add_docs_m2m_table.py
index 7e7d4e794..8847eadc4 100644
--- a/ietf/community/migrations/0005_2_add_docs_m2m_table.py
+++ b/ietf/community/migrations/0005_2_add_docs_m2m_table.py
@@ -3,6 +3,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
 
 
diff --git a/ietf/community/migrations/0006_copy_docs_m2m_table.py b/ietf/community/migrations/0006_copy_docs_m2m_table.py
index 0390ab03d..9a9b40a7b 100644
--- a/ietf/community/migrations/0006_copy_docs_m2m_table.py
+++ b/ietf/community/migrations/0006_copy_docs_m2m_table.py
@@ -3,6 +3,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
diff --git a/ietf/community/migrations/0007_remove_docs2_m2m.py b/ietf/community/migrations/0007_remove_docs2_m2m.py
index 2fec92659..dce7e45cc 100644
--- a/ietf/community/migrations/0007_remove_docs2_m2m.py
+++ b/ietf/community/migrations/0007_remove_docs2_m2m.py
@@ -3,6 +3,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
 
 
diff --git a/ietf/community/resources.py b/ietf/community/resources.py
index eea118ed7..2d87f3ce9 100644
--- a/ietf/community/resources.py
+++ b/ietf/community/resources.py
@@ -1,5 +1,8 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 # Autogenerated by the mkresources management command 2014-11-13 23:53
+
+
 from ietf.api import ModelResource
 from tastypie.fields import ToOneField, ToManyField
 from tastypie.constants import ALL, ALL_WITH_RELATIONS
diff --git a/ietf/community/tests.py b/ietf/community/tests.py
index 1076750f9..2882a0df7 100644
--- a/ietf/community/tests.py
+++ b/ietf/community/tests.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2016-2019, 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
diff --git a/ietf/community/utils.py b/ietf/community/utils.py
index 357a48366..2d7ed5ef5 100644
--- a/ietf/community/utils.py
+++ b/ietf/community/utils.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import re
 
 from django.db.models import Q
diff --git a/ietf/cookies/__init__.py b/ietf/cookies/__init__.py
index 65eb4a033..f17c21d38 100644
--- a/ietf/cookies/__init__.py
+++ b/ietf/cookies/__init__.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2010-2019, 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
diff --git a/ietf/cookies/views.py b/ietf/cookies/views.py
index 700222b48..58268dc61 100644
--- a/ietf/cookies/views.py
+++ b/ietf/cookies/views.py
@@ -1,4 +1,8 @@
 # Copyright The IETF Trust 2010-2019, 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
diff --git a/ietf/dbtemplate/forms.py b/ietf/dbtemplate/forms.py
index f502249b0..987d61b60 100644
--- a/ietf/dbtemplate/forms.py
+++ b/ietf/dbtemplate/forms.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2012-2019, 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
diff --git a/ietf/dbtemplate/migrations/0001_initial.py b/ietf/dbtemplate/migrations/0001_initial.py
index 32fbae322..dd4944906 100644
--- a/ietf/dbtemplate/migrations/0001_initial.py
+++ b/ietf/dbtemplate/migrations/0001_initial.py
@@ -3,6 +3,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
 
 
diff --git a/ietf/dbtemplate/migrations/0002_auto_20180220_1052.py b/ietf/dbtemplate/migrations/0002_auto_20180220_1052.py
index 7545334d0..84f026f7a 100644
--- a/ietf/dbtemplate/migrations/0002_auto_20180220_1052.py
+++ b/ietf/dbtemplate/migrations/0002_auto_20180220_1052.py
@@ -3,6 +3,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
diff --git a/ietf/dbtemplate/migrations/0003_adjust_review_templates.py b/ietf/dbtemplate/migrations/0003_adjust_review_templates.py
index cd8e9d8c0..80699981c 100644
--- a/ietf/dbtemplate/migrations/0003_adjust_review_templates.py
+++ b/ietf/dbtemplate/migrations/0003_adjust_review_templates.py
@@ -3,6 +3,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):
diff --git a/ietf/dbtemplate/migrations/0004_adjust_assignment_email_summary_templates.py b/ietf/dbtemplate/migrations/0004_adjust_assignment_email_summary_templates.py
index ccee5eb17..9aa7493fe 100644
--- a/ietf/dbtemplate/migrations/0004_adjust_assignment_email_summary_templates.py
+++ b/ietf/dbtemplate/migrations/0004_adjust_assignment_email_summary_templates.py
@@ -3,6 +3,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):
diff --git a/ietf/dbtemplate/resources.py b/ietf/dbtemplate/resources.py
index 73e11a9de..3db6e4e11 100644
--- a/ietf/dbtemplate/resources.py
+++ b/ietf/dbtemplate/resources.py
@@ -1,5 +1,8 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 # Autogenerated by the mkresources management command 2014-11-13 23:53
+
+
 from ietf.api import ModelResource
 from tastypie.fields import ToOneField
 from tastypie.constants import ALL, ALL_WITH_RELATIONS
diff --git a/ietf/dbtemplate/template.py b/ietf/dbtemplate/template.py
index efb3b06b4..1b207458a 100644
--- a/ietf/dbtemplate/template.py
+++ b/ietf/dbtemplate/template.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2012-2019, 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
diff --git a/ietf/doc/admin.py b/ietf/doc/admin.py
index 08719a6a2..73dfb22e3 100644
--- a/ietf/doc/admin.py
+++ b/ietf/doc/admin.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2010-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.contrib import admin
 from django import forms
 
diff --git a/ietf/doc/expire.py b/ietf/doc/expire.py
index 0bfe5c40d..5e1add9cd 100644
--- a/ietf/doc/expire.py
+++ b/ietf/doc/expire.py
@@ -1,6 +1,10 @@
 # Copyright The IETF Trust 2010-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 # expiry of Internet Drafts
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.conf import settings
 
 import datetime, os, shutil, glob, re
diff --git a/ietf/doc/factories.py b/ietf/doc/factories.py
index ad46c66f2..af707eda3 100644
--- a/ietf/doc/factories.py
+++ b/ietf/doc/factories.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import debug    # pyflakes:ignore
 import factory
 import datetime
diff --git a/ietf/doc/forms.py b/ietf/doc/forms.py
index a9c0e1e19..1dd23f474 100644
--- a/ietf/doc/forms.py
+++ b/ietf/doc/forms.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 
 import datetime
 import debug #pyflakes:ignore
diff --git a/ietf/doc/migrations/0001_initial.py b/ietf/doc/migrations/0001_initial.py
index 71caeb27c..6ec0f547a 100644
--- a/ietf/doc/migrations/0001_initial.py
+++ b/ietf/doc/migrations/0001_initial.py
@@ -3,6 +3,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
diff --git a/ietf/doc/migrations/0002_auto_20180220_1052.py b/ietf/doc/migrations/0002_auto_20180220_1052.py
index 47e409a96..78b706cf5 100644
--- a/ietf/doc/migrations/0002_auto_20180220_1052.py
+++ b/ietf/doc/migrations/0002_auto_20180220_1052.py
@@ -3,6 +3,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
diff --git a/ietf/doc/migrations/0003_auto_20180401_1231.py b/ietf/doc/migrations/0003_auto_20180401_1231.py
index 10c2700cd..f6f6144bc 100644
--- a/ietf/doc/migrations/0003_auto_20180401_1231.py
+++ b/ietf/doc/migrations/0003_auto_20180401_1231.py
@@ -3,6 +3,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
 
 
diff --git a/ietf/doc/migrations/0004_add_draft_stream_replaced_states.py b/ietf/doc/migrations/0004_add_draft_stream_replaced_states.py
index 7d09d7ea2..5ab95997f 100644
--- a/ietf/doc/migrations/0004_add_draft_stream_replaced_states.py
+++ b/ietf/doc/migrations/0004_add_draft_stream_replaced_states.py
@@ -3,6 +3,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):
diff --git a/ietf/doc/migrations/0005_fix_replaced_iab_irtf_stream_docs.py b/ietf/doc/migrations/0005_fix_replaced_iab_irtf_stream_docs.py
index 18840a621..da03c5fa1 100644
--- a/ietf/doc/migrations/0005_fix_replaced_iab_irtf_stream_docs.py
+++ b/ietf/doc/migrations/0005_fix_replaced_iab_irtf_stream_docs.py
@@ -3,6 +3,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):
diff --git a/ietf/doc/migrations/0006_ballotpositiondocevent_send_email.py b/ietf/doc/migrations/0006_ballotpositiondocevent_send_email.py
index 7da218deb..44ea6295f 100644
--- a/ietf/doc/migrations/0006_ballotpositiondocevent_send_email.py
+++ b/ietf/doc/migrations/0006_ballotpositiondocevent_send_email.py
@@ -3,6 +3,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
 
 
diff --git a/ietf/doc/migrations/0007_idexists.py b/ietf/doc/migrations/0007_idexists.py
index f943a380a..3731661ae 100644
--- a/ietf/doc/migrations/0007_idexists.py
+++ b/ietf/doc/migrations/0007_idexists.py
@@ -3,6 +3,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
diff --git a/ietf/doc/migrations/0008_add_uploaded_filename.py b/ietf/doc/migrations/0008_add_uploaded_filename.py
index 97c149bb3..82e528b8d 100644
--- a/ietf/doc/migrations/0008_add_uploaded_filename.py
+++ b/ietf/doc/migrations/0008_add_uploaded_filename.py
@@ -3,6 +3,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
 
 
diff --git a/ietf/doc/migrations/0009_move_non_url_externalurls_to_uploaded_filename.py b/ietf/doc/migrations/0009_move_non_url_externalurls_to_uploaded_filename.py
index c05baa5d6..95ef47d11 100644
--- a/ietf/doc/migrations/0009_move_non_url_externalurls_to_uploaded_filename.py
+++ b/ietf/doc/migrations/0009_move_non_url_externalurls_to_uploaded_filename.py
@@ -3,6 +3,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
 
diff --git a/ietf/doc/migrations/0010_auto_20190225_1302.py b/ietf/doc/migrations/0010_auto_20190225_1302.py
index dcad974fb..1d581c59b 100644
--- a/ietf/doc/migrations/0010_auto_20190225_1302.py
+++ b/ietf/doc/migrations/0010_auto_20190225_1302.py
@@ -3,6 +3,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
 
 
diff --git a/ietf/doc/migrations/0011_reviewassignmentdocevent.py b/ietf/doc/migrations/0011_reviewassignmentdocevent.py
index ac04a7577..0482dd967 100644
--- a/ietf/doc/migrations/0011_reviewassignmentdocevent.py
+++ b/ietf/doc/migrations/0011_reviewassignmentdocevent.py
@@ -3,6 +3,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
diff --git a/ietf/doc/migrations/0012_add_event_type_closed_review_assignment.py b/ietf/doc/migrations/0012_add_event_type_closed_review_assignment.py
index c946e3e12..813943da5 100644
--- a/ietf/doc/migrations/0012_add_event_type_closed_review_assignment.py
+++ b/ietf/doc/migrations/0012_add_event_type_closed_review_assignment.py
@@ -3,6 +3,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
 
 
diff --git a/ietf/doc/migrations/0013_add_document_docalias_id.py b/ietf/doc/migrations/0013_add_document_docalias_id.py
index 75700530c..09d3f1a87 100644
--- a/ietf/doc/migrations/0013_add_document_docalias_id.py
+++ b/ietf/doc/migrations/0013_add_document_docalias_id.py
@@ -3,6 +3,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
 
 
diff --git a/ietf/doc/migrations/0014_set_document_docalias_id.py b/ietf/doc/migrations/0014_set_document_docalias_id.py
index 5c97c81e5..785b82bf2 100644
--- a/ietf/doc/migrations/0014_set_document_docalias_id.py
+++ b/ietf/doc/migrations/0014_set_document_docalias_id.py
@@ -3,6 +3,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
diff --git a/ietf/doc/migrations/0015_1_add_fk_to_document_id.py b/ietf/doc/migrations/0015_1_add_fk_to_document_id.py
index fff0c56af..1efabe53d 100644
--- a/ietf/doc/migrations/0015_1_add_fk_to_document_id.py
+++ b/ietf/doc/migrations/0015_1_add_fk_to_document_id.py
@@ -3,6 +3,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
diff --git a/ietf/doc/migrations/0015_2_add_doc_document_m2m_fields.py b/ietf/doc/migrations/0015_2_add_doc_document_m2m_fields.py
index 8b426b77d..2bd8a7ae1 100644
--- a/ietf/doc/migrations/0015_2_add_doc_document_m2m_fields.py
+++ b/ietf/doc/migrations/0015_2_add_doc_document_m2m_fields.py
@@ -3,6 +3,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
diff --git a/ietf/doc/migrations/0017_make_document_id_primary_key.py b/ietf/doc/migrations/0017_make_document_id_primary_key.py
index 57fd2e379..3bbaa8176 100644
--- a/ietf/doc/migrations/0017_make_document_id_primary_key.py
+++ b/ietf/doc/migrations/0017_make_document_id_primary_key.py
@@ -3,6 +3,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
 
 
diff --git a/ietf/doc/migrations/0018_remove_old_document_field.py b/ietf/doc/migrations/0018_remove_old_document_field.py
index f02cc6fa4..19a8a4065 100644
--- a/ietf/doc/migrations/0018_remove_old_document_field.py
+++ b/ietf/doc/migrations/0018_remove_old_document_field.py
@@ -3,6 +3,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
diff --git a/ietf/doc/migrations/0019_rename_field_document2.py b/ietf/doc/migrations/0019_rename_field_document2.py
index 0319e5461..1d7cc0b21 100644
--- a/ietf/doc/migrations/0019_rename_field_document2.py
+++ b/ietf/doc/migrations/0019_rename_field_document2.py
@@ -3,6 +3,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
 
 
diff --git a/ietf/doc/migrations/0020_copy_docs_m2m_table.py b/ietf/doc/migrations/0020_copy_docs_m2m_table.py
index 0817ca716..1bc395c33 100644
--- a/ietf/doc/migrations/0020_copy_docs_m2m_table.py
+++ b/ietf/doc/migrations/0020_copy_docs_m2m_table.py
@@ -3,6 +3,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
diff --git a/ietf/doc/migrations/0021_remove_docs2_m2m.py b/ietf/doc/migrations/0021_remove_docs2_m2m.py
index b89aba803..469523732 100644
--- a/ietf/doc/migrations/0021_remove_docs2_m2m.py
+++ b/ietf/doc/migrations/0021_remove_docs2_m2m.py
@@ -3,6 +3,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
 
 
diff --git a/ietf/doc/migrations/0022_document_primary_key_cleanup.py b/ietf/doc/migrations/0022_document_primary_key_cleanup.py
index 3700228fc..5b666907c 100644
--- a/ietf/doc/migrations/0022_document_primary_key_cleanup.py
+++ b/ietf/doc/migrations/0022_document_primary_key_cleanup.py
@@ -3,6 +3,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
diff --git a/ietf/doc/migrations/0023_one_to_many_docalias.py b/ietf/doc/migrations/0023_one_to_many_docalias.py
index 9e0d3de26..cf7f54756 100644
--- a/ietf/doc/migrations/0023_one_to_many_docalias.py
+++ b/ietf/doc/migrations/0023_one_to_many_docalias.py
@@ -3,6 +3,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
diff --git a/ietf/doc/templatetags/managed_groups.py b/ietf/doc/templatetags/managed_groups.py
index c971d21c6..53a16d3a2 100644
--- a/ietf/doc/templatetags/managed_groups.py
+++ b/ietf/doc/templatetags/managed_groups.py
@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django import template
 
 import debug                            # pyflakes:ignore
diff --git a/ietf/doc/tests_downref.py b/ietf/doc/tests_downref.py
index bf5dcfa7b..714e2d965 100644
--- a/ietf/doc/tests_downref.py
+++ b/ietf/doc/tests_downref.py
@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 
 from django.urls import reverse as urlreverse
 from pyquery import PyQuery
diff --git a/ietf/doc/urls.py b/ietf/doc/urls.py
index 32f3ae5bc..2de7d2806 100644
--- a/ietf/doc/urls.py
+++ b/ietf/doc/urls.py
@@ -1,4 +1,5 @@
 # Copyright The IETF Trust 2009-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 # Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen 
 #
@@ -31,6 +32,9 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # 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
diff --git a/ietf/doc/urls_conflict_review.py b/ietf/doc/urls_conflict_review.py
index e59f39189..3e244d852 100644
--- a/ietf/doc/urls_conflict_review.py
+++ b/ietf/doc/urls_conflict_review.py
@@ -1,4 +1,8 @@
 # Copyright The IETF Trust 2012-2019, 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
diff --git a/ietf/doc/views_ballot.py b/ietf/doc/views_ballot.py
index 85d533442..78e0d64f7 100644
--- a/ietf/doc/views_ballot.py
+++ b/ietf/doc/views_ballot.py
@@ -1,7 +1,11 @@
 # Copyright The IETF Trust 2010-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 # ballot management (voting, commenting, writeups, ...) for Area
 # Directors and Secretariat
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime, json
 
 from django import forms
diff --git a/ietf/doc/views_downref.py b/ietf/doc/views_downref.py
index 662fe87b0..4336566f8 100644
--- a/ietf/doc/views_downref.py
+++ b/ietf/doc/views_downref.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2017-2019, 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
diff --git a/ietf/group/admin.py b/ietf/group/admin.py
index a6b31a1d5..b44babe1b 100644
--- a/ietf/group/admin.py
+++ b/ietf/group/admin.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2010-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 from functools import update_wrapper
 
 from django.contrib import admin
diff --git a/ietf/group/dot.py b/ietf/group/dot.py
index a29a509e3..0efc40545 100644
--- a/ietf/group/dot.py
+++ b/ietf/group/dot.py
@@ -1,7 +1,10 @@
 # Copyright The IETF Trust 2017-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 # -*- check-flake8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db.models import Q
 from django.template.loader import render_to_string
 
diff --git a/ietf/group/feeds.py b/ietf/group/feeds.py
index 57521c983..8cc8a98ee 100644
--- a/ietf/group/feeds.py
+++ b/ietf/group/feeds.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2011-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.contrib.syndication.views import Feed, FeedDoesNotExist
 from django.utils.feedgenerator import Atom1Feed
 from django.urls import reverse as urlreverse
diff --git a/ietf/group/forms.py b/ietf/group/forms.py
index 6663ec796..50c56baa2 100644
--- a/ietf/group/forms.py
+++ b/ietf/group/forms.py
@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 # Stdlib imports
 import re
 
diff --git a/ietf/group/mails.py b/ietf/group/mails.py
index e4f1042fc..9adcbc4d1 100644
--- a/ietf/group/mails.py
+++ b/ietf/group/mails.py
@@ -1,6 +1,10 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 # generation of mails 
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import re
 
 
diff --git a/ietf/group/migrations/0001_initial.py b/ietf/group/migrations/0001_initial.py
index a0593af8c..331aeb166 100644
--- a/ietf/group/migrations/0001_initial.py
+++ b/ietf/group/migrations/0001_initial.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.10 on 2018-02-20 10:52
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 from django.db import migrations, models
 import django.db.models.deletion
diff --git a/ietf/group/migrations/0002_groupfeatures_historicalgroupfeatures.py b/ietf/group/migrations/0002_groupfeatures_historicalgroupfeatures.py
index ac3bf887b..54f7f784e 100644
--- a/ietf/group/migrations/0002_groupfeatures_historicalgroupfeatures.py
+++ b/ietf/group/migrations/0002_groupfeatures_historicalgroupfeatures.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.13 on 2018-07-10 15:58
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import django.core.validators
 import django.db.models.deletion
 
diff --git a/ietf/group/migrations/0003_groupfeatures_data.py b/ietf/group/migrations/0003_groupfeatures_data.py
index 7d971c8b3..6d78632ed 100644
--- a/ietf/group/migrations/0003_groupfeatures_data.py
+++ b/ietf/group/migrations/0003_groupfeatures_data.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.13 on 2018-07-10 15:58
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.conf import settings
 from django.db import migrations
 
diff --git a/ietf/group/migrations/0004_add_group_feature_fields.py b/ietf/group/migrations/0004_add_group_feature_fields.py
index 8897d7530..625273c74 100644
--- a/ietf/group/migrations/0004_add_group_feature_fields.py
+++ b/ietf/group/migrations/0004_add_group_feature_fields.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.16 on 2019-01-10 07:51
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import django.core.validators
 from django.db import migrations, models
 
diff --git a/ietf/group/migrations/0005_group_features_list_data_to_json.py b/ietf/group/migrations/0005_group_features_list_data_to_json.py
index 9a2309226..1a1597833 100644
--- a/ietf/group/migrations/0005_group_features_list_data_to_json.py
+++ b/ietf/group/migrations/0005_group_features_list_data_to_json.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.16 on 2019-01-09 09:02
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import json
 import re
 
diff --git a/ietf/group/migrations/0006_group_features_lists_to_jsonfield.py b/ietf/group/migrations/0006_group_features_lists_to_jsonfield.py
index 26d5cccdd..bd045f6f5 100644
--- a/ietf/group/migrations/0006_group_features_lists_to_jsonfield.py
+++ b/ietf/group/migrations/0006_group_features_lists_to_jsonfield.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.16 on 2019-01-16 05:53
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations, models
 import jsonfield.fields
 
diff --git a/ietf/group/migrations/0007_new_group_features_data.py b/ietf/group/migrations/0007_new_group_features_data.py
index 555be5809..697f1a04a 100644
--- a/ietf/group/migrations/0007_new_group_features_data.py
+++ b/ietf/group/migrations/0007_new_group_features_data.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.16 on 2019-01-09 09:02
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 
 from django.db import migrations
 
diff --git a/ietf/group/migrations/0008_group_features_onetoone.py b/ietf/group/migrations/0008_group_features_onetoone.py
index 3daed25f2..27883d18f 100644
--- a/ietf/group/migrations/0008_group_features_onetoone.py
+++ b/ietf/group/migrations/0008_group_features_onetoone.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.16 on 2019-01-19 10:08
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations, models
 import django.db.models.deletion
 import ietf.utils.models
diff --git a/ietf/group/migrations/0009_auto_20190122_1012.py b/ietf/group/migrations/0009_auto_20190122_1012.py
index 7b556dd5d..254ec9e69 100644
--- a/ietf/group/migrations/0009_auto_20190122_1012.py
+++ b/ietf/group/migrations/0009_auto_20190122_1012.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.18 on 2019-01-22 10:12
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations, models
 import django.db.models.deletion
 
diff --git a/ietf/group/migrations/0010_add_group_types.py b/ietf/group/migrations/0010_add_group_types.py
index ad4472c67..3f16d377f 100644
--- a/ietf/group/migrations/0010_add_group_types.py
+++ b/ietf/group/migrations/0010_add_group_types.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.16 on 2019-01-09 09:02
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 
 from django.db import migrations
 
diff --git a/ietf/group/migrations/0011_auto_20190225_1302.py b/ietf/group/migrations/0011_auto_20190225_1302.py
index 5c11c9574..0dfa13f25 100644
--- a/ietf/group/migrations/0011_auto_20190225_1302.py
+++ b/ietf/group/migrations/0011_auto_20190225_1302.py
@@ -3,6 +3,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
 
 
diff --git a/ietf/group/migrations/0012_add_old_nomcom_announcements.py b/ietf/group/migrations/0012_add_old_nomcom_announcements.py
index 19d232f66..50308af2c 100644
--- a/ietf/group/migrations/0012_add_old_nomcom_announcements.py
+++ b/ietf/group/migrations/0012_add_old_nomcom_announcements.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.20 on 2019-03-23 17:50
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 
 from ietf.group.models import Group 
diff --git a/ietf/group/migrations/0013_add_groupmilestone_docs2_m2m.py b/ietf/group/migrations/0013_add_groupmilestone_docs2_m2m.py
index b980f5d0c..823ac3ee5 100644
--- a/ietf/group/migrations/0013_add_groupmilestone_docs2_m2m.py
+++ b/ietf/group/migrations/0013_add_groupmilestone_docs2_m2m.py
@@ -3,6 +3,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
 import django.db.models.deletion
 import ietf.utils.models
diff --git a/ietf/group/migrations/0014_set_document_m2m_keys.py b/ietf/group/migrations/0014_set_document_m2m_keys.py
index 520c15e8a..46311d284 100644
--- a/ietf/group/migrations/0014_set_document_m2m_keys.py
+++ b/ietf/group/migrations/0014_set_document_m2m_keys.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.20 on 2019-05-10 06:48
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import sys
 
 from tqdm import tqdm
diff --git a/ietf/group/migrations/0015_1_del_docs_m2m_table.py b/ietf/group/migrations/0015_1_del_docs_m2m_table.py
index 1e5e856b3..1f9868880 100644
--- a/ietf/group/migrations/0015_1_del_docs_m2m_table.py
+++ b/ietf/group/migrations/0015_1_del_docs_m2m_table.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.20 on 2019-05-22 08:00
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations, models
 
 
diff --git a/ietf/group/migrations/0015_2_add_docs_m2m_table.py b/ietf/group/migrations/0015_2_add_docs_m2m_table.py
index d66087372..02d16942c 100644
--- a/ietf/group/migrations/0015_2_add_docs_m2m_table.py
+++ b/ietf/group/migrations/0015_2_add_docs_m2m_table.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.20 on 2019-05-22 08:00
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations, models
 
 
diff --git a/ietf/group/migrations/0016_copy_docs_m2m_table.py b/ietf/group/migrations/0016_copy_docs_m2m_table.py
index 9a380f601..0b34ff7ff 100644
--- a/ietf/group/migrations/0016_copy_docs_m2m_table.py
+++ b/ietf/group/migrations/0016_copy_docs_m2m_table.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.20 on 2019-05-27 05:57
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import sys, time
 
 from tqdm import tqdm
diff --git a/ietf/group/migrations/0017_remove_docs2_m2m.py b/ietf/group/migrations/0017_remove_docs2_m2m.py
index 4f67ac8d3..0839ace4f 100644
--- a/ietf/group/migrations/0017_remove_docs2_m2m.py
+++ b/ietf/group/migrations/0017_remove_docs2_m2m.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.20 on 2019-05-30 03:23
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 
 
diff --git a/ietf/group/migrations/0018_remove_old_document_field.py b/ietf/group/migrations/0018_remove_old_document_field.py
index 0ee29de38..46b165e29 100644
--- a/ietf/group/migrations/0018_remove_old_document_field.py
+++ b/ietf/group/migrations/0018_remove_old_document_field.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.20 on 2019-05-25 06:51
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 
 
diff --git a/ietf/group/migrations/0019_rename_field_document2.py b/ietf/group/migrations/0019_rename_field_document2.py
index 2bd82f5bc..ee6747514 100644
--- a/ietf/group/migrations/0019_rename_field_document2.py
+++ b/ietf/group/migrations/0019_rename_field_document2.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.20 on 2019-05-25 06:52
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 
 
diff --git a/ietf/group/resources.py b/ietf/group/resources.py
index d8f86504b..d32a6da29 100644
--- a/ietf/group/resources.py
+++ b/ietf/group/resources.py
@@ -1,5 +1,8 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 # Autogenerated by the mkresources management command 2014-11-13 23:15
+
+
 from ietf.api import ModelResource
 from ietf.api import ToOneField
 from tastypie.fields import ToManyField, CharField
diff --git a/ietf/group/tests.py b/ietf/group/tests.py
index 6b37b4f90..1fbe40cb6 100644
--- a/ietf/group/tests.py
+++ b/ietf/group/tests.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import os
 from unittest import skipIf
 
diff --git a/ietf/iesg/__init__.py b/ietf/iesg/__init__.py
index 4473dca5e..78e8b3ff8 100644
--- a/ietf/iesg/__init__.py
+++ b/ietf/iesg/__init__.py
@@ -1,5 +1,8 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
-# coding: latin-1
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 from types import ModuleType
 
diff --git a/ietf/iesg/feeds.py b/ietf/iesg/feeds.py
index 3e620a780..0cd17f5fe 100644
--- a/ietf/iesg/feeds.py
+++ b/ietf/iesg/feeds.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 
 from django.contrib.syndication.views import Feed
diff --git a/ietf/iesg/resources.py b/ietf/iesg/resources.py
index 96293bc45..a67dbc3a4 100644
--- a/ietf/iesg/resources.py
+++ b/ietf/iesg/resources.py
@@ -1,5 +1,8 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 # Autogenerated by the mkresources management command 2014-11-13 23:53
+
+
 from ietf.api import ModelResource
 from tastypie.constants import ALL
 from tastypie.cache import SimpleCache
diff --git a/ietf/ietfauth/forms.py b/ietf/ietfauth/forms.py
index ab550a52a..db4874412 100644
--- a/ietf/ietfauth/forms.py
+++ b/ietf/ietfauth/forms.py
@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import re
 from unidecode import unidecode
 
diff --git a/ietf/ietfauth/management/commands/send_apikey_usage_emails.py b/ietf/ietfauth/management/commands/send_apikey_usage_emails.py
index ead143e92..ad671c218 100644
--- a/ietf/ietfauth/management/commands/send_apikey_usage_emails.py
+++ b/ietf/ietfauth/management/commands/send_apikey_usage_emails.py
@@ -2,6 +2,8 @@
 # Copyright The IETF Trust 2017-2019, All Rights Reserved
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 
 from textwrap import dedent
diff --git a/ietf/ietfauth/utils.py b/ietf/ietfauth/utils.py
index b07509268..59eaa99a5 100644
--- a/ietf/ietfauth/utils.py
+++ b/ietf/ietfauth/utils.py
@@ -1,4 +1,8 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 # various authentication and authorization utilities
 
@@ -30,7 +34,7 @@ def has_role(user, role_names, *args, **kwargs):
     """Determines whether user has any of the given standard roles
     given. Role names must be a list or, in case of a single value, a
     string."""
-    if isinstance(role_names, str) or isinstance(role_names, str):
+    if not isinstance(role_names, (list, tuple)):
         role_names = [ role_names ]
     
     if not user or not user.is_authenticated:
diff --git a/ietf/ipr/admin.py b/ietf/ipr/admin.py
index 72201b726..bcc0c33aa 100644
--- a/ietf/ipr/admin.py
+++ b/ietf/ipr/admin.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2010-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django import forms
 from django.contrib import admin
 from ietf.name.models import DocRelationshipName
diff --git a/ietf/ipr/factories.py b/ietf/ipr/factories.py
index 62a96f191..038117f75 100644
--- a/ietf/ipr/factories.py
+++ b/ietf/ipr/factories.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2018-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 import factory
 
diff --git a/ietf/ipr/migrations/0001_initial.py b/ietf/ipr/migrations/0001_initial.py
index 96225f7d2..ac077dd85 100644
--- a/ietf/ipr/migrations/0001_initial.py
+++ b/ietf/ipr/migrations/0001_initial.py
@@ -3,6 +3,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
diff --git a/ietf/ipr/migrations/0002_auto_20180225_1207.py b/ietf/ipr/migrations/0002_auto_20180225_1207.py
index 31c1a23fe..01c1fa9b1 100644
--- a/ietf/ipr/migrations/0002_auto_20180225_1207.py
+++ b/ietf/ipr/migrations/0002_auto_20180225_1207.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.10 on 2018-02-25 12:07
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 
 
diff --git a/ietf/ipr/migrations/0003_add_ipdocrel_document2_fk.py b/ietf/ipr/migrations/0003_add_ipdocrel_document2_fk.py
index bd1542c61..35576ffb3 100644
--- a/ietf/ipr/migrations/0003_add_ipdocrel_document2_fk.py
+++ b/ietf/ipr/migrations/0003_add_ipdocrel_document2_fk.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.20 on 2019-05-08 11:58
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 import django.db.models.deletion
 import ietf.utils.models
diff --git a/ietf/ipr/migrations/0004_remove_iprdocrel_document.py b/ietf/ipr/migrations/0004_remove_iprdocrel_document.py
index d5c538cfb..2439193a6 100644
--- a/ietf/ipr/migrations/0004_remove_iprdocrel_document.py
+++ b/ietf/ipr/migrations/0004_remove_iprdocrel_document.py
@@ -3,6 +3,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
 
 
diff --git a/ietf/ipr/migrations/0005_rename_field_document2.py b/ietf/ipr/migrations/0005_rename_field_document2.py
index 8c55ba473..6db908888 100644
--- a/ietf/ipr/migrations/0005_rename_field_document2.py
+++ b/ietf/ipr/migrations/0005_rename_field_document2.py
@@ -3,6 +3,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
 
 
diff --git a/ietf/ipr/migrations/0006_document_primary_key_cleanup.py b/ietf/ipr/migrations/0006_document_primary_key_cleanup.py
index caa193771..32dca70c4 100644
--- a/ietf/ipr/migrations/0006_document_primary_key_cleanup.py
+++ b/ietf/ipr/migrations/0006_document_primary_key_cleanup.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.20 on 2019-06-10 03:42
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 import django.db.models.deletion
 import ietf.utils.models
diff --git a/ietf/ipr/resources.py b/ietf/ipr/resources.py
index 65cb551f5..665b0ab02 100644
--- a/ietf/ipr/resources.py
+++ b/ietf/ipr/resources.py
@@ -1,5 +1,8 @@
 # Copyright The IETF Trust 2015-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 # Autogenerated by the mkresources management command 2015-03-21 14:05 PDT
+
+
 from ietf.api import ModelResource
 from ietf.api import ToOneField
 from tastypie.fields import ToManyField     # pyflakes:ignore
diff --git a/ietf/ipr/templatetags/ipr_filters.py b/ietf/ipr/templatetags/ipr_filters.py
index 424726baa..43bf90234 100644
--- a/ietf/ipr/templatetags/ipr_filters.py
+++ b/ietf/ipr/templatetags/ipr_filters.py
@@ -1,4 +1,8 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 from django import template
 from django.utils.html import format_html
diff --git a/ietf/ipr/utils.py b/ietf/ipr/utils.py
index 2cb05aa29..b31d5195a 100644
--- a/ietf/ipr/utils.py
+++ b/ietf/ipr/utils.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import debug                            # pyflakes:ignore
 
 def get_genitive(name):
diff --git a/ietf/liaisons/__init__.py b/ietf/liaisons/__init__.py
index e4d3e43e0..fd066bea4 100644
--- a/ietf/liaisons/__init__.py
+++ b/ietf/liaisons/__init__.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+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
diff --git a/ietf/liaisons/admin.py b/ietf/liaisons/admin.py
index 8983cafbf..7bf4ad8aa 100644
--- a/ietf/liaisons/admin.py
+++ b/ietf/liaisons/admin.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2010-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.contrib import admin
 from django.urls import reverse
 
diff --git a/ietf/liaisons/feeds.py b/ietf/liaisons/feeds.py
index d2f0b43a9..21920935a 100644
--- a/ietf/liaisons/feeds.py
+++ b/ietf/liaisons/feeds.py
@@ -1,4 +1,8 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import re
 
diff --git a/ietf/liaisons/mails.py b/ietf/liaisons/mails.py
index 0c13f51c1..caba5d366 100644
--- a/ietf/liaisons/mails.py
+++ b/ietf/liaisons/mails.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2011-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 
 from django.conf import settings
diff --git a/ietf/liaisons/management/commands/check_liaison_deadlines.py b/ietf/liaisons/management/commands/check_liaison_deadlines.py
index 10cbc4291..77032fe4b 100644
--- a/ietf/liaisons/management/commands/check_liaison_deadlines.py
+++ b/ietf/liaisons/management/commands/check_liaison_deadlines.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2010-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 
 from django.core.management.base import BaseCommand
diff --git a/ietf/liaisons/management/commands/remind_update_sdo_list.py b/ietf/liaisons/management/commands/remind_update_sdo_list.py
index 5eae4acd2..264b11b21 100644
--- a/ietf/liaisons/management/commands/remind_update_sdo_list.py
+++ b/ietf/liaisons/management/commands/remind_update_sdo_list.py
@@ -1,4 +1,8 @@
 # Copyright The IETF Trust 2010-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 from django.core.management.base import BaseCommand
 
diff --git a/ietf/liaisons/migrations/0001_initial.py b/ietf/liaisons/migrations/0001_initial.py
index 5d8e78d7a..df733a3cd 100644
--- a/ietf/liaisons/migrations/0001_initial.py
+++ b/ietf/liaisons/migrations/0001_initial.py
@@ -3,6 +3,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
diff --git a/ietf/liaisons/migrations/0002_auto_20180225_1207.py b/ietf/liaisons/migrations/0002_auto_20180225_1207.py
index c3f679ca9..f848a0391 100644
--- a/ietf/liaisons/migrations/0002_auto_20180225_1207.py
+++ b/ietf/liaisons/migrations/0002_auto_20180225_1207.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.10 on 2018-02-25 12:07
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 
 
diff --git a/ietf/liaisons/migrations/0003_liaison_document2_fk.py b/ietf/liaisons/migrations/0003_liaison_document2_fk.py
index 5105bdf3f..b46ced747 100644
--- a/ietf/liaisons/migrations/0003_liaison_document2_fk.py
+++ b/ietf/liaisons/migrations/0003_liaison_document2_fk.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.20 on 2019-05-08 11:58
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 import django.db.models.deletion
 import ietf.utils.models
diff --git a/ietf/liaisons/migrations/0004_remove_liaisonstatementattachment_document.py b/ietf/liaisons/migrations/0004_remove_liaisonstatementattachment_document.py
index 52bcd462e..30a697d58 100644
--- a/ietf/liaisons/migrations/0004_remove_liaisonstatementattachment_document.py
+++ b/ietf/liaisons/migrations/0004_remove_liaisonstatementattachment_document.py
@@ -3,6 +3,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
 
 
diff --git a/ietf/liaisons/migrations/0005_rename_field_document2.py b/ietf/liaisons/migrations/0005_rename_field_document2.py
index f6a2b0e1e..c557b3360 100644
--- a/ietf/liaisons/migrations/0005_rename_field_document2.py
+++ b/ietf/liaisons/migrations/0005_rename_field_document2.py
@@ -3,6 +3,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
 
 
diff --git a/ietf/liaisons/migrations/0006_document_primary_key_cleanup.py b/ietf/liaisons/migrations/0006_document_primary_key_cleanup.py
index 4fc689698..bc2918667 100644
--- a/ietf/liaisons/migrations/0006_document_primary_key_cleanup.py
+++ b/ietf/liaisons/migrations/0006_document_primary_key_cleanup.py
@@ -3,6 +3,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
 import django.db.models.deletion
 import ietf.utils.models
diff --git a/ietf/liaisons/resources.py b/ietf/liaisons/resources.py
index 3bfd6321f..6ca4188ba 100644
--- a/ietf/liaisons/resources.py
+++ b/ietf/liaisons/resources.py
@@ -1,5 +1,8 @@
 # Copyright The IETF Trust 2015-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 # Autogenerated by the makeresources management command 2015-10-11 13:15 PDT
+
+
 from ietf.api import ModelResource
 from ietf.api import ToOneField
 from tastypie.fields import ToManyField     # pyflakes:ignore
diff --git a/ietf/liaisons/widgets.py b/ietf/liaisons/widgets.py
index ef4074390..c29700653 100644
--- a/ietf/liaisons/widgets.py
+++ b/ietf/liaisons/widgets.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2010-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.urls import reverse as urlreverse
 from django.db.models.query import QuerySet
 from django.forms.widgets import Widget
diff --git a/ietf/mailinglists/factories.py b/ietf/mailinglists/factories.py
index 10f41c8da..d713cbbde 100644
--- a/ietf/mailinglists/factories.py
+++ b/ietf/mailinglists/factories.py
@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import factory
 import random
 
diff --git a/ietf/mailinglists/migrations/0001_initial.py b/ietf/mailinglists/migrations/0001_initial.py
index f53f00a9f..c127e7621 100644
--- a/ietf/mailinglists/migrations/0001_initial.py
+++ b/ietf/mailinglists/migrations/0001_initial.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.10 on 2018-02-20 10:52
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion
diff --git a/ietf/mailinglists/resources.py b/ietf/mailinglists/resources.py
index 7f48ac35e..b2fce0900 100644
--- a/ietf/mailinglists/resources.py
+++ b/ietf/mailinglists/resources.py
@@ -1,5 +1,8 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 # Autogenerated by the makeresources management command 2016-06-12 12:29 PDT
+
+
 from ietf.api import ModelResource
 from tastypie.fields import ToManyField                 # pyflakes:ignore
 from tastypie.constants import ALL, ALL_WITH_RELATIONS  # pyflakes:ignore
diff --git a/ietf/mailinglists/tests.py b/ietf/mailinglists/tests.py
index 29cd06518..34b555d91 100644
--- a/ietf/mailinglists/tests.py
+++ b/ietf/mailinglists/tests.py
@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from pyquery import PyQuery
 
 from django.urls import reverse as urlreverse
diff --git a/ietf/mailtrigger/migrations/0001_initial.py b/ietf/mailtrigger/migrations/0001_initial.py
index 1b41575fc..03eb02262 100644
--- a/ietf/mailtrigger/migrations/0001_initial.py
+++ b/ietf/mailtrigger/migrations/0001_initial.py
@@ -3,6 +3,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
 
 
diff --git a/ietf/mailtrigger/migrations/0002_conflrev_changes.py b/ietf/mailtrigger/migrations/0002_conflrev_changes.py
index c801f6fe9..3330e196d 100644
--- a/ietf/mailtrigger/migrations/0002_conflrev_changes.py
+++ b/ietf/mailtrigger/migrations/0002_conflrev_changes.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.13 on 2018-05-21 12:07
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 
 def forward(apps, schema_editor):
diff --git a/ietf/mailtrigger/migrations/0003_add_review_notify_ad.py b/ietf/mailtrigger/migrations/0003_add_review_notify_ad.py
index 3389d050d..b8eebea5e 100644
--- a/ietf/mailtrigger/migrations/0003_add_review_notify_ad.py
+++ b/ietf/mailtrigger/migrations/0003_add_review_notify_ad.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.16 on 2018-11-02 11:34
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 
 def forward(apps, schema_editor):
diff --git a/ietf/mailtrigger/migrations/0004_ballot_rfceditornote_changed_postapproval.py b/ietf/mailtrigger/migrations/0004_ballot_rfceditornote_changed_postapproval.py
index 097ebd6a3..411fc68b1 100644
--- a/ietf/mailtrigger/migrations/0004_ballot_rfceditornote_changed_postapproval.py
+++ b/ietf/mailtrigger/migrations/0004_ballot_rfceditornote_changed_postapproval.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.16 on 2018-11-03 00:24
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 
 def forward(apps, schema_editor):
diff --git a/ietf/mailtrigger/migrations/0005_slides_proposed.py b/ietf/mailtrigger/migrations/0005_slides_proposed.py
index 8c1e71f8d..8efa3397d 100644
--- a/ietf/mailtrigger/migrations/0005_slides_proposed.py
+++ b/ietf/mailtrigger/migrations/0005_slides_proposed.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.20 on 2019-03-25 06:11
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 
 def forward(apps, schema_editor):
diff --git a/ietf/mailtrigger/migrations/0006_sub_new_wg_00.py b/ietf/mailtrigger/migrations/0006_sub_new_wg_00.py
index 712803015..a380a20a1 100644
--- a/ietf/mailtrigger/migrations/0006_sub_new_wg_00.py
+++ b/ietf/mailtrigger/migrations/0006_sub_new_wg_00.py
@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 
 def forward(apps, schema_editor):
diff --git a/ietf/mailtrigger/tests.py b/ietf/mailtrigger/tests.py
index db5d0281a..802c2a6bb 100644
--- a/ietf/mailtrigger/tests.py
+++ b/ietf/mailtrigger/tests.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2015-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.urls import reverse as urlreverse
 
 from ietf.utils.test_utils import TestCase
diff --git a/ietf/meeting/admin.py b/ietf/meeting/admin.py
index d6ea3a5ee..63bb68067 100644
--- a/ietf/meeting/admin.py
+++ b/ietf/meeting/admin.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.contrib import admin
 
 from ietf.meeting.models import (Meeting, Room, Session, TimeSlot, Constraint, Schedule,
diff --git a/ietf/meeting/factories.py b/ietf/meeting/factories.py
index 9eb6d6b56..df54dd646 100644
--- a/ietf/meeting/factories.py
+++ b/ietf/meeting/factories.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import factory
 import random
 import datetime
diff --git a/ietf/meeting/feeds.py b/ietf/meeting/feeds.py
index bc9fa4ecd..0a1e0a42a 100644
--- a/ietf/meeting/feeds.py
+++ b/ietf/meeting/feeds.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import os
 
 from django.contrib.syndication.views import Feed
diff --git a/ietf/meeting/management/commands/update_important_dates.py b/ietf/meeting/management/commands/update_important_dates.py
index 656cbdb02..8689ba7b3 100644
--- a/ietf/meeting/management/commands/update_important_dates.py
+++ b/ietf/meeting/management/commands/update_important_dates.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2018-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 
 from django.core.management.base import BaseCommand
diff --git a/ietf/meeting/migrations/0001_initial.py b/ietf/meeting/migrations/0001_initial.py
index e71b0ae90..5d8910e68 100644
--- a/ietf/meeting/migrations/0001_initial.py
+++ b/ietf/meeting/migrations/0001_initial.py
@@ -3,6 +3,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
diff --git a/ietf/meeting/migrations/0002_auto_20180225_1207.py b/ietf/meeting/migrations/0002_auto_20180225_1207.py
index 6f5aab8af..981dcf831 100644
--- a/ietf/meeting/migrations/0002_auto_20180225_1207.py
+++ b/ietf/meeting/migrations/0002_auto_20180225_1207.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.10 on 2018-02-25 12:07
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations, models
 
 
diff --git a/ietf/meeting/migrations/0003_rename_modified_fields.py b/ietf/meeting/migrations/0003_rename_modified_fields.py
index dea714019..c63aa49a8 100644
--- a/ietf/meeting/migrations/0003_rename_modified_fields.py
+++ b/ietf/meeting/migrations/0003_rename_modified_fields.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.10 on 2018-03-02 14:33
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations, models
 
 
diff --git a/ietf/meeting/migrations/0004_meeting_attendees.py b/ietf/meeting/migrations/0004_meeting_attendees.py
index ea7546a5b..502b0b126 100644
--- a/ietf/meeting/migrations/0004_meeting_attendees.py
+++ b/ietf/meeting/migrations/0004_meeting_attendees.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.11 on 2018-03-20 09:17
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations, models
 
 
diff --git a/ietf/meeting/migrations/0005_backfill_old_meetings.py b/ietf/meeting/migrations/0005_backfill_old_meetings.py
index 36e308dc7..af245617c 100644
--- a/ietf/meeting/migrations/0005_backfill_old_meetings.py
+++ b/ietf/meeting/migrations/0005_backfill_old_meetings.py
@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 
 
diff --git a/ietf/meeting/migrations/0006_backfill_attendees.py b/ietf/meeting/migrations/0006_backfill_attendees.py
index 5b6a70958..2e4103c16 100644
--- a/ietf/meeting/migrations/0006_backfill_attendees.py
+++ b/ietf/meeting/migrations/0006_backfill_attendees.py
@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 
 
diff --git a/ietf/meeting/migrations/0007_auto_20180716_1337.py b/ietf/meeting/migrations/0007_auto_20180716_1337.py
index 2fcf4804c..b348d07cb 100644
--- a/ietf/meeting/migrations/0007_auto_20180716_1337.py
+++ b/ietf/meeting/migrations/0007_auto_20180716_1337.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.14 on 2018-07-16 13:37
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations, models
 
 
diff --git a/ietf/meeting/migrations/0008_rename_meeting_agenda_note.py b/ietf/meeting/migrations/0008_rename_meeting_agenda_note.py
index 1cef45068..528bb2afd 100644
--- a/ietf/meeting/migrations/0008_rename_meeting_agenda_note.py
+++ b/ietf/meeting/migrations/0008_rename_meeting_agenda_note.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.15 on 2018-10-09 13:09
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 
 
diff --git a/ietf/meeting/migrations/0009_add_agenda_info_note.py b/ietf/meeting/migrations/0009_add_agenda_info_note.py
index e9136158f..109fcd910 100644
--- a/ietf/meeting/migrations/0009_add_agenda_info_note.py
+++ b/ietf/meeting/migrations/0009_add_agenda_info_note.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.16 on 2018-10-09 14:07
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations, models
 
 
diff --git a/ietf/meeting/migrations/0010_set_ietf_103_agenda_info_note.py b/ietf/meeting/migrations/0010_set_ietf_103_agenda_info_note.py
index 14d68538f..92bbd6a24 100644
--- a/ietf/meeting/migrations/0010_set_ietf_103_agenda_info_note.py
+++ b/ietf/meeting/migrations/0010_set_ietf_103_agenda_info_note.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.16 on 2018-10-09 14:23
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 
 def forward(apps,schema_editor):
diff --git a/ietf/meeting/migrations/0011_auto_20190114_0550.py b/ietf/meeting/migrations/0011_auto_20190114_0550.py
index bc9a076fa..0a12b5fc0 100644
--- a/ietf/meeting/migrations/0011_auto_20190114_0550.py
+++ b/ietf/meeting/migrations/0011_auto_20190114_0550.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.18 on 2019-01-14 05:50
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations, models
 
 
diff --git a/ietf/meeting/migrations/0012_add_slide_submissions.py b/ietf/meeting/migrations/0012_add_slide_submissions.py
index 659b8f475..617809de0 100644
--- a/ietf/meeting/migrations/0012_add_slide_submissions.py
+++ b/ietf/meeting/migrations/0012_add_slide_submissions.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.20 on 2019-03-23 07:41
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations, models
 import django.db.models.deletion
 import ietf.utils.models
diff --git a/ietf/meeting/migrations/0013_make_separate_break_sessobj.py b/ietf/meeting/migrations/0013_make_separate_break_sessobj.py
index c7af0cf0b..359f75ce5 100644
--- a/ietf/meeting/migrations/0013_make_separate_break_sessobj.py
+++ b/ietf/meeting/migrations/0013_make_separate_break_sessobj.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.20 on 2019-03-23 06:11
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 from django.db import migrations
 
diff --git a/ietf/meeting/migrations/0014_auto_20190426_0305.py b/ietf/meeting/migrations/0014_auto_20190426_0305.py
index 84f4dc4fc..4f7d47a62 100644
--- a/ietf/meeting/migrations/0014_auto_20190426_0305.py
+++ b/ietf/meeting/migrations/0014_auto_20190426_0305.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.20 on 2019-04-26 03:05
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations, models
 
 
diff --git a/ietf/meeting/migrations/0015_sessionpresentation_document2_fk.py b/ietf/meeting/migrations/0015_sessionpresentation_document2_fk.py
index 8897f0b44..8354d546e 100644
--- a/ietf/meeting/migrations/0015_sessionpresentation_document2_fk.py
+++ b/ietf/meeting/migrations/0015_sessionpresentation_document2_fk.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.20 on 2019-05-08 11:58
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 import django.db.models.deletion
 import ietf.utils.models
diff --git a/ietf/meeting/migrations/0016_remove_sessionpresentation_document.py b/ietf/meeting/migrations/0016_remove_sessionpresentation_document.py
index 741153eb5..724bfcfc0 100644
--- a/ietf/meeting/migrations/0016_remove_sessionpresentation_document.py
+++ b/ietf/meeting/migrations/0016_remove_sessionpresentation_document.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.20 on 2019-05-21 03:57
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 
 
diff --git a/ietf/meeting/migrations/0017_rename_field_document2.py b/ietf/meeting/migrations/0017_rename_field_document2.py
index 672112a91..5095a33ff 100644
--- a/ietf/meeting/migrations/0017_rename_field_document2.py
+++ b/ietf/meeting/migrations/0017_rename_field_document2.py
@@ -3,6 +3,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
 
 
diff --git a/ietf/meeting/migrations/0018_document_primary_key_cleanup.py b/ietf/meeting/migrations/0018_document_primary_key_cleanup.py
index 08b1f5ab0..786530908 100644
--- a/ietf/meeting/migrations/0018_document_primary_key_cleanup.py
+++ b/ietf/meeting/migrations/0018_document_primary_key_cleanup.py
@@ -3,6 +3,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
 import django.db.models.deletion
 import ietf.utils.models
diff --git a/ietf/meeting/resources.py b/ietf/meeting/resources.py
index 62fea679c..a8783c295 100644
--- a/ietf/meeting/resources.py
+++ b/ietf/meeting/resources.py
@@ -1,5 +1,8 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 # Autogenerated by the mkresources management command 2014-11-13 23:15
+
+
 from ietf.api import ModelResource
 from ietf.api import ToOneField
 from tastypie.fields import ToManyField, DateTimeField
diff --git a/ietf/meeting/templatetags/agenda_custom_tags.py b/ietf/meeting/templatetags/agenda_custom_tags.py
index 5adeb314c..a1501ab64 100644
--- a/ietf/meeting/templatetags/agenda_custom_tags.py
+++ b/ietf/meeting/templatetags/agenda_custom_tags.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django import template
 
 register = template.Library()
diff --git a/ietf/meeting/test_data.py b/ietf/meeting/test_data.py
index 53879166f..6cb2c8f39 100644
--- a/ietf/meeting/test_data.py
+++ b/ietf/meeting/test_data.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 
 from django.utils.text import slugify
diff --git a/ietf/meeting/tests_js.py b/ietf/meeting/tests_js.py
index 6dd0ef6e1..b306814aa 100644
--- a/ietf/meeting/tests_js.py
+++ b/ietf/meeting/tests_js.py
@@ -1,4 +1,8 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import sys
 import time
diff --git a/ietf/message/migrations/0001_initial.py b/ietf/message/migrations/0001_initial.py
index dad23f182..9fe4ff38e 100644
--- a/ietf/message/migrations/0001_initial.py
+++ b/ietf/message/migrations/0001_initial.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.10 on 2018-02-20 10:52
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 from django.db import migrations, models
 import django.db.models.deletion
diff --git a/ietf/message/migrations/0002_add_message_docs2_m2m.py b/ietf/message/migrations/0002_add_message_docs2_m2m.py
index 9f65c4a84..1402fa8d8 100644
--- a/ietf/message/migrations/0002_add_message_docs2_m2m.py
+++ b/ietf/message/migrations/0002_add_message_docs2_m2m.py
@@ -3,6 +3,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
diff --git a/ietf/message/migrations/0003_set_document_m2m_keys.py b/ietf/message/migrations/0003_set_document_m2m_keys.py
index 70d1b08fa..493adc2ee 100644
--- a/ietf/message/migrations/0003_set_document_m2m_keys.py
+++ b/ietf/message/migrations/0003_set_document_m2m_keys.py
@@ -3,6 +3,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
diff --git a/ietf/message/migrations/0004_1_del_docs_m2m_table.py b/ietf/message/migrations/0004_1_del_docs_m2m_table.py
index 38e160a91..670609fc7 100644
--- a/ietf/message/migrations/0004_1_del_docs_m2m_table.py
+++ b/ietf/message/migrations/0004_1_del_docs_m2m_table.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.20 on 2019-05-22 08:01
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations, models
 
 
diff --git a/ietf/message/migrations/0004_2_add_docs_m2m_table.py b/ietf/message/migrations/0004_2_add_docs_m2m_table.py
index 8fc173e5a..9da02c6e6 100644
--- a/ietf/message/migrations/0004_2_add_docs_m2m_table.py
+++ b/ietf/message/migrations/0004_2_add_docs_m2m_table.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.20 on 2019-05-22 08:01
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations, models
 
 
diff --git a/ietf/message/migrations/0005_copy_docs_m2m_table.py b/ietf/message/migrations/0005_copy_docs_m2m_table.py
index 4a52e9096..f85def627 100644
--- a/ietf/message/migrations/0005_copy_docs_m2m_table.py
+++ b/ietf/message/migrations/0005_copy_docs_m2m_table.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.20 on 2019-05-27 05:56
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import sys, time
 
 from django.db import migrations
diff --git a/ietf/message/migrations/0006_remove_docs2_m2m.py b/ietf/message/migrations/0006_remove_docs2_m2m.py
index c3e54f232..58743da07 100644
--- a/ietf/message/migrations/0006_remove_docs2_m2m.py
+++ b/ietf/message/migrations/0006_remove_docs2_m2m.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.20 on 2019-05-30 03:32
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 
 
diff --git a/ietf/message/resources.py b/ietf/message/resources.py
index f1e77cb5b..30c7ac1e8 100644
--- a/ietf/message/resources.py
+++ b/ietf/message/resources.py
@@ -1,5 +1,8 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 # Autogenerated by the mkresources management command 2014-11-13 23:53
+
+
 from ietf.api import ModelResource
 from ietf.api import ToOneField
 from tastypie.fields import ToManyField
diff --git a/ietf/message/tests.py b/ietf/message/tests.py
index 13e599568..5781a72d8 100644
--- a/ietf/message/tests.py
+++ b/ietf/message/tests.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 
 from django.urls import reverse as urlreverse
diff --git a/ietf/middleware.py b/ietf/middleware.py
index 149a87f72..b0759894e 100644
--- a/ietf/middleware.py
+++ b/ietf/middleware.py
@@ -1,4 +1,8 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 from django.db import connection
 from django.db.utils import OperationalError
diff --git a/ietf/name/migrations/0001_initial.py b/ietf/name/migrations/0001_initial.py
index b7e31cf98..72b30039f 100644
--- a/ietf/name/migrations/0001_initial.py
+++ b/ietf/name/migrations/0001_initial.py
@@ -3,6 +3,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
diff --git a/ietf/name/migrations/0002_agendatypename.py b/ietf/name/migrations/0002_agendatypename.py
index 4089f9b73..cf9f42950 100644
--- a/ietf/name/migrations/0002_agendatypename.py
+++ b/ietf/name/migrations/0002_agendatypename.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.13 on 2018-07-10 13:47
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations, models
 
 class Migration(migrations.Migration):
diff --git a/ietf/name/migrations/0003_agendatypename_data.py b/ietf/name/migrations/0003_agendatypename_data.py
index c5d224bab..48d72129d 100644
--- a/ietf/name/migrations/0003_agendatypename_data.py
+++ b/ietf/name/migrations/0003_agendatypename_data.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.13 on 2018-07-10 13:47
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 
 agenda_type_names = (
diff --git a/ietf/name/migrations/0004_add_prefix_to_doctypenames.py b/ietf/name/migrations/0004_add_prefix_to_doctypenames.py
index 31a3d60cc..038b7c2a5 100644
--- a/ietf/name/migrations/0004_add_prefix_to_doctypenames.py
+++ b/ietf/name/migrations/0004_add_prefix_to_doctypenames.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.16 on 2018-10-19 11:34
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 
 def forward(apps, schema_editor):
diff --git a/ietf/name/migrations/0005_reviewassignmentstatename.py b/ietf/name/migrations/0005_reviewassignmentstatename.py
index 9b2567e0c..c8660920d 100644
--- a/ietf/name/migrations/0005_reviewassignmentstatename.py
+++ b/ietf/name/migrations/0005_reviewassignmentstatename.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.18 on 2019-01-04 13:59
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations, models
 
 
diff --git a/ietf/name/migrations/0006_adjust_statenames.py b/ietf/name/migrations/0006_adjust_statenames.py
index 30c49e774..116e25f3c 100644
--- a/ietf/name/migrations/0006_adjust_statenames.py
+++ b/ietf/name/migrations/0006_adjust_statenames.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.18 on 2019-01-04 14:02
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 
 def forward(apps, schema_editor):
diff --git a/ietf/nomcom/admin.py b/ietf/nomcom/admin.py
index 6e25736e0..9e8ba57b3 100644
--- a/ietf/nomcom/admin.py
+++ b/ietf/nomcom/admin.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.contrib import admin
 
 from ietf.nomcom.models import ( ReminderDates, NomCom, Nomination, Nominee, NomineePosition, 
diff --git a/ietf/nomcom/decorators.py b/ietf/nomcom/decorators.py
index 99d85d487..bbaebd0cd 100644
--- a/ietf/nomcom/decorators.py
+++ b/ietf/nomcom/decorators.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import functools
 
 from django.urls import reverse
diff --git a/ietf/nomcom/factories.py b/ietf/nomcom/factories.py
index bffdd338b..1f41466a0 100644
--- a/ietf/nomcom/factories.py
+++ b/ietf/nomcom/factories.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2015-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import factory
 import random
 
diff --git a/ietf/nomcom/management/commands/make_dummy_nomcom.py b/ietf/nomcom/management/commands/make_dummy_nomcom.py
index bb55ba9f2..92d71dcac 100644
--- a/ietf/nomcom/management/commands/make_dummy_nomcom.py
+++ b/ietf/nomcom/management/commands/make_dummy_nomcom.py
@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import socket
 
 from django.core.management.base import BaseCommand
diff --git a/ietf/nomcom/management/commands/send_reminders.py b/ietf/nomcom/management/commands/send_reminders.py
index 85318df60..a4a442de8 100644
--- a/ietf/nomcom/management/commands/send_reminders.py
+++ b/ietf/nomcom/management/commands/send_reminders.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 import syslog
 
diff --git a/ietf/nomcom/migrations/0001_initial.py b/ietf/nomcom/migrations/0001_initial.py
index d45a1a33b..09bdebd6f 100644
--- a/ietf/nomcom/migrations/0001_initial.py
+++ b/ietf/nomcom/migrations/0001_initial.py
@@ -3,6 +3,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
diff --git a/ietf/nomcom/migrations/0002_auto_20180918_0550.py b/ietf/nomcom/migrations/0002_auto_20180918_0550.py
index 9c68a359a..9d32121c9 100644
--- a/ietf/nomcom/migrations/0002_auto_20180918_0550.py
+++ b/ietf/nomcom/migrations/0002_auto_20180918_0550.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.15 on 2018-09-18 05:50
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.conf import settings
 from django.db import migrations
 import django.db.models.deletion
diff --git a/ietf/nomcom/migrations/0003_nomcom_show_accepted_nominees.py b/ietf/nomcom/migrations/0003_nomcom_show_accepted_nominees.py
index ec16a045f..5076c70a8 100644
--- a/ietf/nomcom/migrations/0003_nomcom_show_accepted_nominees.py
+++ b/ietf/nomcom/migrations/0003_nomcom_show_accepted_nominees.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.15 on 2018-09-26 11:10
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations, models
 
 
diff --git a/ietf/nomcom/migrations/0004_set_show_accepted_nominees_false_on_existing_nomcoms.py b/ietf/nomcom/migrations/0004_set_show_accepted_nominees_false_on_existing_nomcoms.py
index 05245b4c0..d3ab2f478 100644
--- a/ietf/nomcom/migrations/0004_set_show_accepted_nominees_false_on_existing_nomcoms.py
+++ b/ietf/nomcom/migrations/0004_set_show_accepted_nominees_false_on_existing_nomcoms.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.15 on 2018-09-26 11:12
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 
 def forward(apps, schema_editor):
diff --git a/ietf/nomcom/migrations/0005_auto_20181008_0602.py b/ietf/nomcom/migrations/0005_auto_20181008_0602.py
index 3a6f42805..9a5a37d4f 100644
--- a/ietf/nomcom/migrations/0005_auto_20181008_0602.py
+++ b/ietf/nomcom/migrations/0005_auto_20181008_0602.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.16 on 2018-10-08 06:02
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 
 
diff --git a/ietf/nomcom/resources.py b/ietf/nomcom/resources.py
index cc95d5ff7..61d101052 100644
--- a/ietf/nomcom/resources.py
+++ b/ietf/nomcom/resources.py
@@ -1,5 +1,8 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 # Autogenerated by the mkresources management command 2014-11-13 23:53
+
+
 from ietf.api import ModelResource
 from ietf.api import ToOneField
 from tastypie.fields import ToManyField
diff --git a/ietf/person/forms.py b/ietf/person/forms.py
index 2759c2ea7..d146aa0b1 100644
--- a/ietf/person/forms.py
+++ b/ietf/person/forms.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2018-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 
 from django import forms
 from ietf.person.models import Person
diff --git a/ietf/person/migrations/0001_initial.py b/ietf/person/migrations/0001_initial.py
index f406c4221..66d405bbf 100644
--- a/ietf/person/migrations/0001_initial.py
+++ b/ietf/person/migrations/0001_initial.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.10 on 2018-02-20 10:52
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 from django.conf import settings
 import django.core.validators
diff --git a/ietf/person/migrations/0002_auto_20180330_0808.py b/ietf/person/migrations/0002_auto_20180330_0808.py
index 03ffc8363..3c4d7c9ab 100644
--- a/ietf/person/migrations/0002_auto_20180330_0808.py
+++ b/ietf/person/migrations/0002_auto_20180330_0808.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.11 on 2018-03-30 08:08
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations, models
 
 
diff --git a/ietf/person/migrations/0003_auto_20180504_1519.py b/ietf/person/migrations/0003_auto_20180504_1519.py
index db7d6ca55..f24581584 100644
--- a/ietf/person/migrations/0003_auto_20180504_1519.py
+++ b/ietf/person/migrations/0003_auto_20180504_1519.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.12 on 2018-05-04 15:19
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 from django.conf import settings
 import django.core.validators
diff --git a/ietf/person/migrations/0004_populate_email_origin.py b/ietf/person/migrations/0004_populate_email_origin.py
index 55a926665..5a07e0b83 100644
--- a/ietf/person/migrations/0004_populate_email_origin.py
+++ b/ietf/person/migrations/0004_populate_email_origin.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.12 on 2018-05-10 05:28
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import sys
 
 from django.db import migrations
diff --git a/ietf/person/migrations/0005_populate_person_name_from_draft.py b/ietf/person/migrations/0005_populate_person_name_from_draft.py
index 3eb26ce63..dc4cb829d 100644
--- a/ietf/person/migrations/0005_populate_person_name_from_draft.py
+++ b/ietf/person/migrations/0005_populate_person_name_from_draft.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.12 on 2018-05-10 05:28
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import sys
 
 from django.db import migrations
diff --git a/ietf/person/migrations/0006_auto_20180910_0719.py b/ietf/person/migrations/0006_auto_20180910_0719.py
index 44d280305..2a86ac351 100644
--- a/ietf/person/migrations/0006_auto_20180910_0719.py
+++ b/ietf/person/migrations/0006_auto_20180910_0719.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.13 on 2018-09-10 07:19
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.conf import settings
 from django.db import migrations
 import django.db.models.deletion
diff --git a/ietf/person/migrations/0007_auto_20180929_1303.py b/ietf/person/migrations/0007_auto_20180929_1303.py
index de1b3660f..310691e6d 100644
--- a/ietf/person/migrations/0007_auto_20180929_1303.py
+++ b/ietf/person/migrations/0007_auto_20180929_1303.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.15 on 2018-09-29 13:03
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations, models
 
 
diff --git a/ietf/person/migrations/0008_auto_20181014_1448.py b/ietf/person/migrations/0008_auto_20181014_1448.py
index 8a7116e8a..a7cee4884 100644
--- a/ietf/person/migrations/0008_auto_20181014_1448.py
+++ b/ietf/person/migrations/0008_auto_20181014_1448.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.16 on 2018-10-14 14:48
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations, models
 
 
diff --git a/ietf/person/migrations/0009_auto_20190118_0725.py b/ietf/person/migrations/0009_auto_20190118_0725.py
index 24c6148b4..d96edbe59 100644
--- a/ietf/person/migrations/0009_auto_20190118_0725.py
+++ b/ietf/person/migrations/0009_auto_20190118_0725.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.18 on 2019-01-18 07:25
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations, models
 
 
diff --git a/ietf/person/name.py b/ietf/person/name.py
index 74bb5cd64..1cfbd06fb 100644
--- a/ietf/person/name.py
+++ b/ietf/person/name.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2011-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import re
 import unidecode
 
diff --git a/ietf/person/resources.py b/ietf/person/resources.py
index 049b3e104..91dc19d4f 100644
--- a/ietf/person/resources.py
+++ b/ietf/person/resources.py
@@ -1,5 +1,8 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 # Autogenerated by the mkresources management command 2014-11-13 23:53
+
+
 from ietf.api import ModelResource
 from tastypie.fields import ToOneField
 from tastypie.constants import ALL, ALL_WITH_RELATIONS
diff --git a/ietf/person/views.py b/ietf/person/views.py
index 582b78337..59e0cc101 100644
--- a/ietf/person/views.py
+++ b/ietf/person/views.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 from io import StringIO
 
diff --git a/ietf/redirects/resources.py b/ietf/redirects/resources.py
index d65726280..672edd958 100644
--- a/ietf/redirects/resources.py
+++ b/ietf/redirects/resources.py
@@ -1,5 +1,8 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 # Autogenerated by the mkresources management command 2014-11-13 23:53
+
+
 from ietf.api import ModelResource
 from tastypie.fields import ToOneField
 from tastypie.constants import ALL, ALL_WITH_RELATIONS
diff --git a/ietf/release/tests.py b/ietf/release/tests.py
index fa91c33ab..4f9fdded2 100644
--- a/ietf/release/tests.py
+++ b/ietf/release/tests.py
@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from pyquery import PyQuery
 
 from django.urls import reverse
diff --git a/ietf/release/urls.py b/ietf/release/urls.py
index 01b90d95e..34cb023e5 100644
--- a/ietf/release/urls.py
+++ b/ietf/release/urls.py
@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.views.generic import TemplateView
 
 from ietf.release import views
diff --git a/ietf/review/admin.py b/ietf/review/admin.py
index 3d2541bf3..7a36fec88 100644
--- a/ietf/review/admin.py
+++ b/ietf/review/admin.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import simple_history
 
 from django.contrib import admin
diff --git a/ietf/review/migrations/0001_initial.py b/ietf/review/migrations/0001_initial.py
index d9b618de3..a57ead202 100644
--- a/ietf/review/migrations/0001_initial.py
+++ b/ietf/review/migrations/0001_initial.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.10 on 2018-02-20 10:52
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 from django.db import migrations, models
 import django.db.models.deletion
diff --git a/ietf/review/migrations/0002_unavailableperiod_reason.py b/ietf/review/migrations/0002_unavailableperiod_reason.py
index 046697e2f..6a2754388 100644
--- a/ietf/review/migrations/0002_unavailableperiod_reason.py
+++ b/ietf/review/migrations/0002_unavailableperiod_reason.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.14 on 2018-07-23 15:11
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations, models
 
 
diff --git a/ietf/review/migrations/0003_add_notify_ad_when.py b/ietf/review/migrations/0003_add_notify_ad_when.py
index 26f7e3376..3a950a413 100644
--- a/ietf/review/migrations/0003_add_notify_ad_when.py
+++ b/ietf/review/migrations/0003_add_notify_ad_when.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.16 on 2018-11-02 10:10
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations, models
 import ietf.review.models
 
diff --git a/ietf/review/migrations/0004_reviewteamsettings_secr_mail_alias.py b/ietf/review/migrations/0004_reviewteamsettings_secr_mail_alias.py
index 315642947..91fbcf94a 100644
--- a/ietf/review/migrations/0004_reviewteamsettings_secr_mail_alias.py
+++ b/ietf/review/migrations/0004_reviewteamsettings_secr_mail_alias.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.16 on 2018-11-03 03:10
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations, models
 
 
diff --git a/ietf/review/migrations/0005_set_secdir_notify_ad_when.py b/ietf/review/migrations/0005_set_secdir_notify_ad_when.py
index aa4eeaed2..ade5a5287 100644
--- a/ietf/review/migrations/0005_set_secdir_notify_ad_when.py
+++ b/ietf/review/migrations/0005_set_secdir_notify_ad_when.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.16 on 2018-11-02 10:20
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 
 def forward(apps, schema_editor):
diff --git a/ietf/review/migrations/0006_historicalreviewersettings.py b/ietf/review/migrations/0006_historicalreviewersettings.py
index 0d641d733..0f9bc75d8 100644
--- a/ietf/review/migrations/0006_historicalreviewersettings.py
+++ b/ietf/review/migrations/0006_historicalreviewersettings.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.16 on 2018-11-09 08:31
 
 
+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
diff --git a/ietf/review/migrations/0007_allow_notify_ad_when_to_be_blank.py b/ietf/review/migrations/0007_allow_notify_ad_when_to_be_blank.py
index ba38a4478..91016a8ed 100644
--- a/ietf/review/migrations/0007_allow_notify_ad_when_to_be_blank.py
+++ b/ietf/review/migrations/0007_allow_notify_ad_when_to_be_blank.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.17 on 2018-12-06 13:16
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations, models
 
 
diff --git a/ietf/review/migrations/0008_remove_reviewrequest_old_id.py b/ietf/review/migrations/0008_remove_reviewrequest_old_id.py
index 5454b5eaa..df107e5b0 100644
--- a/ietf/review/migrations/0008_remove_reviewrequest_old_id.py
+++ b/ietf/review/migrations/0008_remove_reviewrequest_old_id.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.17 on 2019-01-03 12:34
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 
 
diff --git a/ietf/review/migrations/0009_refactor_review_request.py b/ietf/review/migrations/0009_refactor_review_request.py
index 642cf32a6..78638239d 100644
--- a/ietf/review/migrations/0009_refactor_review_request.py
+++ b/ietf/review/migrations/0009_refactor_review_request.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.18 on 2019-01-04 14:27
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations, models
 import django.db.models.deletion
 import ietf.utils.models
diff --git a/ietf/review/migrations/0010_populate_review_assignments.py b/ietf/review/migrations/0010_populate_review_assignments.py
index d254576be..3602645c4 100644
--- a/ietf/review/migrations/0010_populate_review_assignments.py
+++ b/ietf/review/migrations/0010_populate_review_assignments.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.18 on 2019-01-04 14:34
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import sys
 
 from tqdm import tqdm
diff --git a/ietf/review/migrations/0011_review_document2_fk.py b/ietf/review/migrations/0011_review_document2_fk.py
index 78cc4d87c..f613cdb9b 100644
--- a/ietf/review/migrations/0011_review_document2_fk.py
+++ b/ietf/review/migrations/0011_review_document2_fk.py
@@ -1,8 +1,10 @@
+# Copyright The IETF Trust 2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-05-08 11:58
-# Copyright The IETF Trust 2019, All Rights Reserved
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 import django.db.models.deletion
 import ietf.utils.models
diff --git a/ietf/review/migrations/0012_remove_old_document_field.py b/ietf/review/migrations/0012_remove_old_document_field.py
index 8f6971ce5..56790f507 100644
--- a/ietf/review/migrations/0012_remove_old_document_field.py
+++ b/ietf/review/migrations/0012_remove_old_document_field.py
@@ -1,8 +1,10 @@
+# Copyright The IETF Trust 2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-05-20 09:53
-# Copyright The IETF Trust 2019, All Rights Reserved
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 
 
diff --git a/ietf/review/migrations/0013_rename_field_document2.py b/ietf/review/migrations/0013_rename_field_document2.py
index ba9f556aa..da3c17ea0 100644
--- a/ietf/review/migrations/0013_rename_field_document2.py
+++ b/ietf/review/migrations/0013_rename_field_document2.py
@@ -1,8 +1,10 @@
+# Copyright The IETF Trust 2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-05-21 05:31
-# Copyright The IETF Trust 2019, All Rights Reserved
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 
 
diff --git a/ietf/review/migrations/0014_document_primary_key_cleanup.py b/ietf/review/migrations/0014_document_primary_key_cleanup.py
index 818782e4e..c8ef25beb 100644
--- a/ietf/review/migrations/0014_document_primary_key_cleanup.py
+++ b/ietf/review/migrations/0014_document_primary_key_cleanup.py
@@ -1,8 +1,10 @@
+# Copyright The IETF Trust 2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-06-10 03:47
-# Copyright The IETF Trust 2019, All Rights Reserved
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 import django.db.models.deletion
 import ietf.utils.models
diff --git a/ietf/review/resources.py b/ietf/review/resources.py
index 7b5a912d5..a7850dcb8 100644
--- a/ietf/review/resources.py
+++ b/ietf/review/resources.py
@@ -1,5 +1,8 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 # Autogenerated by the makeresources management command 2016-06-14 04:21 PDT
+
+
 from tastypie.resources import ModelResource
 from tastypie.fields import ToManyField                 # pyflakes:ignore
 from tastypie.constants import ALL, ALL_WITH_RELATIONS  # pyflakes:ignore
diff --git a/ietf/review/tests.py b/ietf/review/tests.py
index b0ace5272..5d599669a 100644
--- a/ietf/review/tests.py
+++ b/ietf/review/tests.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 from ietf.utils.test_utils import TestCase
 from .mailarch import hash_list_message_id
 
diff --git a/ietf/secr/announcement/forms.py b/ietf/secr/announcement/forms.py
index 8be5044e2..ea8be460c 100644
--- a/ietf/secr/announcement/forms.py
+++ b/ietf/secr/announcement/forms.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django import forms
 
 from ietf.group.models import Group, Role
diff --git a/ietf/secr/announcement/tests.py b/ietf/secr/announcement/tests.py
index 1110c0f23..6200af090 100644
--- a/ietf/secr/announcement/tests.py
+++ b/ietf/secr/announcement/tests.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.urls import reverse
 
 from pyquery import PyQuery
diff --git a/ietf/secr/console/tests.py b/ietf/secr/console/tests.py
index 2f686a9b1..75ddf483b 100644
--- a/ietf/secr/console/tests.py
+++ b/ietf/secr/console/tests.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 """
 This file demonstrates two different styles of tests (one doctest and one
 unittest). These will both pass when you run "manage.py test".
diff --git a/ietf/secr/drafts/forms.py b/ietf/secr/drafts/forms.py
index 076a43575..0dd7539a0 100644
--- a/ietf/secr/drafts/forms.py
+++ b/ietf/secr/drafts/forms.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import re
 import os
 
diff --git a/ietf/secr/groups/tests.py b/ietf/secr/groups/tests.py
index af05d2079..c49d95cd1 100644
--- a/ietf/secr/groups/tests.py
+++ b/ietf/secr/groups/tests.py
@@ -1,5 +1,9 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.urls import reverse
 from ietf.utils.test_utils import TestCase
 from ietf.group.models import Group
diff --git a/ietf/secr/meetings/tests.py b/ietf/secr/meetings/tests.py
index 2ebe85dc2..5082cb6b9 100644
--- a/ietf/secr/meetings/tests.py
+++ b/ietf/secr/meetings/tests.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 import os
 import shutil
diff --git a/ietf/secr/proceedings/migrations/0001_initial.py b/ietf/secr/proceedings/migrations/0001_initial.py
index ff57ba5fe..48d6b6264 100644
--- a/ietf/secr/proceedings/migrations/0001_initial.py
+++ b/ietf/secr/proceedings/migrations/0001_initial.py
@@ -3,6 +3,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
 
 
diff --git a/ietf/secr/roles/tests.py b/ietf/secr/roles/tests.py
index 344634563..e70d5e563 100644
--- a/ietf/secr/roles/tests.py
+++ b/ietf/secr/roles/tests.py
@@ -1,5 +1,9 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.urls import reverse
 from ietf.utils.test_utils import TestCase
 
diff --git a/ietf/secr/rolodex/forms.py b/ietf/secr/rolodex/forms.py
index 4c3351fcb..ab094bdca 100644
--- a/ietf/secr/rolodex/forms.py
+++ b/ietf/secr/rolodex/forms.py
@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import re
 
 from django import forms
diff --git a/ietf/secr/sreq/forms.py b/ietf/secr/sreq/forms.py
index 6ed1ca4a9..36a804042 100644
--- a/ietf/secr/sreq/forms.py
+++ b/ietf/secr/sreq/forms.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django import forms
 
 import debug                            # pyflakes:ignore
diff --git a/ietf/secr/sreq/views.py b/ietf/secr/sreq/views.py
index ef8ebfff9..f55ed4060 100644
--- a/ietf/secr/sreq/views.py
+++ b/ietf/secr/sreq/views.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 
 from django.conf import settings
diff --git a/ietf/secr/telechat/tests.py b/ietf/secr/telechat/tests.py
index 26d50d2ba..0b6aa524e 100644
--- a/ietf/secr/telechat/tests.py
+++ b/ietf/secr/telechat/tests.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 from pyquery import PyQuery
 
diff --git a/ietf/secr/utils/document.py b/ietf/secr/utils/document.py
index 72ffbda31..216958b70 100644
--- a/ietf/secr/utils/document.py
+++ b/ietf/secr/utils/document.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 def get_full_path(doc):
     '''
     Returns for name of file on disk with full path.  This should really be a method on doc
diff --git a/ietf/secr/utils/test.py b/ietf/secr/utils/test.py
index 9fca188b1..3fc791923 100644
--- a/ietf/secr/utils/test.py
+++ b/ietf/secr/utils/test.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 '''
 Functions to aid unit testing
 '''
diff --git a/ietf/settings_releasetest.py b/ietf/settings_releasetest.py
index 7c2a87889..421e6f851 100644
--- a/ietf/settings_releasetest.py
+++ b/ietf/settings_releasetest.py
@@ -1,4 +1,10 @@
 # Copyright The IETF Trust 2015-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+
 # Standard settings except we use SQLite, this is useful for speeding
 # up tests that depend on the test database, try for instance:
 #
diff --git a/ietf/settings_sqlitetest.py b/ietf/settings_sqlitetest.py
index e41fbf96c..9657f7775 100644
--- a/ietf/settings_sqlitetest.py
+++ b/ietf/settings_sqlitetest.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2010-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 # Standard settings except we use SQLite and skip migrations, this is
 # useful for speeding up tests that depend on the test database, try
 # for instance:
diff --git a/ietf/settings_testcrawl.py b/ietf/settings_testcrawl.py
index 5f48abd30..ce1f4f8b3 100644
--- a/ietf/settings_testcrawl.py
+++ b/ietf/settings_testcrawl.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2015-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 # Standard settings except we enable caching like in the production
 # environment, this is useful for speeding up the test crawl, try for
 # instance:
diff --git a/ietf/stats/migrations/0001_initial.py b/ietf/stats/migrations/0001_initial.py
index 671036647..cc96985e8 100644
--- a/ietf/stats/migrations/0001_initial.py
+++ b/ietf/stats/migrations/0001_initial.py
@@ -3,6 +3,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
diff --git a/ietf/stats/resources.py b/ietf/stats/resources.py
index 6d7afd9f5..f7bae4a25 100644
--- a/ietf/stats/resources.py
+++ b/ietf/stats/resources.py
@@ -1,5 +1,8 @@
 # Copyright The IETF Trust 2017-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 # Autogenerated by the makeresources management command 2017-02-15 10:10 PST
+
+
 from tastypie.resources import ModelResource
 from tastypie.fields import ToManyField                 # pyflakes:ignore
 from tastypie.constants import ALL, ALL_WITH_RELATIONS  # pyflakes:ignore
diff --git a/ietf/stats/tests.py b/ietf/stats/tests.py
index 314763097..d4247e305 100644
--- a/ietf/stats/tests.py
+++ b/ietf/stats/tests.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 
 from mock import patch
diff --git a/ietf/stats/urls.py b/ietf/stats/urls.py
index d36f3c1a2..7929ecadd 100644
--- a/ietf/stats/urls.py
+++ b/ietf/stats/urls.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.conf import settings
 
 from ietf.stats import views
diff --git a/ietf/submit/migrations/0001_initial.py b/ietf/submit/migrations/0001_initial.py
index feeb457b4..a7b039aa5 100644
--- a/ietf/submit/migrations/0001_initial.py
+++ b/ietf/submit/migrations/0001_initial.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.10 on 2018-02-20 10:52
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 from django.db import migrations, models
 import django.db.models.deletion
diff --git a/ietf/submit/migrations/0002_submission_document2_fk.py b/ietf/submit/migrations/0002_submission_document2_fk.py
index e6a7c3b7c..debd1d52c 100644
--- a/ietf/submit/migrations/0002_submission_document2_fk.py
+++ b/ietf/submit/migrations/0002_submission_document2_fk.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.20 on 2019-05-08 11:58
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 import django.db.models.deletion
 import ietf.utils.models
diff --git a/ietf/submit/migrations/0003_remove_old_document_field.py b/ietf/submit/migrations/0003_remove_old_document_field.py
index a0412cbae..fe4d880ef 100644
--- a/ietf/submit/migrations/0003_remove_old_document_field.py
+++ b/ietf/submit/migrations/0003_remove_old_document_field.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.20 on 2019-05-25 06:44
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 
 
diff --git a/ietf/submit/migrations/0004_rename_field_document2.py b/ietf/submit/migrations/0004_rename_field_document2.py
index 0e928dc8c..b1bdbdcec 100644
--- a/ietf/submit/migrations/0004_rename_field_document2.py
+++ b/ietf/submit/migrations/0004_rename_field_document2.py
@@ -3,6 +3,8 @@
 # Generated by Django 1.11.20 on 2019-05-25 06:46
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.db import migrations
 
 
diff --git a/ietf/submit/parsers/base.py b/ietf/submit/parsers/base.py
index c9eb7478f..b92fabdb7 100644
--- a/ietf/submit/parsers/base.py
+++ b/ietf/submit/parsers/base.py
@@ -1,4 +1,8 @@
 # Copyright The IETF Trust 2011-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import re
 import magic
diff --git a/ietf/submit/parsers/plain_parser.py b/ietf/submit/parsers/plain_parser.py
index be76c69ee..c7b0538af 100644
--- a/ietf/submit/parsers/plain_parser.py
+++ b/ietf/submit/parsers/plain_parser.py
@@ -1,5 +1,8 @@
 # Copyright The IETF Trust 2011-2019, All Rights Reserved
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import re
 
 import debug                            # pyflakes:ignore
diff --git a/ietf/submit/resources.py b/ietf/submit/resources.py
index 66a82cdf8..aed899717 100644
--- a/ietf/submit/resources.py
+++ b/ietf/submit/resources.py
@@ -1,5 +1,8 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 # Autogenerated by the mkresources management command 2014-11-13 23:53
+
+
 from ietf.api import ModelResource
 from tastypie.fields import ToOneField, ToManyField
 from tastypie.constants import ALL, ALL_WITH_RELATIONS
diff --git a/ietf/submit/templatetags/submit_tags.py b/ietf/submit/templatetags/submit_tags.py
index aefd3cb9e..514e8a7f4 100644
--- a/ietf/submit/templatetags/submit_tags.py
+++ b/ietf/submit/templatetags/submit_tags.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2011-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import os
 
 from django import template
diff --git a/ietf/utils/aliases.py b/ietf/utils/aliases.py
index 8068e8d17..6c31e9ec2 100644
--- a/ietf/utils/aliases.py
+++ b/ietf/utils/aliases.py
@@ -1,5 +1,5 @@
-# Copyright The IETF Trust 2013-2019, All Rights Reserved
 #!/usr/bin/env python
+# Copyright The IETF Trust 2013-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 # -*- Python -*-
 #
@@ -7,12 +7,17 @@
 #
 # Author: Markus Stenberg 
 #
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 """
 
 Mailing list alias dumping utilities
 
 """
 
+
 from django.conf import settings
 
 import debug                            # pyflakes:ignore
diff --git a/ietf/utils/bootstrap.py b/ietf/utils/bootstrap.py
index 150f92b57..b4e169f5a 100644
--- a/ietf/utils/bootstrap.py
+++ b/ietf/utils/bootstrap.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import bootstrap3.renderers
 
 class SeparateErrorsFromHelpTextFieldRenderer(bootstrap3.renderers.FieldRenderer):
diff --git a/ietf/utils/draft_search.py b/ietf/utils/draft_search.py
index 4afb56f8e..dd250e319 100644
--- a/ietf/utils/draft_search.py
+++ b/ietf/utils/draft_search.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import re
 
 def normalize_draftname(string):
diff --git a/ietf/utils/history.py b/ietf/utils/history.py
index a4e37e81f..35d532641 100644
--- a/ietf/utils/history.py
+++ b/ietf/utils/history.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2011-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import debug                            # pyflakes:ignore
 
 def find_history_active_at(obj, time):
diff --git a/ietf/utils/management/commands/loadrelated.py b/ietf/utils/management/commands/loadrelated.py
index 2e68d2163..78da0e33e 100644
--- a/ietf/utils/management/commands/loadrelated.py
+++ b/ietf/utils/management/commands/loadrelated.py
@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import gzip
 import os
 #import sys
diff --git a/ietf/utils/management/commands/populate_yang_model_dirs.py b/ietf/utils/management/commands/populate_yang_model_dirs.py
index 5d7adea17..671912b26 100644
--- a/ietf/utils/management/commands/populate_yang_model_dirs.py
+++ b/ietf/utils/management/commands/populate_yang_model_dirs.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import os
 import sys
 import time
diff --git a/ietf/utils/management/commands/pyflakes.py b/ietf/utils/management/commands/pyflakes.py
index a0cefbac5..bf9c4b17e 100644
--- a/ietf/utils/management/commands/pyflakes.py
+++ b/ietf/utils/management/commands/pyflakes.py
@@ -1,4 +1,8 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import
 
 import ast
 import os
diff --git a/ietf/utils/management/commands/run_yang_model_checks.py b/ietf/utils/management/commands/run_yang_model_checks.py
index 8df7e9da8..2b3c324d7 100644
--- a/ietf/utils/management/commands/run_yang_model_checks.py
+++ b/ietf/utils/management/commands/run_yang_model_checks.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2017-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import sys
 import json
 
diff --git a/ietf/utils/management/commands/send_apikey_usage_emails.py b/ietf/utils/management/commands/send_apikey_usage_emails.py
index ead143e92..f8f923021 100644
--- a/ietf/utils/management/commands/send_apikey_usage_emails.py
+++ b/ietf/utils/management/commands/send_apikey_usage_emails.py
@@ -1,7 +1,9 @@
-# -*- coding: utf-8 -*-
 # Copyright The IETF Trust 2017-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 
 from textwrap import dedent
diff --git a/ietf/utils/management/commands/update_community_list_index.py b/ietf/utils/management/commands/update_community_list_index.py
index a7d8bcbfe..299038388 100644
--- a/ietf/utils/management/commands/update_community_list_index.py
+++ b/ietf/utils/management/commands/update_community_list_index.py
@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 
 from django.core.management.base import BaseCommand
 
diff --git a/ietf/utils/management/commands/update_external_command_info.py b/ietf/utils/management/commands/update_external_command_info.py
index d950eb01b..7e63d7c65 100644
--- a/ietf/utils/management/commands/update_external_command_info.py
+++ b/ietf/utils/management/commands/update_external_command_info.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2017-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import sys
 
 from textwrap import dedent
diff --git a/ietf/utils/migrations/0001_initial.py b/ietf/utils/migrations/0001_initial.py
index 38c7566ae..d9f9002e4 100644
--- a/ietf/utils/migrations/0001_initial.py
+++ b/ietf/utils/migrations/0001_initial.py
@@ -3,6 +3,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
 
 
diff --git a/ietf/utils/ordereddict.py b/ietf/utils/ordereddict.py
index 18ec55f8f..bdc911efd 100644
--- a/ietf/utils/ordereddict.py
+++ b/ietf/utils/ordereddict.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 def insert_after_in_ordered_dict(dictionary, key, value, after):
     """There's no "insert" in ordered dict so simulate it instead by
     re-adding entries. Obviously that's not ideal, but for small dicts the
diff --git a/ietf/utils/pipe.py b/ietf/utils/pipe.py
index 5d4d28e5f..62a67e671 100644
--- a/ietf/utils/pipe.py
+++ b/ietf/utils/pipe.py
@@ -1,7 +1,12 @@
 # Copyright The IETF Trust 2010-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 # Simplified interface to os.popen3()
 
-def pipe(cmd:bytes, str:bytes=None) -> (int, bytes, bytes):
+def pipe(cmd, str=None):
     from subprocess import Popen, PIPE
     bufsize = 4096
     MAX = 65536*16
diff --git a/ietf/utils/resources.py b/ietf/utils/resources.py
index c1f115d05..6d61c5e2e 100644
--- a/ietf/utils/resources.py
+++ b/ietf/utils/resources.py
@@ -1,5 +1,8 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 # Autogenerated by the mkresources management command 2014-11-13 05:39
+
+
 from ietf.api import ModelResource
 from tastypie.fields import CharField
 from tastypie.constants import ALL
diff --git a/ietf/utils/templatetags/htmlfilters.py b/ietf/utils/templatetags/htmlfilters.py
index 6d8e666b7..80ad13e78 100644
--- a/ietf/utils/templatetags/htmlfilters.py
+++ b/ietf/utils/templatetags/htmlfilters.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2017-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 
 from django.template.library import Library
 from django.template.defaultfilters import stringfilter
diff --git a/ietf/utils/templatetags/textfilters.py b/ietf/utils/templatetags/textfilters.py
index 63a694199..ad4d6cb64 100644
--- a/ietf/utils/templatetags/textfilters.py
+++ b/ietf/utils/templatetags/textfilters.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import bleach
 
 from django import template
diff --git a/ietf/utils/test_data.py b/ietf/utils/test_data.py
index 2351727f9..17763825a 100644
--- a/ietf/utils/test_data.py
+++ b/ietf/utils/test_data.py
@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 
 import datetime
 
diff --git a/ietf/utils/texescape.py b/ietf/utils/texescape.py
index 83a78812e..623c192db 100644
--- a/ietf/utils/texescape.py
+++ b/ietf/utils/texescape.py
@@ -2,6 +2,10 @@
 # -*- coding: utf-8 -*-
 # Copied from https://github.com/sphinx-doc/sphinx/blob/master/sphinx/util/texescape.py
 # Copyright and license as indicated in the original and below
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 """
     sphinx.util.texescape
     ~~~~~~~~~~~~~~~~~~~~~
diff --git a/ietf/utils/textupload.py b/ietf/utils/textupload.py
index 751a75450..6dc010d56 100644
--- a/ietf/utils/textupload.py
+++ b/ietf/utils/textupload.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import re
 
 from django.core.exceptions import ValidationError

From 1fae7839e2facd1fcde2210418815624a02bc666 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 15 Jul 2019 15:44:38 +0000
Subject: [PATCH 100/114] Py2/3 compatibility: Added __future__ import and an
 explicit encoding scheme, not relying on py3's implicit utf-8  - Legacy-Id:
 16447

---
 ietf/nomcom/fields.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ietf/nomcom/fields.py b/ietf/nomcom/fields.py
index f418bb382..be8c5ba6c 100644
--- a/ietf/nomcom/fields.py
+++ b/ietf/nomcom/fields.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.conf import settings
 from django.db import models
 from django.utils.encoding import smart_str
@@ -20,7 +25,7 @@ class EncryptedTextField(models.TextField):
                 raise ValueError("Trying to read the NomCom public key: " + str(e))
 
             command = "%s smime -encrypt -in /dev/stdin %s" % (settings.OPENSSL_COMMAND, cert_file)
-            code, out, error = pipe(command, comments.encode())
+            code, out, error = pipe(command, comments.encode('utf-8'))
             if code != 0:
                 log("openssl error: %s:\n  Error %s: %s" %(command, code, error))
             if not error:

From 855716e1d550ca20ddad9d3cddff188b8af46fef Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 15 Jul 2019 15:46:06 +0000
Subject: [PATCH 101/114] Py2/3 compatibility: Added __future__ import  -
 Legacy-Id: 16448

---
 ietf/checks.py                                              | 5 +++++
 ietf/doc/views_search.py                                    | 5 ++++-
 ietf/redirects/views.py                                     | 4 ++++
 ietf/submit/views.py                                        | 3 +++
 ietf/utils/management/commands/send_gdpr_consent_request.py | 2 ++
 5 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/ietf/checks.py b/ietf/checks.py
index f4d6e2e9a..1fdde2dc1 100644
--- a/ietf/checks.py
+++ b/ietf/checks.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2015-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import os
 import patch
 import sys
diff --git a/ietf/doc/views_search.py b/ietf/doc/views_search.py
index 5f9a26fd8..09b582aa4 100644
--- a/ietf/doc/views_search.py
+++ b/ietf/doc/views_search.py
@@ -1,6 +1,6 @@
 # Copyright The IETF Trust 2009-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
-
+#
 # Some parts Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen 
 #
@@ -33,6 +33,9 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import re
 import datetime
 
diff --git a/ietf/redirects/views.py b/ietf/redirects/views.py
index bd98a641c..37d2b7645 100644
--- a/ietf/redirects/views.py
+++ b/ietf/redirects/views.py
@@ -1,4 +1,8 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 from django.http import HttpResponsePermanentRedirect, Http404, BadHeaderError
 from django.shortcuts import get_object_or_404
diff --git a/ietf/submit/views.py b/ietf/submit/views.py
index 3cf6a6534..733794115 100644
--- a/ietf/submit/views.py
+++ b/ietf/submit/views.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2011-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import re
 import base64
 import datetime
diff --git a/ietf/utils/management/commands/send_gdpr_consent_request.py b/ietf/utils/management/commands/send_gdpr_consent_request.py
index ee0282f68..9a50399dc 100644
--- a/ietf/utils/management/commands/send_gdpr_consent_request.py
+++ b/ietf/utils/management/commands/send_gdpr_consent_request.py
@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 import time
 

From eb423945348a70109d91d49e5913ef76bc044780 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 15 Jul 2019 15:47:31 +0000
Subject: [PATCH 102/114] Py2/3 compatibility: Added __future__ import.  -
 Legacy-Id: 16449

---
 ietf/utils/accesstoken.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ietf/utils/accesstoken.py b/ietf/utils/accesstoken.py
index 18fc4a73a..a6ba65935 100644
--- a/ietf/utils/accesstoken.py
+++ b/ietf/utils/accesstoken.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import time, random, hashlib
 
 from django.conf import settings

From 831fb18f8ac82a796df86066772cf4c054248dba Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 15 Jul 2019 15:49:35 +0000
Subject: [PATCH 103/114] Python2/3 compatibility: Added force_str or
 force_bytes in some places, to ensure the argument right type  - Legacy-Id:
 16450

---
 ietf/ietfauth/views.py   | 11 ++++++++---
 ietf/ipr/forms.py        |  8 +++++++-
 ietf/utils/decorators.py |  7 ++++++-
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/ietf/ietfauth/views.py b/ietf/ietfauth/views.py
index 21c4e11a3..04359f88a 100644
--- a/ietf/ietfauth/views.py
+++ b/ietf/ietfauth/views.py
@@ -1,5 +1,6 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
-
+# -*- coding: utf-8 -*-
+#
 # Portions Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen 
 #
@@ -32,6 +33,9 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import importlib
 
 from datetime import datetime as DateTime, timedelta as TimeDelta, date as Date
@@ -54,6 +58,7 @@ from django.urls import reverse as urlreverse
 from django.utils.safestring import mark_safe
 from django.http import Http404, HttpResponseRedirect  #, HttpResponse, 
 from django.shortcuts import render, redirect, get_object_or_404
+from django.utils.encoding import force_bytes
 
 import debug                            # pyflakes:ignore
 
@@ -674,7 +679,7 @@ def apikey_disable(request):
     class KeyDeleteForm(forms.Form):
         hash = forms.ChoiceField(label='Key', choices=choices)
         def clean_key(self):
-            hash = self.cleaned_data['hash']
+            hash = force_bytes(self.cleaned_data['hash'])
             key = PersonalApiKey.validate_key(hash)
             if key and key.person == request.user.person:
                 return hash
@@ -684,7 +689,7 @@ def apikey_disable(request):
     if request.method == 'POST':
         form = KeyDeleteForm(request.POST)
         if form.is_valid():
-            hash = form.data['hash']
+            hash = force_bytes(form.data['hash'])
             key = PersonalApiKey.validate_key(hash)
             key.valid = False
             key.save()
diff --git a/ietf/ipr/forms.py b/ietf/ipr/forms.py
index 0ce338ec1..896e5912b 100644
--- a/ietf/ipr/forms.py
+++ b/ietf/ipr/forms.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 import email
 
@@ -6,6 +11,7 @@ import email
 from django import forms
 from django.core.validators import RegexValidator
 from django.utils.safestring import mark_safe
+from django.utils.encoding import force_str
 
 import debug                            # pyflakes:ignore
 
@@ -71,7 +77,7 @@ class AddEmailForm(forms.Form):
     def clean_message(self):
         '''Returns a ietf.message.models.Message object'''
         text = self.cleaned_data['message']
-        message = email.message_from_string(text)
+        message = email.message_from_string(force_str(text))
         for field in ('to','from','subject','date'):
             if not message[field]:
                 raise forms.ValidationError('Error parsing email: {} field not found.'.format(field))
diff --git a/ietf/utils/decorators.py b/ietf/utils/decorators.py
index f961ca267..ff91a2860 100644
--- a/ietf/utils/decorators.py
+++ b/ietf/utils/decorators.py
@@ -1,4 +1,8 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import datetime
 
@@ -8,6 +12,7 @@ from django.conf import settings
 from django.contrib.auth import login
 from django.http import HttpResponse
 from django.shortcuts import render
+from django.utils.encoding import force_bytes
 
 import debug                            # pyflakes:ignore
 
@@ -49,7 +54,7 @@ def require_api_key(f, request, *args, **kwargs):
     if not hash:
         return err(400, "Missing apikey parameter")
     # Check hash
-    key = PersonalApiKey.validate_key(hash)
+    key = PersonalApiKey.validate_key(force_bytes(hash))
     if not key:
         return err(400, "Invalid apikey")
     # Check endpoint

From 28472a462bfb29f0c82c4ae0b8848c66653161ab Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 15 Jul 2019 15:51:26 +0000
Subject: [PATCH 104/114] Python2/3 compatibility: Added more elements to list
 (tuple) entries to ensure sorting without exceptions under Python3.  -
 Legacy-Id: 16451

---
 ietf/doc/utils_search.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ietf/doc/utils_search.py b/ietf/doc/utils_search.py
index 6abad12e2..8756832d7 100644
--- a/ietf/doc/utils_search.py
+++ b/ietf/doc/utils_search.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 import debug                            # pyflakes:ignore
 
@@ -103,7 +106,7 @@ def fill_in_document_table_attributes(docs, have_telechat_date=False):
         d.expirable = expirable_draft(d)
 
         if d.get_state_slug() != "rfc":
-            d.milestones = [ m for (t, m) in sorted(((m.time, m) for m in d.groupmilestone_set.all() if m.state_id == "active")) ]
+            d.milestones = [ m for (t, s, d, m) in sorted(((m.time, m.state.slug, m.desc, m) for m in d.groupmilestone_set.all() if m.state_id == "active")) ]
             d.reviewed_by_teams = sorted(set(r.team.acronym for r in d.reviewrequest_set.filter(state__in=["assigned","accepted","part-completed","completed"]).distinct().select_related('team')))
 
         e = d.latest_event_cache.get('started_iesg_process', None)

From a5e31c3f40f5b59277f77bb79a5d2b83291fd40b Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 15 Jul 2019 15:52:18 +0000
Subject: [PATCH 105/114] Py2/3 compatibility: Added __future__ import.  -
 Legacy-Id: 16452

---
 ietf/api/views.py                                     | 3 +--
 ietf/doc/views_draft.py                               | 3 +++
 ietf/group/management/commands/show_group_features.py | 2 ++
 ietf/liaisons/views.py                                | 5 +++++
 ietf/nomcom/views.py                                  | 5 +++++
 ietf/secr/proceedings/views.py                        | 5 +++++
 ietf/secr/telechat/views.py                           | 5 +++++
 ietf/secr/utils/ams_utils.py                          | 5 +++++
 ietf/stats/utils.py                                   | 5 +++++
 ietf/stats/views.py                                   | 3 +++
 10 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/ietf/api/views.py b/ietf/api/views.py
index 8ac5db805..2376d23e4 100644
--- a/ietf/api/views.py
+++ b/ietf/api/views.py
@@ -1,7 +1,6 @@
 # Copyright The IETF Trust 2017-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
-
-
+from __future__ import absolute_import, print_function, unicode_literals
 
 from jwcrypto.jwk import JWK
 
diff --git a/ietf/doc/views_draft.py b/ietf/doc/views_draft.py
index 921961585..3a4be72c5 100644
--- a/ietf/doc/views_draft.py
+++ b/ietf/doc/views_draft.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2010-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 # changing state and metadata on Internet Drafts
 
 import datetime
diff --git a/ietf/group/management/commands/show_group_features.py b/ietf/group/management/commands/show_group_features.py
index e63b7fd66..75789d23f 100644
--- a/ietf/group/management/commands/show_group_features.py
+++ b/ietf/group/management/commands/show_group_features.py
@@ -2,6 +2,8 @@
 # -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import collections
 
 from django.core.management.base import BaseCommand
diff --git a/ietf/liaisons/views.py b/ietf/liaisons/views.py
index 2f2412ee4..0b68cf8b6 100644
--- a/ietf/liaisons/views.py
+++ b/ietf/liaisons/views.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import json
 from email.utils import parseaddr
 
diff --git a/ietf/nomcom/views.py b/ietf/nomcom/views.py
index 4afaff6f3..2fde29b64 100644
--- a/ietf/nomcom/views.py
+++ b/ietf/nomcom/views.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 import re
 from collections import OrderedDict, Counter
diff --git a/ietf/secr/proceedings/views.py b/ietf/secr/proceedings/views.py
index 1b0178d59..4180dd3d1 100644
--- a/ietf/secr/proceedings/views.py
+++ b/ietf/secr/proceedings/views.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 import glob
 import itertools
diff --git a/ietf/secr/telechat/views.py b/ietf/secr/telechat/views.py
index c78208ff1..d78dde653 100644
--- a/ietf/secr/telechat/views.py
+++ b/ietf/secr/telechat/views.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 
 from django.contrib import messages
diff --git a/ietf/secr/utils/ams_utils.py b/ietf/secr/utils/ams_utils.py
index 6a9ac3196..d8e3c2a62 100644
--- a/ietf/secr/utils/ams_utils.py
+++ b/ietf/secr/utils/ams_utils.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.conf import settings
 
 from ietf.person.models import Person
diff --git a/ietf/stats/utils.py b/ietf/stats/utils.py
index fd7b939e7..909a37b1e 100644
--- a/ietf/stats/utils.py
+++ b/ietf/stats/utils.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2017-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import re
 import requests
 from collections import defaultdict
diff --git a/ietf/stats/views.py b/ietf/stats/views.py
index ab1f956ad..bd9b4210d 100644
--- a/ietf/stats/views.py
+++ b/ietf/stats/views.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import os
 import calendar
 import datetime

From 99a7f9c263c42059d350e44a66b040b32ff2d583 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 15 Jul 2019 17:13:46 +0000
Subject: [PATCH 106/114] Python2/3 compatibility: Added force_str or
 force_bytes in some places, to ensure the argument right type  - Legacy-Id:
 16453

---
 ietf/ipr/mail.py      |  8 ++++++--
 ietf/message/utils.py | 15 +++++++++++----
 ietf/submit/mail.py   |  8 ++++++--
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/ietf/ipr/mail.py b/ietf/ipr/mail.py
index 93b8ff9d8..1f4497e7e 100644
--- a/ietf/ipr/mail.py
+++ b/ietf/ipr/mail.py
@@ -1,4 +1,8 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import base64
 import email
@@ -9,7 +13,7 @@ import pytz
 import re
 
 from django.template.loader import render_to_string
-from django.utils.encoding import force_text
+from django.utils.encoding import force_text, force_str
 
 import debug                            # pyflakes:ignore
 
@@ -171,7 +175,7 @@ def process_response_email(msg):
     a matching value in the reply_to field, associated to an IPR disclosure through
     IprEvent.  Create a Message object for the incoming message and associate it to
     the original message via new IprEvent"""
-    message = email.message_from_string(msg)
+    message = email.message_from_string(force_str(msg))
     to = message.get('To')
     
     # exit if this isn't a response we're interested in (with plus addressing)
diff --git a/ietf/message/utils.py b/ietf/message/utils.py
index 8c0c6934a..1460fed62 100644
--- a/ietf/message/utils.py
+++ b/ietf/message/utils.py
@@ -1,13 +1,20 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import re, datetime, email
 
-from ietf.utils.mail import send_mail_text, send_mail_mime
+from django.utils.encoding import force_str
+
+from ietf.utils.mail import send_mail_text, send_mail_mime, get_payload
 from ietf.message.models import Message
 
 first_dot_on_line_re = re.compile(r'^\.', re.MULTILINE)
 
 def infer_message(s):
-    parsed = email.message_from_string(s)
+    parsed = email.message_from_string(force_str(s))
 
     m = Message()
     m.subject = parsed.get("Subject", "")
@@ -16,7 +23,7 @@ def infer_message(s):
     m.cc = parsed.get("Cc", "")
     m.bcc = parsed.get("Bcc", "")
     m.reply_to = parsed.get("Reply-To", "")
-    m.body = parsed.get_payload()
+    m.body = get_payload(parsed)
 
     return m
 
@@ -41,7 +48,7 @@ def send_scheduled_message_from_send_queue(send_queue):
         # make body a real message so we can parse it
         body = ("MIME-Version: 1.0\r\nContent-Type: %s\r\n" % message.content_type) + body
         
-        msg = email.message_from_string(body)
+        msg = email.message_from_string(force_str(body))
         send_mail_mime(None, message.to, message.frm, message.subject,
                        msg, cc=message.cc, bcc=message.bcc)
 
diff --git a/ietf/submit/mail.py b/ietf/submit/mail.py
index 3ffb3769a..1014ea6ea 100644
--- a/ietf/submit/mail.py
+++ b/ietf/submit/mail.py
@@ -1,4 +1,8 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import re
 import email
@@ -12,7 +16,7 @@ from django.urls import reverse as urlreverse
 from django.core.validators import ValidationError
 from django.contrib.sites.models import Site
 from django.template.loader import render_to_string
-from django.utils.encoding import force_text
+from django.utils.encoding import force_text, force_str
 
 import debug                            # pyflakes:ignore
 
@@ -186,7 +190,7 @@ def process_response_email(msg):
     a matching value in the reply_to field, associated to a submission.
     Create a Message object for the incoming message and associate it to
     the original message via new SubmissionEvent"""
-    message = email.message_from_string(msg)
+    message = email.message_from_string(force_str(msg))
     to = message.get('To')
 
     # exit if this isn't a response we're interested in (with plus addressing)

From 2cfb81fc83c570ff6be19404b805d9e8b561c180 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 15 Jul 2019 17:15:16 +0000
Subject: [PATCH 107/114] Changed instances of email body extaction to use a
 custom get_payload() function.  - Legacy-Id: 16454

---
 ietf/doc/tests_ballot.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ietf/doc/tests_ballot.py b/ietf/doc/tests_ballot.py
index 026f7c96b..ca1d9c1f0 100644
--- a/ietf/doc/tests_ballot.py
+++ b/ietf/doc/tests_ballot.py
@@ -1,6 +1,7 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
 import datetime
 from pyquery import PyQuery
 
@@ -20,7 +21,7 @@ from ietf.iesg.models import TelechatDate
 from ietf.person.models import Person, PersonalApiKey
 from ietf.person.factories import PersonFactory
 from ietf.utils.test_utils import TestCase, login_testing_unauthorized
-from ietf.utils.mail import outbox, empty_outbox
+from ietf.utils.mail import outbox, empty_outbox, get_payload
 from ietf.utils.text import unwrap
 
 
@@ -171,7 +172,7 @@ class EditPositionTests(TestCase):
         self.assertEqual(len(outbox), mailbox_before + 1)
         m = outbox[-1]
         self.assertIn('COMMENT', m['Subject'])
-        self.assertIn('New comment', m.get_payload())
+        self.assertIn('New comment', get_payload(m))
 
 
     def test_edit_position_as_secretary(self):
@@ -790,7 +791,7 @@ class MakeLastCallTests(TestCase):
         self.assertTrue("ietf-announce@" in outbox[-2]['To'])
         for prefix in ['draft-ietf-mars-test','mars-chairs','aread']:
             self.assertTrue(prefix+"@" in outbox[-2]['Cc'])
-        self.assertIn("The following IPR Declarations",outbox[-2].get_payload())
+        self.assertIn("The following IPR Declarations", get_payload(outbox[-2]))
 
         self.assertTrue("Last Call" in outbox[-1]['Subject'])
         self.assertTrue("drafts-lastcall@icann.org" in outbox[-1]['To'])

From ea8c84d2f6a3e645bec4c180cee599cb0830ff72 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 15 Jul 2019 18:01:26 +0000
Subject: [PATCH 108/114] Python2/3 compatibility: used
 @python_2_unicode_compatible to provide __unicode__() versions of __str__()
 methods.  - Legacy-Id: 16455

---
 docker/install-extras           |  1 +
 ietf/community/models.py        |  9 +++++++++
 ietf/dbtemplate/models.py       |  5 +++--
 ietf/iesg/models.py             | 12 +++++++++---
 ietf/ipr/models.py              | 11 ++++++++++-
 ietf/liaisons/models.py         | 11 ++++++++++-
 ietf/mailinglists/models.py     |  8 ++++++++
 ietf/mailtrigger/models.py      |  7 +++++++
 ietf/message/models.py          | 10 ++++++++++
 ietf/name/models.py             |  6 ++++++
 ietf/nomcom/models.py           | 18 ++++++++++++++----
 ietf/redirects/models.py        |  8 ++++++++
 ietf/review/models.py           | 13 +++++++++++++
 ietf/secr/proceedings/models.py |  7 +++++++
 ietf/settings.py                |  1 +
 ietf/stats/models.py            |  9 +++++++++
 ietf/submit/models.py           | 13 ++++++++++++-
 17 files changed, 137 insertions(+), 12 deletions(-)

diff --git a/docker/install-extras b/docker/install-extras
index fc81638b5..5ebbfa853 100755
--- a/docker/install-extras
+++ b/docker/install-extras
@@ -5,3 +5,4 @@ su - -c "apt-get update \
 	&& apt-get install -qy graphviz ghostscript apache2-utils \
 	&& apt-get clean \
 	&& rm -rf /var/lib/apt/lists/*"
+      
\ No newline at end of file
diff --git a/ietf/community/models.py b/ietf/community/models.py
index ffaf307b0..a5c98f8e5 100644
--- a/ietf/community/models.py
+++ b/ietf/community/models.py
@@ -1,14 +1,21 @@
 # Copyright The IETF Trust 2012-2019, 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
 from django.urls import reverse as urlreverse
+from django.utils.encoding import python_2_unicode_compatible
 
 from ietf.doc.models import Document, DocEvent, State
 from ietf.group.models import Group
 from ietf.person.models import Person, Email
 from ietf.utils.models import ForeignKey
 
+@python_2_unicode_compatible
 class CommunityList(models.Model):
     user = ForeignKey(User, blank=True, null=True)
     group = ForeignKey(Group, blank=True, null=True)
@@ -34,6 +41,7 @@ class CommunityList(models.Model):
         return ""
 
 
+@python_2_unicode_compatible
 class SearchRule(models.Model):
     # these types define the UI for setting up the rule, and also
     # helps when interpreting the rule and matching documents
@@ -79,6 +87,7 @@ class SearchRule(models.Model):
     def __str__(self):
         return "%s %s %s/%s/%s/%s" % (self.community_list, self.rule_type, self.state, self.group, self.person, self.text)
 
+@python_2_unicode_compatible
 class EmailSubscription(models.Model):
     community_list = ForeignKey(CommunityList)
     email = ForeignKey(Email)
diff --git a/ietf/dbtemplate/models.py b/ietf/dbtemplate/models.py
index 9ba70a9be..0678236c5 100644
--- a/ietf/dbtemplate/models.py
+++ b/ietf/dbtemplate/models.py
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
-
-
+from __future__ import absolute_import, print_function, unicode_literals
 
 from django.db import models
 from django.core.exceptions import ValidationError
 from django.template import Context
+from django.utils.encoding import python_2_unicode_compatible
 
 from ietf.group.models import Group
 from ietf.name.models import DBTemplateTypeName
@@ -19,6 +19,7 @@ TEMPLATE_TYPES = (
     )
 
 
+@python_2_unicode_compatible
 class DBTemplate(models.Model):
     path = models.CharField( max_length=255, unique=True, blank=False, null=False, )
     title = models.CharField( max_length=255, blank=False, null=False, )
diff --git a/ietf/iesg/models.py b/ietf/iesg/models.py
index d20172cbd..bf716a9d9 100644
--- a/ietf/iesg/models.py
+++ b/ietf/iesg/models.py
@@ -1,5 +1,6 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
-
+# -*- coding: utf-8 -*-
+#
 # Portion Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen 
 # 
@@ -32,11 +33,15 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 
 from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 
-
+@python_2_unicode_compatible
 class TelechatAgendaItem(models.Model):
     TYPE_CHOICES = (
         (1, "Any Other Business (WG News, New Proposals, etc.)"),
@@ -51,7 +56,7 @@ class TelechatAgendaItem(models.Model):
 
     def __str__(self):
         type_name = self.TYPE_CHOICES_DICT.get(self.type, str(self.type))
-        return '%s: %s' % (type_name, self.title or "")
+        return "%s: %s" % (type_name, self.title or "")
 
 class Telechat(models.Model):
     telechat_id = models.IntegerField(primary_key=True)
@@ -77,6 +82,7 @@ class TelechatDateManager(models.Manager):
     def active(self):
         return self.get_queryset().filter(date__gte=datetime.date.today())
 
+@python_2_unicode_compatible
 class TelechatDate(models.Model):
     objects = TelechatDateManager()
 
diff --git a/ietf/ipr/models.py b/ietf/ipr/models.py
index 0c79818e1..4b70dbe3c 100644
--- a/ietf/ipr/models.py
+++ b/ietf/ipr/models.py
@@ -1,10 +1,15 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import datetime
 
 from django.conf import settings
-from django.urls import reverse
 from django.db import models
+from django.urls import reverse
+from django.utils.encoding import python_2_unicode_compatible
 
 from ietf.doc.models import DocAlias
 from ietf.name.models import DocRelationshipName,IprDisclosureStateName,IprLicenseTypeName,IprEventTypeName
@@ -12,6 +17,7 @@ from ietf.person.models import Person
 from ietf.message.models import Message
 from ietf.utils.models import ForeignKey
 
+@python_2_unicode_compatible
 class IprDisclosureBase(models.Model):
     by                  = ForeignKey(Person) # who was logged in, or System if nobody was logged in
     compliant           = models.BooleanField("Complies to RFC3979", default=True)
@@ -148,6 +154,7 @@ class GenericIprDisclosure(IprDisclosureBase):
     holder_contact_info      = models.TextField(blank=True, help_text="Address, phone, etc.")
     statement                = models.TextField() # includes licensing info
 
+@python_2_unicode_compatible
 class IprDocRel(models.Model):
     disclosure = ForeignKey(IprDisclosureBase)
     document   = ForeignKey(DocAlias)
@@ -178,6 +185,7 @@ class IprDocRel(models.Model):
         else:
             return "%s which applies to %s" % (self.disclosure, self.document.name)
 
+@python_2_unicode_compatible
 class RelatedIpr(models.Model):
     source       = ForeignKey(IprDisclosureBase,related_name='relatedipr_source_set')
     target       = ForeignKey(IprDisclosureBase,related_name='relatedipr_target_set')
@@ -186,6 +194,7 @@ class RelatedIpr(models.Model):
     def __str__(self):
         return "%s %s %s" % (self.source.title, self.relationship.name.lower(), self.target.title)
 
+@python_2_unicode_compatible
 class IprEvent(models.Model):
     time        = models.DateTimeField(auto_now_add=True)
     type        = ForeignKey(IprEventTypeName)
diff --git a/ietf/liaisons/models.py b/ietf/liaisons/models.py
index ed2ddfac9..77a29e9a0 100644
--- a/ietf/liaisons/models.py
+++ b/ietf/liaisons/models.py
@@ -1,8 +1,13 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 from django.conf import settings
 from django.urls import reverse as urlreverse
 from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 from django.utils.text import slugify
 
 from ietf.person.models import Email, Person
@@ -24,6 +29,7 @@ STATE_EVENT_MAPPING = {
 }
 
 
+@python_2_unicode_compatible
 class LiaisonStatement(models.Model):
     title = models.CharField(max_length=255)
     from_groups = models.ManyToManyField(Group, blank=True, related_name='liaisonstatement_from_set')
@@ -47,7 +53,6 @@ class LiaisonStatement(models.Model):
 
     class Meta:
         ordering = ['id']
-        
 
     def __str__(self):
         return self.title or ""
@@ -198,6 +203,7 @@ class LiaisonStatement(models.Model):
                 approval_set.intersection_update(group.liaison_approvers())
         return list(set([ r.email.address for r in approval_set ]))
 
+@python_2_unicode_compatible
 class LiaisonStatementAttachment(models.Model):
     statement = ForeignKey(LiaisonStatement)
     document = ForeignKey(Document)
@@ -207,6 +213,7 @@ class LiaisonStatementAttachment(models.Model):
         return self.document.name
 
 
+@python_2_unicode_compatible
 class RelatedLiaisonStatement(models.Model):
     source = ForeignKey(LiaisonStatement, related_name='source_of_set')
     target = ForeignKey(LiaisonStatement, related_name='target_of_set')
@@ -216,6 +223,7 @@ class RelatedLiaisonStatement(models.Model):
         return "%s %s %s" % (self.source.title, self.relationship.name.lower(), self.target.title)
 
 
+@python_2_unicode_compatible
 class LiaisonStatementGroupContacts(models.Model):
     group = ForeignKey(Group, unique=True, null=True)
     contacts = models.CharField(max_length=255,blank=True)
@@ -225,6 +233,7 @@ class LiaisonStatementGroupContacts(models.Model):
         return "%s" % self.group.name
 
 
+@python_2_unicode_compatible
 class LiaisonStatementEvent(models.Model):
     time = models.DateTimeField(auto_now_add=True)
     type = ForeignKey(LiaisonStatementEventTypeName)
diff --git a/ietf/mailinglists/models.py b/ietf/mailinglists/models.py
index 63e4808d8..a3e742f28 100644
--- a/ietf/mailinglists/models.py
+++ b/ietf/mailinglists/models.py
@@ -1,22 +1,29 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 from django.conf import settings
 from django.core.validators import validate_email
 from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 
 from ietf.person.models import Person
 from ietf.utils.models import ForeignKey
 
+@python_2_unicode_compatible
 class List(models.Model):
     name = models.CharField(max_length=32)
     description = models.CharField(max_length=256)
     advertised = models.BooleanField(default=True)
+
     def __str__(self):
         return "" % self.name
     def info_url(self):
         return settings.MAILING_LIST_INFO_URL % {'list_addr': self.name }
 
+@python_2_unicode_compatible
 class Subscribed(models.Model):
     time = models.DateTimeField(auto_now_add=True)
     email = models.CharField(max_length=64, validators=[validate_email])
@@ -26,6 +33,7 @@ class Subscribed(models.Model):
     class Meta:
         verbose_name_plural = "Subscribed"
 
+@python_2_unicode_compatible
 class Whitelisted(models.Model):
     time = models.DateTimeField(auto_now_add=True)
     email = models.CharField("Email address", max_length=64, validators=[validate_email])
diff --git a/ietf/mailtrigger/models.py b/ietf/mailtrigger/models.py
index 7e770b388..7de884552 100644
--- a/ietf/mailtrigger/models.py
+++ b/ietf/mailtrigger/models.py
@@ -1,7 +1,12 @@
 # Copyright The IETF Trust 2015-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 from django.db import models
 from django.template import Template, Context
+from django.utils.encoding import python_2_unicode_compatible
 
 from email.utils import parseaddr
 from ietf.utils.mail import formataddr, get_email_addresses_from_text
@@ -28,6 +33,7 @@ def clean_duplicates(addrlist):
             addresses.append(addr)
     return addresses
 
+@python_2_unicode_compatible
 class MailTrigger(models.Model):
     slug = models.CharField(max_length=32, primary_key=True)
     desc = models.TextField(blank=True)
@@ -40,6 +46,7 @@ class MailTrigger(models.Model):
     def __str__(self):
         return self.slug
 
+@python_2_unicode_compatible
 class Recipient(models.Model):
     slug = models.CharField(max_length=32, primary_key=True)
     desc = models.TextField(blank=True)
diff --git a/ietf/message/models.py b/ietf/message/models.py
index 0740d1f27..9a03bde36 100644
--- a/ietf/message/models.py
+++ b/ietf/message/models.py
@@ -1,8 +1,14 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 import email.utils
 
 from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 
 import debug                            # pyflakes:ignore
 
@@ -13,6 +19,7 @@ from ietf.name.models import RoleName
 from ietf.utils.models import ForeignKey
 from ietf.utils.mail import get_email_addresses_from_text
 
+@python_2_unicode_compatible
 class Message(models.Model):
     time = models.DateTimeField(default=datetime.datetime.now)
     by = ForeignKey(Person)
@@ -41,6 +48,7 @@ class Message(models.Model):
         return r if isinstance(r, list) else get_email_addresses_from_text(r)
             
 
+@python_2_unicode_compatible
 class MessageAttachment(models.Model):
     message = ForeignKey(Message)
     filename = models.CharField(max_length=255, db_index=True, blank=True)
@@ -53,6 +61,7 @@ class MessageAttachment(models.Model):
         return self.filename
 
 
+@python_2_unicode_compatible
 class SendQueue(models.Model):
     time = models.DateTimeField(default=datetime.datetime.now)
     by = ForeignKey(Person)
@@ -71,6 +80,7 @@ class SendQueue(models.Model):
         return "'%s' %s -> %s (sent at %s)" % (self.message.subject, self.message.frm, self.message.to, self.sent_at or "")
 
 
+@python_2_unicode_compatible
 class AnnouncementFrom(models.Model):
     name = ForeignKey(RoleName)
     group = ForeignKey(Group)
diff --git a/ietf/name/models.py b/ietf/name/models.py
index 19d2d7eea..453b7042e 100644
--- a/ietf/name/models.py
+++ b/ietf/name/models.py
@@ -1,9 +1,15 @@
 # Copyright The IETF Trust 2010-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 
 from ietf.utils.models import ForeignKey
 
+@python_2_unicode_compatible
 class NameModel(models.Model):
     slug = models.CharField(max_length=32, primary_key=True)
     name = models.CharField(max_length=255)
diff --git a/ietf/nomcom/models.py b/ietf/nomcom/models.py
index 249958cb7..d0977acea 100644
--- a/ietf/nomcom/models.py
+++ b/ietf/nomcom/models.py
@@ -1,5 +1,7 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, print_function, unicode_literals
+
 import os
 
 from django.db import models
@@ -8,6 +10,7 @@ from django.conf import settings
 from django.contrib.auth.models import User
 from django.template.loader import render_to_string
 from django.template.defaultfilters import linebreaks
+from django.utils.encoding import python_2_unicode_compatible
 
 import debug                            # pyflakes:ignore
 
@@ -40,6 +43,7 @@ class ReminderDates(models.Model):
     nomcom = ForeignKey('NomCom')
 
 
+@python_2_unicode_compatible
 class NomCom(models.Model):
     public_key = models.FileField(storage=NoLocationMigrationFileSystemStorage(location=settings.NOMCOM_PUBLIC_KEYS_DIR),
                                   upload_to=upload_path_handler, blank=True, null=True)
@@ -82,14 +86,14 @@ class NomCom(models.Model):
     def pending_email_count(self):
         return self.feedback_set.filter(type__isnull=True).count()
 
-    def encrypt(self, cleartext:str) -> bytes:
+    def encrypt(self, cleartext):
         try:
             cert_file = self.public_key.path
         except ValueError as e:
             raise ValueError("Trying to read the NomCom public key: " + str(e))
 
         command = "%s smime -encrypt -in /dev/stdin %s" % (settings.OPENSSL_COMMAND, cert_file)
-        code, out, error = pipe(command, cleartext.encode())
+        code, out, error = pipe(command, cleartext.encode('utf-8'))
         if code != 0:
             log("openssl error: %s:\n  Error %s: %s" %(command, code, error))
         if not error:
@@ -106,6 +110,7 @@ def delete_nomcom(sender, **kwargs):
 post_delete.connect(delete_nomcom, sender=NomCom)
 
 
+@python_2_unicode_compatible
 class Nomination(models.Model):
     position = ForeignKey('Position')
     candidate_name = models.CharField(verbose_name='Candidate name', max_length=255)
@@ -130,6 +135,7 @@ class Nomination(models.Model):
         return "%s (%s)" % (self.candidate_name, self.candidate_email)
 
 
+@python_2_unicode_compatible
 class Nominee(models.Model):
 
     email = ForeignKey(Email)
@@ -147,9 +153,9 @@ class Nominee(models.Model):
 
     def __str__(self):
         if self.email.person and self.email.person.name:
-            return '%s <%s> %s' % (self.email.person.plain_name(), self.email.address, self.nomcom.year())
+            return "%s <%s> %s" % (self.email.person.plain_name(), self.email.address, self.nomcom.year())
         else:
-            return '%s %s' % (self.email.address, self.nomcom.year())
+            return "%s %s" % (self.email.address, self.nomcom.year())
 
     def name(self):
         if self.email.person and self.email.person.name:
@@ -157,6 +163,7 @@ class Nominee(models.Model):
         else:
             return self.email.address
 
+@python_2_unicode_compatible
 class NomineePosition(models.Model):
 
     position = ForeignKey('Position')
@@ -186,6 +193,7 @@ class NomineePosition(models.Model):
                                                         nominees__in=[self.nominee])
 
 
+@python_2_unicode_compatible
 class Position(models.Model):
     nomcom = ForeignKey('NomCom')
     name = models.CharField(verbose_name='Name', max_length=255, help_text='This short description will appear on the Nomination and Feedback pages. Be as descriptive as necessary. Past examples: "Transport AD", "IAB Member"')
@@ -232,6 +240,7 @@ class Position(models.Model):
             rendered = linebreaks(rendered)
         return rendered
 
+@python_2_unicode_compatible
 class Topic(models.Model):
     nomcom = ForeignKey('NomCom')
     subject = models.CharField(verbose_name='Name', max_length=255, help_text='This short description will appear on the Feedback pages.')
@@ -261,6 +270,7 @@ class Topic(models.Model):
             rendered = linebreaks(rendered)
         return rendered
 
+@python_2_unicode_compatible
 class Feedback(models.Model):
     nomcom = ForeignKey('NomCom')
     author = models.EmailField(verbose_name='Author', blank=True)
diff --git a/ietf/redirects/models.py b/ietf/redirects/models.py
index eddf59cc7..6a3b702e5 100644
--- a/ietf/redirects/models.py
+++ b/ietf/redirects/models.py
@@ -1,9 +1,15 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 
 from ietf.utils.models import ForeignKey
 
+@python_2_unicode_compatible
 class Redirect(models.Model):
     """Mapping of CGI script to url.  The "rest" is a
     sprintf-style string with %(param)s entries to insert
@@ -24,6 +30,7 @@ class Redirect(models.Model):
     def __str__(self):
         return "%s -> %s/%s" % (self.cgi, self.url, self.rest)
 
+@python_2_unicode_compatible
 class Suffix(models.Model):
     """This is a "rest" and "remove" (see Redirect class)
     for requests with command=.
@@ -35,6 +42,7 @@ class Suffix(models.Model):
     class Meta:
         verbose_name_plural="Suffixes"
 
+@python_2_unicode_compatible
 class Command(models.Model):
     """When a request comes in with a command= argument,
     the command is looked up in this table to see if there
diff --git a/ietf/review/models.py b/ietf/review/models.py
index 2a1536077..4cdb34297 100644
--- a/ietf/review/models.py
+++ b/ietf/review/models.py
@@ -1,10 +1,15 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import datetime
 
 from simple_history.models import HistoricalRecords
 
 from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 
 from ietf.doc.models import Document
 from ietf.group.models import Group
@@ -13,6 +18,7 @@ from ietf.name.models import ReviewTypeName, ReviewRequestStateName, ReviewResul
 from ietf.utils.validators import validate_regular_expression_string
 from ietf.utils.models import ForeignKey, OneToOneField
 
+@python_2_unicode_compatible
 class ReviewerSettings(models.Model):
     """Keeps track of admin data associated with a reviewer in a team."""
     history     = HistoricalRecords()
@@ -39,6 +45,7 @@ class ReviewerSettings(models.Model):
     class Meta:
         verbose_name_plural = "reviewer settings"
 
+@python_2_unicode_compatible
 class ReviewSecretarySettings(models.Model):
     """Keeps track of admin data associated with a secretary in a team."""
     team        = ForeignKey(Group, limit_choices_to=~models.Q(reviewteamsettings=None))
@@ -51,6 +58,7 @@ class ReviewSecretarySettings(models.Model):
     class Meta:
         verbose_name_plural = "review secretary settings"
 
+@python_2_unicode_compatible
 class UnavailablePeriod(models.Model):
     team         = ForeignKey(Group, limit_choices_to=~models.Q(reviewteamsettings=None))
     person       = ForeignKey(Person)
@@ -81,6 +89,7 @@ class UnavailablePeriod(models.Model):
     def __str__(self):
         return "{} is unavailable in {} {} - {}".format(self.person, self.team.acronym, self.start_date or "", self.end_date or "")
 
+@python_2_unicode_compatible
 class ReviewWish(models.Model):
     """Reviewer wishes to review a document when it becomes available for review."""
     time        = models.DateTimeField(default=datetime.datetime.now)
@@ -95,6 +104,7 @@ class ReviewWish(models.Model):
         verbose_name_plural = "review wishes"
     
 
+@python_2_unicode_compatible
 class NextReviewerInTeam(models.Model):
     team        = ForeignKey(Group, limit_choices_to=~models.Q(reviewteamsettings=None))
     next_reviewer = ForeignKey(Person)
@@ -106,6 +116,7 @@ class NextReviewerInTeam(models.Model):
         verbose_name = "next reviewer in team setting"
         verbose_name_plural = "next reviewer in team settings"
 
+@python_2_unicode_compatible
 class ReviewRequest(models.Model):
     """Represents a request for a review and the process it goes through."""
     state         = ForeignKey(ReviewRequestStateName)
@@ -130,6 +141,7 @@ class ReviewRequest(models.Model):
     def request_closed_time(self):
         return self.doc.request_closed_time(self) or self.time
 
+@python_2_unicode_compatible
 class ReviewAssignment(models.Model):
     """ One of possibly many reviews assigned in response to a ReviewRequest """
     review_request = ForeignKey(ReviewRequest)
@@ -152,6 +164,7 @@ def get_default_review_types():
 def get_default_review_results():
     return ReviewResultName.objects.filter(slug__in=['not-ready', 'right-track', 'almost-ready', 'ready-issues', 'ready-nits', 'ready'])
 
+@python_2_unicode_compatible
 class ReviewTeamSettings(models.Model):
     """Holds configuration specific to groups that are review teams"""
     group = OneToOneField(Group)
diff --git a/ietf/secr/proceedings/models.py b/ietf/secr/proceedings/models.py
index 107da0cd3..e7d24e7c8 100644
--- a/ietf/secr/proceedings/models.py
+++ b/ietf/secr/proceedings/models.py
@@ -1,8 +1,14 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import os
 
 from django.conf import settings
 from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 
 from ietf.meeting.models import Meeting
 
@@ -57,6 +63,7 @@ class InterimMeeting(Meeting):
         else:
             return ''
 
+@python_2_unicode_compatible
 class Registration(models.Model):
     rsn = models.AutoField(primary_key=True)
     fname = models.CharField(max_length=255)
diff --git a/ietf/settings.py b/ietf/settings.py
index 66b98ef92..1060e0b2a 100644
--- a/ietf/settings.py
+++ b/ietf/settings.py
@@ -831,6 +831,7 @@ MEETING_VALID_MIME_TYPE_EXTENSIONS = {
 INTERNET_DRAFT_DAYS_TO_EXPIRE = 185
 
 FLOORPLAN_MEDIA_DIR = 'floor'
+FLOORPLAN_DIR = os.path.join(MEDIA_ROOT, FLOORPLAN_MEDIA_DIR)
 
 # ==============================================================================
 
diff --git a/ietf/stats/models.py b/ietf/stats/models.py
index 7a139bcf7..924ff962e 100644
--- a/ietf/stats/models.py
+++ b/ietf/stats/models.py
@@ -1,6 +1,11 @@
 # Copyright The IETF Trust 2017-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 from django.db import models
+from django.utils.encoding import python_2_unicode_compatible
 
 import debug                            # pyflakes:ignore
 
@@ -10,6 +15,7 @@ from ietf.person.models import Person
 from ietf.utils.models import ForeignKey
 
 
+@python_2_unicode_compatible
 class AffiliationAlias(models.Model):
     """Records that alias should be treated as name for statistical
     purposes."""
@@ -27,6 +33,7 @@ class AffiliationAlias(models.Model):
     class Meta:
         verbose_name_plural = "affiliation aliases"
 
+@python_2_unicode_compatible
 class AffiliationIgnoredEnding(models.Model):
     """Records that ending should be stripped from the affiliation for statistical purposes."""
 
@@ -35,6 +42,7 @@ class AffiliationIgnoredEnding(models.Model):
     def __str__(self):
         return self.ending
 
+@python_2_unicode_compatible
 class CountryAlias(models.Model):
     """Records that alias should be treated as country for statistical
     purposes."""
@@ -48,6 +56,7 @@ class CountryAlias(models.Model):
     class Meta:
         verbose_name_plural = "country aliases"
     
+@python_2_unicode_compatible
 class MeetingRegistration(models.Model):
     """Registration attendee records from the IETF registration system"""
     meeting = ForeignKey(Meeting)
diff --git a/ietf/submit/models.py b/ietf/submit/models.py
index 9450a283d..04f7400bf 100644
--- a/ietf/submit/models.py
+++ b/ietf/submit/models.py
@@ -1,9 +1,15 @@
 # Copyright The IETF Trust 2011-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 import email
+import jsonfield
 
 from django.db import models
-import jsonfield
+from django.utils.encoding import python_2_unicode_compatible
 
 import debug                            # pyflakes:ignore
 
@@ -24,6 +30,7 @@ def parse_email_line(line):
     name, addr = email.utils.parseaddr(line) if '@' in line else (line, '')
     return dict(name=name, email=addr)
 
+@python_2_unicode_compatible
 class Submission(models.Model):
     state = ForeignKey(DraftSubmissionStateName)
     remote_ip = models.CharField(max_length=100, blank=True)
@@ -71,6 +78,7 @@ class Submission(models.Model):
         checks = [ self.checks.filter(checker=c).latest('time') for c in self.checks.values_list('checker', flat=True).distinct() ]
         return checks
         
+@python_2_unicode_compatible
 class SubmissionCheck(models.Model):
     time = models.DateTimeField(default=datetime.datetime.now)
     submission = ForeignKey(Submission, related_name='checks')
@@ -89,6 +97,7 @@ class SubmissionCheck(models.Model):
     def has_errors(self):
         return self.errors != '[]'
 
+@python_2_unicode_compatible
 class SubmissionEvent(models.Model):
     submission = ForeignKey(Submission)
     time = models.DateTimeField(default=datetime.datetime.now)
@@ -102,6 +111,7 @@ class SubmissionEvent(models.Model):
         ordering = ("-time", "-id")
 
 
+@python_2_unicode_compatible
 class Preapproval(models.Model):
     """Pre-approved draft submission name."""
     name = models.CharField(max_length=255, db_index=True)
@@ -111,6 +121,7 @@ class Preapproval(models.Model):
     def __str__(self):
         return self.name
 
+@python_2_unicode_compatible
 class SubmissionEmailEvent(SubmissionEvent):
     message     = ForeignKey(Message, null=True, blank=True,related_name='manualevents')
     msgtype     = models.CharField(max_length=25)

From 44f51c1d64ae554e81784be6a6fb1077935aa9b4 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 15 Jul 2019 19:03:35 +0000
Subject: [PATCH 109/114] The beginning of a dev file download helper.  -
 Legacy-Id: 16456

---
 .../management/commands/download_extras.py    | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 ietf/utils/management/commands/download_extras.py

diff --git a/ietf/utils/management/commands/download_extras.py b/ietf/utils/management/commands/download_extras.py
new file mode 100644
index 000000000..74bfc1e1b
--- /dev/null
+++ b/ietf/utils/management/commands/download_extras.py
@@ -0,0 +1,31 @@
+# Copyright The IETF Trust 2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import os
+import subprocess
+
+from textwrap import dedent
+
+from django.core.management.base import BaseCommand
+from django.conf import settings
+
+import debug                            # pyflakes:ignore
+
+class Command(BaseCommand):
+    """
+    Download extra files (photos, floorplans, ...)
+    """
+
+    help = dedent(__doc__).strip()
+            
+    def handle(self, *filenames, **options):
+        for src, dst in (
+                ('rsync.ietf.org::dev.media/', settings.MEDIA_ROOT), ):
+            if src and dst:
+                if not dst.endswith(os.pathsep):
+                    dst += os.pathsep
+                subprocess.call(('rsync', '-auz', '--info=progress2', src, dst))
+                
\ No newline at end of file

From 4ce67683996db69f53ad0f30beee6bd47c079749 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 15 Jul 2019 19:12:58 +0000
Subject: [PATCH 110/114] Fixed a bug in check-copyright  - Legacy-Id: 16457

---
 bin/check-copyright | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/check-copyright b/bin/check-copyright
index ca393b781..0e6c0a36c 100755
--- a/bin/check-copyright
+++ b/bin/check-copyright
@@ -188,6 +188,7 @@ write_cache = False
 loginfo_format = r'^r[0-9]+ \| [^@]+@[^@]+ \| \d\d\d\d-\d\d-\d\d '
 
 year = time.strftime('%Y')
+copyright_re = "(?i)"+opt_copyright.format(years=r"(\d+-)?\d+")
 for path in files:
     try:
         if not os.path.exists(path):
@@ -200,8 +201,7 @@ for path in files:
         date = initinfo[path]['date']
         init = date[:4]
         
-        copyright_re = "(?i)"+opt_copyright.format(years=r"(\d+-)?\d+")
-        copyright_year_re = "(?i)"+opt_copyright.format(years=r"({init})?{year}")
+        copyright_year_re = "(?i)"+opt_copyright.format(years=r"({init}-)?{year}".format(init=init, year=year))
         with open(path) as file:
             try:
                 chunk = file.read(4000)

From 8c6eb3a30a12e1e1277e917332227650d4701a12 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Mon, 15 Jul 2019 19:14:04 +0000
Subject: [PATCH 111/114] Python2/3 compatibility: Changed the use of open()
 and StringIO to io.open() etc.  - Legacy-Id: 16458

---
 changelog.py                                  |   6 +-
 ietf/api/__init__.py                          |  22 ++-
 ietf/api/serializer.py                        |   8 +-
 ietf/community/views.py                       |  14 +-
 ietf/cookies/tests.py                         | 149 +++++++++---------
 ietf/doc/feeds.py                             |   7 +-
 ietf/doc/fields.py                            |  10 +-
 ietf/doc/mails.py                             |  25 +--
 .../commands/generate_draft_bibxml_files.py   |  10 +-
 .../0016_set_document_docalias_fk.py          |   5 +-
 ietf/doc/models.py                            |  40 +++--
 ietf/doc/resources.py                         |   2 +
 ietf/doc/templatetags/ietf_filters.py         |  23 +--
 ietf/doc/tests.py                             |  48 +++---
 ietf/doc/tests_charter.py                     |  41 ++---
 ietf/doc/tests_conflict_review.py             |  25 +--
 ietf/doc/tests_draft.py                       |  23 +--
 ietf/doc/tests_material.py                    |  14 +-
 ietf/doc/tests_review.py                      |  19 ++-
 ietf/doc/tests_status_change.py               |  10 +-
 ietf/doc/utils.py                             |  26 +--
 ietf/doc/utils_charter.py                     |  16 +-
 ietf/doc/views_charter.py                     |  18 ++-
 ietf/doc/views_conflict_review.py             |  11 +-
 ietf/doc/views_doc.py                         |  23 ++-
 ietf/doc/views_material.py                    |   6 +-
 ietf/doc/views_review.py                      |   5 +-
 ietf/doc/views_status_change.py               |  15 +-
 ietf/group/models.py                          |  24 ++-
 ietf/group/tests_info.py                      |  12 +-
 ietf/group/tests_review.py                    |   6 +-
 ietf/group/utils.py                           |   6 +-
 ietf/group/views.py                           |  31 ++--
 ietf/idindex/generate_all_id2_txt.py          |  10 +-
 ietf/idindex/generate_all_id_txt.py           |   9 +-
 ietf/idindex/generate_id_abstracts_txt.py     |   9 +-
 ietf/idindex/generate_id_index_txt.py         |   9 +-
 ietf/idindex/index.py                         |  16 +-
 ietf/idindex/tests.py                         |  17 +-
 ietf/iesg/agenda.py                           |   7 +-
 ietf/iesg/tests.py                            |  12 +-
 ietf/iesg/views.py                            |  22 +--
 ietf/ietfauth/htpasswd.py                     |   7 +-
 ietf/ietfauth/tests.py                        |  25 +--
 ietf/ipr/feeds.py                             |   8 +-
 ietf/ipr/fields.py                            |   8 +-
 ietf/ipr/management/commands/process_email.py |   8 +-
 ietf/ipr/tests.py                             |  10 +-
 ietf/ipr/views.py                             |   8 +-
 ietf/liaisons/fields.py                       |  10 +-
 ietf/liaisons/forms.py                        |  12 +-
 ietf/liaisons/tests.py                        |  21 ++-
 ietf/meeting/forms.py                         |   7 +-
 ietf/meeting/helpers.py                       |  11 +-
 ietf/meeting/models.py                        |  40 +++--
 ietf/meeting/tests_api.py                     |   6 +-
 ietf/meeting/tests_views.py                   |  58 +++----
 ietf/meeting/utils.py                         |  12 +-
 ietf/meeting/views.py                         |  24 +--
 ietf/name/generate_fixtures.py                |   4 +-
 ietf/nomcom/forms.py                          |  11 +-
 .../management/commands/feedback_email.py     |   8 +-
 ietf/nomcom/test_data.py                      |  10 +-
 ietf/nomcom/tests.py                          |  36 +++--
 ietf/nomcom/utils.py                          |  26 +--
 ietf/person/factories.py                      |  12 +-
 ietf/person/fields.py                         |  12 +-
 .../commands/deactivate_email_addresses.py    |   5 +-
 ietf/person/models.py                         |  37 +++--
 ietf/person/tests.py                          |   6 +-
 ietf/person/utils.py                          |  13 +-
 ietf/release/views.py                         |   5 +-
 ietf/review/mailarch.py                       |  26 ++-
 ietf/review/utils.py                          |  11 +-
 ietf/secr/drafts/tests_views.py               |   8 +-
 ietf/secr/drafts/views.py                     |   6 +-
 ietf/secr/meetings/blue_sheets.py             |  43 +++--
 ietf/secr/proceedings/proc_utils.py           |   5 +-
 ietf/secr/proceedings/tests.py                |   8 +-
 ietf/secr/proceedings/utils.py                |   4 +-
 ietf/secr/sreq/tests.py                       |  13 +-
 ietf/secr/utils/group.py                      |   8 +-
 ietf/stats/backfill_data.py                   |  23 +--
 ietf/submit/checkers.py                       |  24 ++-
 ietf/submit/forms.py                          |  19 ++-
 .../management/commands/manualpost_email.py   |   8 +-
 ietf/submit/tests.py                          |  54 ++++---
 ietf/submit/utils.py                          |  13 +-
 ietf/sync/iana.py                             |  21 ++-
 ietf/sync/rfceditor.py                        |  21 ++-
 ietf/sync/tests.py                            |  12 +-
 ietf/utils/admin.py                           |  11 +-
 ietf/utils/draft.py                           |  21 ++-
 ietf/utils/fields.py                          |  10 +-
 ietf/utils/html.py                            |   9 +-
 ietf/utils/log.py                             |  19 ++-
 ietf/utils/mail.py                            |  46 ++++--
 .../commands/check_referential_integrity.py   |  28 ++--
 .../management/commands/coverage_changes.py   |  15 +-
 .../management/commands/create_group_wikis.py |   7 +-
 ietf/utils/management/commands/dumprelated.py |   8 +-
 .../management/commands/import_htpasswd.py    |   4 +-
 ietf/utils/management/commands/makefixture.py |  10 +-
 ietf/utils/management/commands/tests.py       |  15 +-
 ietf/utils/markup_txt.py                      |   8 +-
 ietf/utils/pdf.py                             |   8 +-
 ietf/utils/test_runner.py                     |  17 +-
 ietf/utils/test_smtpserver.py                 |  31 ++--
 ietf/utils/test_utils.py                      |  23 ++-
 ietf/utils/tests.py                           | 104 ++++++------
 ietf/utils/tests_restapi.py                   |  24 ++-
 ietf/utils/text.py                            |  10 +-
 ietf/utils/urls.py                            |   8 +-
 ietf/virtualenv-manage.py                     |   9 +-
 ietf/wsgi.py                                  |  10 +-
 115 files changed, 1361 insertions(+), 692 deletions(-)

diff --git a/changelog.py b/changelog.py
index f5f867f0e..c7eb53a8e 100644
--- a/changelog.py
+++ b/changelog.py
@@ -1,5 +1,9 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+from __future__ import absolute_import, print_function, unicode_literals
 import re
+import six
 from tzparse import tzparse
 from datetime import datetime as Datetime
 
@@ -44,7 +48,7 @@ def parse(logfile):
     inf_line = r"^  \*\*(.*)\*\* *"
 
     entries = []
-    if type(logfile) == type(''):
+    if isinstance(logfile, six.string_types):
         logfile = open(logfile)
     entry = None
     for line in logfile:
diff --git a/ietf/api/__init__.py b/ietf/api/__init__.py
index d2b205e59..ff0b57bd3 100644
--- a/ietf/api/__init__.py
+++ b/ietf/api/__init__.py
@@ -1,7 +1,14 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
-import re
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
-from urllib.parse import urlencode
+import re
+import six
+
+from six.moves.urllib.parse import urlencode
 
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
@@ -75,7 +82,7 @@ class TimedeltaField(ApiField):
         if value is None:
             return None
 
-        if isinstance(value, str):
+        if isinstance(value, six.string_types):
             match = TIMEDELTA_REGEX.search(value)
 
             if match:
@@ -90,7 +97,7 @@ class TimedeltaField(ApiField):
         value = super(TimedeltaField, self).hydrate(bundle)
 
         if value and not hasattr(value, 'seconds'):
-            if isinstance(value, str):
+            if isinstance(value, six.string_types):
                 try:
                     match = TIMEDELTA_REGEX.search(value)
 
@@ -112,14 +119,17 @@ class ToOneField(tastypie.fields.ToOneField):
 
     def dehydrate(self, bundle, for_list=True):
         foreign_obj = None
+        previous_obj = None
+        attrib = None
         
         if callable(self.attribute):
             previous_obj = bundle.obj
             foreign_obj = self.attribute(bundle)
-        elif isinstance(self.attribute, str):
+        elif isinstance(self.attribute, six.string_types):
             foreign_obj = bundle.obj
 
             for attr in self._attrs:
+                attrib = attr
                 previous_obj = foreign_obj
                 try:
                     foreign_obj = getattr(foreign_obj, attr, None)
@@ -131,7 +141,7 @@ class ToOneField(tastypie.fields.ToOneField):
                 if callable(self.attribute):
                     raise ApiFieldError("The related resource for resource %s could not be found." % (previous_obj))
                 else:
-                    raise ApiFieldError("The model '%r' has an empty attribute '%s' and doesn't allow a null value." % (previous_obj, attr))
+                    raise ApiFieldError("The model '%r' has an empty attribute '%s' and doesn't allow a null value." % (previous_obj, attrib))
             return None
 
         fk_resource = self.get_related_resource(foreign_obj)
diff --git a/ietf/api/serializer.py b/ietf/api/serializer.py
index 3fdfc428c..0dfdb6aed 100644
--- a/ietf/api/serializer.py
+++ b/ietf/api/serializer.py
@@ -1,6 +1,12 @@
 # Copyright The IETF Trust 2018-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import hashlib
 import json
+import six
 
 from django.core.cache import cache
 from django.core.exceptions import ObjectDoesNotExist, FieldError
@@ -148,7 +154,7 @@ class AdminJsonSerializer(Serializer):
                             if hasattr(field_value, "_meta"):
                                 self._current[name] = self.expand_related(field_value, name)
                             else:
-                                self._current[name] = str(field_value)
+                                self._current[name] = six.ensure_text(field_value)
             except ObjectDoesNotExist:
                 pass
             except AttributeError:
diff --git a/ietf/community/views.py b/ietf/community/views.py
index 09ffd361b..375287e29 100644
--- a/ietf/community/views.py
+++ b/ietf/community/views.py
@@ -1,16 +1,22 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import csv
-import uuid
 import datetime
 import json
+import six
+import uuid
 
 from django.http import HttpResponse, HttpResponseForbidden, HttpResponseRedirect, Http404
 from django.shortcuts import get_object_or_404, render
 from django.contrib.auth.decorators import login_required
 from django.utils.html import strip_tags
 
+import debug                            # pyflakes:ignore
+
 from ietf.community.models import SearchRule, EmailSubscription
 from ietf.community.forms import SearchRuleTypeForm, SearchRuleForm, AddDocumentsForm, SubscriptionForm
 from ietf.community.utils import lookup_community_list, can_manage_community_list
@@ -174,7 +180,7 @@ def export_to_csv(request, username=None, acronym=None, group_type=None):
 
     response['Content-Disposition'] = 'attachment; filename=%s' % filename
 
-    writer = csv.writer(response, dialect=csv.excel, delimiter=',')
+    writer = csv.writer(response, dialect=csv.excel, delimiter=str(','))
 
     header = [
         "Name",
@@ -196,7 +202,7 @@ def export_to_csv(request, username=None, acronym=None, group_type=None):
         row.append(e.time.strftime("%Y-%m-%d") if e else "")
         row.append(strip_tags(doc.friendly_state()))
         row.append(doc.group.acronym if doc.group else "")
-        row.append(str(doc.ad) if doc.ad else "")
+        row.append(six.ensure_text(doc.ad) if doc.ad else "")
         e = doc.latest_event()
         row.append(e.time.strftime("%Y-%m-%d") if e else "")
         writer.writerow([v.encode("utf-8") for v in row])
@@ -221,7 +227,7 @@ def feed(request, username=None, acronym=None, group_type=None):
 
     host = request.get_host()
     feed_url = 'https://%s%s' % (host, request.get_full_path())
-    feed_id = uuid.uuid5(uuid.NAMESPACE_URL, feed_url)
+    feed_id = uuid.uuid5(uuid.NAMESPACE_URL, str(feed_url))
     title = '%s RSS Feed' % clist.long_name()
     if significant:
         subtitle = 'Significant document changes'
diff --git a/ietf/cookies/tests.py b/ietf/cookies/tests.py
index 42ea437b2..302cab100 100644
--- a/ietf/cookies/tests.py
+++ b/ietf/cookies/tests.py
@@ -1,6 +1,11 @@
 # Copyright The IETF Trust 2015-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 from pyquery import PyQuery
-from http.cookies import SimpleCookie
+from six.moves.http_cookies import SimpleCookie
 
 from django.urls import reverse as urlreverse
 
@@ -22,7 +27,7 @@ class CookieTests(TestCase):
 
         
     def test_settings_defaults_from_cookies(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '7', 'expires_soon' : 7, 'left_menu': 'on', })
+        self.client.cookies = SimpleCookie({str('full_draft'): 'off', str('new_enough') : '7', str('expires_soon') : 7, str('left_menu'): 'on', })
         r = self.client.get(urlreverse("ietf.cookies.views.preferences"))
         self.assertEqual(r.status_code, 200)
         self.assertListEqual([], list(r.cookies.keys()))
@@ -33,7 +38,7 @@ class CookieTests(TestCase):
         self.assertEqual(q('div a.active[href="/accounts/settings/left_menu/on"]').contents(),    ['On'])
         
     def test_settings_values_from_cookies_garbage(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'foo', 'new_enough' : 'foo', 'expires_soon' : 'foo', 'left_menu': 'foo', })
+        self.client.cookies = SimpleCookie({str('full_draft'): 'foo', str('new_enough') : 'foo', str('expires_soon') : 'foo', str('left_menu'): 'foo', })
         r = self.client.get(urlreverse("ietf.cookies.views.preferences"))
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
@@ -43,7 +48,7 @@ class CookieTests(TestCase):
         self.assertEqual(q('div a.active[href="/accounts/settings/left_menu/off"]').contents(),   ['Off'])
 
     def test_settings_values_from_cookies_random(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'zappa', 'new_enough' : '365', 'expires_soon' : '5', 'left_menu': 'zappa', })
+        self.client.cookies = SimpleCookie({str('full_draft'): 'zappa', str('new_enough') : '365', str('expires_soon') : '5', str('left_menu'): 'zappa', })
         r = self.client.get(urlreverse("ietf.cookies.views.preferences"))
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
@@ -58,7 +63,7 @@ class CookieTests(TestCase):
 #         self.assertNotRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon')
 
     def test_settings_values_from_cookies_1(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'on', 'new_enough' : '90', 'expires_soon' : 7, 'left_menu': 'off', })
+        self.client.cookies = SimpleCookie({str('full_draft'): 'on', str('new_enough') : '90', str('expires_soon') : 7, str('left_menu'): 'off', })
         r = self.client.get(urlreverse("ietf.cookies.views.preferences"))
         self.assertEqual(r.status_code, 200)
         self.assertListEqual([], list(r.cookies.keys()))
@@ -72,7 +77,7 @@ class CookieTests(TestCase):
 #         self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*7 days')
 
     def test_settings_values_from_cookies_2(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '60', 'expires_soon' : 14, 'left_menu': 'on', })
+        self.client.cookies = SimpleCookie({str('full_draft'): 'off', str('new_enough') : '60', str('expires_soon') : 14, str('left_menu'): 'on', })
         r = self.client.get(urlreverse("ietf.cookies.views.preferences"))
         self.assertEqual(r.status_code, 200)
         self.assertListEqual([], list(r.cookies.keys()))
@@ -86,7 +91,7 @@ class CookieTests(TestCase):
 #         self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*14 days')
        
     def test_settings_values_from_cookies_3(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'on', 'new_enough' : '30', 'expires_soon' : 21, 'left_menu': 'off'})
+        self.client.cookies = SimpleCookie({str('full_draft'): 'on', str('new_enough') : '30', str('expires_soon') : 21, str('left_menu'): 'off'})
         r = self.client.get(urlreverse("ietf.cookies.views.preferences"))
         self.assertEqual(r.status_code, 200)
         self.assertListEqual([], list(r.cookies.keys()))
@@ -100,7 +105,7 @@ class CookieTests(TestCase):
 #         self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*21 days')
 
     def test_settings_values_from_cookies_4(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '21', 'expires_soon' : 30, 'left_menu': 'on', })
+        self.client.cookies = SimpleCookie({str('full_draft'): 'off', str('new_enough') : '21', str('expires_soon') : 30, str('left_menu'): 'on', })
         r = self.client.get(urlreverse("ietf.cookies.views.preferences"))
         self.assertEqual(r.status_code, 200)
         self.assertListEqual([], list(r.cookies.keys()))
@@ -114,7 +119,7 @@ class CookieTests(TestCase):
 #         self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*30 days')
 
     def test_settings_values_from_cookies_5(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'on', 'new_enough' : '14', 'expires_soon' : 60, 'left_menu': 'off', })
+        self.client.cookies = SimpleCookie({str('full_draft'): 'on', str('new_enough') : '14', str('expires_soon') : 60, str('left_menu'): 'off', })
         r = self.client.get(urlreverse("ietf.cookies.views.preferences"))
         self.assertEqual(r.status_code, 200)
         self.assertListEqual([], list(r.cookies.keys()))
@@ -128,7 +133,7 @@ class CookieTests(TestCase):
 #         self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*60 days')
 
     def test_settings_values_from_cookies_6(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '7', 'expires_soon' : 90, 'left_menu': 'on', })
+        self.client.cookies = SimpleCookie({str('full_draft'): 'off', str('new_enough') : '7', str('expires_soon') : 90, str('left_menu'): 'on', })
         r = self.client.get(urlreverse("ietf.cookies.views.preferences"))
         self.assertEqual(r.status_code, 200)
         self.assertListEqual([], list(r.cookies.keys()))
@@ -142,11 +147,11 @@ class CookieTests(TestCase):
 #         self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*90 days')
 
     def test_full_draft(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '14', 'expires_soon' : 14})
+        self.client.cookies = SimpleCookie({str('full_draft'): 'off', str('new_enough') : '14', str('expires_soon') : 14})
         r = self.client.get(urlreverse("ietf.cookies.views.full_draft")) # no value: reset
         self.assertEqual(r.status_code, 200)
-        self.assertEqual(r.cookies['full_draft'].value, '')
-        self.assertListEqual(['full_draft'], list(r.cookies.keys()))
+        self.assertEqual(r.cookies[str('full_draft')].value, '')
+        self.assertListEqual([str('full_draft')], list(r.cookies.keys()))
         q = PyQuery(r.content)
         self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/off"]').contents(),  ['Off'])
         self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/14"]').contents(),   ['14 days'])
@@ -156,21 +161,21 @@ class CookieTests(TestCase):
 #         self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*14 days')
 
     def test_full_draft_on(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '14', 'expires_soon' : 14})
+        self.client.cookies = SimpleCookie({str('full_draft'): 'off', str('new_enough') : '14', str('expires_soon') : 14})
         r = self.client.get(urlreverse("ietf.cookies.views.full_draft", kwargs=dict(enabled="on")))
         self.assertEqual(r.status_code, 200)
-        self.assertEqual(r.cookies['full_draft'].value, 'on')
-        self.assertListEqual(['full_draft'], list(r.cookies.keys()))
+        self.assertEqual(r.cookies[str('full_draft')].value, 'on')
+        self.assertListEqual([str('full_draft')], list(r.cookies.keys()))
         q = PyQuery(r.content)
         self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/on"]').contents(),  ['On'])
 #         self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*on')
 
     def test_full_draft_off(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '14', 'expires_soon' : 14})
+        self.client.cookies = SimpleCookie({str('full_draft'): 'off', str('new_enough') : '14', str('expires_soon') : 14})
         r = self.client.get(urlreverse("ietf.cookies.views.full_draft", kwargs=dict(enabled="off")))
         self.assertEqual(r.status_code, 200)
-        self.assertEqual(r.cookies['full_draft'].value, 'off')
-        self.assertListEqual(['full_draft'], list(r.cookies.keys()))
+        self.assertEqual(r.cookies[str('full_draft')].value, 'off')
+        self.assertListEqual([str('full_draft')], list(r.cookies.keys()))
         q = PyQuery(r.content)
         self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/off"]').contents(),  ['Off'])
 #        self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/14"]').contents(),   ['14 days'])
@@ -178,7 +183,7 @@ class CookieTests(TestCase):
 #        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*off')
 
     def test_full_draft_foo(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '14', 'expires_soon' : 14})
+        self.client.cookies = SimpleCookie({str('full_draft'): 'off', str('new_enough') : '14', str('expires_soon') : 14})
         r = self.client.get(urlreverse("ietf.cookies.views.full_draft", kwargs=dict(enabled="foo")))
         self.assertEqual(r.status_code, 200)
         self.assertListEqual([], list(r.cookies.keys()))
@@ -189,11 +194,11 @@ class CookieTests(TestCase):
 #        self.assertRegexpMatches(r.content, r'ietf-highlight-y.*full_draft.*off')
 
     def test_left_menu(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '14', 'expires_soon' : 14, 'left_menu': 'on', })
+        self.client.cookies = SimpleCookie({str('full_draft'): 'off', str('new_enough') : '14', str('expires_soon') : 14, str('left_menu'): 'on', })
         r = self.client.get(urlreverse("ietf.cookies.views.left_menu")) # no value: reset
         self.assertEqual(r.status_code, 200)
-        self.assertEqual(r.cookies['left_menu'].value, '')
-        self.assertListEqual(['left_menu'], list(r.cookies.keys()))
+        self.assertEqual(r.cookies[str('left_menu')].value, '')
+        self.assertListEqual([str('left_menu')], list(r.cookies.keys()))
         q = PyQuery(r.content)
         self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/off"]').contents(),  ['Off'])
         self.assertEqual(q('div a.active[href="/accounts/settings/left_menu/off"]').contents(),   ['Off'])
@@ -201,25 +206,25 @@ class CookieTests(TestCase):
         self.assertEqual(q('div a.active[href="/accounts/settings/expires_soon/14"]').contents(), ['14 days'])
 
     def test_left_menu_on(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '14', 'expires_soon' : 14, 'left_menu': 'off', })
+        self.client.cookies = SimpleCookie({str('full_draft'): 'off', str('new_enough') : '14', str('expires_soon') : 14, str('left_menu'): 'off', })
         r = self.client.get(urlreverse("ietf.cookies.views.left_menu", kwargs=dict(enabled="on")))
         self.assertEqual(r.status_code, 200)
-        self.assertEqual(r.cookies['left_menu'].value, 'on')
-        self.assertListEqual(['left_menu'], list(r.cookies.keys()))
+        self.assertEqual(r.cookies[str('left_menu')].value, 'on')
+        self.assertListEqual([str('left_menu')], list(r.cookies.keys()))
         q = PyQuery(r.content)
         self.assertEqual(q('div a.active[href="/accounts/settings/left_menu/on"]').contents(),  ['On'])
 
     def test_left_menu_off(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '14', 'expires_soon' : 14, 'left_menu': 'off', })
+        self.client.cookies = SimpleCookie({str('full_draft'): 'off', str('new_enough') : '14', str('expires_soon') : 14, str('left_menu'): 'off', })
         r = self.client.get(urlreverse("ietf.cookies.views.left_menu", kwargs=dict(enabled="off")))
         self.assertEqual(r.status_code, 200)
-        self.assertEqual(r.cookies['left_menu'].value, 'off')
-        self.assertListEqual(['left_menu'], list(r.cookies.keys()))
+        self.assertEqual(r.cookies[str('left_menu')].value, 'off')
+        self.assertListEqual([str('left_menu')], list(r.cookies.keys()))
         q = PyQuery(r.content)
         self.assertEqual(q('div a.active[href="/accounts/settings/left_menu/off"]').contents(),  ['Off'])
 
     def test_left_menu_foo(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '14', 'expires_soon' : 14, 'left_menu': 'off', })
+        self.client.cookies = SimpleCookie({str('full_draft'): 'off', str('new_enough') : '14', str('expires_soon') : 14, str('left_menu'): 'off', })
         r = self.client.get(urlreverse("ietf.cookies.views.left_menu", kwargs=dict(enabled="foo")))
         self.assertEqual(r.status_code, 200)
         self.assertListEqual([], list(r.cookies.keys()))
@@ -227,11 +232,11 @@ class CookieTests(TestCase):
         self.assertEqual(q('div a.active[href="/accounts/settings/left_menu/off"]').contents(),  ['Off'])
 
     def test_new_enough(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '14', 'expires_soon' : 14})
+        self.client.cookies = SimpleCookie({str('full_draft'): 'off', str('new_enough') : '14', str('expires_soon') : 14})
         r = self.client.get(urlreverse("ietf.cookies.views.new_enough")) # no value: reset
         self.assertEqual(r.status_code, 200)
-        self.assertEqual(r.cookies['new_enough'].value, '')
-        self.assertListEqual(['new_enough'], list(r.cookies.keys()))
+        self.assertEqual(r.cookies[str('new_enough')].value, '')
+        self.assertListEqual([str('new_enough')], list(r.cookies.keys()))
         q = PyQuery(r.content)
         self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/off"]').contents(),  ['Off'])
         self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/14"]').contents(),   ['14 days'])
@@ -241,11 +246,11 @@ class CookieTests(TestCase):
 #         self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*14 days')
 
     def test_new_enough_7(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'on', 'new_enough' : '14', 'expires_soon' : 21})
+        self.client.cookies = SimpleCookie({str('full_draft'): 'on', str('new_enough') : '14', str('expires_soon') : 21})
         r = self.client.get(urlreverse("ietf.cookies.views.new_enough", kwargs=dict(days="7")))
         self.assertEqual(r.status_code, 200)
-        self.assertEqual(r.cookies['new_enough'].value, '7')
-        self.assertListEqual(['new_enough'], list(r.cookies.keys()))
+        self.assertEqual(r.cookies[str('new_enough')].value, '7')
+        self.assertListEqual([str('new_enough')], list(r.cookies.keys()))
         q = PyQuery(r.content)
         self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/on"]').contents(),  ['On'])
         self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/7"]').contents(),   ['7 days'])
@@ -255,11 +260,11 @@ class CookieTests(TestCase):
 #         self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*21 days')
 
     def test_new_enough_14(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'on', 'new_enough' : '7', 'expires_soon' : 99})
+        self.client.cookies = SimpleCookie({str('full_draft'): 'on', str('new_enough') : '7', str('expires_soon') : 99})
         r = self.client.get(urlreverse("ietf.cookies.views.new_enough", kwargs=dict(days="14")))
         self.assertEqual(r.status_code, 200)
-        self.assertEqual(r.cookies['new_enough'].value, '14')
-        self.assertListEqual(['new_enough'], list(r.cookies.keys()))
+        self.assertEqual(r.cookies[str('new_enough')].value, '14')
+        self.assertListEqual([str('new_enough')], list(r.cookies.keys()))
         q = PyQuery(r.content)
         self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/on"]').contents(),  ['On'])
         self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/14"]').contents(),   ['14 days'])
@@ -269,11 +274,11 @@ class CookieTests(TestCase):
 #         self.assertNotRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon')
 
     def test_new_enough_21(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'on', 'new_enough' : '14', 'expires_soon' : 90})
+        self.client.cookies = SimpleCookie({str('full_draft'): 'on', str('new_enough') : '14', str('expires_soon') : 90})
         r = self.client.get(urlreverse("ietf.cookies.views.new_enough", kwargs=dict(days="21")))
         self.assertEqual(r.status_code, 200)
-        self.assertEqual(r.cookies['new_enough'].value, '21')
-        self.assertListEqual(['new_enough'], list(r.cookies.keys()))
+        self.assertEqual(r.cookies[str('new_enough')].value, '21')
+        self.assertListEqual([str('new_enough')], list(r.cookies.keys()))
         q = PyQuery(r.content)
         self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/on"]').contents(),  ['On'])
         self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/21"]').contents(),   ['21 days'])
@@ -283,11 +288,11 @@ class CookieTests(TestCase):
 #         self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*90 days')
 
     def test_new_enough_30(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '14', 'expires_soon' : 7})
+        self.client.cookies = SimpleCookie({str('full_draft'): 'off', str('new_enough') : '14', str('expires_soon') : 7})
         r = self.client.get(urlreverse("ietf.cookies.views.new_enough", kwargs=dict(days="30")))
         self.assertEqual(r.status_code, 200)
-        self.assertEqual(r.cookies['new_enough'].value, '30')
-        self.assertListEqual(['new_enough'], list(r.cookies.keys()))
+        self.assertEqual(r.cookies[str('new_enough')].value, '30')
+        self.assertListEqual([str('new_enough')], list(r.cookies.keys()))
         q = PyQuery(r.content)
         self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/off"]').contents(),  ['Off'])
         self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/30"]').contents(),   ['30 days'])
@@ -297,11 +302,11 @@ class CookieTests(TestCase):
 #         self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*7 days')
 
     def test_new_enough_60(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '14', 'expires_soon' : 14})
+        self.client.cookies = SimpleCookie({str('full_draft'): 'off', str('new_enough') : '14', str('expires_soon') : 14})
         r = self.client.get(urlreverse("ietf.cookies.views.new_enough", kwargs=dict(days="60")))
         self.assertEqual(r.status_code, 200)
-        self.assertEqual(r.cookies['new_enough'].value, '60')
-        self.assertListEqual(['new_enough'], list(r.cookies.keys()))
+        self.assertEqual(r.cookies[str('new_enough')].value, '60')
+        self.assertListEqual([str('new_enough')], list(r.cookies.keys()))
         q = PyQuery(r.content)
         self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/off"]').contents(),  ['Off'])
         self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/60"]').contents(),   ['60 days'])
@@ -311,11 +316,11 @@ class CookieTests(TestCase):
 #         self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*14 days')
 
     def test_new_enough_90(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'off', 'new_enough' : '22', 'expires_soon' : 60})
+        self.client.cookies = SimpleCookie({str('full_draft'): 'off', str('new_enough') : '22', str('expires_soon') : 60})
         r = self.client.get(urlreverse("ietf.cookies.views.new_enough", kwargs=dict(days="90")))
         self.assertEqual(r.status_code, 200)
-        self.assertEqual(r.cookies['new_enough'].value, '90')
-        self.assertListEqual(['new_enough'], list(r.cookies.keys()))
+        self.assertEqual(r.cookies[str('new_enough')].value, '90')
+        self.assertListEqual([str('new_enough')], list(r.cookies.keys()))
         q = PyQuery(r.content)
         self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/off"]').contents(),  ['Off'])
         self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/90"]').contents(),   ['90 days'])
@@ -325,11 +330,11 @@ class CookieTests(TestCase):
 #         self.assertRegexpMatches(r.content, r'ietf-highlight-y.*expires_soon.*60 days')
 
     def test_expires_soon(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'off', 'expires_soon' : '14', 'new_enough' : 14})
+        self.client.cookies = SimpleCookie({str('full_draft'): 'off', str('expires_soon') : '14', str('new_enough') : 14})
         r = self.client.get(urlreverse("ietf.cookies.views.expires_soon")) # no value: reset
         self.assertEqual(r.status_code, 200)
-        self.assertEqual(r.cookies['expires_soon'].value, '')
-        self.assertListEqual(['expires_soon'], list(r.cookies.keys()))
+        self.assertEqual(r.cookies[str('expires_soon')].value, '')
+        self.assertListEqual([str('expires_soon')], list(r.cookies.keys()))
         q = PyQuery(r.content)
         self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/off"]').contents(),  ['Off'])
         self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/14"]').contents(),   ['14 days'])
@@ -339,11 +344,11 @@ class CookieTests(TestCase):
 #         self.assertRegexpMatches(r.content, r'ietf-highlight-y.*new_enough.*14 days')
 
     def test_expires_soon_7(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'on', 'expires_soon' : '14', 'new_enough' : 21})
+        self.client.cookies = SimpleCookie({str('full_draft'): 'on', str('expires_soon') : '14', str('new_enough') : 21})
         r = self.client.get(urlreverse("ietf.cookies.views.expires_soon", kwargs=dict(days="7")))
         self.assertEqual(r.status_code, 200)
-        self.assertEqual(r.cookies['expires_soon'].value, '7')
-        self.assertListEqual(['expires_soon'], list(r.cookies.keys()))
+        self.assertEqual(r.cookies[str('expires_soon')].value, '7')
+        self.assertListEqual([str('expires_soon')], list(r.cookies.keys()))
         q = PyQuery(r.content)
         self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/on"]').contents(),  ['On'])
         self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/21"]').contents(),   ['21 days'])
@@ -353,11 +358,11 @@ class CookieTests(TestCase):
 #         self.assertRegexpMatches(r.content, r'ietf-highlight-y.*new_enough.*21 days')
 
     def test_expires_soon_14(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'on', 'expires_soon' : '7', 'new_enough' : 99})
+        self.client.cookies = SimpleCookie({str('full_draft'): 'on', str('expires_soon') : '7', str('new_enough') : 99})
         r = self.client.get(urlreverse("ietf.cookies.views.expires_soon", kwargs=dict(days="14")))
         self.assertEqual(r.status_code, 200)
-        self.assertEqual(r.cookies['expires_soon'].value, '14')
-        self.assertListEqual(['expires_soon'], list(r.cookies.keys()))
+        self.assertEqual(r.cookies[str('expires_soon')].value, '14')
+        self.assertListEqual([str('expires_soon')], list(r.cookies.keys()))
         q = PyQuery(r.content)
         self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/on"]').contents(),  ['On'])
         self.assertEqual(q('div a.active[href^="/accounts/settings/new_enough/"]').contents(),   [])
@@ -367,11 +372,11 @@ class CookieTests(TestCase):
 #         self.assertNotRegexpMatches(r.content, r'ietf-highlight-y.*new_enough')
 
     def test_expires_soon_21(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'on', 'expires_soon' : '14', 'new_enough' : 90})
+        self.client.cookies = SimpleCookie({str('full_draft'): 'on', str('expires_soon') : '14', str('new_enough') : 90})
         r = self.client.get(urlreverse("ietf.cookies.views.expires_soon", kwargs=dict(days="21")))
         self.assertEqual(r.status_code, 200)
-        self.assertEqual(r.cookies['expires_soon'].value, '21')
-        self.assertListEqual(['expires_soon'], list(r.cookies.keys()))
+        self.assertEqual(r.cookies[str('expires_soon')].value, '21')
+        self.assertListEqual([str('expires_soon')], list(r.cookies.keys()))
         q = PyQuery(r.content)
         self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/on"]').contents(),  ['On'])
         self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/90"]').contents(),   ['90 days'])
@@ -381,11 +386,11 @@ class CookieTests(TestCase):
 #         self.assertRegexpMatches(r.content, r'ietf-highlight-y.*new_enough.*90 days')
 
     def test_expires_soon_30(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'off', 'expires_soon' : '14', 'new_enough' : 7})
+        self.client.cookies = SimpleCookie({str('full_draft'): 'off', str('expires_soon') : '14', str('new_enough') : 7})
         r = self.client.get(urlreverse("ietf.cookies.views.expires_soon", kwargs=dict(days="30")))
         self.assertEqual(r.status_code, 200)
-        self.assertEqual(r.cookies['expires_soon'].value, '30')
-        self.assertListEqual(['expires_soon'], list(r.cookies.keys()))
+        self.assertEqual(r.cookies[str('expires_soon')].value, '30')
+        self.assertListEqual([str('expires_soon')], list(r.cookies.keys()))
         q = PyQuery(r.content)
         self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/off"]').contents(),  ['Off'])
         self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/7"]').contents(),   ['7 days'])
@@ -395,11 +400,11 @@ class CookieTests(TestCase):
 #         self.assertRegexpMatches(r.content, r'ietf-highlight-y.*new_enough.*7 days')
 
     def test_expires_soon_60(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'off', 'expires_soon' : '14', 'new_enough' : 14})
+        self.client.cookies = SimpleCookie({str('full_draft'): 'off', str('expires_soon') : '14', str('new_enough') : 14})
         r = self.client.get(urlreverse("ietf.cookies.views.expires_soon", kwargs=dict(days="60")))
         self.assertEqual(r.status_code, 200)
-        self.assertEqual(r.cookies['expires_soon'].value, '60')
-        self.assertListEqual(['expires_soon'], list(r.cookies.keys()))
+        self.assertEqual(r.cookies[str('expires_soon')].value, '60')
+        self.assertListEqual([str('expires_soon')], list(r.cookies.keys()))
         q = PyQuery(r.content)
         self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/off"]').contents(),  ['Off'])
         self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/14"]').contents(),   ['14 days'])
@@ -409,11 +414,11 @@ class CookieTests(TestCase):
 #         self.assertRegexpMatches(r.content, r'ietf-highlight-y.*new_enough.*14 days')
 
     def test_expires_soon_90(self):
-        self.client.cookies = SimpleCookie({'full_draft': 'off', 'expires_soon' : '22', 'new_enough' : 60})
+        self.client.cookies = SimpleCookie({str('full_draft'): 'off', str('expires_soon') : '22', str('new_enough') : 60})
         r = self.client.get(urlreverse("ietf.cookies.views.expires_soon", kwargs=dict(days="90")))
         self.assertEqual(r.status_code, 200)
-        self.assertEqual(r.cookies['expires_soon'].value, '90')
-        self.assertListEqual(['expires_soon'], list(r.cookies.keys()))
+        self.assertEqual(r.cookies[str('expires_soon')].value, '90')
+        self.assertListEqual([str('expires_soon')], list(r.cookies.keys()))
         q = PyQuery(r.content)
         self.assertEqual(q('div a.active[href="/accounts/settings/full_draft/off"]').contents(),  ['Off'])
         self.assertEqual(q('div a.active[href="/accounts/settings/new_enough/60"]').contents(),   ['60 days'])
diff --git a/ietf/doc/feeds.py b/ietf/doc/feeds.py
index 16e51a5e5..24a79568c 100644
--- a/ietf/doc/feeds.py
+++ b/ietf/doc/feeds.py
@@ -1,6 +1,11 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import datetime
+import six
 
 from django.contrib.syndication.views import Feed, FeedDoesNotExist
 from django.utils.feedgenerator import Atom1Feed, Rss201rev2Feed
@@ -44,7 +49,7 @@ class DocumentChangesFeed(Feed):
         return item.time
 
     def item_author_name(self, item):
-        return str(item.by)
+        return six.ensure_text(item.by)
 
     def item_link(self, item):
         return urlreverse('ietf.doc.views_doc.document_history', kwargs=dict(name=item.doc.canonical_name())) + "#history-%s" % item.pk
diff --git a/ietf/doc/fields.py b/ietf/doc/fields.py
index 0cdb1830d..e8f76b222 100644
--- a/ietf/doc/fields.py
+++ b/ietf/doc/fields.py
@@ -1,7 +1,11 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import json
+import six
 
 from django.utils.html import escape
 from django import forms
@@ -53,9 +57,9 @@ class SearchableDocumentsField(forms.CharField):
     def prepare_value(self, value):
         if not value:
             value = ""
-        if isinstance(value, int):
+        if isinstance(value, six.integer_types):
             value = str(value)
-        if isinstance(value, str):
+        if isinstance(value, six.string_types):
             items = self.parse_select2_value(value)
             # accept both names and pks here
             names = [ i for i in items if not i.isdigit() ]
@@ -79,7 +83,7 @@ class SearchableDocumentsField(forms.CharField):
             "model_name": self.model.__name__.lower()
         })
 
-        return ",".join(str(o.pk) for o in value)
+        return ",".join(six.ensure_text(o.pk) for o in value)
 
     def clean(self, value):
         value = super(SearchableDocumentsField, self).clean(value)
diff --git a/ietf/doc/mails.py b/ietf/doc/mails.py
index aca9a0c8d..9d9526751 100644
--- a/ietf/doc/mails.py
+++ b/ietf/doc/mails.py
@@ -1,16 +1,23 @@
 # Copyright The IETF Trust 2010-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 # generation of mails 
 
-import textwrap, datetime
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import datetime
+import six
+import textwrap
 
 from django.template.loader import render_to_string
 from django.utils.html import strip_tags
 from django.conf import settings
 from django.urls import reverse as urlreverse
+from django.utils.encoding import force_str
 
 import debug                            # pyflakes:ignore
 
-from ietf.utils.mail import send_mail, send_mail_text
+from ietf.utils.mail import send_mail, send_mail_text, get_payload
 from ietf.ipr.utils import iprs_from_docs, related_docs
 from ietf.doc.models import WriteupDocEvent, LastCallDocEvent, DocAlias, ConsensusDocEvent
 from ietf.doc.utils import needed_ballot_positions
@@ -121,7 +128,7 @@ def generate_ballot_writeup(request, doc):
     e.doc = doc
     e.rev = doc.rev
     e.desc = "Ballot writeup was generated"
-    e.text = str(render_to_string("doc/mail/ballot_writeup.txt", {'iana': iana}))
+    e.text = six.ensure_text(render_to_string("doc/mail/ballot_writeup.txt", {'iana': iana}))
 
     # caller is responsible for saving, if necessary
     return e
@@ -133,7 +140,7 @@ def generate_ballot_rfceditornote(request, doc):
     e.doc = doc
     e.rev = doc.rev
     e.desc = "RFC Editor Note for ballot was generated"
-    e.text = str(render_to_string("doc/mail/ballot_rfceditornote.txt"))
+    e.text = six.ensure_text(render_to_string("doc/mail/ballot_rfceditornote.txt"))
     e.save()
     
     return e
@@ -178,7 +185,7 @@ def generate_last_call_announcement(request, doc):
     e.doc = doc
     e.rev = doc.rev
     e.desc = "Last call announcement was generated"
-    e.text = str(mail)
+    e.text = six.ensure_text(mail)
 
     # caller is responsible for saving, if necessary
     return e
@@ -198,7 +205,7 @@ def generate_approval_mail(request, doc):
     e.doc = doc
     e.rev = doc.rev
     e.desc = "Ballot approval text was generated"
-    e.text = str(mail)
+    e.text = six.ensure_text(mail)
 
     # caller is responsible for saving, if necessary
     return e
@@ -281,7 +288,7 @@ def generate_publication_request(request, doc):
         approving_body = "IRSG"
         consensus_body = doc.group.acronym.upper()
     else:
-        approving_body = str(doc.stream)
+        approving_body = six.ensure_text(doc.stream)
         consensus_body = approving_body
 
     e = doc.latest_event(WriteupDocEvent, type="changed_rfc_editor_note_text")
@@ -383,7 +390,7 @@ def generate_issue_ballot_mail(request, doc, ballot):
 def email_iana(request, doc, to, msg, cc=None):
     # fix up message and send it with extra info on doc in headers
     import email
-    parsed_msg = email.message_from_string(msg)
+    parsed_msg = email.message_from_string(force_str(msg))
     parsed_msg.set_charset('UTF-8')
 
     extra = extra_automation_headers(doc)
@@ -391,7 +398,7 @@ def email_iana(request, doc, to, msg, cc=None):
     
     send_mail_text(request, to,
                    parsed_msg["From"], parsed_msg["Subject"],
-                   parsed_msg.get_payload(),
+                   get_payload(parsed_msg),
                    extra=extra,
                    cc=cc)
 
diff --git a/ietf/doc/management/commands/generate_draft_bibxml_files.py b/ietf/doc/management/commands/generate_draft_bibxml_files.py
index 171026b67..78a052927 100644
--- a/ietf/doc/management/commands/generate_draft_bibxml_files.py
+++ b/ietf/doc/management/commands/generate_draft_bibxml_files.py
@@ -1,4 +1,10 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import io
 import sys
 import os
 
@@ -10,14 +16,14 @@ from ietf.doc.models import Document
 
 def write(fn, new):
     try:
-        f = open(fn)
+        f = io.open(fn)
         old = f.read().decode('utf-8')
         f.close
     except IOError:
         old = ""
     if old.strip() != new.strip():
         sys.stdout.write(os.path.basename(fn)+'\n')
-        f = open(fn, "wb")
+        f = io.open(fn, "wb")
         f.write(new.encode('utf-8'))
         f.close()
 
diff --git a/ietf/doc/migrations/0016_set_document_docalias_fk.py b/ietf/doc/migrations/0016_set_document_docalias_fk.py
index 31b244591..e931f1306 100644
--- a/ietf/doc/migrations/0016_set_document_docalias_fk.py
+++ b/ietf/doc/migrations/0016_set_document_docalias_fk.py
@@ -3,6 +3,9 @@
 # Generated by Django 1.11.20 on 2019-05-08 14:04
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
+import six
 import sys
 
 from tqdm import tqdm
@@ -15,7 +18,7 @@ def forward(apps, schema_editor):
         n = getattr(o, a+'_id')
         if n:
             i = nameid[n]
-            if not isinstance(i, int):
+            if not isinstance(i, six.integer_types):
                 raise ValueError("Inappropriate value: %s: nameid[%s]: %s" % (o.__class__.__name__, n, i))
             if getattr(o, a+'2_id') != i:
                 setattr(o, a+'2_id', i)
diff --git a/ietf/doc/models.py b/ietf/doc/models.py
index 0c79fbf02..65c3e4730 100644
--- a/ietf/doc/models.py
+++ b/ietf/doc/models.py
@@ -1,10 +1,13 @@
 # Copyright The IETF Trust 2010-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, print_function, unicode_literals
 
 import datetime
 import logging
+import io
 import os
 import rfc2html
+import six
 
 from django.db import models
 from django.core import checks
@@ -14,6 +17,7 @@ from django.core.validators import URLValidator, RegexValidator
 from django.urls import reverse as urlreverse
 from django.contrib.contenttypes.models import ContentType
 from django.conf import settings
+from django.utils.encoding import python_2_unicode_compatible
 from django.utils.html import mark_safe
 
 import debug                            # pyflakes:ignore
@@ -33,6 +37,7 @@ from ietf.utils.models import ForeignKey
 
 logger = logging.getLogger('django')
 
+@python_2_unicode_compatible
 class StateType(models.Model):
     slug = models.CharField(primary_key=True, max_length=30) # draft, draft-iesg, charter, ...
     label = models.CharField(max_length=255, help_text="Label that should be used (e.g. in admin) for state drop-down for this type of state") # State, IESG state, WG state, ...
@@ -54,6 +59,7 @@ def check_statetype_slugs(app_configs, **kwargs):
             ))
     return errors
 
+@python_2_unicode_compatible
 class State(models.Model):
     type = ForeignKey(StateType)
     slug = models.SlugField()
@@ -406,7 +412,7 @@ class DocumentInfo(models.Model):
 
     def relations_that(self, relationship):
         """Return the related-document objects that describe a given relationship targeting self."""
-        if isinstance(relationship, str):
+        if isinstance(relationship, six.string_types):
             relationship = ( relationship, )
         if not isinstance(relationship, tuple):
             raise TypeError("Expected a string or tuple, received %s" % type(relationship))
@@ -429,7 +435,7 @@ class DocumentInfo(models.Model):
 
     def relations_that_doc(self, relationship):
         """Return the related-document objects that describe a given relationship from self to other documents."""
-        if isinstance(relationship, str):
+        if isinstance(relationship, six.string_types):
             relationship = ( relationship, )
         if not isinstance(relationship, tuple):
             raise TypeError("Expected a string or tuple, received %s" % type(relationship))
@@ -481,7 +487,7 @@ class DocumentInfo(models.Model):
         if ext != '.txt' and os.path.exists(txtpath):
             path = txtpath
         try:
-            with open(path, 'rb') as file:
+            with io.open(path, 'rb') as file:
                 raw = file.read()
         except IOError:
             return None
@@ -523,6 +529,7 @@ class DocumentInfo(models.Model):
 
 STATUSCHANGE_RELATIONS = ('tops','tois','tohist','toinf','tobcp','toexp')
 
+@python_2_unicode_compatible
 class RelatedDocument(models.Model):
     source = ForeignKey('Document')
     target = ForeignKey('DocAlias')
@@ -530,7 +537,7 @@ class RelatedDocument(models.Model):
     def action(self):
         return self.relationship.name
     def __str__(self):
-        return "%s %s %s" % (self.source.name, self.relationship.name.lower(), self.target.name)
+        return u"%s %s %s" % (self.source.name, self.relationship.name.lower(), self.target.name)
 
     def is_downref(self):
 
@@ -596,11 +603,12 @@ class DocumentAuthorInfo(models.Model):
         abstract = True
         ordering = ["document", "order"]
 
+@python_2_unicode_compatible
 class DocumentAuthor(DocumentAuthorInfo):
     document = ForeignKey('Document')
 
     def __str__(self):
-        return "%s %s (%s)" % (self.document.name, self.person, self.order)
+        return u"%s %s (%s)" % (self.document.name, self.person, self.order)
 
 
 validate_docname = RegexValidator(
@@ -609,6 +617,7 @@ validate_docname = RegexValidator(
     'invalid'
 )
 
+@python_2_unicode_compatible
 class Document(DocumentInfo):
     name = models.CharField(max_length=255, validators=[validate_docname,], unique=True)           # immutable
 
@@ -844,21 +853,24 @@ class DocumentURL(models.Model):
     desc = models.CharField(max_length=255, default='', blank=True)
     url  = models.URLField(max_length=2083) # 2083 is the legal max for URLs
 
+@python_2_unicode_compatible
 class RelatedDocHistory(models.Model):
     source = ForeignKey('DocHistory')
     target = ForeignKey('DocAlias', related_name="reversely_related_document_history_set")
     relationship = ForeignKey(DocRelationshipName)
     def __str__(self):
-        return "%s %s %s" % (self.source.doc.name, self.relationship.name.lower(), self.target.name)
+        return u"%s %s %s" % (self.source.doc.name, self.relationship.name.lower(), self.target.name)
 
+@python_2_unicode_compatible
 class DocHistoryAuthor(DocumentAuthorInfo):
     # use same naming convention as non-history version to make it a bit
     # easier to write generic code
     document = ForeignKey('DocHistory', related_name="documentauthor_set")
 
     def __str__(self):
-        return "%s %s (%s)" % (self.document.doc.name, self.person, self.order)
+        return u"%s %s (%s)" % (self.document.doc.name, self.person, self.order)
 
+@python_2_unicode_compatible
 class DocHistory(DocumentInfo):
     doc = ForeignKey(Document, related_name="history_set")
     # the name here is used to capture the canonical name at the time
@@ -868,7 +880,7 @@ class DocHistory(DocumentInfo):
     name = models.CharField(max_length=255)
 
     def __str__(self):
-        return str(self.doc.name)
+        return six.ensure_text(self.doc.name)
 
     def canonical_name(self):
         if hasattr(self, '_canonical_name'):
@@ -903,6 +915,7 @@ class DocHistory(DocumentInfo):
         verbose_name = "document history"
         verbose_name_plural = "document histories"
 
+@python_2_unicode_compatible
 class DocAlias(models.Model):
     """This is used for documents that may appear under multiple names,
     and in particular for RFCs, which for continuity still keep the
@@ -917,7 +930,7 @@ class DocAlias(models.Model):
         return self.docs.first()
 
     def __str__(self):
-        return "%s-->%s" % (self.name, ','.join([str(d.name) for d in self.docs.all() if isinstance(d, Document) ]))
+        return u"%s-->%s" % (self.name, ','.join([six.ensure_text(d.name) for d in self.docs.all() if isinstance(d, Document) ]))
     document_link = admin_link("document")
     class Meta:
         verbose_name = "document alias"
@@ -1006,6 +1019,7 @@ EVENT_TYPES = [
     ("downref_approved", "Downref approved"),
     ]
 
+@python_2_unicode_compatible
 class DocEvent(models.Model):
     """An occurrence for a document, used for tracking who, when and what."""
     time = models.DateTimeField(default=datetime.datetime.now, help_text="When the event happened", db_index=True)
@@ -1023,7 +1037,7 @@ class DocEvent(models.Model):
         return DocHistory.objects.filter(time__lte=self.time,doc__name=self.doc.name).order_by('-time', '-pk').first()
 
     def __str__(self):
-        return "%s %s by %s at %s" % (self.doc.name, self.get_type_display().lower(), self.by.plain_name(), self.time)
+        return u"%s %s by %s at %s" % (self.doc.name, self.get_type_display().lower(), self.by.plain_name(), self.time)
 
     def save(self, *args, **kwargs):
         super(DocEvent, self).save(*args, **kwargs)        
@@ -1046,6 +1060,7 @@ class ConsensusDocEvent(DocEvent):
     consensus = models.NullBooleanField(default=None)
 
 # IESG events
+@python_2_unicode_compatible
 class BallotType(models.Model):
     doc_type = ForeignKey(DocTypeName, blank=True, null=True)
     slug = models.SlugField()
@@ -1056,7 +1071,7 @@ class BallotType(models.Model):
     positions = models.ManyToManyField(BallotPositionName, blank=True)
 
     def __str__(self):
-        return "%s: %s" % (self.name, self.doc_type.name)
+        return u"%s: %s" % (self.name, self.doc_type.name)
     
     class Meta:
         ordering = ['order']
@@ -1176,6 +1191,7 @@ class SubmissionDocEvent(DocEvent):
     submission = ForeignKey(ietf.submit.models.Submission)
 
 # dumping store for removed events
+@python_2_unicode_compatible
 class DeletedEvent(models.Model):
     content_type = ForeignKey(ContentType)
     json = models.TextField(help_text="Deleted object in JSON format, with attribute names chosen to be suitable for passing into the relevant create method.")
@@ -1183,7 +1199,7 @@ class DeletedEvent(models.Model):
     time = models.DateTimeField(default=datetime.datetime.now)
 
     def __str__(self):
-        return "%s by %s %s" % (self.content_type, self.by, self.time)
+        return u"%s by %s %s" % (self.content_type, self.by, self.time)
 
 class EditedAuthorsDocEvent(DocEvent):
     """ Capture the reasoning or authority for changing a document author list.
diff --git a/ietf/doc/resources.py b/ietf/doc/resources.py
index 08f5489fc..b80d2b409 100644
--- a/ietf/doc/resources.py
+++ b/ietf/doc/resources.py
@@ -1,6 +1,8 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 # Autogenerated by the makeresources management command 2015-10-19 12:29 PDT
+
+
 from ietf.api import ModelResource
 from ietf.api import ToOneField
 from tastypie.fields import ToManyField, CharField
diff --git a/ietf/doc/templatetags/ietf_filters.py b/ietf/doc/templatetags/ietf_filters.py
index 90851df25..a8662bbc4 100644
--- a/ietf/doc/templatetags/ietf_filters.py
+++ b/ietf/doc/templatetags/ietf_filters.py
@@ -1,8 +1,13 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
+# -*- 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
 
@@ -45,24 +50,24 @@ def parse_email_list(value):
 
     Splitting a string of email addresses should return a list:
 
-    >>> parse_email_list('joe@example.org, fred@example.com')
+    >>> six.ensure_str(parse_email_list('joe@example.org, fred@example.com'))
     'joe@example.org, fred@example.com'
 
     Parsing a non-string should return the input value, rather than fail:
 
-    >>> parse_email_list(['joe@example.org', 'fred@example.com'])
+    >>> [ six.ensure_str(e) for e in parse_email_list(['joe@example.org', 'fred@example.com']) ]
     ['joe@example.org', 'fred@example.com']
 
     Null input values should pass through silently:
 
-    >>> parse_email_list('')
+    >>> six.ensure_str(parse_email_list(''))
     ''
 
     >>> parse_email_list(None)
 
 
     """
-    if value and isinstance(value, (bytes,str)): # testing for 'value' being true isn't necessary; it's a fast-out route
+    if value and isinstance(value, (six.binary_type, six.text_type)): # testing for 'value' being true isn't necessary; it's a fast-out route
         addrs = re.split(", ?", value)
         ret = []
         for addr in addrs:
@@ -96,7 +101,7 @@ def make_one_per_line(value):
     """
     Turn a comma-separated list into a carriage-return-seperated list.
 
-    >>> make_one_per_line("a, b, c")
+    >>> six.ensure_str(make_one_per_line("a, b, c"))
     'a\\nb\\nc'
 
     Pass through non-strings:
@@ -107,7 +112,7 @@ def make_one_per_line(value):
     >>> make_one_per_line(None)
 
     """
-    if value and isinstance(value, (bytes,str)):
+    if value and isinstance(value, (six.binary_type, six.text_type)):
         return re.sub(", ?", "\n", value)
     else:
         return value
@@ -143,7 +148,7 @@ def sanitize(value):
 @register.filter(name='bracket')
 def square_brackets(value):
     """Adds square brackets around text."""
-    if isinstance(value, (bytes,str)):
+    if isinstance(value, (six.binary_type, six.text_type)):
         if value == "":
              value = " "
         return "[ %s ]" % value
@@ -193,7 +198,7 @@ def rfcnospace(string):
 @register.filter
 def prettystdname(string):
     from ietf.doc.utils import prettify_std_name
-    return prettify_std_name(str(string or ""))
+    return prettify_std_name(six.ensure_text(string or ""))
 
 @register.filter(name='rfcurl')
 def rfclink(string):
@@ -336,7 +341,7 @@ def expires_soon(x,request):
 
 @register.filter(name='startswith')
 def startswith(x, y):
-    return str(x).startswith(y)
+    return six.ensure_text(x).startswith(y)
 
 @register.filter
 def has_role(user, role_names):
diff --git a/ietf/doc/tests.py b/ietf/doc/tests.py
index b5160bc4e..bfac87497 100644
--- a/ietf/doc/tests.py
+++ b/ietf/doc/tests.py
@@ -1,19 +1,25 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import os
 import shutil
 import datetime
+import io
 import sys
-import urllib.parse
 import bibtexparser
+
 if sys.version_info[0] == 2 and sys.version_info[1] < 7:
     import unittest2 as unittest
 else:
     import unittest
+
+from six.moves.http_cookies import SimpleCookie
 from pyquery import PyQuery
+from six.moves.urllib.parse import urlparse, parse_qs
 from tempfile import NamedTemporaryFile
-from http.cookies import SimpleCookie
 
 from django.urls import reverse as urlreverse
 from django.conf import settings
@@ -141,71 +147,71 @@ class SearchTests(TestCase):
         # exact match
         r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name=draft.name)))
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urllib.parse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
+        self.assertEqual(urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
 
         # prefix match
         r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(draft.name.split("-")[:-1]))))
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urllib.parse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
+        self.assertEqual(urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
 
         # non-prefix match
         r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(draft.name.split("-")[1:]))))
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urllib.parse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
+        self.assertEqual(urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
 
         # other doctypes than drafts
         doc = Document.objects.get(name='charter-ietf-mars')
         r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name='charter-ietf-ma')))
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urllib.parse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
+        self.assertEqual(urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
 
         doc = Document.objects.filter(name__startswith='conflict-review-').first()
         r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(doc.name.split("-")[:-1]))))
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urllib.parse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
+        self.assertEqual(urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
 
         doc = Document.objects.filter(name__startswith='status-change-').first()
         r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(doc.name.split("-")[:-1]))))
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urllib.parse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
+        self.assertEqual(urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
 
         doc = Document.objects.filter(name__startswith='agenda-').first()
         r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(doc.name.split("-")[:-1]))))
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urllib.parse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
+        self.assertEqual(urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
 
         doc = Document.objects.filter(name__startswith='minutes-').first()
         r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(doc.name.split("-")[:-1]))))
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urllib.parse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
+        self.assertEqual(urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
 
         doc = Document.objects.filter(name__startswith='slides-').first()
         r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="-".join(doc.name.split("-")[:-1]))))
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urllib.parse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
+        self.assertEqual(urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=doc.name)))
 
         # match with revision
         r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name=draft.name + "-" + prev_rev)))
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urllib.parse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name, rev=prev_rev)))
+        self.assertEqual(urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name, rev=prev_rev)))
 
         # match with non-existing revision
         r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name=draft.name + "-09")))
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urllib.parse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
+        self.assertEqual(urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
 
         # match with revision and extension
         r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name=draft.name + "-" + prev_rev + ".txt")))
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urllib.parse.urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name, rev=prev_rev)))
+        self.assertEqual(urlparse(r["Location"]).path, urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name, rev=prev_rev)))
         
         # no match
         r = self.client.get(urlreverse('ietf.doc.views_search.search_for_name', kwargs=dict(name="draft-ietf-doesnotexist-42")))
         self.assertEqual(r.status_code, 302)
 
-        parsed = urllib.parse.urlparse(r["Location"])
+        parsed = urlparse(r["Location"])
         self.assertEqual(parsed.path, urlreverse('ietf.doc.views_search.search'))
-        self.assertEqual(urllib.parse.parse_qs(parsed.query)["name"][0], "draft-ietf-doesnotexist-42")
+        self.assertEqual(parse_qs(parsed.query)["name"][0], "draft-ietf-doesnotexist-42")
 
     def test_frontpage(self):
         r = self.client.get("/")
@@ -486,7 +492,7 @@ Man                    Expires September 22, 2015               [Page 3]
         settings.INTERNET_DRAFT_PATH = self.id_dir
         self.saved_internet_all_drafts_archive_dir = settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR
         settings.INTERNET_ALL_DRAFTS_ARCHIVE_DIR = self.id_dir
-        f = open(os.path.join(self.id_dir, 'draft-ietf-mars-test-01.txt'), 'w')
+        f = io.open(os.path.join(self.id_dir, 'draft-ietf-mars-test-01.txt'), 'w')
         f.write(self.draft_text)
         f.close()
 
@@ -528,21 +534,21 @@ Man                    Expires September 22, 2015               [Page 3]
         self.assertNotContains(r, "Show full document text")
         self.assertContains(r, "Deimos street")
 
-        self.client.cookies = SimpleCookie({'full_draft': 'on'})
+        self.client.cookies = SimpleCookie({str('full_draft'): str('on')})
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, "Active Internet-Draft")
         self.assertNotContains(r, "Show full document text")
         self.assertContains(r, "Deimos street")
 
-        self.client.cookies = SimpleCookie({'full_draft': 'off'})
+        self.client.cookies = SimpleCookie({str('full_draft'): str('off')})
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, "Active Internet-Draft")
         self.assertContains(r, "Show full document text")
         self.assertNotContains(r, "Deimos street")
 
-        self.client.cookies = SimpleCookie({'full_draft': 'foo'})
+        self.client.cookies = SimpleCookie({str('full_draft'): str('foo')})
         r = self.client.get(urlreverse("ietf.doc.views_doc.document_main", kwargs=dict(name=draft.name)))
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, "Active Internet-Draft")
@@ -1021,7 +1027,7 @@ class EmailAliasesTests(TestCase):
     def setUp(self):
         WgDraftFactory(name='draft-ietf-mars-test',group__acronym='mars')
         WgDraftFactory(name='draft-ietf-ames-test',group__acronym='ames')
-        self.doc_alias_file = NamedTemporaryFile(delete=False, encoding='utf-8', mode='w+')
+        self.doc_alias_file = NamedTemporaryFile(delete=False, mode='w+')
         self.doc_alias_file.write("""# Generated by hand at 2015-02-12_16:26:45
 virtual.ietf.org anything
 draft-ietf-mars-test@ietf.org              xfilter-draft-ietf-mars-test
diff --git a/ietf/doc/tests_charter.py b/ietf/doc/tests_charter.py
index 0bad514ea..c44cd01eb 100644
--- a/ietf/doc/tests_charter.py
+++ b/ietf/doc/tests_charter.py
@@ -1,8 +1,14 @@
 # -*- coding: utf-8 -*-
 # Copyright The IETF Trust 2011-2019, All Rights Reserved
 
-import os, shutil, datetime
-from io import StringIO
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import datetime
+import io
+import os
+import shutil
+
 from pyquery import PyQuery
 
 from django.conf import settings
@@ -21,7 +27,7 @@ from ietf.group.models import Group, GroupMilestone
 from ietf.iesg.models import TelechatDate
 from ietf.person.models import Person
 from ietf.utils.test_utils import TestCase
-from ietf.utils.mail import outbox, empty_outbox
+from ietf.utils.mail import outbox, empty_outbox, get_payload
 from ietf.utils.test_utils import login_testing_unauthorized
 
 class EditCharterTests(TestCase):
@@ -35,7 +41,7 @@ class EditCharterTests(TestCase):
         shutil.rmtree(self.charter_dir)
 
     def write_charter_file(self, charter):
-        with open(os.path.join(self.charter_dir, "%s-%s.txt" % (charter.canonical_name(), charter.rev)), "w") as f:
+        with io.open(os.path.join(self.charter_dir, "%s-%s.txt" % (charter.canonical_name(), charter.rev)), "w") as f:
             f.write("This is a charter.")
 
     def test_startstop_process(self):
@@ -128,24 +134,24 @@ class EditCharterTests(TestCase):
                 self.assertIn("Internal WG Review", outbox[-3]['Subject'])
                 self.assertIn("iab@", outbox[-3]['To'])
                 self.assertIn("iesg@", outbox[-3]['To'])
-                self.assertIn("A new IETF WG", outbox[-3].get_payload())
-                body = outbox[-3].get_payload()
-                for word in ["Chairs", "Ames Man ",
+                body = get_payload(outbox[-3])
+                for word in ["A new IETF WG", "Chairs", "Ames Man ",
                     "Secretaries", "Secretary ",
                     "Assigned Area Director", "Areað Irector ",
                     "Mailing list", "ames-wg@ietf.org",
                     "Charter", "Milestones"]:
+
                     self.assertIn(word, body)
 
             self.assertIn("state changed", outbox[-2]['Subject'].lower())
             self.assertIn("iesg-secretary@", outbox[-2]['To'])
-            body = outbox[-2].get_payload()
+            body = get_payload(outbox[-2])
             for word in ["WG", "Charter", ]:
                 self.assertIn(word, body)
 
             self.assertIn("State Update Notice", outbox[-1]['Subject'])
             self.assertIn("ames-chairs@", outbox[-1]['To'])
-            body = outbox[-1].get_payload()
+            body = get_payload(outbox[-1])
             for word in ["State changed", "Datatracker URL", ]:
                 self.assertIn(word, body)
 
@@ -165,7 +171,7 @@ class EditCharterTests(TestCase):
         empty_outbox()
         r = self.client.post(url, dict(charter_state=str(State.objects.get(used=True,type="charter",slug="intrev").pk), message="test"))
         self.assertEqual(r.status_code, 302)
-        self.assertTrue("A new charter" in outbox[-3].get_payload())
+        self.assertTrue("A new charter" in get_payload(outbox[-3]))
 
     def test_abandon_bof(self):
         charter = CharterFactory(group__state_id='bof',group__type_id='wg')
@@ -389,7 +395,7 @@ class EditCharterTests(TestCase):
         self.assertEqual(len(q('form input[name=txt]')), 1)
 
         # faulty post
-        test_file = StringIO("\x10\x11\x12") # post binary file
+        test_file = io.StringIO("\x10\x11\x12") # post binary file
         test_file.name = "unnamed"
 
         r = self.client.post(url, dict(txt=test_file))
@@ -401,7 +407,7 @@ class EditCharterTests(TestCase):
 
         latin_1_snippet = b'\xe5' * 10
         utf_8_snippet = b'\xc3\xa5' * 10
-        test_file = StringIO("Windows line\r\nMac line\rUnix line\n" + latin_1_snippet.decode('latin-1'))
+        test_file = io.StringIO("Windows line\r\nMac line\rUnix line\n" + latin_1_snippet.decode('latin-1'))
         test_file.name = "unnamed"
 
         r = self.client.post(url, dict(txt=test_file))
@@ -411,9 +417,8 @@ class EditCharterTests(TestCase):
         self.assertEqual(charter.rev, next_revision(prev_rev))
         self.assertTrue("new_revision" in charter.latest_event().type)
 
-        with open(os.path.join(self.charter_dir, charter.canonical_name() + "-" + charter.rev + ".txt")) as f:
-            self.assertEqual(f.read(),
-                              "Windows line\nMac line\nUnix line\n" + utf_8_snippet.decode('utf_8'))
+        with io.open(os.path.join(self.charter_dir, charter.canonical_name() + "-" + charter.rev + ".txt")) as f:
+            self.assertEqual(f.read(), "Windows line\nMac line\nUnix line\n" + utf_8_snippet.decode('utf_8'))
 
     def test_submit_initial_charter(self):
         group = GroupFactory(type_id='wg',acronym='mars',list_email='mars-wg@ietf.org')
@@ -428,7 +433,7 @@ class EditCharterTests(TestCase):
         self.assertEqual(len(q('form input[name=txt]')), 1)
 
         # create charter
-        test_file = StringIO("Simple test")
+        test_file = io.StringIO("Simple test")
         test_file.name = "unnamed"
 
         r = self.client.post(url, dict(txt=test_file))
@@ -658,7 +663,7 @@ class EditCharterTests(TestCase):
         #
         self.assertTrue("approved" in outbox[0]['Subject'].lower())
         self.assertTrue("iesg-secretary" in outbox[0]['To'])
-        body = outbox[0].get_payload()
+        body = get_payload(outbox[0])
         for word in ["WG",   "/wg/ames/about/",
             "Charter", "/doc/charter-ietf-ames/", ]:
             self.assertIn(word, body)
@@ -666,7 +671,7 @@ class EditCharterTests(TestCase):
         self.assertTrue("WG Action" in outbox[1]['Subject'])
         self.assertTrue("ietf-announce" in outbox[1]['To'])
         self.assertTrue("ames-wg@ietf.org" in outbox[1]['Cc'])
-        body = outbox[1].get_payload()
+        body = get_payload(outbox[1])
         for word in ["Chairs", "Ames Man ",
             "Secretaries", "Secretary ",
             "Assigned Area Director", "Areað Irector ",
diff --git a/ietf/doc/tests_conflict_review.py b/ietf/doc/tests_conflict_review.py
index 112623652..eb1c83371 100644
--- a/ietf/doc/tests_conflict_review.py
+++ b/ietf/doc/tests_conflict_review.py
@@ -1,16 +1,21 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
-import debug    # pyflakes:ignore
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import io
 import os
 import shutil
 
 from pyquery import PyQuery
-from io import StringIO
 from textwrap import wrap
 
 from django.conf import settings
 from django.urls import reverse as urlreverse
 
+import debug    # pyflakes:ignore
+
 from ietf.doc.factories import IndividualDraftFactory, ConflictReviewFactory
 from ietf.doc.models import Document, DocEvent, NewRevisionDocEvent, BallotPositionDocEvent, TelechatDocEvent, State
 from ietf.doc.utils import create_ballot_if_not_open
@@ -19,7 +24,7 @@ from ietf.group.models import Person
 from ietf.iesg.models import TelechatDate
 from ietf.name.models import StreamName
 from ietf.utils.test_utils import TestCase
-from ietf.utils.mail import outbox, empty_outbox
+from ietf.utils.mail import outbox, empty_outbox, get_payload
 from ietf.utils.test_utils import login_testing_unauthorized
 
 
@@ -299,9 +304,9 @@ class ConflictReviewTests(TestCase):
         self.assertIn('iana@', outbox[0]['Cc'])
 
         if approve_type == 'appr-noprob':
-            self.assertIn( 'IESG has no problem', ''.join(wrap(outbox[0].get_payload(), 2**16)))
+            self.assertIn( 'IESG has no problem', ''.join(wrap(get_payload(outbox[0]), 2**16)))
         else:
-            self.assertIn( 'NOT be published', ''.join(wrap(outbox[0].get_payload(), 2**16)))
+            self.assertIn( 'NOT be published', ''.join(wrap(get_payload(outbox[0]), 2**16)))
 
 
     def test_approve_reqnopub(self):
@@ -338,7 +343,7 @@ class ConflictReviewSubmitTests(TestCase):
         self.assertEqual(r.status_code,302)
         doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
         self.assertEqual(doc.rev,'00')
-        with open(path) as f:
+        with io.open(path) as f:
             self.assertEqual(f.read(),"Some initial review text\n")
             f.close()
         self.assertTrue( "submission-00" in doc.latest_event(NewRevisionDocEvent).desc)
@@ -352,7 +357,7 @@ class ConflictReviewSubmitTests(TestCase):
         # doc.rev is u'00' per the test setup - double-checking that here - if it fails, the breakage is in setUp
         self.assertEqual(doc.rev,'00')
         path = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev))
-        with open(path,'w') as f:
+        with io.open(path,'w') as f:
             f.write('This is the old proposal.')
             f.close()
 
@@ -365,21 +370,21 @@ class ConflictReviewSubmitTests(TestCase):
         # faulty posts trying to use file upload
         # Copied from wgtracker tests - is this really testing the server code, or is it testing
         #  how client.post populates Content-Type?
-        test_file = StringIO("\x10\x11\x12") # post binary file
+        test_file = io.StringIO("\x10\x11\x12") # post binary file
         test_file.name = "unnamed"
         r = self.client.post(url, dict(txt=test_file,submit_response="1"))
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, "does not appear to be a text file")
 
         # sane post uploading a file
-        test_file = StringIO("This is a new proposal.")
+        test_file = io.StringIO("This is a new proposal.")
         test_file.name = "unnamed"
         r = self.client.post(url,dict(txt=test_file,submit_response="1"))
         self.assertEqual(r.status_code, 302)
         doc = Document.objects.get(name='conflict-review-imaginary-irtf-submission')
         self.assertEqual(doc.rev,'01')
         path = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev))
-        with open(path) as f:
+        with io.open(path) as f:
             self.assertEqual(f.read(),"This is a new proposal.")
             f.close()
         self.assertTrue( "submission-01" in doc.latest_event(NewRevisionDocEvent).desc)
diff --git a/ietf/doc/tests_draft.py b/ietf/doc/tests_draft.py
index fcc7118cd..a6952ac0d 100644
--- a/ietf/doc/tests_draft.py
+++ b/ietf/doc/tests_draft.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2011-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import os
 import shutil
 import datetime
@@ -26,7 +29,7 @@ from ietf.person.models import Person, Email
 from ietf.meeting.models import Meeting, MeetingTypeName
 from ietf.iesg.models import TelechatDate
 from ietf.utils.test_utils import login_testing_unauthorized
-from ietf.utils.mail import outbox, empty_outbox
+from ietf.utils.mail import outbox, empty_outbox, get_payload
 from ietf.utils.test_utils import TestCase
 
 
@@ -372,7 +375,7 @@ class EditInfoTests(TestCase):
         data["telechat_date"] = next_week.isoformat()
         r = self.client.post(url,data)
         self.assertEqual(r.status_code, 302)
-        self.assertTrue("may not leave enough time" in outbox[-1].get_payload())
+        self.assertIn("may not leave enough time", get_payload(outbox[-1]))
 
     def test_start_iesg_process_on_draft(self):
 
@@ -563,7 +566,7 @@ class ExpireIDsTests(TestCase):
         settings.INTERNET_DRAFT_ARCHIVE_DIR = self.saved_archive_dir
 
     def write_draft_file(self, name, size):
-        f = open(os.path.join(self.id_dir, name), 'w')
+        f = io.open(os.path.join(self.id_dir, name), 'w')
         f.write("a" * size)
         f.close()
         
@@ -1399,9 +1402,9 @@ class ChangeStreamStateTests(TestCase):
         self.assertEqual(draft.docevent_set.count() - events_before, 2)
         self.assertEqual(len(outbox), mailbox_before + 1)
         self.assertTrue("tags changed" in outbox[-1]["Subject"].lower())
-        self.assertTrue("mars-chairs@ietf.org" in str(outbox[-1]))
-        self.assertTrue("marsdelegate@example.org" in str(outbox[-1]))
-        self.assertTrue("plain@example.com" in str(outbox[-1]))
+        self.assertTrue("mars-chairs@ietf.org" in outbox[-1].as_string())
+        self.assertTrue("marsdelegate@example.org" in outbox[-1].as_string())
+        self.assertTrue("plain@example.com" in outbox[-1].as_string())
 
     def test_set_initial_state(self):
         role = RoleFactory(name_id='chair',group__acronym='mars',group__list_email='mars-wg@ietf.org',person__user__username='marschairman',person__name='WG Cháir Man')
@@ -1436,8 +1439,8 @@ class ChangeStreamStateTests(TestCase):
         self.assertTrue(due - datetime.timedelta(days=1) <= reminder[0].due <= due + datetime.timedelta(days=1))
         self.assertEqual(len(outbox), 1)
         self.assertTrue("state changed" in outbox[0]["Subject"].lower())
-        self.assertTrue("mars-chairs@ietf.org" in str(outbox[0]))
-        self.assertTrue("marsdelegate@ietf.org" in str(outbox[0]))
+        self.assertTrue("mars-chairs@ietf.org" in outbox[0].as_string())
+        self.assertTrue("marsdelegate@ietf.org" in outbox[0].as_string())
 
     def test_set_state(self):
         role = RoleFactory(name_id='chair',group__acronym='mars',group__list_email='mars-wg@ietf.org',person__user__username='marschairman',person__name='WG Cháir Man')
@@ -1481,8 +1484,8 @@ class ChangeStreamStateTests(TestCase):
         self.assertTrue(due - datetime.timedelta(days=1) <= reminder[0].due <= due + datetime.timedelta(days=1))
         self.assertEqual(len(outbox), 1)
         self.assertTrue("state changed" in outbox[0]["Subject"].lower())
-        self.assertTrue("mars-chairs@ietf.org" in str(outbox[0]))
-        self.assertTrue("marsdelegate@ietf.org" in str(outbox[0]))
+        self.assertTrue("mars-chairs@ietf.org" in outbox[0].as_string())
+        self.assertTrue("marsdelegate@ietf.org" in outbox[0].as_string())
 
     def test_pubreq_validation(self):
         role = RoleFactory(name_id='chair',group__acronym='mars',group__list_email='mars-wg@ietf.org',person__user__username='marschairman',person__name='WG Cháir Man')
diff --git a/ietf/doc/tests_material.py b/ietf/doc/tests_material.py
index cc414d9d7..47c71f90d 100644
--- a/ietf/doc/tests_material.py
+++ b/ietf/doc/tests_material.py
@@ -1,10 +1,14 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import os
 import shutil
 import datetime
-from io import StringIO
+import io
+
 from pyquery import PyQuery
 
 import debug              # pyflakes:ignore
@@ -85,7 +89,7 @@ class GroupMaterialTests(TestCase):
         self.assertEqual(r.status_code, 200)
 
         content = "%PDF-1.5\n..."
-        test_file = StringIO(content)
+        test_file = io.StringIO(content)
         test_file.name = "unnamed.pdf"
 
         # faulty post
@@ -110,7 +114,7 @@ class GroupMaterialTests(TestCase):
         self.assertEqual(doc.title, "Test File - with fancy title")
         self.assertEqual(doc.get_state_slug(), "active")
 
-        with open(os.path.join(self.materials_dir, "slides", doc.name + "-" + doc.rev + ".pdf")) as f:
+        with io.open(os.path.join(self.materials_dir, "slides", doc.name + "-" + doc.rev + ".pdf")) as f:
             self.assertEqual(f.read(), content)
 
         # check that posting same name is prevented
@@ -165,7 +169,7 @@ class GroupMaterialTests(TestCase):
         login_testing_unauthorized(self, "secretary", url)
 
         content = "some text"
-        test_file = StringIO(content)
+        test_file = io.StringIO(content)
         test_file.name = "unnamed.txt"
 
         # post
@@ -179,6 +183,6 @@ class GroupMaterialTests(TestCase):
         self.assertEqual(doc.title, "New title")
         self.assertEqual(doc.get_state_slug(), "active")
 
-        with open(os.path.join(doc.get_file_path(), doc.name + "-" + doc.rev + ".txt")) as f:
+        with io.open(os.path.join(doc.get_file_path(), doc.name + "-" + doc.rev + ".txt")) as f:
             self.assertEqual(f.read(), content)
 
diff --git a/ietf/doc/tests_review.py b/ietf/doc/tests_review.py
index de62d9116..1137cf141 100644
--- a/ietf/doc/tests_review.py
+++ b/ietf/doc/tests_review.py
@@ -1,11 +1,14 @@
 # Copyright The IETF Trust 2016-2019, 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
 import email.mime.multipart, email.mime.text, email.utils
 
-from io import StringIO
 from mock import patch
 from requests import Response
 
@@ -98,8 +101,10 @@ class ReviewTests(TestCase):
 
         self.assertEqual(len(outbox),2)
         self.assertTrue('reviewteam Early' in outbox[0]['Subject'])
+#        debug.show("outbox[0]['To']")
         self.assertTrue('reviewsecretary@' in outbox[0]['To'])
         self.assertTrue('reviewteam3 Early' in outbox[1]['Subject'])
+#        debug.show("outbox[1]['To']")
         self.assertTrue('reviewsecretary3@' in outbox[1]['To'])
 
         # set the reviewteamsetting for the secretary email alias, then do the post again
@@ -557,7 +562,7 @@ class ReviewTests(TestCase):
 
             # Test failure to return mailarch results
             no_result_path = os.path.join(self.review_dir, "mailarch_no_result.html")
-            with open(no_result_path, "w") as f:
+            with io.open(no_result_path, "w") as f:
                 f.write('Content-Type: text/html\n\n
No results found
')
             ietf.review.mailarch.construct_query_urls = lambda review_req, query=None: { "query_data_url": "file://" + os.path.abspath(no_result_path) }
 
@@ -614,7 +619,7 @@ class ReviewTests(TestCase):
         # complete by uploading file
         empty_outbox()
 
-        test_file = StringIO("This is a review\nwith two lines")
+        test_file = io.StringIO("This is a review\nwith two lines")
         test_file.name = "unnamed"
 
         r = self.client.post(url, data={
@@ -635,7 +640,7 @@ class ReviewTests(TestCase):
         self.assertTrue(assignment.review_request.team.acronym.lower() in assignment.review.name)
         self.assertTrue(assignment.review_request.doc.rev in assignment.review.name)
 
-        with open(os.path.join(self.review_subdir, assignment.review.name + ".txt")) as f:
+        with io.open(os.path.join(self.review_subdir, assignment.review.name + ".txt")) as f:
             self.assertEqual(f.read(), "This is a review\nwith two lines")
 
         self.assertEqual(len(outbox), 1)
@@ -685,7 +690,7 @@ class ReviewTests(TestCase):
         self.assertEqual(assignment.state_id, "completed")
         self.assertNotEqual(assignment.completed_on, None)
 
-        with open(os.path.join(self.review_subdir, assignment.review.name + ".txt")) as f:
+        with io.open(os.path.join(self.review_subdir, assignment.review.name + ".txt")) as f:
             self.assertEqual(f.read(), "This is a review\nwith two lines")
 
         self.assertEqual(len(outbox), 1)
@@ -772,7 +777,7 @@ class ReviewTests(TestCase):
         assignment = reload_db_objects(assignment)
         self.assertEqual(assignment.state_id, "completed")
 
-        with open(os.path.join(self.review_subdir, assignment.review.name + ".txt")) as f:
+        with io.open(os.path.join(self.review_subdir, assignment.review.name + ".txt")) as f:
             self.assertEqual(f.read(), "This is a review\nwith two lines")
 
         self.assertEqual(len(outbox), 0)
@@ -872,7 +877,7 @@ class ReviewTests(TestCase):
         event = ReviewAssignmentDocEvent.objects.get(type="closed_review_assignment", review_assignment=assignment)
         self.assertEqual(event.time, datetime.datetime(2012, 12, 24, 12, 13, 14))
 
-        with open(os.path.join(self.review_subdir, assignment.review.name + ".txt")) as f:
+        with io.open(os.path.join(self.review_subdir, assignment.review.name + ".txt")) as f:
             self.assertEqual(f.read(), "This is a review\nwith two lines")
 
         self.assertEqual(len(outbox), 0)
diff --git a/ietf/doc/tests_status_change.py b/ietf/doc/tests_status_change.py
index 2665ec702..01dd42457 100644
--- a/ietf/doc/tests_status_change.py
+++ b/ietf/doc/tests_status_change.py
@@ -1,6 +1,10 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import io
 import os
 import shutil
 
@@ -421,7 +425,7 @@ class StatusChangeSubmitTests(TestCase):
         self.assertEqual(r.status_code,302)
         doc = Document.objects.get(name='status-change-imaginary-mid-review')
         self.assertEqual(doc.rev,'00')
-        with open(path) as f:
+        with io.open(path) as f:
             self.assertEqual(f.read(),"Some initial review text\n")
         self.assertTrue( "mid-review-00" in doc.latest_event(NewRevisionDocEvent).desc)
 
@@ -434,7 +438,7 @@ class StatusChangeSubmitTests(TestCase):
         # doc.rev is u'00' per the test setup - double-checking that here - if it fails, the breakage is in setUp
         self.assertEqual(doc.rev,'00')
         path = os.path.join(settings.STATUS_CHANGE_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev))
-        with open(path,'w') as f:
+        with io.open(path,'w') as f:
             f.write('This is the old proposal.')
             f.close()
         # Put the old proposal into IESG review (exercises ballot tab when looking at an older revision below)
@@ -466,7 +470,7 @@ class StatusChangeSubmitTests(TestCase):
         doc = Document.objects.get(name='status-change-imaginary-mid-review')
         self.assertEqual(doc.rev,'01')
         path = os.path.join(settings.STATUS_CHANGE_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev))
-        with open(path) as f:
+        with io.open(path) as f:
             self.assertEqual(f.read(),"This is a new proposal.")
             f.close()
         self.assertTrue( "mid-review-01" in doc.latest_event(NewRevisionDocEvent).desc)
diff --git a/ietf/doc/utils.py b/ietf/doc/utils.py
index 601efc0d8..91a2e79be 100644
--- a/ietf/doc/utils.py
+++ b/ietf/doc/utils.py
@@ -1,14 +1,20 @@
 # Copyright The IETF Trust 2011-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
-import os
-import re
-import urllib.request, urllib.parse, urllib.error
-import math
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 import hashlib
+import io
 import json
+import math
+import os
+import re
+import six
+
 from collections import defaultdict
+from six.moves.urllib.parse import quote
 
 from django.conf import settings
 from django.contrib import messages
@@ -313,7 +319,7 @@ def add_links_in_new_revision_events(doc, events, diff_revisions):
             links += ""
 
         if prev != None:
-            links += ' (diff from previous)' % (settings.RFCDIFF_BASE_URL, urllib.parse.quote(prev, safe="~"), urllib.parse.quote(diff_url, safe="~"))
+            links += ' (diff from previous)' % (settings.RFCDIFF_BASE_URL, quote(prev, safe="~"), quote(diff_url, safe="~"))
 
         # replace the bold filename part
         e.desc = re.sub(r"(.+-[0-9][0-9].txt)", links, e.desc)
@@ -333,7 +339,7 @@ def add_events_message_info(events):
 
 def get_unicode_document_content(key, filename, codec='utf-8', errors='ignore'):
     try:
-        with open(filename, 'rb') as f:
+        with io.open(filename, 'rb') as f:
             raw_content = f.read().decode(codec,errors)
     except IOError:
         if settings.DEBUG:
@@ -347,7 +353,7 @@ def get_unicode_document_content(key, filename, codec='utf-8', errors='ignore'):
 def get_document_content(key, filename, split=True, markup=True):
     log.unreachable("2017-12-05")
     try:
-        with open(filename, 'rb') as f:
+        with io.open(filename, 'rb') as f:
             raw_content = f.read()
     except IOError:
         if settings.DEBUG:
@@ -541,7 +547,7 @@ def rebuild_reference_relations(doc,filename=None):
             filename=os.path.join(settings.INTERNET_DRAFT_PATH,doc.filename_with_rev())
 
     try:
-        with open(filename, 'rb') as file:
+        with io.open(filename, 'rb') as file:
             refs = draft.Draft(file.read().decode('utf8'), filename).get_refs()
     except IOError as e:
         return { 'errors': ["%s :%s" %  (e.strerror, filename)] }
@@ -661,7 +667,7 @@ def get_initial_notify(doc,extra=None):
     receivers = []
 
     if extra:
-        if isinstance(extra,str):
+        if isinstance(extra, six.string_types):
             extra = extra.split(', ')
         receivers.extend(extra)
 
@@ -767,7 +773,7 @@ def get_search_cache_key(params):
     from ietf.doc.views_search import SearchForm
     fields = set(SearchForm.base_fields) - set(['sort',])
     kwargs = dict([ (k,v) for (k,v) in list(params.items()) if k in fields ])
-    key = "doc:document:search:" + hashlib.sha512(json.dumps(kwargs, sort_keys=True).encode()).hexdigest()
+    key = "doc:document:search:" + hashlib.sha512(json.dumps(kwargs, sort_keys=True).encode('utf-8')).hexdigest()
     return key
     
 def label_wrap(label, items, joiner=',', max=50):
diff --git a/ietf/doc/utils_charter.py b/ietf/doc/utils_charter.py
index beb96864e..3dae431a6 100644
--- a/ietf/doc/utils_charter.py
+++ b/ietf/doc/utils_charter.py
@@ -1,5 +1,15 @@
 # Copyright The IETF Trust 2011-2019, All Rights Reserved
-import re, datetime, os, shutil
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import datetime
+import io
+import os
+import re
+import shutil
+import six
 
 from django.conf import settings
 from django.urls import reverse as urlreverse
@@ -53,7 +63,7 @@ def next_approved_revision(rev):
 def read_charter_text(doc):
     filename = os.path.join(settings.CHARTER_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev))
     try:
-        with open(filename, 'r') as f:
+        with io.open(filename, 'r') as f:
             return f.read()
     except IOError:
         return "Error: couldn't read charter text"
@@ -142,7 +152,7 @@ def generate_ballot_writeup(request, doc):
     e.doc = doc
     e.rev = doc.rev,
     e.desc = "Ballot writeup was generated"
-    e.text = str(render_to_string("doc/charter/ballot_writeup.txt"))
+    e.text = six.ensure_text(render_to_string("doc/charter/ballot_writeup.txt"))
 
     # caller is responsible for saving, if necessary
     return e
diff --git a/ietf/doc/views_charter.py b/ietf/doc/views_charter.py
index 30e915cf5..2438f4241 100644
--- a/ietf/doc/views_charter.py
+++ b/ietf/doc/views_charter.py
@@ -1,7 +1,15 @@
 # Copyright The IETF Trust 2011-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
-import os, datetime, textwrap, json
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import datetime
+import io
+import json
+import os
+import six
+import textwrap
 
 from django.http import HttpResponseRedirect, HttpResponseNotFound, HttpResponseForbidden, Http404
 from django.shortcuts import get_object_or_404, redirect, render
@@ -413,7 +421,7 @@ def submit(request, name, option=None):
 
             # Save file on disk
             filename = os.path.join(settings.CHARTER_PATH, '%s-%s.txt' % (charter.canonical_name(), charter.rev))
-            with open(filename, 'w', encoding='utf-8') as destination:
+            with io.open(filename, 'w', encoding='utf-8') as destination:
                 if form.cleaned_data['txt']:
                     destination.write(form.cleaned_data['txt'])
                 else:
@@ -442,7 +450,7 @@ def submit(request, name, option=None):
         filename = os.path.join(settings.CHARTER_PATH, '%s-%s.txt' % (charter_canonical_name, charter_rev))
 
         try:
-            with open(filename, 'r') as f:
+            with io.open(filename, 'r') as f:
                 init["content"] = f.read()
         except IOError:
             pass
@@ -807,8 +815,8 @@ def charter_with_milestones_txt(request, name, rev):
     charter_text = ""
 
     try:
-        with open(os.path.join(settings.CHARTER_PATH, filename), 'r') as f:
-            charter_text = str(f.read(), errors='ignore')
+        with io.open(os.path.join(settings.CHARTER_PATH, filename), 'r') as f:
+            charter_text = six.ensure_text(f.read(), errors='ignore')
     except IOError:
         charter_text = "Error reading charter text %s" % filename
 
diff --git a/ietf/doc/views_conflict_review.py b/ietf/doc/views_conflict_review.py
index 0b741e6c3..04ed5675c 100644
--- a/ietf/doc/views_conflict_review.py
+++ b/ietf/doc/views_conflict_review.py
@@ -1,7 +1,12 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
-import datetime, os
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import datetime
+import io
+import os
 
 from django import forms
 from django.shortcuts import render, get_object_or_404, redirect
@@ -159,7 +164,7 @@ class UploadForm(forms.Form):
 
     def save(self, review):
         filename = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (review.canonical_name(), review.rev))
-        with open(filename, 'w', encoding='utf-8') as destination:
+        with io.open(filename, 'w', encoding='utf-8') as destination:
             if self.cleaned_data['txt']:
                 destination.write(self.cleaned_data['txt'])
             else:
@@ -223,7 +228,7 @@ def submit(request, name):
         else:
             filename = os.path.join(settings.CONFLICT_REVIEW_PATH, '%s-%s.txt' % (review.canonical_name(), review.rev))
             try:
-                with open(filename, 'r') as f:
+                with io.open(filename, 'r') as f:
                     init["content"] = f.read()
             except IOError:
                 pass
diff --git a/ietf/doc/views_doc.py b/ietf/doc/views_doc.py
index f4b4cff20..cbdcfefe7 100644
--- a/ietf/doc/views_doc.py
+++ b/ietf/doc/views_doc.py
@@ -1,6 +1,6 @@
 # Copyright The IETF Trust 2009-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
-
+#
 # Parts Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen 
 #
@@ -33,7 +33,18 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import os, datetime, urllib.request, urllib.parse, urllib.error, json, glob, re
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import datetime
+import glob
+import io
+import json
+import os
+import re
+import six
+
+from six.moves.urllib.parse import quote
 
 from django.http import HttpResponse, Http404 , HttpResponseForbidden
 from django.shortcuts import render, get_object_or_404, redirect
@@ -312,7 +323,7 @@ def document_main(request, name, rev=None):
         if doc.stream_id == "ietf" and group.type_id == "wg" and group.list_archive:
             search_archive = group.list_archive
 
-        search_archive = urllib.parse.quote(search_archive, safe="~")
+        search_archive = quote(search_archive, safe="~")
 
         # conflict reviews
         conflict_reviews = [d.document.name for d in doc.related_that("conflrev")]
@@ -661,7 +672,7 @@ def check_doc_email_aliases():
     pattern = re.compile(r'^expand-(.*?)(\..*?)?@.*? +(.*)$')
     good_count = 0
     tot_count = 0
-    with open(settings.DRAFT_VIRTUAL_PATH,"r") as virtual_file:
+    with io.open(settings.DRAFT_VIRTUAL_PATH,"r") as virtual_file:
         for line in virtual_file.readlines():
             m = pattern.match(line)
             tot_count += 1
@@ -677,7 +688,7 @@ def get_doc_email_aliases(name):
     else:
         pattern = re.compile(r'^expand-(.*?)(\..*?)?@.*? +(.*)$')
     aliases = []
-    with open(settings.DRAFT_VIRTUAL_PATH,"r") as virtual_file:
+    with io.open(settings.DRAFT_VIRTUAL_PATH,"r") as virtual_file:
         for line in virtual_file.readlines():
             m = pattern.match(line)
             if m:
@@ -1263,7 +1274,7 @@ def add_sessionpresentation(request,name):
     if doc.group:
         sessions = sorted(sessions,key=lambda x:0 if x.group==doc.group else 1)
 
-    session_choices = [(s.pk,str(s)) for s in sessions]
+    session_choices = [(s.pk, six.ensure_text(s)) for s in sessions]
 
     if request.method == 'POST':
         version_form = VersionForm(request.POST,choices=version_choices)
diff --git a/ietf/doc/views_material.py b/ietf/doc/views_material.py
index fdd7ab705..29c6174b9 100644
--- a/ietf/doc/views_material.py
+++ b/ietf/doc/views_material.py
@@ -1,7 +1,11 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 # views for managing group materials (slides, ...)
+import io
 import os
 import re
 
@@ -140,7 +144,7 @@ def edit_material(request, name=None, acronym=None, action=None, doc_type=None):
                 f = form.cleaned_data["material"]
                 file_ext = os.path.splitext(f.name)[1]
 
-                with open(os.path.join(doc.get_file_path(), doc.name + "-" + doc.rev + file_ext), 'wb+') as dest:
+                with io.open(os.path.join(doc.get_file_path(), doc.name + "-" + doc.rev + file_ext), 'wb+') as dest:
                     for chunk in f.chunks():
                         dest.write(chunk)
 
diff --git a/ietf/doc/views_review.py b/ietf/doc/views_review.py
index 1cf5c0510..d4ac64db6 100644
--- a/ietf/doc/views_review.py
+++ b/ietf/doc/views_review.py
@@ -2,6 +2,9 @@
 # -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
+import io
 import os
 import datetime
 import requests
@@ -625,7 +628,7 @@ def complete_review(request, name, assignment_id):
                 content = form.cleaned_data['review_content']
 
             filename = os.path.join(review.get_file_path(), '{}.txt'.format(review.name, review.rev))
-            with open(filename, 'w', encoding='utf-8') as destination:
+            with io.open(filename, 'w', encoding='utf-8') as destination:
                 destination.write(content)
 
             completion_datetime = datetime.datetime.now()
diff --git a/ietf/doc/views_status_change.py b/ietf/doc/views_status_change.py
index b78aa91e7..14113f5d5 100644
--- a/ietf/doc/views_status_change.py
+++ b/ietf/doc/views_status_change.py
@@ -1,7 +1,14 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
-import datetime, os, re
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import datetime
+import io
+import os
+import re
+import six
 
 from django import forms
 from django.shortcuts import render, get_object_or_404, redirect
@@ -124,7 +131,7 @@ class UploadForm(forms.Form):
 
     def save(self, doc):
        filename = os.path.join(settings.STATUS_CHANGE_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev))
-       with open(filename, 'w', encoding='utf-8') as destination:
+       with io.open(filename, 'w', encoding='utf-8') as destination:
            if self.cleaned_data['txt']:
                destination.write(self.cleaned_data['txt'])
            else:
@@ -188,7 +195,7 @@ def submit(request, name):
         else:
             filename = os.path.join(settings.STATUS_CHANGE_PATH, '%s-%s.txt' % (doc.canonical_name(), doc.rev))
             try:
-                with open(filename, 'r') as f:
+                with io.open(filename, 'r') as f:
                     init["content"] = f.read()
             except IOError:
                 pass
@@ -634,7 +641,7 @@ def generate_last_call_text(request, doc):
     e.doc = doc
     e.rev = doc.rev
     e.desc = 'Last call announcement was generated'
-    e.text = str(new_text)
+    e.text = six.ensure_text(new_text)
     e.save()
 
     return e 
diff --git a/ietf/group/models.py b/ietf/group/models.py
index ec36e8014..aecbf3287 100644
--- a/ietf/group/models.py
+++ b/ietf/group/models.py
@@ -1,19 +1,22 @@
 # Copyright The IETF Trust 2010-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, print_function, unicode_literals
 
 import datetime
 import email.utils
 import jsonfield
 import os
 import re
+import six
 
-from urllib.parse import urljoin
+from six.moves.urllib.parse import urljoin
 
 from django.conf import settings
 from django.core.validators import RegexValidator
 from django.db import models
 from django.db.models.deletion import CASCADE
 from django.dispatch import receiver
+from django.utils.encoding import python_2_unicode_compatible
 
 from simple_history.models import HistoricalRecords
 
@@ -27,6 +30,7 @@ from ietf.utils import log
 from ietf.utils.models import ForeignKey, OneToOneField
 
 
+@python_2_unicode_compatible
 class GroupInfo(models.Model):
     time = models.DateTimeField(default=datetime.datetime.now)
     name = models.CharField(max_length=80)
@@ -91,7 +95,7 @@ class Group(GroupInfo):
         return e[0] if e else None
 
     def has_role(self, user, role_names):
-        if isinstance(role_names, str) or isinstance(role_names, str):
+        if isinstance(role_names, six.string_types):
             role_names = [role_names]
         return user.is_authenticated and self.role_set.filter(name__in=role_names, person__user=user).exists()
 
@@ -247,14 +251,16 @@ class GroupHistory(GroupInfo):
     class Meta:
         verbose_name_plural="group histories"
 
+@python_2_unicode_compatible
 class GroupURL(models.Model):
     group = ForeignKey(Group)
     name = models.CharField(max_length=255)
     url = models.URLField()
 
     def __str__(self):
-        return "%s (%s)" % (self.url, self.name)
+        return u"%s (%s)" % (self.url, self.name)
 
+@python_2_unicode_compatible
 class GroupMilestoneInfo(models.Model):
     group = ForeignKey(Group)
     # a group has two sets of milestones, current milestones
@@ -281,6 +287,7 @@ class GroupMilestoneHistory(GroupMilestoneInfo):
     time = models.DateTimeField()
     milestone = ForeignKey(GroupMilestone, related_name="history_set")
 
+@python_2_unicode_compatible
 class GroupStateTransitions(models.Model):
     """Captures that a group has overriden the default available
     document state transitions for a certain state."""
@@ -289,7 +296,7 @@ class GroupStateTransitions(models.Model):
     next_states = models.ManyToManyField('doc.State', related_name='previous_groupstatetransitions_states')
 
     def __str__(self):
-        return '%s "%s" -> %s' % (self.group.acronym, self.state.name, [s.name for s in self.next_states.all()])
+        return u'%s "%s" -> %s' % (self.group.acronym, self.state.name, [s.name for s in self.next_states.all()])
 
 GROUP_EVENT_CHOICES = [
     ("changed_state", "Changed state"),
@@ -301,6 +308,7 @@ GROUP_EVENT_CHOICES = [
     ("status_update", "Status update"),
     ]
 
+@python_2_unicode_compatible
 class GroupEvent(models.Model):
     """An occurrence for a group, used for tracking who, when and what."""
     group = ForeignKey(Group)
@@ -310,7 +318,7 @@ class GroupEvent(models.Model):
     desc = models.TextField()
 
     def __str__(self):
-        return "%s %s at %s" % (self.by.plain_name(), self.get_type_display().lower(), self.time)
+        return u"%s %s at %s" % (self.by.plain_name(), self.get_type_display().lower(), self.time)
 
     class Meta:
         ordering = ['-time', 'id']
@@ -321,13 +329,14 @@ class ChangeStateGroupEvent(GroupEvent):
 class MilestoneGroupEvent(GroupEvent):
     milestone = ForeignKey(GroupMilestone)
 
+@python_2_unicode_compatible
 class Role(models.Model):
     name = ForeignKey(RoleName)
     group = ForeignKey(Group)
     person = ForeignKey(Person)
     email = ForeignKey(Email, help_text="Email address used by person for this role.")
     def __str__(self):
-        return "%s is %s in %s" % (self.person.plain_name(), self.name.name, self.group.acronym or self.group.name)
+        return u"%s is %s in %s" % (self.person.plain_name(), self.name.name, self.group.acronym or self.group.name)
 
     def formatted_ascii_email(self):
         return email.utils.formataddr((self.person.plain_ascii(), self.email.address))
@@ -338,6 +347,7 @@ class Role(models.Model):
     class Meta:
         ordering = ['name_id', ]
 
+@python_2_unicode_compatible
 class RoleHistory(models.Model):
     # RoleHistory doesn't have a time field as it's not supposed to be
     # used on its own - there should always be a GroupHistory
@@ -348,7 +358,7 @@ class RoleHistory(models.Model):
     person = ForeignKey(Person)
     email = ForeignKey(Email, help_text="Email address used by person for this role.")
     def __str__(self):
-        return "%s is %s in %s" % (self.person.plain_name(), self.name.name, self.group.acronym)
+        return u"%s is %s in %s" % (self.person.plain_name(), self.name.name, self.group.acronym)
 
     class Meta:
         verbose_name_plural = "role histories"
diff --git a/ietf/group/tests_info.py b/ietf/group/tests_info.py
index 9ee3c0bcb..11c227579 100644
--- a/ietf/group/tests_info.py
+++ b/ietf/group/tests_info.py
@@ -1,12 +1,16 @@
 # Copyright The IETF Trust 2009-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import os
 import shutil
 import calendar
 import datetime
 import io
 import bleach
+import six
 
 from pyquery import PyQuery
 from tempfile import NamedTemporaryFile
@@ -115,7 +119,7 @@ class GroupPagesTests(TestCase):
 
         chair = Email.objects.filter(role__group=group, role__name="chair")[0]
 
-        with open(os.path.join(self.charter_dir, "%s-%s.txt" % (group.charter.canonical_name(), group.charter.rev)), "w") as f:
+        with io.open(os.path.join(self.charter_dir, "%s-%s.txt" % (group.charter.canonical_name(), group.charter.rev)), "w") as f:
             f.write("This is a charter.")
 
         url = urlreverse('ietf.group.views.wg_summary_area', kwargs=dict(group_type="wg"))
@@ -229,7 +233,7 @@ class GroupPagesTests(TestCase):
         group = CharterFactory().group
         draft = WgDraftFactory(group=group)
 
-        with open(os.path.join(self.charter_dir, "%s-%s.txt" % (group.charter.canonical_name(), group.charter.rev)), "w") as f:
+        with io.open(os.path.join(self.charter_dir, "%s-%s.txt" % (group.charter.canonical_name(), group.charter.rev)), "w") as f:
             f.write("This is a charter.")
 
         milestone = GroupMilestone.objects.create(
@@ -582,7 +586,7 @@ class GroupEditTests(TestCase):
         self.assertTrue(len(q('form .has-error')) > 0)
         
         # edit info
-        with open(os.path.join(self.charter_dir, "%s-%s.txt" % (group.charter.canonical_name(), group.charter.rev)), "w") as f:
+        with io.open(os.path.join(self.charter_dir, "%s-%s.txt" % (group.charter.canonical_name(), group.charter.rev)), "w") as f:
             f.write("This is a charter.")
         area = group.parent
         ad = Person.objects.get(name="Areað Irector")
@@ -1264,7 +1268,7 @@ class StatusUpdateTests(TestCase):
             response = self.client.get(url)
             self.assertEqual(response.status_code,200)
             q=PyQuery(response.content)
-            self.assertTrue(bleach.linkify(escape(event.desc)) in str(q('pre')))
+            self.assertTrue(bleach.linkify(escape(event.desc)) in six.ensure_text(q('pre')))
             self.assertFalse(q('a#edit_button'))
             self.client.login(username=chair.person.user.username,password='%s+password'%chair.person.user.username)
             response = self.client.get(url)
diff --git a/ietf/group/tests_review.py b/ietf/group/tests_review.py
index ea8e80e89..4d5f99c2a 100644
--- a/ietf/group/tests_review.py
+++ b/ietf/group/tests_review.py
@@ -1,8 +1,12 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 import debug      # pyflakes:ignore
+import six
 
 from pyquery import PyQuery
 
@@ -260,7 +264,7 @@ class ReviewTests(TestCase):
         q = PyQuery(r.content)
         generated_text = q("[name=body]").text()
         self.assertTrue(review_req1.doc.name in generated_text)
-        self.assertTrue(str(Person.objects.get(user__username="marschairman")) in generated_text)
+        self.assertTrue(six.ensure_text(Person.objects.get(user__username="marschairman")) in generated_text)
 
         empty_outbox()
         r = self.client.post(url, {
diff --git a/ietf/group/utils.py b/ietf/group/utils.py
index 2a6003de3..e6660cccf 100644
--- a/ietf/group/utils.py
+++ b/ietf/group/utils.py
@@ -1,6 +1,10 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import io
 import os
 
 from django.db.models import Q
@@ -53,7 +57,7 @@ def get_charter_text(group):
 
     filename = os.path.join(c.get_file_path(), "%s-%s.txt" % (c.canonical_name(), c.rev))
     try:
-        with open(filename) as f:
+        with io.open(filename) as f:
             return f.read()
     except IOError:
         return 'Error Loading Group Charter'
diff --git a/ietf/group/views.py b/ietf/group/views.py
index 462f6f790..ab15db3df 100644
--- a/ietf/group/views.py
+++ b/ietf/group/views.py
@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 # Copyright The IETF Trust 2009-2019, All Rights Reserved
-
-
+#
 # Portion Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen 
 # 
@@ -34,12 +33,18 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import os
-import re
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import datetime
+import itertools
+import io
 import json
 import math
-import itertools
-import datetime
+import os
+import re
+import six
+
 from tempfile import mkstemp
 from collections import OrderedDict, defaultdict
 from simple_history.utils import update_change_reason
@@ -109,7 +114,7 @@ from ietf.doc.models import LastCallDocEvent
 
 
 from ietf.name.models import ReviewAssignmentStateName
-from ietf.utils.mail import send_mail_text, parse_preformatted
+from ietf.utils.mail import send_mail_text, parse_preformatted, get_payload
 
 from ietf.ietfauth.utils import user_is_person
 from ietf.dbtemplate.models import DBTemplate
@@ -204,7 +209,7 @@ def check_group_email_aliases():
     pattern = re.compile(r'expand-(.*?)(-\w+)@.*? +(.*)$')
     tot_count = 0
     good_count = 0
-    with open(settings.GROUP_VIRTUAL_PATH,"r") as virtual_file:
+    with io.open(settings.GROUP_VIRTUAL_PATH,"r") as virtual_file:
         for line in virtual_file.readlines():
             m = pattern.match(line)
             tot_count += 1
@@ -630,7 +635,7 @@ def get_group_email_aliases(acronym, group_type):
         pattern = re.compile(r'expand-(.*?)(-\w+)@.*? +(.*)$')
 
     aliases = []
-    with open(settings.GROUP_VIRTUAL_PATH,"r") as virtual_file:
+    with io.open(settings.GROUP_VIRTUAL_PATH,"r") as virtual_file:
         for line in virtual_file.readlines():
             m = pattern.match(line)
             if m:
@@ -691,7 +696,7 @@ def dependencies(request, acronym, group_type=None, output_type="pdf"):
 
     dothandle, dotname = mkstemp()
     os.close(dothandle)
-    dotfile = open(dotname, "w")
+    dotfile = io.open(dotname, "w")
     dotfile.write(make_dot(group))
     dotfile.close()
 
@@ -708,7 +713,7 @@ def dependencies(request, acronym, group_type=None, output_type="pdf"):
     pipe("%s -f -l 10 -o %s %s" % (settings.UNFLATTEN_BINARY, unflatname, dotname))
     pipe("%s -T%s -o %s %s" % (settings.DOT_BINARY, output_type, outname, unflatname))
 
-    outhandle = open(outname, "rb")
+    outhandle = io.open(outname, "rb")
     out = outhandle.read()
     outhandle.close()
 
@@ -1443,7 +1448,7 @@ def manage_review_requests(request, acronym, group_type=None, assignment_status=
         saving = form_action.startswith("save")
 
         # check for conflicts
-        review_requests_dict = { str(r.pk): r for r in review_requests }
+        review_requests_dict = { six.ensure_text(r.pk): r for r in review_requests }
         posted_reqs = set(request.POST.getlist("reviewrequest", []))
         current_reqs = set(review_requests_dict.keys())
 
@@ -1599,7 +1604,7 @@ def email_open_review_assignments(request, acronym, group_type=None):
         
         (msg,_,_) = parse_preformatted(partial_msg)
 
-        body = msg.get_payload()
+        body = get_payload(msg)
         subject = msg['Subject']
 
         form = EmailOpenAssignmentsForm(initial={
diff --git a/ietf/idindex/generate_all_id2_txt.py b/ietf/idindex/generate_all_id2_txt.py
index edaf12ab4..67fef35d2 100755
--- a/ietf/idindex/generate_all_id2_txt.py
+++ b/ietf/idindex/generate_all_id2_txt.py
@@ -1,5 +1,7 @@
-# Copyright The IETF Trust 2010-2019, All Rights Reserved
 #!/usr/bin/env python
+# Copyright The IETF Trust 2010-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+#
 # Portions Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen 
 #
@@ -32,11 +34,15 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import os
+import six
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
 
 import django
 django.setup()
 
 from ietf.idindex.index import all_id2_txt
-print(all_id2_txt().encode('utf-8'), end=' ')
+six.print_(all_id2_txt().encode('utf-8'), end=' ')
diff --git a/ietf/idindex/generate_all_id_txt.py b/ietf/idindex/generate_all_id_txt.py
index e9d5f8cf5..f7d805be9 100755
--- a/ietf/idindex/generate_all_id_txt.py
+++ b/ietf/idindex/generate_all_id_txt.py
@@ -1,5 +1,6 @@
-# Copyright The IETF Trust 2009-2019, All Rights Reserved
 #!/usr/bin/env python
+# Copyright The IETF Trust 2009-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 # Portions Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen 
 #
@@ -32,11 +33,15 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import os
+import six
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
 
 import django
 django.setup()
 
 from ietf.idindex.index import all_id_txt
-print(all_id_txt().encode("utf-8"), end=' ')
+six.print_(all_id_txt().encode("utf-8"), end=' ')
diff --git a/ietf/idindex/generate_id_abstracts_txt.py b/ietf/idindex/generate_id_abstracts_txt.py
index e21a96303..d93b4b8a7 100755
--- a/ietf/idindex/generate_id_abstracts_txt.py
+++ b/ietf/idindex/generate_id_abstracts_txt.py
@@ -1,5 +1,6 @@
-# Copyright The IETF Trust 2009-2019, All Rights Reserved
 #!/usr/bin/env python
+# Copyright The IETF Trust 2009-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 # Portions Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen 
 #
@@ -32,11 +33,15 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import os
+import six
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
 
 import django
 django.setup()
 
 from ietf.idindex.index import id_index_txt
-print(id_index_txt(with_abstracts=True).encode('utf-8'), end=' ')
+six.print_(id_index_txt(with_abstracts=True).encode('utf-8'), end=' ')
diff --git a/ietf/idindex/generate_id_index_txt.py b/ietf/idindex/generate_id_index_txt.py
index 7fe969a45..c201a9cb7 100755
--- a/ietf/idindex/generate_id_index_txt.py
+++ b/ietf/idindex/generate_id_index_txt.py
@@ -1,5 +1,6 @@
-# Copyright The IETF Trust 2009-2019, All Rights Reserved
 #!/usr/bin/env python
+# Copyright The IETF Trust 2009-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 # Portions Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen 
 #
@@ -32,11 +33,15 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import os
+import six
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
 
 import django
 django.setup()
 
 from ietf.idindex.index import id_index_txt
-print(id_index_txt().encode('utf-8'), end=' ')
+six.print_(id_index_txt().encode('utf-8'), end=' ')
diff --git a/ietf/idindex/index.py b/ietf/idindex/index.py
index 0291eda09..b79308952 100644
--- a/ietf/idindex/index.py
+++ b/ietf/idindex/index.py
@@ -1,22 +1,26 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 # code to generate plain-text index files that are placed on
 # www.ietf.org in the same directory as the I-Ds
 
-import datetime, os
-
-import debug    # pyflakes:ignore
-
+import datetime
+import os
 import pytz
+import six
 
 from django.conf import settings
 from django.template.loader import render_to_string
 
-from ietf.doc.templatetags.ietf_filters import clean_whitespace
+import debug    # pyflakes:ignore
+
 from ietf.doc.models import Document, DocEvent, DocumentAuthor, RelatedDocument, DocAlias, State
 from ietf.doc.models import LastCallDocEvent, NewRevisionDocEvent
 from ietf.doc.models import IESG_SUBSTATE_TAGS
+from ietf.doc.templatetags.ietf_filters import clean_whitespace
 from ietf.group.models import Group
 from ietf.person.models import Person, Email
 from ietf.utils import log
@@ -191,7 +195,7 @@ def all_id2_txt():
                 area = d.group.parent.acronym
         fields.append(area)
         # 9 responsible AD name
-        fields.append(str(d.ad) if d.ad else "")
+        fields.append(six.ensure_text(d.ad) if d.ad else "")
         # 10
         fields.append(d.intended_std_level.name if d.intended_std_level else "")
         # 11
diff --git a/ietf/idindex/tests.py b/ietf/idindex/tests.py
index 10144d42c..c073fbe0b 100644
--- a/ietf/idindex/tests.py
+++ b/ietf/idindex/tests.py
@@ -1,14 +1,19 @@
 # Copyright The IETF Trust 2009-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
-import os
-import datetime
-import shutil
 
-import debug    # pyflakes:ignore
+from __future__ import absolute_import, print_function, unicode_literals
+
+import datetime
+import io
+import os
+import shutil
+import six
 
 from django.conf import settings
 
+import debug    # pyflakes:ignore
+
 from ietf.doc.factories import WgDraftFactory
 from ietf.doc.models import Document, DocAlias, RelatedDocument, State, LastCallDocEvent, NewRevisionDocEvent
 from ietf.group.factories import GroupFactory
@@ -28,7 +33,7 @@ class IndexTests(TestCase):
         shutil.rmtree(self.id_dir)
         
     def write_draft_file(self, name, size):
-        with open(os.path.join(self.id_dir, name), 'w') as f:
+        with io.open(os.path.join(self.id_dir, name), 'w') as f:
             f.write("a" * size)
 
     def test_all_id_txt(self):
@@ -97,7 +102,7 @@ class IndexTests(TestCase):
         self.assertEqual(t[6], draft.latest_event(type="new_revision").time.strftime("%Y-%m-%d"))
         self.assertEqual(t[7], draft.group.acronym)
         self.assertEqual(t[8], draft.group.parent.acronym)
-        self.assertEqual(t[9], str(draft.ad))
+        self.assertEqual(t[9], six.ensure_text(draft.ad))
         self.assertEqual(t[10], draft.intended_std_level.name)
         self.assertEqual(t[11], "")
         self.assertEqual(t[12], ".pdf,.txt")
diff --git a/ietf/iesg/agenda.py b/ietf/iesg/agenda.py
index 15f9b0f5f..381d3fa65 100644
--- a/ietf/iesg/agenda.py
+++ b/ietf/iesg/agenda.py
@@ -1,9 +1,12 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 # utilities for constructing agendas for IESG telechats
 
-import codecs
+import io
 import datetime
 from collections import OrderedDict
 
@@ -146,7 +149,7 @@ def fill_in_agenda_administrivia(date, sections):
 
     for s, key, filename in extra_info_files:
         try:
-            with codecs.open(filename, 'r', 'utf-8', 'replace') as f:
+            with io.open(filename, 'r', encoding='utf-8', errors='replace') as f:
                 t = f.read().strip()
         except IOError:
             t = "(Error reading %s)" % filename
diff --git a/ietf/iesg/tests.py b/ietf/iesg/tests.py
index c18a35687..3735f3005 100644
--- a/ietf/iesg/tests.py
+++ b/ietf/iesg/tests.py
@@ -1,9 +1,15 @@
 # Copyright The IETF Trust 2009-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import datetime
+import io
 import os
 import shutil
-import datetime
+import tarfile
+
 from pyquery import PyQuery
 
 from django.conf import settings
@@ -448,15 +454,13 @@ class IESGAgendaTests(TestCase):
         d1_filename = "%s-%s.txt" % (d1.name, d1.rev)
         d2_filename = "%s-%s.txt" % (d2.name, d2.rev)
 
-        with open(os.path.join(self.draft_dir, d1_filename), "w") as f:
+        with io.open(os.path.join(self.draft_dir, d1_filename), "w") as f:
             f.write("test content")
 
         url = urlreverse("ietf.iesg.views.telechat_docs_tarfile", kwargs=dict(date=get_agenda_date().isoformat()))
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
 
-        import tarfile, io
-
         tar = tarfile.open(None, fileobj=io.BytesIO(r.content))
         names = tar.getnames()
         self.assertIn(d1_filename, names)
diff --git a/ietf/iesg/views.py b/ietf/iesg/views.py
index ce478b7b1..35b9d0b96 100644
--- a/ietf/iesg/views.py
+++ b/ietf/iesg/views.py
@@ -1,5 +1,6 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
-
+# -*- coding: utf-8 -*-
+#
 # Portion Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen 
 #
@@ -32,16 +33,17 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import os
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
-import tarfile
 import io
-import time
 import itertools
 import json
-
-import debug               # pyflakes:ignore
-
+import os
+import six
+import tarfile
+import time
 
 from django import forms
 from django.conf import settings
@@ -53,6 +55,8 @@ from django.utils.encoding import force_bytes
 #from django.views.decorators.cache import cache_page
 #from django.views.decorators.vary import vary_on_cookie
 
+import debug               # pyflakes:ignore
+
 from ietf.doc.models import Document, State, LastCallDocEvent, ConsensusDocEvent, DocEvent, IESG_BALLOT_ACTIVE_STATES
 from ietf.doc.utils import update_telechat, augment_events_with_revision
 from ietf.group.models import GroupMilestone, Role
@@ -312,9 +316,9 @@ def agenda_documents_txt(request):
         row = (
             d.computed_telechat_date.isoformat(),
             d.name,
-            str(d.intended_std_level),
+            six.ensure_text(d.intended_std_level),
             "1" if d.stream_id in ("ise", "irtf") else "0",
-            str(d.area_acronym()).lower(),
+            six.ensure_text(d.area_acronym()).lower(),
             d.ad.plain_name() if d.ad else "None Assigned",
             d.rev,
             )
diff --git a/ietf/ietfauth/htpasswd.py b/ietf/ietfauth/htpasswd.py
index 7474d7592..cc42a5d8a 100644
--- a/ietf/ietfauth/htpasswd.py
+++ b/ietf/ietfauth/htpasswd.py
@@ -1,5 +1,10 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import io
 import subprocess, hashlib
 from django.utils.encoding import force_bytes
 
@@ -11,7 +16,7 @@ def update_htpasswd_file(username, password):
         realm = settings.HTDIGEST_REALM
         prefix = force_bytes('%s:%s:' % (username, realm))
         key = force_bytes(hashlib.md5(prefix + force_bytes(password)).hexdigest())
-        f = open(pass_file, 'r+b')
+        f = io.open(pass_file, 'r+b')
         pos = f.tell()
         line = f.readline()
         while line:
diff --git a/ietf/ietfauth/tests.py b/ietf/ietfauth/tests.py
index 99ae23c59..ea7eea7e8 100644
--- a/ietf/ietfauth/tests.py
+++ b/ietf/ietfauth/tests.py
@@ -2,8 +2,11 @@
 # -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
+import io
 import os, shutil, time, datetime
-from urllib.parse import urlsplit
+from six.moves.urllib.parse import urlsplit
 from pyquery import PyQuery
 from unittest import skipIf
 
@@ -46,7 +49,7 @@ class IetfAuthTests(TestCase):
         self.saved_htpasswd_file = settings.HTPASSWD_FILE
         self.htpasswd_dir = self.tempdir('htpasswd')
         settings.HTPASSWD_FILE = os.path.join(self.htpasswd_dir, "htpasswd")
-        open(settings.HTPASSWD_FILE, 'a').close() # create empty file
+        io.open(settings.HTPASSWD_FILE, 'a').close() # create empty file
 
         self.saved_htdigest_realm = getattr(settings, "HTDIGEST_REALM", None)
         settings.HTDIGEST_REALM = "test-realm"
@@ -109,11 +112,11 @@ class IetfAuthTests(TestCase):
         return confirm_url
 
     def username_in_htpasswd_file(self, username):
-        with open(settings.HTPASSWD_FILE) as f:
+        with io.open(settings.HTPASSWD_FILE) as f:
             for l in f:
                 if l.startswith(username + ":"):
                     return True
-        with open(settings.HTPASSWD_FILE) as f:
+        with io.open(settings.HTPASSWD_FILE) as f:
             print(f.read())
 
         return False
@@ -581,31 +584,30 @@ class IetfAuthTests(TestCase):
             self.assertRedirects(r, urlreverse('ietf.ietfauth.views.apikey_index'))
 
         for key in person.apikeys.all()[:3]:
-            url = key.endpoint
 
             # bad method
-            r = self.client.put(url, {'apikey':key.hash()})
+            r = self.client.put(key.endpoint, {'apikey':key.hash()})
             self.assertEqual(r.status_code, 405)
 
             # missing apikey
-            r = self.client.post(url, {'dummy':'dummy',})
+            r = self.client.post(key.endpoint, {'dummy':'dummy',})
             self.assertContains(r, 'Missing apikey parameter', status_code=400)
 
             # invalid apikey
-            r = self.client.post(url, {'apikey':BAD_KEY, 'dummy':'dummy',})
+            r = self.client.post(key.endpoint, {'apikey':BAD_KEY, 'dummy':'dummy',})
             self.assertContains(r, 'Invalid apikey', status_code=400)
 
             # too long since regular login
             person.user.last_login = datetime.datetime.now() - datetime.timedelta(days=settings.UTILS_APIKEY_GUI_LOGIN_LIMIT_DAYS+1)
             person.user.save()
-            r = self.client.post(url, {'apikey':key.hash(), 'dummy':'dummy',})
+            r = self.client.post(key.endpoint, {'apikey':key.hash(), 'dummy':'dummy',})
             self.assertContains(r, 'Too long since last regular login', status_code=400)
             person.user.last_login = datetime.datetime.now()
             person.user.save()
 
             # endpoint mismatch
             key2 = PersonalApiKey.objects.create(person=person, endpoint='/')
-            r = self.client.post(url, {'apikey':key2.hash(), 'dummy':'dummy',})
+            r = self.client.post(key.endpoint, {'apikey':key2.hash(), 'dummy':'dummy',})
             self.assertContains(r, 'Apikey endpoint mismatch', status_code=400)
             key2.delete()
 
@@ -632,8 +634,7 @@ class IetfAuthTests(TestCase):
             time.sleep(2)
         for i in range(count):
             for key in person.apikeys.all():
-                url = key.endpoint
-                self.client.post(url, {'apikey':key.hash(), 'dummy': 'dummy', })
+                self.client.post(key.endpoint, {'apikey':key.hash(), 'dummy': 'dummy', })
         date = str(datetime.date.today())
 
         empty_outbox()
diff --git a/ietf/ipr/feeds.py b/ietf/ipr/feeds.py
index 7d1c8ac81..7482abf5e 100644
--- a/ietf/ipr/feeds.py
+++ b/ietf/ipr/feeds.py
@@ -1,4 +1,10 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import six
 
 from django.contrib.syndication.views import Feed
 from django.utils.feedgenerator import Atom1Feed
@@ -22,7 +28,7 @@ class LatestIprDisclosuresFeed(Feed):
         return mark_safe(item.title)
 
     def item_description(self, item):
-        return str(item.title)
+        return six.ensure_text(item.title)
         
     def item_pubdate(self, item):
         return item.time
diff --git a/ietf/ipr/fields.py b/ietf/ipr/fields.py
index 775205772..d2a24268c 100644
--- a/ietf/ipr/fields.py
+++ b/ietf/ipr/fields.py
@@ -1,7 +1,11 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import json
+import six
 
 from django.utils.html import escape
 from django import forms
@@ -48,7 +52,7 @@ class SearchableIprDisclosuresField(forms.CharField):
     def prepare_value(self, value):
         if not value:
             value = ""
-        if isinstance(value, str):
+        if isinstance(value, six.string_types):
             pks = self.parse_select2_value(value)
             # if the user posted a non integer value we need to remove it
             for key in pks:
@@ -64,7 +68,7 @@ class SearchableIprDisclosuresField(forms.CharField):
         # patterns may not have been fully constructed there yet
         self.widget.attrs["data-ajax-url"] = urlreverse('ietf.ipr.views.ajax_search')
 
-        return ",".join(str(e.pk) for e in value)
+        return ",".join(six.ensure_text(e.pk) for e in value)
 
     def clean(self, value):
         value = super(SearchableIprDisclosuresField, self).clean(value)
diff --git a/ietf/ipr/management/commands/process_email.py b/ietf/ipr/management/commands/process_email.py
index c307ebc8f..0bb200ff6 100644
--- a/ietf/ipr/management/commands/process_email.py
+++ b/ietf/ipr/management/commands/process_email.py
@@ -1,4 +1,10 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import io
 import sys
 
 from django.core.management.base import BaseCommand, CommandError
@@ -20,7 +26,7 @@ class Command(BaseCommand):
         if not email:
             msg = sys.stdin.read()
         else:
-            msg = open(email, "r").read()
+            msg = io.open(email, "r").read()
 
         try:
             process_response_email(msg)
diff --git a/ietf/ipr/tests.py b/ietf/ipr/tests.py
index c7683cad7..38186752c 100644
--- a/ietf/ipr/tests.py
+++ b/ietf/ipr/tests.py
@@ -1,10 +1,14 @@
 # Copyright The IETF Trust 2009-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
-import urllib.request, urllib.parse, urllib.error
+
 
 from pyquery import PyQuery
+from six.moves.urllib.parse import quote
 
 from django.urls import reverse as urlreverse
 
@@ -172,11 +176,11 @@ class IprTests(TestCase):
         self.assertContains(r, ipr.title)
 
         # find by doc title
-        r = self.client.get(url + "?submit=doctitle&doctitle=%s" % urllib.parse.quote(draft.title))
+        r = self.client.get(url + "?submit=doctitle&doctitle=%s" % quote(draft.title))
         self.assertContains(r, ipr.title)
 
         # find by ipr title
-        r = self.client.get(url + "?submit=iprtitle&iprtitle=%s" % urllib.parse.quote(ipr.title))
+        r = self.client.get(url + "?submit=iprtitle&iprtitle=%s" % quote(ipr.title))
         self.assertContains(r, ipr.title)
 
     def test_feed(self):
diff --git a/ietf/ipr/views.py b/ietf/ipr/views.py
index 32f9bc4cd..607b609ad 100644
--- a/ietf/ipr/views.py
+++ b/ietf/ipr/views.py
@@ -1,8 +1,12 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 import itertools
+import six
 
 from django.conf import settings
 from django.contrib import messages
@@ -452,7 +456,7 @@ def by_draft_txt(request):
 
     lines = [ "# Machine-readable list of IPR disclosures by draft name" ]
     for name, iprs in docipr.items():
-        lines.append(name + "\t" + "\t".join(str(ipr_id) for ipr_id in sorted(iprs)))
+        lines.append(name + "\t" + "\t".join(six.ensure_text(ipr_id) for ipr_id in sorted(iprs)))
 
     return HttpResponse("\n".join(lines), content_type="text/plain; charset=%s"%settings.DEFAULT_CHARSET)
 
@@ -474,7 +478,7 @@ def by_draft_recursive_txt(request):
 
     lines = [ "# Machine-readable list of IPR disclosures by draft name" ]
     for name, iprs in docipr.items():
-        lines.append(name + "\t" + "\t".join(str(ipr_id) for ipr_id in sorted(iprs)))
+        lines.append(name + "\t" + "\t".join(six.ensure_text(ipr_id) for ipr_id in sorted(iprs)))
 
     return HttpResponse("\n".join(lines), content_type="text/plain; charset=%s"%settings.DEFAULT_CHARSET)
 
diff --git a/ietf/liaisons/fields.py b/ietf/liaisons/fields.py
index 94f58bff9..b70572ff8 100644
--- a/ietf/liaisons/fields.py
+++ b/ietf/liaisons/fields.py
@@ -1,7 +1,11 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import json
+import six
 
 from django.utils.html import escape
 from django import forms
@@ -47,9 +51,9 @@ class SearchableLiaisonStatementsField(forms.CharField):
     def prepare_value(self, value):
         if not value:
             value = ""
-        if isinstance(value, int):
+        if isinstance(value, six.integer_types):
             value = str(value)
-        if isinstance(value, str):
+        if isinstance(value, six.string_types):
             pks = self.parse_select2_value(value)
             value = self.model.objects.filter(pk__in=pks)
         if isinstance(value, LiaisonStatement):
@@ -61,7 +65,7 @@ class SearchableLiaisonStatementsField(forms.CharField):
         # patterns may not have been fully constructed there yet
         self.widget.attrs["data-ajax-url"] = urlreverse("ietf.liaisons.views.ajax_select2_search_liaison_statements")
 
-        return ",".join(str(o.pk) for o in value)
+        return ",".join(six.ensure_text(o.pk) for o in value)
 
     def clean(self, value):
         value = super(SearchableLiaisonStatementsField, self).clean(value)
diff --git a/ietf/liaisons/forms.py b/ietf/liaisons/forms.py
index f997e5f3c..eeb128a0c 100644
--- a/ietf/liaisons/forms.py
+++ b/ietf/liaisons/forms.py
@@ -1,8 +1,14 @@
 # Copyright The IETF Trust 2011-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import io
 import datetime, os
 import operator
+import six
+
 from email.utils import parseaddr
 from form_utils.forms import BetterModelForm
 
@@ -198,7 +204,7 @@ class CustomModelMultipleChoiceField(forms.ModelMultipleChoiceField):
         if isinstance(value, QuerySet):
             return value
         if (hasattr(value, '__iter__') and
-                not isinstance(value, str) and
+                not isinstance(value, six.text_type) and
                 not hasattr(value, '_meta')):
             return [super(CustomModelMultipleChoiceField, self).prepare_value(v) for v in value]
         return super(CustomModelMultipleChoiceField, self).prepare_value(value)
@@ -375,7 +381,7 @@ class LiaisonModelForm(BetterModelForm):
             if created:
                 DocAlias.objects.create(name=attach.name).docs.add(attach)
             LiaisonStatementAttachment.objects.create(statement=self.instance,document=attach)
-            attach_file = open(os.path.join(settings.LIAISON_ATTACH_PATH, attach.name + extension), 'wb')
+            attach_file = io.open(os.path.join(settings.LIAISON_ATTACH_PATH, attach.name + extension), 'wb')
             attach_file.write(attached_file.read())
             attach_file.close()
 
@@ -446,7 +452,7 @@ class IncomingLiaisonForm(LiaisonModelForm):
             self.fields['from_contact'].initial = self.person.role_set.filter(group=queryset[0]).first().email.address
             self.fields['from_contact'].widget.attrs['readonly'] = True
         self.fields['from_groups'].queryset = queryset
-        self.fields['from_groups'].widget.submitter = str(self.person)
+        self.fields['from_groups'].widget.submitter = six.ensure_text(self.person)
 
         # if there's only one possibility make it the default
         if len(queryset) == 1:
diff --git a/ietf/liaisons/tests.py b/ietf/liaisons/tests.py
index 3d56cccf0..c5cd80b27 100644
--- a/ietf/liaisons/tests.py
+++ b/ietf/liaisons/tests.py
@@ -1,5 +1,14 @@
 # Copyright The IETF Trust 2009-2019, All Rights Reserved
-import datetime, os, shutil
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import datetime
+import io
+import os
+import shutil
+import six
 
 import debug    # pyflakes:ignore
 
@@ -232,7 +241,7 @@ class ManagementCommandTests(TestCase):
 
         LiaisonStatementFactory(deadline=datetime.date.today()+datetime.timedelta(days=1))
 
-        out = StringIO()
+        out = six.StringIO()
         mailbox_before = len(outbox)
         call_command('check_liaison_deadlines',stdout=out)
         self.assertEqual(len(outbox), mailbox_before + 1)
@@ -242,7 +251,7 @@ class ManagementCommandTests(TestCase):
 
         RoleFactory(name_id='liaiman',group__type_id='sdo')
 
-        out = StringIO()
+        out = six.StringIO()
         mailbox_before = len(outbox)
         call_command('remind_update_sdo_list',stdout=out)
         self.assertTrue(len(outbox) > mailbox_before)
@@ -432,7 +441,7 @@ class LiaisonManagementTests(TestCase):
         self.assertEqual(new_liaison.attachments.count(), attachments_before + 1)
         attachment = new_liaison.attachments.order_by("-name")[0]
         self.assertEqual(attachment.title, "attachment")
-        with open(os.path.join(self.liaison_dir, attachment.uploaded_filename)) as f:
+        with io.open(os.path.join(self.liaison_dir, attachment.uploaded_filename)) as f:
             written_content = f.read()
 
         test_file.seek(0)
@@ -736,7 +745,7 @@ class LiaisonManagementTests(TestCase):
         self.assertEqual(l.attachments.count(), 1)
         attachment = l.attachments.all()[0]
         self.assertEqual(attachment.title, "attachment")
-        with open(os.path.join(self.liaison_dir, attachment.uploaded_filename)) as f:
+        with io.open(os.path.join(self.liaison_dir, attachment.uploaded_filename)) as f:
             written_content = f.read()
 
         test_file.seek(0)
@@ -815,7 +824,7 @@ class LiaisonManagementTests(TestCase):
         self.assertEqual(l.attachments.count(), 1)
         attachment = l.attachments.all()[0]
         self.assertEqual(attachment.title, "attachment")
-        with open(os.path.join(self.liaison_dir, attachment.uploaded_filename)) as f:
+        with io.open(os.path.join(self.liaison_dir, attachment.uploaded_filename)) as f:
             written_content = f.read()
 
         test_file.seek(0)
diff --git a/ietf/meeting/forms.py b/ietf/meeting/forms.py
index a50965bec..8cea55790 100644
--- a/ietf/meeting/forms.py
+++ b/ietf/meeting/forms.py
@@ -1,8 +1,11 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import io
 import os
-import codecs
 import datetime
 
 from django import forms
@@ -287,7 +290,7 @@ class InterimSessionModelForm(forms.ModelForm):
         directory = os.path.dirname(path)
         if not os.path.exists(directory):
             os.makedirs(directory)
-        with codecs.open(path, "w", encoding='utf-8') as file:
+        with io.open(path, "w", encoding='utf-8') as file:
             file.write(self.cleaned_data['agenda'])
 
 
diff --git a/ietf/meeting/helpers.py b/ietf/meeting/helpers.py
index fde7887af..50cc4f041 100644
--- a/ietf/meeting/helpers.py
+++ b/ietf/meeting/helpers.py
@@ -1,6 +1,11 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import datetime
+import io
 import os
 import re
 from tempfile import mkstemp
@@ -211,7 +216,7 @@ def read_session_file(type, num, doc):
     # FIXME: uploaded_filename should be replaced with a function call that computes names that are fixed
     path = os.path.join(settings.AGENDA_PATH, "%s/%s/%s" % (num, type, doc.uploaded_filename))
     if os.path.exists(path):
-        with open(path) as f:
+        with io.open(path) as f:
             return f.read(), path
     else:
         return None, path
@@ -224,13 +229,13 @@ def convert_draft_to_pdf(doc_name):
     outpath = os.path.join(settings.INTERNET_DRAFT_PDF_PATH, doc_name + ".pdf")
 
     try:
-        infile = open(inpath, "r")
+        infile = io.open(inpath, "r")
     except IOError:
         return
 
     t,tempname = mkstemp()
     os.close(t)
-    tempfile = open(tempname, "w")
+    tempfile = io.open(tempname, "w")
 
     pageend = 0;
     newpage = 0;
diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py
index a84e51db0..464b2ae15 100644
--- a/ietf/meeting/models.py
+++ b/ietf/meeting/models.py
@@ -1,11 +1,13 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
+from __future__ import absolute_import, print_function, unicode_literals
 
 # old meeting models can be found in ../proceedings/models.py
 
 import pytz
 import datetime
-from urllib.parse import urljoin
+import io
+from six.moves.urllib.parse import urljoin
 import os
 import re
 import string
@@ -19,6 +21,7 @@ from django.conf import settings
 # mostly used by json_dict()
 #from django.template.defaultfilters import slugify, date as date_format, time as time_format
 from django.template.defaultfilters import date as date_format
+from django.utils.encoding import python_2_unicode_compatible
 from django.utils.text import slugify
 
 from ietf.dbtemplate.models import DBTemplate
@@ -54,6 +57,7 @@ def fmt_date(o):
     d = datetime_safe.new_date(o)
     return d.strftime(DATE_FORMAT)
 
+@python_2_unicode_compatible
 class Meeting(models.Model):
     # number is either the number for IETF meetings, or some other
     # identifier for interim meetings/IESG retreats/liaison summits/...
@@ -109,7 +113,7 @@ class Meeting(models.Model):
 
     def __str__(self):
         if self.type_id == "ietf":
-            return "IETF-%s" % (self.number)
+            return u"IETF-%s" % (self.number)
         else:
             return self.number
 
@@ -276,7 +280,7 @@ class Meeting(models.Model):
             try:
                 tzfn = os.path.join(settings.TZDATA_ICS_PATH, self.time_zone + ".ics")
                 if os.path.exists(tzfn):
-                    with open(tzfn) as tzf:
+                    with io.open(tzfn) as tzf:
                         icstext = tzf.read()
                     vtimezone = re.search("(?sm)(\nBEGIN:VTIMEZONE.*\nEND:VTIMEZONE\n)", icstext).group(1).strip()
                     if vtimezone:
@@ -310,6 +314,7 @@ class Meeting(models.Model):
 
 # === Rooms, Resources, Floorplans =============================================
 
+@python_2_unicode_compatible
 class ResourceAssociation(models.Model):
     name = ForeignKey(RoomResourceName)
     icon = models.CharField(max_length=64)       # icon to be found in /static/img
@@ -326,6 +331,7 @@ class ResourceAssociation(models.Model):
         res1['resource_id'] = self.pk
         return res1
 
+@python_2_unicode_compatible
 class Room(models.Model):
     meeting = ForeignKey(Meeting)
     modified = models.DateTimeField(auto_now=True)
@@ -345,7 +351,7 @@ class Room(models.Model):
     # end floorplan-related stuff
 
     def __str__(self):
-        return "%s size: %s" % (self.name, self.capacity)
+        return u"%s size: %s" % (self.name, self.capacity)
 
     def delete_timeslots(self):
         for ts in self.timeslot_set.all():
@@ -415,6 +421,7 @@ def floorplan_path(instance, filename):
     root, ext = os.path.splitext(filename)
     return "%s/floorplan-%s-%s%s" % (settings.FLOORPLAN_MEDIA_DIR, instance.meeting.number, xslugify(instance.name), ext)
 
+@python_2_unicode_compatible
 class FloorPlan(models.Model):
     name    = models.CharField(max_length=255)
     short   = models.CharField(max_length=3, default='')
@@ -427,10 +434,11 @@ class FloorPlan(models.Model):
         ordering = ['-id',]
     #
     def __str__(self):
-        return 'floorplan-%s-%s' % (self.meeting.number, xslugify(self.name))
+        return u'floorplan-%s-%s' % (self.meeting.number, xslugify(self.name))
 
 # === Schedules, Sessions, Timeslots and Assignments ===========================
 
+@python_2_unicode_compatible
 class TimeSlot(models.Model):
     """
     Everything that would appear on the meeting agenda of a meeting is
@@ -475,9 +483,9 @@ class TimeSlot(models.Model):
     def __str__(self):
         location = self.get_location()
         if not location:
-            location = "(no location)"
+            location = u"(no location)"
 
-        return "%s: %s-%s %s, %s" % (self.meeting.number, self.time.strftime("%m-%d %H:%M"), (self.time + self.duration).strftime("%H:%M"), self.name, location)
+        return u"%s: %s-%s %s, %s" % (self.meeting.number, self.time.strftime("%m-%d %H:%M"), (self.time + self.duration).strftime("%H:%M"), self.name, location)
 
     def end_time(self):
         return self.time + self.duration
@@ -598,6 +606,7 @@ class TimeSlot(models.Model):
 
 # end of TimeSlot
 
+@python_2_unicode_compatible
 class Schedule(models.Model):
     """
     Each person may have multiple agendas saved.
@@ -617,7 +626,7 @@ class Schedule(models.Model):
     # considering copiedFrom = ForeignKey('Schedule', blank=True, null=True)
 
     def __str__(self):
-        return "%s:%s(%s)" % (self.meeting, self.name, self.owner)
+        return u"%s:%s(%s)" % (self.meeting, self.name, self.owner)
 
     def base_url(self):
         return "/meeting/%s/agenda/%s/%s" % (self.meeting.number, self.owner_email(), self.name)
@@ -707,6 +716,7 @@ class Schedule(models.Model):
         self.delete()
 
 # to be renamed SchedTimeSessAssignments (stsa)
+@python_2_unicode_compatible
 class SchedTimeSessAssignment(models.Model):
     """
     This model provides an N:M relationship between Session and TimeSlot.
@@ -726,7 +736,7 @@ class SchedTimeSessAssignment(models.Model):
         ordering = ["timeslot__time", "timeslot__type__slug", "session__group__parent__name", "session__group__acronym", "session__name", ]
 
     def __str__(self):
-        return "%s [%s<->%s]" % (self.schedule, self.session, self.timeslot)
+        return u"%s [%s<->%s]" % (self.schedule, self.session, self.timeslot)
 
     @property
     def room_name(self):
@@ -809,6 +819,7 @@ class SchedTimeSessAssignment(models.Model):
 
         return "-".join(components).lower()
 
+@python_2_unicode_compatible
 class Constraint(models.Model):
     """
     Specifies a constraint on the scheduling.
@@ -829,7 +840,7 @@ class Constraint(models.Model):
     active_status = None
 
     def __str__(self):
-        return "%s %s target=%s person=%s" % (self.source, self.name.name.lower(), self.target, self.person)
+        return u"%s %s target=%s person=%s" % (self.source, self.name.name.lower(), self.target, self.person)
 
     def brief_display(self):
         if self.target and self.person:
@@ -857,6 +868,7 @@ class Constraint(models.Model):
         return ct1
 
 
+@python_2_unicode_compatible
 class SessionPresentation(models.Model):
     session = ForeignKey('Session')
     document = ForeignKey(Document)
@@ -869,11 +881,12 @@ class SessionPresentation(models.Model):
         unique_together = (('session', 'document'),)
 
     def __str__(self):
-        return "%s -> %s-%s" % (self.session, self.document.name, self.rev)
+        return u"%s -> %s-%s" % (self.session, self.document.name, self.rev)
 
 constraint_cache_uses = 0
 constraint_cache_initials = 0
 
+@python_2_unicode_compatible
 class Session(models.Model):
     """Session records that a group should have a session on the
     meeting (time and location is stored in a TimeSlot) - if multiple
@@ -1113,7 +1126,7 @@ class Session(models.Model):
         if doc:
             path = os.path.join(settings.AGENDA_PATH, self.meeting.number, "agenda", doc.uploaded_filename)
             if os.path.exists(path):
-                with open(path) as f:
+                with io.open(path) as f:
                     return f.read()
             else:
                 return "No agenda file found"
@@ -1147,6 +1160,7 @@ class Session(models.Model):
         else:
             return self.group.acronym
 
+@python_2_unicode_compatible
 class ImportantDate(models.Model):
     meeting = ForeignKey(Meeting)
     date = models.DateField()
@@ -1155,7 +1169,7 @@ class ImportantDate(models.Model):
         ordering = ["-meeting_id","date", ]
 
     def __str__(self):
-        return '%s : %s : %s' % ( self.meeting, self.name, self.date )
+        return u'%s : %s : %s' % ( self.meeting, self.name, self.date )
 
 class SlideSubmission(models.Model):
     session = ForeignKey(Session)
diff --git a/ietf/meeting/tests_api.py b/ietf/meeting/tests_api.py
index 51f5c1ae1..dc9b788bf 100644
--- a/ietf/meeting/tests_api.py
+++ b/ietf/meeting/tests_api.py
@@ -1,8 +1,12 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
-from urllib.parse import urlsplit
+
+from six.moves.urllib.parse import urlsplit
 
 from django.urls import reverse as urlreverse
 
diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py
index d81a6e062..a9a296923 100644
--- a/ietf/meeting/tests_views.py
+++ b/ietf/meeting/tests_views.py
@@ -1,17 +1,22 @@
 # Copyright The IETF Trust 2009-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
-import os
-import shutil
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
-import urllib.parse
+import io
+import os
 import random
+import shutil
+import six
 
 from unittest import skipIf
 from mock import patch
 from pyquery import PyQuery
 from io import StringIO, BytesIO
 from bs4 import BeautifulSoup
+from six.moves.urllib.parse import urlparse
 
 from django.urls import reverse as urlreverse
 from django.conf import settings
@@ -68,7 +73,7 @@ class MeetingTests(TestCase):
         if not os.path.exists(dirname):
             os.makedirs(dirname)
 
-        with open(path, "w") as f:
+        with io.open(path, "w") as f:
             f.write(content)
 
     def write_materials_files(self, meeting, session):
@@ -381,10 +386,9 @@ class MeetingTests(TestCase):
         response = self.client.get(url)
         self.assertContains(response, 'test acknowledgements')
 
-
-    @patch('urllib.request.urlopen')
+    @patch('six.moves.urllib.request.urlopen')
     def test_proceedings_attendees(self, mock_urlopen):
-        mock_urlopen.return_value = BytesIO(b'[{"LastName":"Smith","FirstName":"John","Company":"ABC","Country":"US"}]')
+        mock_urlopen.return_value = six.BytesIO(b'[{"LastName":"Smith","FirstName":"John","Company":"ABC","Country":"US"}]')
         make_meeting_test_data()
         meeting = MeetingFactory(type_id='ietf', date=datetime.date(2016,7,14), number="96")
         finalize(meeting)
@@ -394,12 +398,12 @@ class MeetingTests(TestCase):
         q = PyQuery(response.content)
         self.assertEqual(1,len(q("#id_attendees tbody tr")))
 
-    @patch('urllib.request.urlopen')
+    @patch('six.moves.urllib.request.urlopen')
     def test_proceedings_overview(self, mock_urlopen):
         '''Test proceedings IETF Overview page.
         Note: old meetings aren't supported so need to add a new meeting then test.
         '''
-        mock_urlopen.return_value = BytesIO(b'[{"LastName":"Smith","FirstName":"John","Company":"ABC","Country":"US"}]')
+        mock_urlopen.return_value = six.BytesIO(b'[{"LastName":"Smith","FirstName":"John","Company":"ABC","Country":"US"}]')
         make_meeting_test_data()
         meeting = MeetingFactory(type_id='ietf', date=datetime.date(2016,7,14), number="96")
         finalize(meeting)
@@ -476,7 +480,7 @@ class MeetingTests(TestCase):
         session.sessionpresentation_set.create(document=doc)
         file,_ = submission_file(name=doc.name,format='txt',templatename='test_submission.txt',group=session.group,rev="00")
         filename = os.path.join(doc.get_file_path(),file.name)
-        with open(filename,'w') as draftbits:
+        with io.open(filename,'w') as draftbits:
             draftbits.write(file.getvalue())
         
         url = urlreverse('ietf.meeting.views.session_draft_tarfile', kwargs={'num':session.meeting.number,'acronym':session.group.acronym})
@@ -492,7 +496,7 @@ class MeetingTests(TestCase):
         session.sessionpresentation_set.create(document=doc)
         file,_ = submission_file(name=doc.name,format='txt',templatename='test_submission.txt',group=session.group,rev="00")
         filename = os.path.join(doc.get_file_path(),file.name)
-        with open(filename,'w') as draftbits:
+        with io.open(filename,'w') as draftbits:
             draftbits.write(file.getvalue())
         
         url = urlreverse('ietf.meeting.views.session_draft_pdf', kwargs={'num':session.meeting.number,'acronym':session.group.acronym})
@@ -590,7 +594,7 @@ class EditTests(TestCase):
             })
         self.assertEqual(r.status_code, 302)
         # Verify that we actually got redirected to a new place.
-        self.assertNotEqual(urllib.parse.urlparse(r.url).path, url)
+        self.assertNotEqual(urlparse(r.url).path, url)
 
         # get
         schedule = meeting.get_schedule_by_name("foo")
@@ -636,7 +640,7 @@ class EditTests(TestCase):
             'saveas': "saveas",
             })
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urllib.parse.urlparse(r.url).path, url)
+        self.assertEqual(urlparse(r.url).path, url)
         # TODO: Verify that an error message was in fact returned.
 
         r = self.client.post(url, {
@@ -645,7 +649,7 @@ class EditTests(TestCase):
             })
         # TODO: Verify that an error message was in fact returned.
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urllib.parse.urlparse(r.url).path, url)
+        self.assertEqual(urlparse(r.url).path, url)
 
         # Non-ASCII alphanumeric characters
         r = self.client.post(url, {
@@ -654,7 +658,7 @@ class EditTests(TestCase):
             })
         # TODO: Verify that an error message was in fact returned.
         self.assertEqual(r.status_code, 302)
-        self.assertEqual(urllib.parse.urlparse(r.url).path, url)
+        self.assertEqual(urlparse(r.url).path, url)
         
 
     def test_edit_timeslots(self):
@@ -1661,7 +1665,7 @@ class IphoneAppJsonTests(TestCase):
         self.assertEqual(r.status_code,200)
 
 class FinalizeProceedingsTests(TestCase):
-    @patch('urllib.request.urlopen')
+    @patch('six.moves.urllib.request.urlopen')
     def test_finalize_proceedings(self, mock_urlopen):
         mock_urlopen.return_value = BytesIO(b'[{"LastName":"Smith","FirstName":"John","Company":"ABC","Country":"US"}]')
         make_meeting_test_data()
@@ -1711,7 +1715,7 @@ class MaterialsTests(TestCase):
                     soup = BeautifulSoup(page, 'html.parser')
                     for a in soup('a'):
                         href = a.get('href')
-                        path = urllib.parse.urlparse(href).path
+                        path = urlparse(href).path
                         if (path and path not in seen and path.startswith(top)):
                             follow(path)
         follow(url)
@@ -1723,7 +1727,7 @@ class MaterialsTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertIn('Upload', str(q("title")))
+        self.assertIn('Upload', six.ensure_text(q("title")))
         self.assertFalse(session.sessionpresentation_set.exists())
         test_file = StringIO('%PDF-1.4\n%âãÏÓ\nthis is some text for a test')
         test_file.name = "not_really.pdf"
@@ -1734,7 +1738,7 @@ class MaterialsTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertIn('Revise', str(q("title")))
+        self.assertIn('Revise', six.ensure_text(q("title")))
         test_file = StringIO('%PDF-1.4\n%âãÏÓ\nthis is some different text for a test')
         test_file.name = "also_not_really.pdf"
         r = self.client.post(url,dict(file=test_file))
@@ -1758,7 +1762,7 @@ class MaterialsTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertIn('Upload', str(q("title")))
+        self.assertIn('Upload', six.ensure_text(q("title")))
         self.assertFalse(session.sessionpresentation_set.exists())
         test_file = StringIO('%PDF-1.4\n%âãÏÓ\nthis is some text for a test')
         test_file.name = "not_really.pdf"
@@ -1776,7 +1780,7 @@ class MaterialsTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertIn('Upload', str(q("title")))
+        self.assertIn('Upload', six.ensure_text(q("title")))
         
 
     def test_upload_minutes_agenda(self):
@@ -1791,7 +1795,7 @@ class MaterialsTests(TestCase):
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
             q = PyQuery(r.content)
-            self.assertIn('Upload', str(q("Title")))
+            self.assertIn('Upload', six.ensure_text(q("Title")))
             self.assertFalse(session.sessionpresentation_set.exists())
             self.assertFalse(q('form input[type="checkbox"]'))
     
@@ -1845,7 +1849,7 @@ class MaterialsTests(TestCase):
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
             q = PyQuery(r.content)
-            self.assertIn('Revise', str(q("Title")))
+            self.assertIn('Revise', six.ensure_text(q("Title")))
             test_file = BytesIO(b'this is some different text for a test')
             test_file.name = "also_not_really.txt"
             r = self.client.post(url,dict(file=test_file,apply_to_all=True))
@@ -1879,7 +1883,7 @@ class MaterialsTests(TestCase):
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
             q = PyQuery(r.content)
-            self.assertIn('Upload', str(q("Title")))
+            self.assertIn('Upload', six.ensure_text(q("Title")))
             self.assertFalse(session.sessionpresentation_set.exists())
             self.assertFalse(q('form input[type="checkbox"]'))
 
@@ -1900,7 +1904,7 @@ class MaterialsTests(TestCase):
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
             q = PyQuery(r.content)
-            self.assertIn('Upload', str(q("title")))
+            self.assertIn('Upload', six.ensure_text(q("title")))
             self.assertFalse(session.sessionpresentation_set.filter(document__type_id=doctype))
             test_file = BytesIO(b'this is some text for a test')
             test_file.name = "not_really.txt"
@@ -1923,7 +1927,7 @@ class MaterialsTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertIn('Upload', str(q("title")))
+        self.assertIn('Upload', six.ensure_text(q("title")))
         self.assertFalse(session1.sessionpresentation_set.filter(document__type_id='slides'))
         test_file = BytesIO(b'this is not really a slide')
         test_file.name = 'not_really.txt'
@@ -1951,7 +1955,7 @@ class MaterialsTests(TestCase):
         r = self.client.get(url)
         self.assertTrue(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertIn('Revise', str(q("title")))
+        self.assertIn('Revise', six.ensure_text(q("title")))
         test_file = BytesIO(b'new content for the second slide deck')
         test_file.name = 'doesnotmatter.txt'
         r = self.client.post(url,dict(file=test_file,title='rename the presentation',apply_to_all=False))
diff --git a/ietf/meeting/utils.py b/ietf/meeting/utils.py
index 296e9ac08..4a845ec33 100644
--- a/ietf/meeting/utils.py
+++ b/ietf/meeting/utils.py
@@ -1,8 +1,14 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 import json
-import urllib.request, urllib.error, urllib.parse
+import six.moves.urllib.request
 
+from six.moves.urllib.error import HTTPError
 from django.conf import settings
 from django.template.loader import render_to_string
 
@@ -88,8 +94,8 @@ def create_proceedings_templates(meeting):
     # Get meeting attendees from registration system
     url = settings.STATS_REGISTRATION_ATTENDEES_JSON_URL.format(number=meeting.number)
     try:
-        attendees = json.load(urllib.request.urlopen(url))
-    except (ValueError, urllib.error.HTTPError):
+        attendees = json.load(six.moves.urllib.request.urlopen(url))
+    except (ValueError, HTTPError):
         attendees = []
 
     if attendees:
diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py
index 8c80905d0..083c961d0 100644
--- a/ietf/meeting/views.py
+++ b/ietf/meeting/views.py
@@ -1,18 +1,24 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import csv
 import datetime
 import glob
+import io
 import json
 import os
 import pytz
 import re
+import six
 import tarfile
-import urllib.request, urllib.parse, urllib.error
+
 
 from calendar import timegm
 from collections import OrderedDict, Counter, deque
+from six.moves.urllib.parse import unquote
 from tempfile import mkstemp
 from wsgiref.handlers import format_date_time
 
@@ -199,7 +205,7 @@ def materials_document(request, document, num=None, ext=None):
     _, basename = os.path.split(filename)
     if not os.path.exists(filename):
         raise Http404("File not found: %s" % filename)
-    with open(filename, 'rb') as file:
+    with io.open(filename, 'rb') as file:
         bytes = file.read()
     
     mtype, chset = get_mime_type(bytes)
@@ -518,12 +524,12 @@ def agenda(request, num=None, name=None, base=None, ext=None, owner=None, utc=""
 
 def agenda_csv(schedule, filtered_assignments):
     response = HttpResponse(content_type="text/csv; charset=%s"%settings.DEFAULT_CHARSET)
-    writer = csv.writer(response, delimiter=',', quoting=csv.QUOTE_ALL)
+    writer = csv.writer(response, delimiter=str(','), quoting=csv.QUOTE_ALL)
 
     headings = ["Date", "Start", "End", "Session", "Room", "Area", "Acronym", "Type", "Description", "Session ID", "Agenda", "Slides"]
 
     def write_row(row):
-        encoded_row = [v.encode('utf-8') if isinstance(v, str) else v for v in row]
+        encoded_row = [v.encode('utf-8') if isinstance(v, six.text_type) else v for v in row]
 
         while len(encoded_row) < len(headings):
             encoded_row.append(None) # produce empty entries at the end as necessary
@@ -681,7 +687,7 @@ def session_draft_tarfile(request, num, acronym):
     tarstream = tarfile.open('','w:gz',response)
     mfh, mfn = mkstemp()
     os.close(mfh)
-    manifest = open(mfn, "w")
+    manifest = io.open(mfn, "w")
 
     for doc_name in drafts:
         pdf_path = os.path.join(settings.INTERNET_DRAFT_PDF_PATH, doc_name + ".pdf")
@@ -709,7 +715,7 @@ def session_draft_pdf(request, num, acronym):
     curr_page = 1
     pmh, pmn = mkstemp()
     os.close(pmh)
-    pdfmarks = open(pmn, "w")
+    pdfmarks = io.open(pmn, "w")
     pdf_list = ""
 
     for draft in drafts:
@@ -730,7 +736,7 @@ def session_draft_pdf(request, num, acronym):
     code, out, err = pipe(gs + " -dBATCH -dNOPAUSE -q -sDEVICE=pdfwrite -sOutputFile=" + pdfn + " " + pdf_list + " " + pmn)
     assertion('code == 0')
 
-    pdf = open(pdfn,"rb")
+    pdf = io.open(pdfn,"rb")
     pdf_contents = pdf.read()
     pdf.close()
 
@@ -873,7 +879,7 @@ def ical_agenda(request, num=None, name=None, acronym=None, session_id=None):
         raise Http404
 
     q = request.META.get('QUERY_STRING','') or ""
-    filter = set(urllib.parse.unquote(q).lower().split(','))
+    filter = set(unquote(q).lower().split(','))
     include = [ i for i in filter if not (i.startswith('-') or i.startswith('~')) ]
     include_types = set(["plenary","other"])
     exclude = []
@@ -1583,7 +1589,7 @@ def propose_session_slides(request, session_id, num):
                 name = 'slides-%s-%s' % (session.meeting.number, session.docname_token())
             name = name + '-' + slugify(title).replace('_', '-')[:128]
             filename = '%s-00%s'% (name, ext)
-            destination = open(os.path.join(settings.SLIDE_STAGING_PATH, filename),'wb+')
+            destination = io.open(os.path.join(settings.SLIDE_STAGING_PATH, filename),'wb+')
             for chunk in file.chunks():
                 destination.write(chunk)
             destination.close()
diff --git a/ietf/name/generate_fixtures.py b/ietf/name/generate_fixtures.py
index 707c54aff..c453b6c53 100644
--- a/ietf/name/generate_fixtures.py
+++ b/ietf/name/generate_fixtures.py
@@ -1,8 +1,10 @@
+# Copyright The IETF Trust 2011-2019, All Rights Reserved
 #!/usr/bin/python
 
 # simple script for exporting name related base data for the tests
 
 # boiler plate
+import io
 import os, sys
 import django
 
@@ -17,7 +19,7 @@ from django.core.serializers import serialize
 
 def output(name, seq):
     try:
-        f = open(os.path.join(os.path.dirname(os.path.abspath(__file__)), "fixtures/%s.json" % name), 'w')
+        f = io.open(os.path.join(os.path.dirname(os.path.abspath(__file__)), "fixtures/%s.json" % name), 'w')
         f.write(serialize("json", seq, indent=1))
         f.close()
     except:
diff --git a/ietf/nomcom/forms.py b/ietf/nomcom/forms.py
index dd9c18686..2f801a842 100644
--- a/ietf/nomcom/forms.py
+++ b/ietf/nomcom/forms.py
@@ -1,4 +1,11 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import six
+
 from django.conf import settings
 from django import forms
 from django.urls import reverse
@@ -33,12 +40,12 @@ class PositionNomineeField(forms.ChoiceField):
         results = []
         for position in positions:
             accepted_nominees = [np.nominee for np in NomineePosition.objects.filter(position=position,state='accepted').exclude(nominee__duplicated__isnull=False)]
-            nominees = [('%s_%s' % (position.id, i.id), str(i)) for i in accepted_nominees]
+            nominees = [('%s_%s' % (position.id, i.id), six.ensure_text(i)) for i in accepted_nominees]
             if nominees:
                 results.append((position.name+" (Accepted)", nominees))
         for position in positions:
             other_nominees = [np.nominee for np in NomineePosition.objects.filter(position=position).exclude(state='accepted').exclude(nominee__duplicated__isnull=False)]
-            nominees = [('%s_%s' % (position.id, i.id), str(i)) for i in other_nominees]
+            nominees = [('%s_%s' % (position.id, i.id), six.ensure_text(i)) for i in other_nominees]
             if nominees:
                 results.append((position.name+" (Declined or Pending)", nominees))
         kwargs['choices'] = results
diff --git a/ietf/nomcom/management/commands/feedback_email.py b/ietf/nomcom/management/commands/feedback_email.py
index 3c4ae9f96..7774a6c08 100644
--- a/ietf/nomcom/management/commands/feedback_email.py
+++ b/ietf/nomcom/management/commands/feedback_email.py
@@ -1,4 +1,10 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import io
 import sys
 
 from django.core.management.base import BaseCommand, CommandError
@@ -31,7 +37,7 @@ class Command(BaseCommand):
         if not email:
             msg = sys.stdin.read()
         else:
-            msg = open(email, "r").read()
+            msg = io.open(email, "r").read()
 
         try:
             nomcom = NomCom.objects.get(group__acronym__icontains=year,
diff --git a/ietf/nomcom/test_data.py b/ietf/nomcom/test_data.py
index 2cb998242..072f43e92 100644
--- a/ietf/nomcom/test_data.py
+++ b/ietf/nomcom/test_data.py
@@ -1,4 +1,10 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import io
 import tempfile
 import os
 
@@ -90,7 +96,7 @@ def check_comments(encryped, plain, privatekey_file):
 
     decrypted_file.close()
     encrypted_file.close()
-    decrypted_comments = open(decrypted_file.name, 'r').read()
+    decrypted_comments = io.open(decrypted_file.name, 'rb').read().decode('utf-8')
     os.unlink(encrypted_file.name)
     os.unlink(decrypted_file.name)
 
@@ -112,7 +118,7 @@ def nomcom_test_data():
         nomcom_test_cert_file, privatekey_file = generate_cert()
 
     nomcom.public_key.storage = FileSystemStorage(location=settings.NOMCOM_PUBLIC_KEYS_DIR)
-    nomcom.public_key.save('cert', File(open(nomcom_test_cert_file.name, 'r')))
+    nomcom.public_key.save('cert', File(io.open(nomcom_test_cert_file.name, 'r')))
 
     # chair and member
     create_person(group, "chair", username=CHAIR_USER, email_address='%s%s'%(CHAIR_USER,EMAIL_DOMAIN))
diff --git a/ietf/nomcom/tests.py b/ietf/nomcom/tests.py
index 262ae006d..49ada547b 100644
--- a/ietf/nomcom/tests.py
+++ b/ietf/nomcom/tests.py
@@ -1,11 +1,17 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
-#import tempfile
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
+import io
 import random
+import six
 import shutil
-import urllib.parse
+
 from pyquery import PyQuery
+from six.moves.urllib.parse import urlparse
 
 from django.db import IntegrityError
 from django.db.models import Max
@@ -35,7 +41,7 @@ from ietf.nomcom.utils import get_nomcom_by_year, make_nomineeposition, get_hash
 from ietf.person.factories import PersonFactory, EmailFactory
 from ietf.person.models import Email, Person
 from ietf.stats.models import MeetingRegistration
-from ietf.utils.mail import outbox, empty_outbox
+from ietf.utils.mail import outbox, empty_outbox, get_payload
 from ietf.utils.test_utils import login_testing_unauthorized, TestCase, unicontent
 
 client_test_cert_files = None
@@ -334,7 +340,7 @@ class NomcomViewsTest(TestCase):
         response = self.client.post(self.private_merge_nominee_url, test_data)
         self.assertEqual(response.status_code, 302)
         redirect_url = response["Location"]
-        redirect_path = urllib.parse.urlparse(redirect_url).path
+        redirect_path = urlparse(redirect_url).path
         self.assertEqual(redirect_path, reverse('ietf.nomcom.views.private_index', kwargs={"year": NOMCOM_YEAR}))
 
         response = self.client.get(redirect_url)
@@ -407,7 +413,7 @@ class NomcomViewsTest(TestCase):
         q = PyQuery(r.content)
         reminder_date = '%s-09-30' % self.year
 
-        f = open(self.cert_file.name)
+        f = io.open(self.cert_file.name)
         response = self.client.post(self.edit_nomcom_url, {
             'public_key': f,
             'reminderdates_set-TOTAL_FORMS': q('input[name="reminderdates_set-TOTAL_FORMS"]').val(),
@@ -520,7 +526,7 @@ class NomcomViewsTest(TestCase):
         self.assertEqual('Nomination receipt', outbox[-1]['Subject'])
         self.assertEqual(self.email_from, outbox[-1]['From'])
         self.assertIn('plain', outbox[-1]['To'])
-        self.assertIn('Comments with accents äöå', str(outbox[-1].get_payload(decode=True),"utf-8","replace"))
+        self.assertIn('Comments with accents äöå', six.ensure_text(outbox[-1].get_payload(decode=True),"utf-8","replace"))
 
         # Nominate the same person for the same position again without asking for confirmation 
 
@@ -561,7 +567,7 @@ class NomcomViewsTest(TestCase):
         self.assertEqual('Nomination receipt', outbox[-1]['Subject'])
         self.assertEqual(self.email_from, outbox[-1]['From'])
         self.assertIn('plain', outbox[-1]['To'])
-        self.assertIn('Comments with accents äöå', str(outbox[-1].get_payload(decode=True),"utf-8","replace"))
+        self.assertIn('Comments with accents äöå', six.ensure_text(outbox[-1].get_payload(decode=True),"utf-8","replace"))
 
         # Nominate the same person for the same position again without asking for confirmation 
 
@@ -621,7 +627,7 @@ class NomcomViewsTest(TestCase):
 
         # save the cert file in tmp
         #nomcom.public_key.storage.location = tempfile.gettempdir()
-        nomcom.public_key.save('cert', File(open(self.cert_file.name, 'r')))
+        nomcom.public_key.save('cert', File(io.open(self.cert_file.name, 'r')))
 
         response = self.client.get(nominate_url)
         self.assertEqual(response.status_code, 200)
@@ -687,7 +693,7 @@ class NomcomViewsTest(TestCase):
 
         # save the cert file in tmp
         #nomcom.public_key.storage.location = tempfile.gettempdir()
-        nomcom.public_key.save('cert', File(open(self.cert_file.name, 'r')))
+        nomcom.public_key.save('cert', File(io.open(self.cert_file.name, 'r')))
 
         response = self.client.get(nominate_url)
         self.assertEqual(response.status_code, 200)
@@ -763,7 +769,7 @@ class NomcomViewsTest(TestCase):
 
         # save the cert file in tmp
         #nomcom.public_key.storage.location = tempfile.gettempdir()
-        nomcom.public_key.save('cert', File(open(self.cert_file.name, 'r')))
+        nomcom.public_key.save('cert', File(io.open(self.cert_file.name, 'r')))
 
         response = self.client.get(self.add_questionnaire_url)
         self.assertEqual(response.status_code, 200)
@@ -801,12 +807,12 @@ class NomcomViewsTest(TestCase):
         # We're interested in the confirmation receipt here
         self.assertEqual(len(outbox),3)
         self.assertEqual('NomCom comment confirmation', outbox[2]['Subject'])
-        email_body = outbox[2].get_payload()
+        email_body = get_payload(outbox[2])
         self.assertIn(position, email_body)
         self.assertNotIn('$', email_body)
         self.assertEqual(self.email_from, outbox[-2]['From'])
         self.assertIn('plain', outbox[2]['To'])
-        self.assertIn('Comments with accents äöå', str(outbox[2].get_payload(decode=True),"utf-8","replace"))
+        self.assertIn('Comments with accents äöå', six.ensure_text(outbox[2].get_payload(decode=True),"utf-8","replace"))
 
         empty_outbox()
         self.feedback_view(public=True)
@@ -842,7 +848,7 @@ class NomcomViewsTest(TestCase):
 
         # save the cert file in tmp
         #nomcom.public_key.storage.location = tempfile.gettempdir()
-        nomcom.public_key.save('cert', File(open(self.cert_file.name, 'r')))
+        nomcom.public_key.save('cert', File(io.open(self.cert_file.name, 'r')))
 
         response = self.client.get(feedback_url)
         self.assertEqual(response.status_code, 200)
@@ -957,7 +963,7 @@ class FeedbackTest(TestCase):
 
         # save the cert file in tmp
         #nomcom.public_key.storage.location = tempfile.gettempdir()
-        nomcom.public_key.save('cert', File(open(self.cert_file.name, 'r')))
+        nomcom.public_key.save('cert', File(io.open(self.cert_file.name, 'r')))
 
         comment_text = 'Plain text. Comments with accents äöåÄÖÅ éáíóú âêîôû ü àèìòù.'
         comments = nomcom.encrypt(comment_text)
@@ -979,7 +985,7 @@ class ReminderTest(TestCase):
         self.nomcom = get_nomcom_by_year(NOMCOM_YEAR)
         self.cert_file, self.privatekey_file = get_cert_files()
         #self.nomcom.public_key.storage.location = tempfile.gettempdir()
-        self.nomcom.public_key.save('cert', File(open(self.cert_file.name, 'r')))
+        self.nomcom.public_key.save('cert', File(io.open(self.cert_file.name, 'r')))
 
         gen = Position.objects.get(nomcom=self.nomcom,name='GEN')
         rai = Position.objects.get(nomcom=self.nomcom,name='RAI')
diff --git a/ietf/nomcom/utils.py b/ietf/nomcom/utils.py
index 736acb5c5..1d76fa11d 100644
--- a/ietf/nomcom/utils.py
+++ b/ietf/nomcom/utils.py
@@ -1,8 +1,14 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 import hashlib
 import os
 import re
+import six
 import tempfile
 
 from email import message_from_string
@@ -16,7 +22,7 @@ from django.core.exceptions import ObjectDoesNotExist
 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
+from django.utils.encoding import force_str
 
 from ietf.dbtemplate.models import DBTemplate
 from ietf.person.models import Email, Person
@@ -87,7 +93,7 @@ def get_user_email(user):
     return user._email_cache
 
 def get_hash_nominee_position(date, nominee_position_id):
-    return hashlib.md5(('%s%s%s' % (settings.SECRET_KEY, date, nominee_position_id)).encode()).hexdigest()
+    return hashlib.md5(('%s%s%s' % (settings.SECRET_KEY, date, nominee_position_id)).encode('utf-8')).hexdigest()
 
 
 def initialize_templates_for_group(group):
@@ -160,7 +166,7 @@ def retrieve_nomcom_private_key(request, year):
 
     command = "%s bf -d -in /dev/stdin -k \"%s\" -a"
     code, out, error = pipe(command % (settings.OPENSSL_COMMAND,
-                                       settings.SECRET_KEY), private_key.encode())
+                                       settings.SECRET_KEY), private_key.encode('utf-8'))
     if code != 0:
         log("openssl error: %s:\n  Error %s: %s" %(command, code, error))        
     return out
@@ -172,7 +178,7 @@ def store_nomcom_private_key(request, year, private_key):
     else:
         command = "%s bf -e -in /dev/stdin -k \"%s\" -a"
         code, out, error = pipe(command % (settings.OPENSSL_COMMAND,
-                                           settings.SECRET_KEY), private_key.encode())
+                                           settings.SECRET_KEY), private_key.encode('utf-8'))
         if code != 0:
             log("openssl error: %s:\n  Error %s: %s" %(command, code, error))        
         if error:
@@ -182,7 +188,7 @@ def store_nomcom_private_key(request, year, private_key):
 
 def validate_private_key(key):
     key_file = tempfile.NamedTemporaryFile(delete=False)
-    key_file.write(key.encode())
+    key_file.write(key.encode('utf-8'))
     key_file.close()
 
     command = "%s rsa -in %s -check -noout"
@@ -400,7 +406,7 @@ def getheader(header_text, default="ascii"):
     """Decode the specified header"""
 
     tuples = decode_header(header_text)
-    header_sections = [ text.decode(charset or default) if isinstance(text, bytes) else text for text, charset in tuples]
+    header_sections = [ text.decode(charset or default) if isinstance(text, six.binary_type) else text for text, charset in tuples]
     return "".join(header_sections)
 
 
@@ -427,7 +433,7 @@ def get_body(message):
         body = []
         for part in text_parts:
             charset = get_charset(part, get_charset(message))
-            body.append(str(part.get_payload(decode=True),
+            body.append(six.ensure_text(part.get_payload(decode=True),
                                 charset,
                                 "replace"))
 
@@ -435,16 +441,14 @@ def get_body(message):
 
     else:  # if it is not multipart, the payload will be a string
            # representing the message body
-        body = str(message.get_payload(decode=True),
+        body = six.ensure_text(message.get_payload(decode=True),
                        get_charset(message),
                        "replace")
         return body.strip()
 
 
 def parse_email(text):
-    if isinstance(text, str):
-        text = smart_str(text)
-    msg = message_from_string(text)
+    msg = message_from_string(force_str(text))
 
     body = get_body(msg)
     subject = getheader(msg['Subject'])
diff --git a/ietf/person/factories.py b/ietf/person/factories.py
index e92b132c6..0dca61037 100644
--- a/ietf/person/factories.py
+++ b/ietf/person/factories.py
@@ -2,12 +2,16 @@
 # -*- coding: utf-8 -*-
 
 
-import os
+from __future__ import absolute_import, print_function, unicode_literals
+
 import factory
 import faker 
-import shutil
-import random
 import faker.config
+import os
+import random
+import shutil
+import six
+
 from unidecode import unidecode
 
 from django.conf import settings
@@ -54,7 +58,7 @@ class PersonFactory(factory.DjangoModelFactory):
 
     user = factory.SubFactory(UserFactory)
     name = factory.LazyAttribute(lambda p: normalize_name('%s %s'%(p.user.first_name, p.user.last_name)))
-    ascii = factory.LazyAttribute(lambda p: str(unidecode_name(p.name)))
+    ascii = factory.LazyAttribute(lambda p: six.ensure_text(unidecode_name(p.name)))
 
     class Params:
         with_bio = factory.Trait(biography = "\n\n".join(fake.paragraphs()))
diff --git a/ietf/person/fields.py b/ietf/person/fields.py
index 89c3e8259..f2ab5d756 100644
--- a/ietf/person/fields.py
+++ b/ietf/person/fields.py
@@ -1,8 +1,14 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import json
+import six
 
 from collections import Counter
-from urllib.parse import urlencode
+from six.moves.urllib.parse import urlencode
 
 from django.utils.html import escape
 from django import forms
@@ -73,7 +79,7 @@ class SearchablePersonsField(forms.CharField):
     def prepare_value(self, value):
         if not value:
             value = ""
-        if isinstance(value, str):
+        if isinstance(value, six.string_types):
             pks = self.parse_select2_value(value)
             if self.model == Person:
                 value = self.model.objects.filter(pk__in=pks)
@@ -162,7 +168,7 @@ class PersonEmailChoiceField(forms.ModelChoiceField):
 
     def label_from_instance(self, email):
         if self.label_with == "person":
-            return str(email.person)
+            return six.ensure_text(email.person)
         elif self.label_with == "email":
             return email.address
         else:
diff --git a/ietf/person/management/commands/deactivate_email_addresses.py b/ietf/person/management/commands/deactivate_email_addresses.py
index e5ec9e348..04357dc9f 100644
--- a/ietf/person/management/commands/deactivate_email_addresses.py
+++ b/ietf/person/management/commands/deactivate_email_addresses.py
@@ -2,7 +2,10 @@
 # -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import flufl.bounce
+import io
 import mailbox
 import sys
 
@@ -67,7 +70,7 @@ class Command(BaseCommand):
                         self.stderr.write('No person is associated with <%s>\n' % (a, ))
                 else:
                     self.stderr.write('Address not found: <%s>\n' % (a, ))
-                    with open('./failed', 'a') as failed:
+                    with io.open('./failed', 'a') as failed:
                         failed.write(messages[a].as_string(unixfrom=True))
                         failed.write('\n')
 
diff --git a/ietf/person/models.py b/ietf/person/models.py
index 2ecf15398..5025a900b 100644
--- a/ietf/person/models.py
+++ b/ietf/person/models.py
@@ -1,22 +1,27 @@
 # Copyright The IETF Trust 2010-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import datetime
 import email.utils
 import email.header
+import six
 import uuid
 
 from hashids import Hashids
-from urllib.parse import urljoin
+from six.moves.urllib.parse import urljoin
 
 from django.conf import settings
-
-from django.core.validators import validate_email
-from django.core.exceptions import ObjectDoesNotExist
-from django.db import models
 from django.contrib.auth.models import User
+from django.core.exceptions import ObjectDoesNotExist
+from django.core.validators import validate_email
+from django.db import models
 from django.template.loader import render_to_string
-from django.utils.encoding import smart_bytes
+from django.utils.encoding import python_2_unicode_compatible, smart_bytes
 from django.utils.text import slugify
+
 from simple_history.models import HistoricalRecords
 
 import debug                            # pyflakes:ignore
@@ -30,6 +35,7 @@ from ietf.utils import log
 from ietf.utils.models import ForeignKey, OneToOneField
 
 
+@python_2_unicode_compatible
 class Person(models.Model):
     history = HistoricalRecords()
     user = OneToOneField(User, blank=True, null=True, on_delete=models.SET_NULL)
@@ -79,7 +85,11 @@ class Person(models.Model):
     def plain_ascii(self):
         if not hasattr(self, '_cached_plain_ascii'):
             if self.ascii:
-                ascii = unidecode_name(self.ascii)
+                if isinstance(self.ascii, six.binary_type):
+                    uname = six.ensure_text(self.ascii)
+                    ascii = unidecode_name(uname)
+                else:
+                    ascii = unidecode_name(self.ascii)
             else:
                 ascii = unidecode_name(self.name)
             prefix, first, middle, last, suffix = name_parts(ascii)
@@ -96,7 +106,7 @@ class Person(models.Model):
         may be an object or the group acronym."""
         if group:
             from ietf.group.models import Group
-            if isinstance(group, str) or isinstance(group, str):
+            if isinstance(group, six.string_types):
                 group = Group.objects.get(acronym=group)
             e = Email.objects.filter(person=self, role__group=group, role__name=role_name)
         else:
@@ -225,6 +235,7 @@ class Person(models.Model):
         ct1['ascii']     = self.ascii
         return ct1
 
+@python_2_unicode_compatible
 class Alias(models.Model):
     """This is used for alternative forms of a name.  This is the
     primary lookup point for names, and should always contain the
@@ -252,6 +263,7 @@ class Alias(models.Model):
     class Meta:
         verbose_name_plural = "Aliases"
 
+@python_2_unicode_compatible
 class Email(models.Model):
     history = HistoricalRecords()
     address = models.CharField(max_length=64, primary_key=True, validators=[validate_email])
@@ -323,6 +335,7 @@ PERSON_API_KEY_ENDPOINTS = [
     ("/api/meeting/session/video/url", "/api/meeting/session/video/url"),
 ]
 
+@python_2_unicode_compatible
 class PersonalApiKey(models.Model):
     person   = ForeignKey(Person, related_name='apikeys')
     endpoint = models.CharField(max_length=128, null=False, blank=False, choices=PERSON_API_KEY_ENDPOINTS)
@@ -335,11 +348,8 @@ class PersonalApiKey(models.Model):
     @classmethod
     def validate_key(cls, s):
         import struct, hashlib, base64
-        try:
-            key = base64.urlsafe_b64decode(s)
-        except TypeError:
-            return None
-
+        assert isinstance(s, six.binary_type)
+        key = base64.urlsafe_b64decode(s)
         id, salt, hash = struct.unpack(KEY_STRUCT, key)
         k = cls.objects.filter(id=id)
         if not k.exists():
@@ -372,6 +382,7 @@ PERSON_EVENT_CHOICES = [
     ("email_address_deactivated", "Email address deactivated"),
     ]
 
+@python_2_unicode_compatible
 class PersonEvent(models.Model):
     person = ForeignKey(Person)
     time = models.DateTimeField(default=datetime.datetime.now, help_text="When the event happened")
diff --git a/ietf/person/tests.py b/ietf/person/tests.py
index 21ec57091..d4a2d9f67 100644
--- a/ietf/person/tests.py
+++ b/ietf/person/tests.py
@@ -2,7 +2,11 @@
 # -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
+import six
+
 from pyquery import PyQuery
 from io import StringIO
 from django.urls import reverse as urlreverse
@@ -89,7 +93,7 @@ class PersonTests(TestCase):
         empty_outbox()
         p = PersonFactory(name="Föö Bär")
         PersonFactory(name=p.name)
-        self.assertTrue("possible duplicate" in str(outbox[0]["Subject"]).lower())
+        self.assertTrue("possible duplicate" in six.ensure_text(outbox[0]["Subject"]).lower())
 
     def test_merge(self):
         url = urlreverse("ietf.person.views.merge")
diff --git a/ietf/person/utils.py b/ietf/person/utils.py
index 9d250bc17..c45ff423d 100755
--- a/ietf/person/utils.py
+++ b/ietf/person/utils.py
@@ -1,8 +1,13 @@
 # Copyright The IETF Trust 2015-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import datetime
 import os
 import pprint 
+import six
 import sys
 import syslog
 
@@ -50,13 +55,13 @@ def merge_persons(source, target, file=sys.stdout, verbose=False):
         objs, opts, user, admin_site, using)
     deletable_objects_summary = deletable_objects[1]
     if len(deletable_objects_summary) > 1:    # should only inlcude one object (Person)
-        print("Not Deleting Person: {}({})".format(source.ascii,source.pk), file=file)
-        print("Related objects remain:", file=file)
+        six.print_("Not Deleting Person: {}({})".format(source.ascii,source.pk), file=file)
+        six.print_("Related objects remain:", file=file)
         pprint.pprint(deletable_objects[1], stream=file)
         success = False
     else:
         success = True
-        print("Deleting Person: {}({})".format(source.ascii,source.pk), file=file)
+        six.print_("Deleting Person: {}({})".format(source.ascii,source.pk), file=file)
         source.delete()
     
     return success, changes
@@ -109,7 +114,7 @@ def move_related_objects(source, target, file, verbose=False):
         field_name = related_object.field.name
         queryset = getattr(source, accessor).all()
         if verbose:
-            print("Merging {}:{}".format(accessor,queryset.count()),file=file)
+            six.print_("Merging {}:{}".format(accessor,queryset.count()), file=file)
         kwargs = { field_name:target }
         queryset.update(**kwargs)
 
diff --git a/ietf/release/views.py b/ietf/release/views.py
index 86b4d04e9..742dcba4f 100644
--- a/ietf/release/views.py
+++ b/ietf/release/views.py
@@ -2,6 +2,9 @@
 # -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
+import io
 import os
 import re
 import json
@@ -43,7 +46,7 @@ def get_coverage_data():
                 with gzip.open(settings.TEST_COVERAGE_MASTER_FILE, "rb") as file:
                     coverage_data = json.load(file)
             else:
-                with open(settings.TEST_COVERAGE_MASTER_FILE) as file:
+                with io.open(settings.TEST_COVERAGE_MASTER_FILE) as file:
                     coverage_data = json.load(file)
         cache.set(cache_key, coverage_data, 60*60*24)
     return coverage_data
diff --git a/ietf/review/mailarch.py b/ietf/review/mailarch.py
index f905a603c..fc50f1075 100644
--- a/ietf/review/mailarch.py
+++ b/ietf/review/mailarch.py
@@ -1,11 +1,25 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+
 # various utilities for working with the mailarch mail archive at
 # mailarchive.ietf.org
 
-import datetime, tarfile, mailbox, tempfile, hashlib, base64, email.utils
-import urllib.request, urllib.parse, urllib.error
-import urllib.request, urllib.error, urllib.parse, contextlib
-import debug                            # pyflakes:ignore
+import contextlib
+import datetime
+import tarfile
+import mailbox
+import tempfile
+import hashlib
+import base64
+import email.utils
+
+from six.moves.urllib.parse import urlencode
+from six.moves.urllib.request import urlopen
+
 import debug                            # pyflakes:ignore
 
 from pyquery import PyQuery
@@ -36,7 +50,7 @@ def construct_query_urls(review_req, query=None):
     if not query:
         query = review_req.doc.name
 
-    encoded_query = "?" + urllib.parse.urlencode({
+    encoded_query = "?" + urlencode({
         "qdr": "c", # custom time frame
         "start_date": (datetime.date.today() - datetime.timedelta(days=180)).isoformat(),
         "email_list": list_name,
@@ -95,7 +109,7 @@ def retrieve_messages(query_data_url):
     """Retrieve and return selected content from mailarch."""
     res = []
 
-    with contextlib.closing(urllib.request.urlopen(query_data_url, timeout=15)) as fileobj:
+    with contextlib.closing(urlopen(query_data_url, timeout=15)) as fileobj:
         content_type = fileobj.info()["Content-type"]
         if not content_type.startswith("application/x-tar"):
             if content_type.startswith("text/html"):
diff --git a/ietf/review/utils.py b/ietf/review/utils.py
index 6f6380c5f..236f85519 100644
--- a/ietf/review/utils.py
+++ b/ietf/review/utils.py
@@ -1,9 +1,14 @@
-# -*- coding: utf-8 -*-
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
+import datetime
+import itertools
+import re
+import six
 
-import datetime, re, itertools
 from collections import defaultdict, namedtuple
 
 from django.db.models import Q, Max, F
@@ -959,7 +964,7 @@ def make_assignment_choices(email_queryset, review_req):
         if stats:
             explanations.append(", ".join(stats))
 
-        label = str(e.person)
+        label = six.ensure_text(e.person)
         if explanations:
             label = "{}: {}".format(label, "; ".join(explanations))
 
diff --git a/ietf/secr/drafts/tests_views.py b/ietf/secr/drafts/tests_views.py
index 592f16d68..ca0968737 100644
--- a/ietf/secr/drafts/tests_views.py
+++ b/ietf/secr/drafts/tests_views.py
@@ -1,5 +1,11 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
+import io
 import os
 import shutil
 from collections import OrderedDict
@@ -130,7 +136,7 @@ class SecrDraftsTestCase(TestCase):
     def test_resurrect(self):
         draft = WgDraftFactory()
         path = os.path.join(self.repository_dir, draft.filename_with_rev())
-        with open(path, 'w') as file:
+        with io.open(path, 'w') as file:
             file.write('test')
         expire_draft(draft)
         email_url = urlreverse('ietf.secr.drafts.views.email', kwargs={'id':draft.name}) + "?action=resurrect"
diff --git a/ietf/secr/drafts/views.py b/ietf/secr/drafts/views.py
index 5fbe61c1c..e6a3bfe27 100644
--- a/ietf/secr/drafts/views.py
+++ b/ietf/secr/drafts/views.py
@@ -1,8 +1,12 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 import glob
+import io
 import os
 import shutil
 from dateutil.parser import parse
@@ -53,7 +57,7 @@ def handle_uploaded_file(f):
     '''
     Save uploaded draft files to temporary directory
     '''
-    destination = open(os.path.join(settings.IDSUBMIT_MANUAL_STAGING_DIR, f.name), 'wb+')
+    destination = io.open(os.path.join(settings.IDSUBMIT_MANUAL_STAGING_DIR, f.name), 'wb+')
     for chunk in f.chunks():
         destination.write(chunk)
     destination.close()
diff --git a/ietf/secr/meetings/blue_sheets.py b/ietf/secr/meetings/blue_sheets.py
index 676542bad..49d8755ca 100644
--- a/ietf/secr/meetings/blue_sheets.py
+++ b/ietf/secr/meetings/blue_sheets.py
@@ -1,5 +1,13 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import io
+
 from django.conf import settings
+from django.utils.encoding import force_bytes
 
 r'''
 RTF quick reference (from Word2007RTFSpec9.doc):
@@ -17,9 +25,9 @@ RTF quick reference (from Word2007RTFSpec9.doc):
 '''
 
 def create_blue_sheets(meeting, groups):
-    file = open(settings.SECR_BLUE_SHEET_PATH, 'w')
+    file = io.open(settings.SECR_BLUE_SHEET_PATH, 'wb')
     
-    header = '''{\\rtf1\\ansi\\ansicpg1252\\uc1 \\deff0\\deflang1033\\deflangfe1033
+    header = b'''{\\rtf1\\ansi\\ansicpg1252\\uc1 \\deff0\\deflang1033\\deflangfe1033
  {\\fonttbl{\\f0\\froman\\fcharset0\\fprq2{\\*\\panose 02020603050405020304}Times New Roman;}}
  {\\colortbl;\\red0\\green0\\blue0;\\red0\\green0\\blue255;\\red0\\green255\\blue255;\\red0\\green255\\blue0;
 \\red255\\green0\\blue255;\\red255\\green0\\blue0;\\red255\\green255\\blue0;\\red255\\green255\\blue255;
@@ -32,7 +40,7 @@ def create_blue_sheets(meeting, groups):
     file.write(header)
     
     for group in groups:
-        group_header = ''' {\\header \\pard\\plain \\s15\\nowidctlpar\\widctlpar\\tqc\\tx4320\\tqr\\tx8640\\adjustright \\fs20\\cgrid
+        group_header = b''' {\\header \\pard\\plain \\s15\\nowidctlpar\\widctlpar\\tqc\\tx4320\\tqr\\tx8640\\adjustright \\fs20\\cgrid
  { Mailing List: %s \\tab\\tab Meeting # %s  %s (%s) \\par }
  \\pard \\s15\\nowidctlpar\\widctlpar\\tqc\\tx4320\\tqr\\tx8640\\adjustright
  {\\b\\fs24
@@ -60,30 +68,31 @@ def create_blue_sheets(meeting, groups):
 \\par }
   \\pard \\fi-90\\li90\\nowidctlpar\\widctlpar\\adjustright
  {\\fs16
-''' % (group.list_email,
-       meeting.number,
-       group.acronym,
-       group.type,
-       meeting.number,
-       group.acronym,
-       group.type,
-       meeting.number,
-       group.name,
-       group.list_email)
+''' % (force_bytes(group.list_email),
+       force_bytes(meeting.number),
+       force_bytes(group.acronym),
+       force_bytes(group.type),
+       force_bytes(meeting.number),
+       force_bytes(group.acronym),
+       force_bytes(group.type),
+       force_bytes(meeting.number),
+       force_bytes(group.name),
+       force_bytes(group.list_email),
+       )
        
         file.write(group_header)
         for x in range(1,117):
-            line = '''\\par %s._________________________________________________ \\tab _____________________________________________________
+            line = b'''\\par %s._________________________________________________ \\tab _____________________________________________________
  \\par
- ''' % x
+ ''' % force_bytes(x)
             file.write(line)
             
-        footer = '''}
+        footer = b'''}
 \\pard \\nowidctlpar\\widctlpar\\adjustright
 {\\fs16 \\sect }
 \\sectd \\pgnrestart\\linex0\\endnhere\\titlepg\\sectdefaultcl
 '''
         file.write(footer)
 
-    file.write('\n}')
+    file.write(b'\n}')
     file.close()
diff --git a/ietf/secr/proceedings/proc_utils.py b/ietf/secr/proceedings/proc_utils.py
index d31c15eba..6c2b9c384 100644
--- a/ietf/secr/proceedings/proc_utils.py
+++ b/ietf/secr/proceedings/proc_utils.py
@@ -1,6 +1,9 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 '''
 proc_utils.py
 
@@ -10,7 +13,7 @@ import datetime
 import os
 import re
 import subprocess
-from urllib.parse import urlencode
+from six.moves.urllib.parse import urlencode
 
 import debug        # pyflakes:ignore
 
diff --git a/ietf/secr/proceedings/tests.py b/ietf/secr/proceedings/tests.py
index e6271fcf3..f4d21ee6b 100644
--- a/ietf/secr/proceedings/tests.py
+++ b/ietf/secr/proceedings/tests.py
@@ -1,7 +1,11 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import debug                            # pyflakes:ignore
+import io
 import json
 import os
 import shutil
@@ -54,7 +58,7 @@ class VideoRecordingTestCase(TestCase):
 
     def test_get_urls_from_json(self):
         path = os.path.join(settings.BASE_DIR, "../test/data/youtube-playlistitems.json")
-        with open(path) as f:
+        with io.open(path) as f:
             doc = json.load(f)
         urls = _get_urls_from_json(doc)
         self.assertEqual(len(urls),2)
@@ -110,7 +114,7 @@ class RecordingTestCase(TestCase):
         path = os.path.join(settings.MEETING_RECORDINGS_DIR,'ietf' + timeslot.meeting.number,filename)
         if not os.path.exists(os.path.dirname(path)):
             os.makedirs(os.path.dirname(path))
-        with open(path, "w") as f:
+        with io.open(path, "w") as f:
             f.write('dummy')
 
     def get_filename_for_timeslot(self, timeslot):
diff --git a/ietf/secr/proceedings/utils.py b/ietf/secr/proceedings/utils.py
index 2ae0ead9f..9b8c7f258 100644
--- a/ietf/secr/proceedings/utils.py
+++ b/ietf/secr/proceedings/utils.py
@@ -1,5 +1,7 @@
+# Copyright The IETF Trust 2016-2019, All Rights Reserved
 
 import glob
+import io
 import os
 
 from django.conf import settings
@@ -34,7 +36,7 @@ def handle_upload_file(file,filename,meeting,subdir, request=None, encoding=None
         for f in old_files:
             os.remove(f)
 
-    destination = open(os.path.join(path,filename), 'wb+')
+    destination = io.open(os.path.join(path,filename), 'wb+')
     if extension in settings.MEETING_VALID_MIME_TYPE_EXTENSIONS['text/html']:
         file.open()
         text = file.read()
diff --git a/ietf/secr/sreq/tests.py b/ietf/secr/sreq/tests.py
index 4108b48f3..2725feae5 100644
--- a/ietf/secr/sreq/tests.py
+++ b/ietf/secr/sreq/tests.py
@@ -1,6 +1,13 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
-from django.urls import reverse
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
+import six
+
+from django.urls import reverse
 
 import debug                            # pyflakes:ignore
 
@@ -177,14 +184,14 @@ class SubmitRequestCase(TestCase):
         r = self.client.post(url,post_data)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertTrue('Confirm' in str(q("title")))
+        self.assertTrue('Confirm' in six.ensure_text(q("title")))
         # confirm
         post_data['submit'] = 'Submit'
         r = self.client.post(confirm_url,post_data)
         self.assertRedirects(r, reverse('ietf.secr.sreq.views.main'))
         self.assertEqual(len(outbox),len_before+1)
         notification = outbox[-1]
-        notification_payload = str(notification.get_payload(decode=True),"utf-8","replace")
+        notification_payload = six.ensure_text(notification.get_payload(decode=True),"utf-8","replace")
         session = Session.objects.get(meeting=meeting,group=group)
         self.assertEqual(session.resources.count(),1)
         self.assertEqual(session.people_constraints.count(),1)
diff --git a/ietf/secr/utils/group.py b/ietf/secr/utils/group.py
index b6542b3f4..1a0b3df0e 100644
--- a/ietf/secr/utils/group.py
+++ b/ietf/secr/utils/group.py
@@ -1,5 +1,11 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 # Python imports
+import io
 import os
 
 # Django imports
@@ -27,7 +33,7 @@ def get_charter_text(group):
     '''
     charter = group.charter
     path = os.path.join(settings.CHARTER_PATH, '%s-%s.txt' % (charter.canonical_name(), charter.rev))
-    f = open(path,'r')
+    f = io.open(path,'r')
     text = f.read()
     f.close()
 
diff --git a/ietf/stats/backfill_data.py b/ietf/stats/backfill_data.py
index 15b100c02..0d170eeb3 100755
--- a/ietf/stats/backfill_data.py
+++ b/ietf/stats/backfill_data.py
@@ -1,12 +1,15 @@
 #!/usr/bin/env python
 # Copyright The IETF Trust 2017-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 
+from __future__ import absolute_import, print_function, unicode_literals
 
-
+import io
 import sys
 import os
 import os.path
 import argparse
+import six
 import time
 
 basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
@@ -15,7 +18,7 @@ os.environ["DJANGO_SETTINGS_MODULE"] = "ietf.settings"
 
 virtualenv_activation = os.path.join(basedir, "env", "bin", "activate_this.py")
 if os.path.exists(virtualenv_activation):
-    exec(compile(open(virtualenv_activation, "rb").read(), virtualenv_activation, 'exec'), dict(__file__=virtualenv_activation))
+    exec(compile(io.open(virtualenv_activation, "rb").read(), virtualenv_activation, 'exec'), dict(__file__=virtualenv_activation))
 
 import django
 django.setup()
@@ -43,7 +46,7 @@ if args.document:
     docs_qs = docs_qs.filter(docalias__name=args.document)
 
 ts = time.strftime("%Y-%m-%d_%H:%M%z")
-logfile = open('backfill-authorstats-%s.log'%ts, 'w')
+logfile = io.open('backfill-authorstats-%s.log'%ts, 'w')
 print("Writing log to %s" % os.path.abspath(logfile.name))
 
 def say(msg):
@@ -53,7 +56,7 @@ def say(msg):
     logfile.write(msg)
     logfile.write('\n')
 
-def str(text):
+def unicode(text):
     if text is None:
         return text
     # order matters here:
@@ -83,10 +86,10 @@ for doc in docs_qs.prefetch_related("docalias", "formal_languages", "documentaut
         say("Skipping %s, no txt file found at %s" % (doc.name, path))
         continue
 
-    with open(path, 'rb') as f:
+    with io.open(path, 'rb') as f:
         say("\nProcessing %s" % doc.name)
         sys.stdout.flush()
-        d = Draft(str(f.read()), path)
+        d = Draft(unicode(f.read()), path)
 
         updated = False
 
@@ -128,10 +131,10 @@ for doc in docs_qs.prefetch_related("docalias", "formal_languages", "documentaut
             # it's an extra author - skip those extra authors
             seen = set()
             for full, _, _, _, _, email, country, company in d.get_author_list():
-                assert full is None or    isinstance(full,    str)
-                assert email is None or   isinstance(email,   str)
-                assert country is None or isinstance(country, str)
-                assert company is None or isinstance(company, str)
+                assert full is None or    isinstance(full,    six.text_type)
+                assert email is None or   isinstance(email,   six.text_type)
+                assert country is None or isinstance(country, six.text_type)
+                assert company is None or isinstance(company, six.text_type)
                 #full, email, country, company = [ unicode(s) for s in [full, email, country, company, ] ]
                 if email in seen:
                     continue
diff --git a/ietf/submit/checkers.py b/ietf/submit/checkers.py
index 97818dc8f..5036680ae 100644
--- a/ietf/submit/checkers.py
+++ b/ietf/submit/checkers.py
@@ -1,14 +1,18 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
+import io
 import os
 import re
-import sys
-from xym import xym
 import shutil
+import six
+import sys
 import tempfile
-import io
 
+from xym import xym
 from django.conf import settings
 
 import debug                            # pyflakes:ignore
@@ -144,19 +148,23 @@ class DraftYangChecker(object):
                 # This places the yang models as files in workdir
                 saved_stdout = sys.stdout
                 saved_stderr = sys.stderr
-                sys.stdout = io.StringIO()
-                sys.stderr = io.StringIO()
+                sys.stdout = six.StringIO()
+                sys.stderr = six.StringIO()
                 extractor.extract_yang_model(file.readlines())
                 model_list = extractor.get_extracted_models(False, True)
                 out = sys.stdout.getvalue()
                 err = sys.stderr.getvalue()
-                sys.stdout = saved_stdout
-                sys.stderr = saved_stderr
                 # signature change in xym:
             except Exception as exc:
+                sys.stdout = saved_stdout
+                sys.stderr = saved_stderr
                 msg = "Exception when running xym on %s: %s" % (name, exc)
                 log(msg)
+                raise
                 return None, msg, 0, 0, info
+            finally:
+                sys.stdout = saved_stdout
+                sys.stderr = saved_stderr
         if not model_list:
             # Found no yang models, don't deliver any YangChecker result
             return None, "", 0, 0, info
@@ -198,7 +206,7 @@ class DraftYangChecker(object):
                                 settings.SUBMIT_YANG_IANA_MODEL_DIR,
                             ])
             if os.path.exists(path):
-                with open(path) as file:
+                with io.open(path) as file:
                     text = file.readlines()
                 # pyang
                 cmd_template = settings.SUBMIT_PYANG_COMMAND
diff --git a/ietf/submit/forms.py b/ietf/submit/forms.py
index 7ede96b55..d9b6dab2e 100644
--- a/ietf/submit/forms.py
+++ b/ietf/submit/forms.py
@@ -1,11 +1,19 @@
 # Copyright The IETF Trust 2011-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import io
 import os
 import re
 import datetime
 import email
 import pytz
-import xml2rfc
+import six
 import tempfile
+import xml2rfc
+
 from email.utils import formataddr
 from unidecode import unidecode
 
@@ -13,6 +21,7 @@ from django import forms
 from django.conf import settings
 from django.utils.html import mark_safe
 from django.urls import reverse as urlreverse
+from django.utils.encoding import force_str
 
 import debug                            # pyflakes:ignore
 
@@ -140,7 +149,7 @@ class SubmissionBaseUploadForm(forms.Form):
                 # over to the xml parser.  XXX FIXME: investigate updating
                 # xml2rfc to be able to work with file handles to in-memory
                 # files.
-                with open(tfn, 'wb+') as tf:
+                with io.open(tfn, 'wb+') as tf:
                     for chunk in xml_file.chunks():
                         tf.write(chunk)
                 os.environ["XML_LIBRARY"] = settings.XML_LIBRARY
@@ -185,10 +194,10 @@ class SubmissionBaseUploadForm(forms.Form):
                     self.revision = None
                     self.filename = draftname
                 self.title = self.xmlroot.findtext('front/title').strip()
-                if type(self.title) is str:
+                if type(self.title) is six.text_type:
                     self.title = unidecode(self.title)
                 self.abstract = (self.xmlroot.findtext('front/abstract') or '').strip()
-                if type(self.abstract) is str:
+                if type(self.abstract) is six.text_type:
                     self.abstract = unidecode(self.abstract)
                 author_info = self.xmlroot.findall('front/author')
                 for author in author_info:
@@ -508,7 +517,7 @@ class SubmissionEmailForm(forms.Form):
         '''Returns a ietf.message.models.Message object'''
         self.message_text = self.cleaned_data['message']
         try:
-            message = email.message_from_string(self.message_text)
+            message = email.message_from_string(force_str(self.message_text))
         except Exception as e:
             self.add_error('message', e)
             return None
diff --git a/ietf/submit/management/commands/manualpost_email.py b/ietf/submit/management/commands/manualpost_email.py
index 771da84be..10d3ed3d5 100644
--- a/ietf/submit/management/commands/manualpost_email.py
+++ b/ietf/submit/management/commands/manualpost_email.py
@@ -1,4 +1,10 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import io
 import sys
 
 from django.core.management.base import BaseCommand, CommandError
@@ -20,7 +26,7 @@ class Command(BaseCommand):
         if not email:
             msg = sys.stdin.read()
         else:
-            msg = open(email, "r").read()
+            msg = io.open(email, "r").read()
 
         try:
             process_response_email(msg)
diff --git a/ietf/submit/tests.py b/ietf/submit/tests.py
index 49470cf9c..4463cb367 100644
--- a/ietf/submit/tests.py
+++ b/ietf/submit/tests.py
@@ -1,11 +1,16 @@
 # Copyright The IETF Trust 2011-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
 import email
+import io
 import os
 import re
 import shutil
+import six
 import sys
 
 
@@ -14,6 +19,7 @@ from pyquery import PyQuery
 
 from django.conf import settings
 from django.urls import reverse as urlreverse
+from django.utils.encoding import force_str
 
 import debug                            # pyflakes:ignore
 
@@ -40,7 +46,7 @@ from ietf.utils.draft import Draft
 
 def submission_file(name, rev, group, format, templatename, author=None, email=None, title=None, year=None, ascii=True):
     # construct appropriate text draft
-    f = open(os.path.join(settings.BASE_DIR, "submit", templatename))
+    f = io.open(os.path.join(settings.BASE_DIR, "submit", templatename))
     template = f.read()
     f.close()
 
@@ -290,16 +296,16 @@ class SubmitTests(TestCase):
         self.assertTrue(draft.relations_that_doc("possibly-replaces").first().target, sug_replaced_alias)
         self.assertEqual(len(outbox), mailbox_before + 5)
         self.assertIn(("I-D Action: %s" % name), outbox[-4]["Subject"])
-        self.assertIn(author.ascii, str(outbox[-4]))
+        self.assertIn(author.ascii, six.ensure_text(outbox[-4]))
         self.assertIn(("I-D Action: %s" % name), outbox[-3]["Subject"])
-        self.assertIn(author.ascii, str(outbox[-3]))
+        self.assertIn(author.ascii, six.ensure_text(outbox[-3]))
         self.assertIn("New Version Notification",outbox[-2]["Subject"])
-        self.assertIn(name, str(outbox[-2]))
-        self.assertIn("mars", str(outbox[-2]))
+        self.assertIn(name, six.ensure_text(outbox[-2]))
+        self.assertIn("mars", six.ensure_text(outbox[-2]))
         # Check "Review of suggested possible replacements for..." mail
         self.assertIn("review", outbox[-1]["Subject"].lower())
-        self.assertIn(name, str(outbox[-1]))
-        self.assertIn(sug_replaced_alias.name, str(outbox[-1]))
+        self.assertIn(name, six.ensure_text(outbox[-1]))
+        self.assertIn(sug_replaced_alias.name, six.ensure_text(outbox[-1]))
         self.assertIn("ames-chairs@", outbox[-1]["To"].lower())
         self.assertIn("mars-chairs@", outbox[-1]["To"].lower())
 
@@ -379,7 +385,7 @@ class SubmitTests(TestCase):
 
         # write the old draft in a file so we can check it's moved away
         old_rev = draft.rev
-        with open(os.path.join(self.repository_dir, "%s-%s.txt" % (name, old_rev)), 'w') as f:
+        with io.open(os.path.join(self.repository_dir, "%s-%s.txt" % (name, old_rev)), 'w') as f:
             f.write("a" * 2000)
 
         old_docevents = list(draft.docevent_set.all())
@@ -407,7 +413,7 @@ class SubmitTests(TestCase):
         self.assertTrue("unknown-email-" not in confirm_email["To"])
         if change_authors:
             # Since authors changed, ensure chairs are copied (and that the message says why)
-            self.assertTrue("chairs have been copied" in str(confirm_email))
+            self.assertTrue("chairs have been copied" in six.ensure_text(confirm_email))
             if group_type in ['wg','rg','ag']:
                 self.assertTrue("mars-chairs@" in confirm_email["To"].lower())
             elif group_type == 'area':
@@ -417,7 +423,7 @@ class SubmitTests(TestCase):
             if stream_type=='ise':
                self.assertTrue("rfc-ise@" in confirm_email["To"].lower())
         else:
-            self.assertNotIn("chairs have been copied", str(confirm_email))
+            self.assertNotIn("chairs have been copied", six.ensure_text(confirm_email))
             self.assertNotIn("mars-chairs@", confirm_email["To"].lower())
 
         confirmation_url = self.extract_confirmation_url(confirm_email)
@@ -486,17 +492,17 @@ class SubmitTests(TestCase):
         self.assertEqual(len(outbox), mailbox_before + 3)
         self.assertTrue(("I-D Action: %s" % name) in outbox[-3]["Subject"])
         self.assertTrue(("I-D Action: %s" % name) in draft.message_set.order_by("-time")[0].subject)
-        self.assertTrue(author.ascii in str(outbox[-3]))
+        self.assertTrue(author.ascii in six.ensure_text(outbox[-3]))
         self.assertTrue("i-d-announce@" in outbox[-3]['To'])
         self.assertTrue("New Version Notification" in outbox[-2]["Subject"])
-        self.assertTrue(name in str(outbox[-2]))
+        self.assertTrue(name in six.ensure_text(outbox[-2]))
         interesting_address = {'ietf':'mars', 'irtf':'irtf-chair', 'iab':'iab-chair', 'ise':'rfc-ise'}[draft.stream_id]
-        self.assertTrue(interesting_address in str(outbox[-2]))
+        self.assertTrue(interesting_address in six.ensure_text(outbox[-2]))
         if draft.stream_id == 'ietf':
-            self.assertTrue(draft.ad.role_email("ad").address in str(outbox[-2]))
-            self.assertTrue(ballot_position.ad.role_email("ad").address in str(outbox[-2]))
+            self.assertTrue(draft.ad.role_email("ad").address in six.ensure_text(outbox[-2]))
+            self.assertTrue(ballot_position.ad.role_email("ad").address in six.ensure_text(outbox[-2]))
         self.assertTrue("New Version Notification" in outbox[-1]["Subject"])
-        self.assertTrue(name in str(outbox[-1]))
+        self.assertTrue(name in six.ensure_text(outbox[-1]))
         r = self.client.get(urlreverse('ietf.doc.views_search.recent_drafts'))
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, draft.name)
@@ -556,7 +562,7 @@ class SubmitTests(TestCase):
         # both submitter and author get email
         self.assertTrue(author.email().address.lower() in confirm_email["To"])
         self.assertTrue("submitter@example.com" in confirm_email["To"])
-        self.assertFalse("chairs have been copied" in str(confirm_email))
+        self.assertFalse("chairs have been copied" in six.ensure_text(confirm_email))
 
         confirmation_url = self.extract_confirmation_url(outbox[-1])
 
@@ -885,14 +891,14 @@ class SubmitTests(TestCase):
         self.assertEqual(Submission.objects.filter(name=name).count(), 1)
 
         self.assertTrue(os.path.exists(os.path.join(self.staging_dir, "%s-%s.txt" % (name, rev))))
-        self.assertTrue(name in open(os.path.join(self.staging_dir, "%s-%s.txt" % (name, rev))).read())
+        self.assertTrue(name in io.open(os.path.join(self.staging_dir, "%s-%s.txt" % (name, rev))).read())
         self.assertTrue(os.path.exists(os.path.join(self.staging_dir, "%s-%s.xml" % (name, rev))))
-        self.assertTrue(name in open(os.path.join(self.staging_dir, "%s-%s.xml" % (name, rev))).read())
-        self.assertTrue('' in open(os.path.join(self.staging_dir, "%s-%s.xml" % (name, rev))).read())
+        self.assertTrue(name in io.open(os.path.join(self.staging_dir, "%s-%s.xml" % (name, rev))).read())
+        self.assertTrue('' in io.open(os.path.join(self.staging_dir, "%s-%s.xml" % (name, rev))).read())
         self.assertTrue(os.path.exists(os.path.join(self.staging_dir, "%s-%s.pdf" % (name, rev))))
-        self.assertTrue('This is PDF' in open(os.path.join(self.staging_dir, "%s-%s.pdf" % (name, rev))).read())
+        self.assertTrue('This is PDF' in io.open(os.path.join(self.staging_dir, "%s-%s.pdf" % (name, rev))).read())
         self.assertTrue(os.path.exists(os.path.join(self.staging_dir, "%s-%s.ps" % (name, rev))))
-        self.assertTrue('This is PostScript' in open(os.path.join(self.staging_dir, "%s-%s.ps" % (name, rev))).read())
+        self.assertTrue('This is PostScript' in io.open(os.path.join(self.staging_dir, "%s-%s.ps" % (name, rev))).read())
 
     def test_expire_submissions(self):
         s = Submission.objects.create(name="draft-ietf-mars-foo",
@@ -1174,7 +1180,7 @@ Please submit my draft at http://test.com/mydraft.txt
 
 Thank you
 """.format(datetime.datetime.now().ctime())
-        message = email.message_from_string(message_string)
+        message = email.message_from_string(force_str(message_string))
         submission, submission_email_event = (
             add_submission_email(request=None,
                                  remote_ip ="192.168.0.1",
@@ -1257,7 +1263,7 @@ ZSBvZiBsaW5lcyAtIGJ1dCBpdCBjb3VsZCBiZSBhIGRyYWZ0Cg==
 --------------090908050800030909090207--
 """.format(frm, datetime.datetime.now().ctime())
 
-        message = email.message_from_string(message_string)
+        message = email.message_from_string(force_str(message_string))
         submission, submission_email_event = (
             add_submission_email(request=None,
                                  remote_ip ="192.168.0.1",
diff --git a/ietf/submit/utils.py b/ietf/submit/utils.py
index f1d46e9b0..b95d636b7 100644
--- a/ietf/submit/utils.py
+++ b/ietf/submit/utils.py
@@ -1,9 +1,14 @@
 # Copyright The IETF Trust 2011-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import datetime
+import io
 import os
 import re
+import six                              # pyflakes:ignore
 import xml2rfc
 
 from django.conf import settings
@@ -456,7 +461,7 @@ def ensure_person_email_info_exists(name, email, docname):
         person = Person()
         person.name = name
         person.name_from_draft = name
-        log.assertion('isinstance(person.name, str)')
+        log.assertion('isinstance(person.name, six.text_type)')
         person.ascii = unidecode_name(person.name)
         person.save()
     else:
@@ -605,7 +610,7 @@ def save_files(form):
 
         name = os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s.%s' % (form.filename, form.revision, ext))
         file_name[ext] = name
-        with open(name, 'wb+') as destination:
+        with io.open(name, 'wb+') as destination:
             for chunk in f.chunks():
                 destination.write(chunk)
     return file_name
@@ -641,7 +646,7 @@ def get_draft_meta(form, saved_files):
         # Some meta-information, such as the page-count, can only
         # be retrieved from the generated text file.  Provide a
         # parsed draft object to get at that kind of information.
-        with open(file_name['txt']) as txt_file:
+        with io.open(file_name['txt']) as txt_file:
             form.parsed_draft = Draft(txt_file.read(), txt_file.name)
 
     else:
@@ -667,7 +672,7 @@ def get_draft_meta(form, saved_files):
                 if s is None:
                     return ""
 
-                if isinstance(s, str):
+                if isinstance(s, six.text_type):
                     return s
                 else:
                     try:
diff --git a/ietf/sync/iana.py b/ietf/sync/iana.py
index cc14c7b60..972f2dda6 100644
--- a/ietf/sync/iana.py
+++ b/ietf/sync/iana.py
@@ -1,13 +1,20 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import base64
 import datetime
 import email
 import json
 import re
-import urllib.request, urllib.error, urllib.parse
 
-from django.utils.http import urlquote
+from six.moves.urllib.request import Request, urlopen
+
 from django.conf import settings
+from django.utils.encoding import force_str
+from django.utils.http import urlquote
 
 import debug                            # pyflakes:ignore
 
@@ -23,7 +30,7 @@ from ietf.utils.timezone import local_timezone_to_utc, email_time_to_local_timez
 #CHANGES_URL = "https://datatracker.dev.icann.org:8080/data-tracker/changes"
 
 def fetch_protocol_page(url):
-    f = urllib.request.urlopen(settings.IANA_SYNC_PROTOCOLS_URL)
+    f = urlopen(settings.IANA_SYNC_PROTOCOLS_URL)
     text = f.read()
     f.close()
     return text
@@ -67,12 +74,12 @@ def update_rfc_log_from_protocol_page(rfc_names, rfc_must_published_later_than):
 def fetch_changes_json(url, start, end):
     url += "?start=%s&end=%s" % (urlquote(local_timezone_to_utc(start).strftime("%Y-%m-%d %H:%M:%S")),
                                  urlquote(local_timezone_to_utc(end).strftime("%Y-%m-%d %H:%M:%S")))
-    request = urllib.request.Request(url)
+    request = Request(url)
     # HTTP basic auth
     username = "ietfsync"
     password = settings.IANA_SYNC_PASSWORD
     request.add_header("Authorization", "Basic %s" % base64.encodestring("%s:%s" % (username, password)).replace("\n", ""))
-    f = urllib.request.urlopen(request)
+    f = urlopen(request)
     text = f.read()
     f.close()
     return text
@@ -234,8 +241,8 @@ def strip_version_extension(text):
         text = text[:-3]
     return text
 
-def parse_review_email(bytes):
-    msg = email.message_from_bytes(bytes)
+def parse_review_email(text):
+    msg = email.message_from_string(force_str(text))
     # doc
     doc_name = find_document_name(msg["Subject"]) or ""
     doc_name = strip_version_extension(doc_name)
diff --git a/ietf/sync/rfceditor.py b/ietf/sync/rfceditor.py
index c4a60ceac..6caf9ec87 100644
--- a/ietf/sync/rfceditor.py
+++ b/ietf/sync/rfceditor.py
@@ -1,12 +1,17 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
-import re
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import base64
 import datetime
-import urllib.request, urllib.parse, urllib.error
-import urllib.request, urllib.error, urllib.parse
+import re
 import socket
+import six
+
+from six.moves.urllib.request import Request, urlopen
+from six.moves.urllib.parse import urlencode
 from xml.dom import pulldom, Node
 
 from django.conf import settings
@@ -40,7 +45,7 @@ def get_child_text(parent_node, tag_name):
 
 def fetch_queue_xml(url):
     socket.setdefaulttimeout(30)
-    return urllib.request.urlopen(url)
+    return urlopen(url)
 
 def parse_queue(response):
     """Parse RFC Editor queue XML into a bunch of tuples + warnings."""
@@ -228,7 +233,7 @@ def update_drafts_from_queue(drafts):
 
 def fetch_index_xml(url):
     socket.setdefaulttimeout(30)
-    return urllib.request.urlopen(url)
+    return urlopen(url)
 
 def parse_index(response):
     """Parse RFC Editor index XML into a bunch of tuples."""
@@ -517,7 +522,7 @@ def post_approved_draft(url, name):
     the data from the Datatracker and start processing it. Returns
     response and error (empty string if no error)."""
 
-    request = urllib.request.Request(url)
+    request = Request(url)
     request.add_header("Content-type", "application/x-www-form-urlencoded")
     request.add_header("Accept", "text/plain")
     # HTTP basic auth
@@ -531,7 +536,7 @@ def post_approved_draft(url, name):
     log("Posting RFC-Editor notifcation of approved draft '%s' to '%s'" % (name, url))
     text = error = ""
     try:
-        f = urllib.request.urlopen(request, data=urllib.parse.urlencode({ 'draft': name }), timeout=20)
+        f = urlopen(request, data=urlencode({ 'draft': name }), timeout=20)
         text = f.read()
         status_code = f.getcode()
         f.close()
@@ -547,6 +552,6 @@ def post_approved_draft(url, name):
         # catch everything so we don't leak exceptions, convert them
         # into string instead
         log("Exception on RFC-Editor notification for draft '%s': '%s'" % (name, e))
-        error = str(e)
+        error = six.ensure_text(e)
 
     return text, error
diff --git a/ietf/sync/tests.py b/ietf/sync/tests.py
index 8f66503f5..df2d33a53 100644
--- a/ietf/sync/tests.py
+++ b/ietf/sync/tests.py
@@ -1,16 +1,21 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import os
+import io
 import json
 import datetime
-import io
 import quopri
 import shutil
 
 from django.conf import settings
 from django.urls import reverse as urlreverse
 
+import debug                            # pyflakes:ignore
+
 from ietf.doc.factories import WgDraftFactory
 from ietf.doc.models import Document, DocAlias, DocEvent, DeletedEvent, DocTagName, RelatedDocument, State, StateDocEvent
 from ietf.doc.utils import add_state_change_event
@@ -177,7 +182,7 @@ ICANN
                         rtime = 7*subjects.index(subject) + 5*tags.index(tag) + embedded_names.index(embedded_name)
                         person=Person.objects.get(user__username="iana")
                         fromaddr = person.email().formatted_email()
-                        msg = msg_template % dict(person=quopri.encodestring(person.name.encode()),
+                        msg = msg_template % dict(person=quopri.encodestring(person.name.encode('utf-8')),
                                                   fromaddr=fromaddr,
                                                   draft=draft.name,
                                                   rev=draft.rev,
@@ -185,7 +190,6 @@ ICANN
                                                   rtime=rtime,
                                                   subject=subject,
                                                   embedded_name=embedded_name,)
-    
                         doc_name, review_time, by, comment = iana.parse_review_email(msg.encode('utf-8'))
     
                         self.assertEqual(doc_name, draft.name)
@@ -232,7 +236,7 @@ class RFCSyncTests(TestCase):
         settings.INTERNET_DRAFT_ARCHIVE_DIR = self.save_archive_dir
 
     def write_draft_file(self, name, size):
-        with open(os.path.join(self.id_dir, name), 'w') as f:
+        with io.open(os.path.join(self.id_dir, name), 'w') as f:
             f.write("a" * size)
 
     def test_rfc_index(self):
diff --git a/ietf/utils/admin.py b/ietf/utils/admin.py
index 4aebed393..e01f1388c 100644
--- a/ietf/utils/admin.py
+++ b/ietf/utils/admin.py
@@ -1,4 +1,11 @@
 # Copyright The IETF Trust 2011-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import six
+
 from django.contrib import admin
 from ietf.utils.models import VersionInfo
 
@@ -9,10 +16,10 @@ def name(obj):
         if callable(obj.name):
             name = obj.name()
         else:
-            name = str(obj.name)
+            name = six.ensure_text(obj.name)
         if name:
             return name
-    return str(obj)
+    return six.ensure_text(obj)
     
 def admin_link(field, label=None, ordering="", display=name, suffix=""):
     if not label:
diff --git a/ietf/utils/draft.py b/ietf/utils/draft.py
index ba539d3e1..adf1468ae 100755
--- a/ietf/utils/draft.py
+++ b/ietf/utils/draft.py
@@ -1,6 +1,11 @@
-# Copyright The IETF Trust 2009-2019, All Rights Reserved
 #!/usr/bin/python
+# Copyright The IETF Trust 2009-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 # -*- python -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 """
 NAME
         %(program)s - Extract meta-information from an IETF draft.
@@ -36,9 +41,11 @@ COPYRIGHT
 
 import datetime
 import getopt
+import io
 import os
 import os.path
 import re
+import six
 import stat
 import sys
 import time
@@ -106,7 +113,7 @@ def _err(string):
 
 # ----------------------------------------------------------------------
 def _gettext(file):
-    file = open(file)
+    file = io.open(file)
     text = file.read()
     file.close()
 
@@ -128,7 +135,7 @@ def acronym_match(s, l):
 class Draft():
 
     def __init__(self, text, source, name_from_source=False):
-        assert isinstance(text, str)
+        assert isinstance(text, six.text_type)
         self.source = source
         self.rawtext = text
         self.name_from_source = name_from_source
@@ -1203,7 +1210,7 @@ def getmeta(fn):
         return
 
     timestamp = time.strftime("%Y-%m-%dT%H:%M:%S+00:00", time.gmtime(os.stat(filename)[stat.ST_MTIME]))
-    with open(filename, 'rb') as file:
+    with io.open(filename, 'rb') as file:
         try:
             draft = Draft(file.read().decode('utf8'), filename)
         except UnicodeDecodeError:
@@ -1311,7 +1318,7 @@ def _main(outfile=sys.stdout):
     # Option processing
     # ----------------------------------------------------------------------
     options = ""
-    for line in re.findall(r"\n +(if|elif) +opt in \[(.+)\]:\s+#(.+)\n", open(sys.argv[0]).read()):
+    for line in re.findall(r"\n +(if|elif) +opt in \[(.+)\]:\s+#(.+)\n", io.open(sys.argv[0]).read()):
         if not options:
             options += "OPTIONS\n"
         options += "        %-16s %s\n" % (line[1].replace('"', ''), line[2])
@@ -1357,7 +1364,7 @@ def _main(outfile=sys.stdout):
 
     company_domain = {}
     if opt_getauthors:
-        gadata = open("/www/tools.ietf.org/tools/getauthors/getauthors.data")
+        gadata = io.open("/www/tools.ietf.org/tools/getauthors/getauthors.data")
         for line in gadata:
             if line.startswith("company:"):
                 try:
@@ -1376,7 +1383,7 @@ def _main(outfile=sys.stdout):
             import gzip
             file = gzip.open(file)
         else:
-            file = open(file)
+            file = io.open(file)
 
         basename = os.path.basename(file.name)
         if basename.startswith("draft-"):
diff --git a/ietf/utils/fields.py b/ietf/utils/fields.py
index 89bca6b8c..8663cab58 100644
--- a/ietf/utils/fields.py
+++ b/ietf/utils/fields.py
@@ -1,7 +1,12 @@
 # Copyright The IETF Trust 2012-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
-import re
 import datetime
+import six
+import re
 
 import debug                            # pyflakes:ignore
 
@@ -18,7 +23,7 @@ class MultiEmailField(forms.Field):
         if not value:
             return []
 
-        if isinstance(value, str):
+        if isinstance(value, six.string_types):
             values = value.split(',')
             return [ x.strip() for x in values if x.strip() ]
         else:
@@ -26,7 +31,6 @@ class MultiEmailField(forms.Field):
 
     def validate(self, value):
         "Check if value consists only of valid emails."
-
         # Use the parent's handling of required fields, etc.
         super(MultiEmailField, self).validate(value)
 
diff --git a/ietf/utils/html.py b/ietf/utils/html.py
index b191c1388..3bc223939 100644
--- a/ietf/utils/html.py
+++ b/ietf/utils/html.py
@@ -1,12 +1,17 @@
 # Copyright The IETF Trust 2010-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 # Taken from http://code.google.com/p/soclone/source/browse/trunk/soclone/utils/html.py
-
 """Utilities for working with HTML."""
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import bleach
 import copy
 import lxml.etree
 import lxml.html
 import lxml.html.clean
+import six
 
 import debug                            # pyflakes:ignore
 
@@ -54,7 +59,7 @@ class Cleaner(lxml.html.clean.Cleaner):
     # Copied from lxml 4.2.0 and modified to insert charset meta:
     def clean_html(self, html):
         result_type = type(html)
-        if isinstance(html, str):
+        if isinstance(html, six.string_types):
             doc = lxml.html.fromstring(html)
         else:
             doc = copy.deepcopy(html)
diff --git a/ietf/utils/log.py b/ietf/utils/log.py
index 7d15b9d04..f250aaccb 100644
--- a/ietf/utils/log.py
+++ b/ietf/utils/log.py
@@ -1,9 +1,14 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import sys
 import logging
 import inspect
 import os.path
+import six
 import traceback
 
 try:
@@ -28,23 +33,27 @@ def getclass(frame):
 
 def getcaller():
     parent, pfile, pline, pfunction, lines, index = inspect.stack()[2]
-    moduleinfo = inspect.getmoduleinfo(pfile)
-    pmodule = moduleinfo[0] if moduleinfo else None
+    pmodule = inspect.getmodulename(pfile)
     pclass = getclass(parent)
     return (pmodule, pclass, pfunction, pfile, pline)
 
-def log(msg):
+def log(msg, e=None):
     "Uses syslog by preference.  Logs the given calling point and message."
     global logfunc
     def _flushfunc():
         pass
     _logfunc = logfunc
     if settings.SERVER_MODE == 'test':
-        return
+## Comment in when debugging for instance test smtp server failures:
+#        if e:
+#            _logfunc = debug.say
+#            _flushfunc = sys.stdout.flush   # pyflakes:ignore (intentional redefinition)
+#        else:
+            return
     elif settings.DEBUG == True:
         _logfunc = debug.say
         _flushfunc = sys.stdout.flush   # pyflakes:ignore (intentional redefinition)
-    if isinstance(msg, str):
+    if isinstance(msg, six.text_type):
         msg = msg.encode('unicode_escape')
     try:
         mod, cls, func, file, line = getcaller()
diff --git a/ietf/utils/mail.py b/ietf/utils/mail.py
index 6f0cb060a..4e3961bd5 100644
--- a/ietf/utils/mail.py
+++ b/ietf/utils/mail.py
@@ -1,9 +1,14 @@
 # Copyright The IETF Trust 2007-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import copy
 import datetime
 import logging
 import re
+import six
 import smtplib
 import sys
 import textwrap
@@ -25,6 +30,7 @@ from django.core.exceptions import ImproperlyConfigured, ValidationError
 from django.core.validators import validate_email
 from django.template.loader import render_to_string
 from django.template import Context,RequestContext
+from django.utils.encoding import force_text, force_str, force_bytes
 
 import debug                            # pyflakes:ignore
 
@@ -115,12 +121,12 @@ def send_smtp(msg, bcc=None):
                 # advertise the AUTH capability.
                 server.ehlo()
                 server.login(settings.EMAIL_HOST_USER, settings.EMAIL_HOST_PASSWORD)
-            unhandled = server.sendmail(frm, to, msg.as_bytes())
+            unhandled = server.sendmail(frm, to, force_bytes(msg.as_string()))
             if unhandled != {}:
                 raise SMTPSomeRefusedRecipients(message="%d addresses were refused"%len(unhandled),original_msg=msg,refusals=unhandled)
         except Exception as e:
             # need to improve log message
-            log("Exception while trying to send email from '%s' to %s subject '%s'" % (frm, to, msg.get('Subject', '[no subject]')))
+            log("Exception while trying to send email from '%s' to %s subject '%s'" % (frm, to, msg.get('Subject', '[no subject]')), e=e)
             if isinstance(e, smtplib.SMTPException):
                 e.original_msg=msg
                 raise 
@@ -131,7 +137,7 @@ def send_smtp(msg, bcc=None):
                 server.quit()
             except smtplib.SMTPServerDisconnected:
                 pass
-        subj = msg.get('Subject', '[no subject]')
+        subj = force_text(msg.get('Subject', '[no subject]'))
         log("sent email from '%s' to %s id %s subject '%s'" % (frm, to, msg.get('Message-ID', ''), subj))
     
 def copy_email(msg, to, toUser=False, originalBcc=None):
@@ -180,7 +186,7 @@ def send_mail(request, to, frm, subject, template, context, *args, **kwargs):
     return send_mail_text(request, to, frm, subject, txt, *args, **kwargs)
 
 def encode_message(txt):
-    assert isinstance(txt, str)
+    assert isinstance(txt, six.text_type)
     return MIMEText(txt.encode('utf-8'), 'plain', 'UTF-8')
 
 def send_mail_text(request, to, frm, subject, txt, cc=None, extra=None, toUser=False, bcc=None, copy=True):
@@ -219,7 +225,13 @@ def formataddr(addrtuple):
     address field.  Does what's needed, and returns a string value suitable for
     use in a To: or Cc: email header field.
     """
-    return simple_formataddr(addrtuple, charset='utf-8')
+    if six.PY2:
+        name, addr = addrtuple
+        if name and not isascii(name):
+            name = str(Header(name, 'utf-8'))
+        return simple_formataddr((name, addr))
+    else:
+        return simple_formataddr(addrtuple)
 
 def parseaddr(addr):
     """
@@ -230,7 +242,7 @@ def parseaddr(addr):
 
     """
 
-    addr = ''.join( [ ( s.decode(m) if m else s.decode()) if isinstance(s, bytes) else s for (s,m) in decode_header(addr) ] )
+    addr = ''.join( [ ( s.decode(m) if m else s.decode()) if isinstance(s, six.binary_type) else s for (s,m) in decode_header(addr) ] )
     name, addr = simple_parseaddr(addr)
     return name, addr
 
@@ -269,7 +281,7 @@ def condition_message(to, frm, subject, msg, cc, extra):
             if name:
                 to_hdr.append('"%s"' % name)
             to_hdr.append("<%s>," % addr)
-    to_str = to_hdr.encode()
+    to_str = to_hdr.encode('utf-8')
     if to_str and to_str[-1] == ',':
         to_str=to_str[:-1]
     # It's important to use this string, and not assign the Header object.
@@ -352,7 +364,7 @@ def send_mail_mime(request, to, frm, subject, msg, cc=None, extra=None, toUser=F
 
 def parse_preformatted(preformatted, extra={}, override={}):
     """Parse preformatted string containing mail with From:, To:, ...,"""
-    msg = message_from_string(preformatted)
+    msg = message_from_string(force_str(preformatted))
     msg.set_charset('UTF-8')
 
     for k, v in override.items():
@@ -408,7 +420,7 @@ def send_mail_preformatted(request, preformatted, extra={}, override={}):
     extra headers as needed)."""
 
     (msg, extra, bcc) = parse_preformatted(preformatted, extra, override)
-    txt = msg.get_payload()
+    txt = get_payload(msg)
     send_mail_text(request, msg['To'], msg["From"], msg["Subject"], txt, extra=extra, bcc=bcc)
     return msg
 
@@ -440,10 +452,10 @@ def exception_components(e):
         
 def log_smtp_exception(e):
     (extype, value, tb) = exception_components(e)
-    log("SMTP Exception: %s : %s" % (extype,value))
+    log("SMTP Exception: %s : %s" % (extype,value), e)
     if isinstance(e,SMTPSomeRefusedRecipients):
-        log("     SomeRefused: %s"%(e.summary_refusals()))
-    log("     Traceback: %s" % tb) 
+        log("     SomeRefused: %s"%(e.summary_refusals()), e)
+    log("     Traceback: %s" % tb, e) 
     return (extype, value, tb)
 
 def build_warning_message(request, e):
@@ -540,9 +552,17 @@ def get_email_addresses_from_text(text):
             validate_email(addr)
             return True
         except ValidationError:
-            logger.error(f'Bad data: get_email_addresses_from_text() got an invalid email address tuple: {email}, in "{text}".')
+            logger.error('Bad data: get_email_addresses_from_text() got an '
+                'invalid email address tuple: {email}, in "{text}".'.format(email=email, text=text))
             return False
     # whitespace normalization -- getaddresses doesn't do this
     text = re.sub(r'(?u)\s+', ' ', text)
     return [ formataddr(e) for e in getaddresses([text, ]) if valid(e) ]
     
+
+def get_payload(msg, decode=False):
+    if six.PY2:
+        return msg.get_payload(decode=decode).decode(msg.get_content_charset('utf-8'))
+    else:
+        return msg.get_payload(decode=decode)
+        
\ No newline at end of file
diff --git a/ietf/utils/management/commands/check_referential_integrity.py b/ietf/utils/management/commands/check_referential_integrity.py
index 3b8d7f2a7..8d409afac 100644
--- a/ietf/utils/management/commands/check_referential_integrity.py
+++ b/ietf/utils/management/commands/check_referential_integrity.py
@@ -1,4 +1,10 @@
 # Copyright The IETF Trust 2015-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import six
 
 from tqdm import tqdm
 
@@ -26,18 +32,18 @@ class Command(BaseCommand):
                 debug.pprint('dir(field)')
                 raise
             if verbosity > 1:
-                print("    %s -> %s.%s" % (field.name,foreign_model.__module__,foreign_model.__name__), end=' ')
+                six.print_("    %s -> %s.%s" % (field.name,foreign_model.__module__,foreign_model.__name__), end=' ')
             used = set(field.model.objects.values_list(field.name,flat=True))
             used.discard(None)
             exists = set(foreign_model.objects.values_list('pk',flat=True))
             if verbosity > 1:
                 if used - exists:
-                    print("  ** Bad key values:",list(used - exists))
+                    six.print_("  ** Bad key values:",list(used - exists))
                 else:
-                    print("  ok")
+                    six.print_("  ok")
             else:
                 if used - exists:
-                    print("\n%s.%s.%s -> %s.%s  ** Bad key values:" % (model.__module__,model.__name__,field.name,foreign_model.__module__,foreign_model.__name__),list(used - exists))
+                    six.print_("\n%s.%s.%s -> %s.%s  ** Bad key values:" % (model.__module__,model.__name__,field.name,foreign_model.__module__,foreign_model.__name__),list(used - exists))
 
         def check_reverse_field(field):
             try:
@@ -50,33 +56,33 @@ class Command(BaseCommand):
             foreign_field_name  = field.remote_field.name
             foreign_accessor_name = field.remote_field.get_accessor_name()
             if verbosity > 1:
-                print("    %s <- %s -> %s.%s" % (field.model.__name__, field.remote_field.through._meta.db_table, foreign_model.__module__, foreign_model.__name__), end=' ')
+                six.print_("    %s <- %s -> %s.%s" % (field.model.__name__, field.remote_field.through._meta.db_table, foreign_model.__module__, foreign_model.__name__), end=' ')
             try:
                 used = set(foreign_model.objects.values_list(foreign_field_name, flat=True))
             except FieldError:
                 try:
                     used = set(foreign_model.objects.values_list(foreign_accessor_name, flat=True))
                 except FieldError:
-                    print("    ** Warning: could not find reverse name for %s.%s -> %s.%s" % (field.model.__module__, field.model.__name__, foreign_model.__name__, foreign_field_name), end=' ')
+                    six.print_("    ** Warning: could not find reverse name for %s.%s -> %s.%s" % (field.model.__module__, field.model.__name__, foreign_model.__name__, foreign_field_name), end=' ')
             used.discard(None)
             exists = set(field.model.objects.values_list('pk',flat=True))
             if verbosity > 1:
                 if used - exists:
-                    print("  ** Bad key values:\n    ",list(used - exists))
+                    six.print_("  ** Bad key values:\n    ",list(used - exists))
                 else:
-                    print("  ok")
+                    six.print_("  ok")
             else:
                 if used - exists:
-                    print("\n%s.%s <- %s -> %s.%s  ** Bad key values:\n    " % (field.model.__module__, field.model.__name__, field.remote_field.through._meta.db_table, foreign_model.__module__, foreign_model.__name__), list(used - exists))
+                    six.print_("\n%s.%s <- %s -> %s.%s  ** Bad key values:\n    " % (field.model.__module__, field.model.__name__, field.remote_field.through._meta.db_table, foreign_model.__module__, foreign_model.__name__), list(used - exists))
 
         for conf in tqdm([ c for c in apps.get_app_configs() if c.name.startswith('ietf.')], desc='apps', disable=verbose):
             if verbosity > 1:
-                print("Checking", conf.name)
+                six.print_("Checking", conf.name)
             for model in tqdm(list(conf.get_models()), desc='models', disable=verbose):
                 if model._meta.proxy:
                     continue
                 if verbosity > 1:
-                    print("  %s.%s" % (model.__module__,model.__name__))
+                    six.print_("  %s.%s" % (model.__module__,model.__name__))
                 for field in [f for f in model._meta.fields if isinstance(f, (ForeignKey, OneToOneField)) ]: 
                     check_field(field)
                 for field in [f for f in model._meta.many_to_many ]: 
diff --git a/ietf/utils/management/commands/coverage_changes.py b/ietf/utils/management/commands/coverage_changes.py
index 33e96d5e9..9058fc790 100644
--- a/ietf/utils/management/commands/coverage_changes.py
+++ b/ietf/utils/management/commands/coverage_changes.py
@@ -1,9 +1,14 @@
 # Copyright The IETF Trust 2015-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
-import os
-import json
-import codecs
 import gzip
+import io
+import json
+import os
+import six
 
 from difflib import ndiff
 
@@ -56,12 +61,12 @@ class Command(BaseCommand):
     valid_sections = ['template', 'url', 'code']
 
     def read_coverage(self, filename, version=None):
-        if isinstance(filename, str):
+        if isinstance(filename, six.string_types):
             try:
                 if filename.endswith(".gz"):
                     file = gzip.open(filename, "rb")
                 else:
-                    file = codecs.open(filename, "r", encoding="utf-8")
+                    file = io.open(filename, "r", encoding="utf-8")
             except IOError as e:
                 self.stderr.write("%s" % e)
                 exit(1)
diff --git a/ietf/utils/management/commands/create_group_wikis.py b/ietf/utils/management/commands/create_group_wikis.py
index c9a007ecf..e648a5985 100644
--- a/ietf/utils/management/commands/create_group_wikis.py
+++ b/ietf/utils/management/commands/create_group_wikis.py
@@ -1,7 +1,12 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import os
 import copy
+import io
 import syslog
 import pkg_resources
 
@@ -132,7 +137,7 @@ class Command(BaseCommand):
                 name = unicode_unquote(name.encode('utf-8'))
                 if os.path.isfile(filename):
                     self.note("  Adding page %s" % name)
-                    with open(filename) as file:
+                    with io.open(filename) as file:
                         text = file.read().decode('utf-8')
                     self.add_wiki_page(env, name, text)
 
diff --git a/ietf/utils/management/commands/dumprelated.py b/ietf/utils/management/commands/dumprelated.py
index 61b38441d..60a7ea70b 100644
--- a/ietf/utils/management/commands/dumprelated.py
+++ b/ietf/utils/management/commands/dumprelated.py
@@ -1,4 +1,10 @@
 # Copyright The IETF Trust 2018-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import io
 import warnings
 from collections import OrderedDict
 
@@ -187,7 +193,7 @@ class Command(BaseCommand):
             if (output and self.stdout.isatty() and options['verbosity'] > 0):
                 progress_output = self.stdout
                 object_count = sum(get_objects(count_only=True))
-            stream = open(output, 'w') if output else None
+            stream = io.open(output, 'w') if output else None
             try:
                 serializers.serialize(
                     format, get_objects(), indent=indent,
diff --git a/ietf/utils/management/commands/import_htpasswd.py b/ietf/utils/management/commands/import_htpasswd.py
index 6093dfb08..2a8a2e5b7 100644
--- a/ietf/utils/management/commands/import_htpasswd.py
+++ b/ietf/utils/management/commands/import_htpasswd.py
@@ -1,3 +1,5 @@
+# Copyright The IETF Trust 2014-2019, All Rights Reserved
+import io
 import sys
 
 from textwrap import dedent
@@ -6,7 +8,7 @@ from django.contrib.auth.models import User
 from django.core.management.base import BaseCommand
 
 def import_htpasswd_file(filename, verbosity=1, overwrite=False):
-    with open(filename) as file:
+    with io.open(filename) as file:
         for line in file:
             if not ':' in line:
                 raise ValueError('Found a line without colon separator in the htpassword file %s:'+
diff --git a/ietf/utils/management/commands/makefixture.py b/ietf/utils/management/commands/makefixture.py
index 5046eb7ea..fbffb061f 100644
--- a/ietf/utils/management/commands/makefixture.py
+++ b/ietf/utils/management/commands/makefixture.py
@@ -1,5 +1,10 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 # From https://github.com/ericholscher/django-test-utils/blob/master/test_utils/management/commands/makefixture.py
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 """
 "Make fixture" command.
 
@@ -39,6 +44,9 @@ python manage.py makefixture --format=xml --indent=4 YourModel[3] AnotherModel a
 #known issues:
 #no support for generic relations
 #no support for one-to-one relations
+
+import six
+
 from django.core import serializers
 from django.core.management.base import CommandError
 from django.core.management.base import LabelCommand
@@ -102,7 +110,7 @@ class Command(LabelCommand):
 
         objects = []
         for model, slice in models:
-            if isinstance(slice, str) and slice:
+            if isinstance(slice, six.string_types) and slice:
                 objects.extend(model._default_manager.filter(pk__exact=slice))
             elif not slice or type(slice) is list:
                 items = model._default_manager.all()
diff --git a/ietf/utils/management/commands/tests.py b/ietf/utils/management/commands/tests.py
index fb77a44e1..807141703 100644
--- a/ietf/utils/management/commands/tests.py
+++ b/ietf/utils/management/commands/tests.py
@@ -1,10 +1,17 @@
 # Copyright The IETF Trust 2015-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import io
 import os
+import six
 import tempfile
 
 from django.core.management import call_command
 from django.test import TestCase
-from io import StringIO
+#from io import StringIO
 
 import debug                            # pyflakes:ignore
 
@@ -78,12 +85,12 @@ class CoverageChangeTestCase(TestCase):
             }
             """
         mfh, master = tempfile.mkstemp(suffix='.json')
-        with open(master, "w") as file:
+        with io.open(master, "w") as file:
             file.write(master_txt)
         lfh, latest = tempfile.mkstemp(suffix='.json')
-        with open(latest, "w") as file:
+        with io.open(latest, "w") as file:
             file.write(latest_txt)
-        output = StringIO()
+        output = six.StringIO()
         call_command('coverage_changes', master, latest, stdout=output)
         text = output.getvalue()
         os.unlink(master)
diff --git a/ietf/utils/markup_txt.py b/ietf/utils/markup_txt.py
index 7542c439d..6e680fd81 100644
--- a/ietf/utils/markup_txt.py
+++ b/ietf/utils/markup_txt.py
@@ -1,4 +1,6 @@
 # Copyright The IETF Trust 2009-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+#
 # Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen 
 #
@@ -31,7 +33,11 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import re
+import six                              # pyflakes:ignore
 
 from django.utils.html import escape
 
@@ -39,7 +45,7 @@ from ietf.utils import log
 from ietf.utils.text import wordwrap
 
 def markup(content, width=None):
-    log.assertion('isinstance(content, str)')
+    log.assertion('isinstance(content, six.text_type)')
     # normalize line endings to LF only
     content = content.replace("\r\n", "\n")
     content = content.replace("\r", "\n")
diff --git a/ietf/utils/pdf.py b/ietf/utils/pdf.py
index 5b5ca2371..c4d39601c 100644
--- a/ietf/utils/pdf.py
+++ b/ietf/utils/pdf.py
@@ -1,10 +1,16 @@
 # Copyright The IETF Trust 2015-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import io
 import re
 
 def pdf_pages(filename):
     """Return number of pages in PDF."""
     try:
-        infile = open(filename, "r")
+        infile = io.open(filename, "r")
     except IOError:
         return 0
     for line in infile:
diff --git a/ietf/utils/test_runner.py b/ietf/utils/test_runner.py
index d3935c924..d146ad75a 100644
--- a/ietf/utils/test_runner.py
+++ b/ietf/utils/test_runner.py
@@ -1,7 +1,6 @@
 # Copyright The IETF Trust 2009-2019, All Rights Reserved
 # -*- coding: utf-8 -*-
-
-
+#
 # Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen 
 #
@@ -35,6 +34,9 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
+import io
 import re
 import os
 import sys
@@ -44,7 +46,6 @@ import pytz
 import importlib
 import socket
 import datetime
-import codecs
 import gzip
 import unittest
 import factory.random
@@ -228,7 +229,7 @@ def save_test_results(failures, test_labels):
     # results and avoid re-running tests if we've alread run them with OK
     # result after the latest code changes:
     topdir = os.path.dirname(os.path.dirname(settings.BASE_DIR))
-    tfile = codecs.open(os.path.join(topdir,".testresult"), "a", encoding='utf-8')
+    tfile = io.open(os.path.join(topdir,".testresult"), "a", encoding='utf-8')
     timestr = time.strftime("%Y-%m-%d %H:%M:%S")
     if failures:
         tfile.write("%s FAILED (failures=%s)\n" % (timestr, failures))
@@ -266,7 +267,7 @@ class CoverageReporter(Reporter):
                 analysis = self.coverage._analyze(fr)
                 nums = analysis.numbers
                 missing_nums = sorted(analysis.missing)
-                with open(analysis.filename) as file:
+                with io.open(analysis.filename) as file:
                     lines = file.read().splitlines()
                 missing_lines = [ lines[l-1] for l in missing_nums ]
                 result["covered"][fr.relative_filename()] = (nums.n_statements, nums.pc_covered/100.0, missing_nums, missing_lines)
@@ -526,7 +527,7 @@ class IetfTestRunner(DiscoverRunner):
                 with gzip.open(self.coverage_file, "rb") as file:
                     self.coverage_master = json.load(file)
             else:
-                with codecs.open(self.coverage_file, encoding='utf-8') as file:
+                with io.open(self.coverage_file, encoding='utf-8') as file:
                     self.coverage_master = json.load(file)
             self.coverage_data = {
                 "time": datetime.datetime.now(pytz.utc).strftime("%Y-%m-%dT%H:%M:%SZ"),
@@ -613,7 +614,7 @@ class IetfTestRunner(DiscoverRunner):
             coverage_latest = {}
             coverage_latest["version"] = "latest"
             coverage_latest["latest"] = self.coverage_data
-            with codecs.open(latest_coverage_file, "w", encoding='utf-8') as file:
+            with open(latest_coverage_file, "w") as file:
                 json.dump(coverage_latest, file, indent=2, sort_keys=True)
             if self.save_version_coverage:
                 self.coverage_master["version"] = self.save_version_coverage
@@ -622,7 +623,7 @@ class IetfTestRunner(DiscoverRunner):
                     with gzip.open(self.coverage_file, "wt", encoding='ascii') as file:
                         json.dump(self.coverage_master, file, sort_keys=True)
                 else:
-                    with codecs.open(self.coverage_file, "w", encoding="utf-8") as file:
+                    with open(self.coverage_file, "w") as file:
                         json.dump(self.coverage_master, file, indent=2, sort_keys=True)
         super(IetfTestRunner, self).teardown_test_environment(**kwargs)
 
diff --git a/ietf/utils/test_smtpserver.py b/ietf/utils/test_smtpserver.py
index 48c3cbc2c..b74797e52 100644
--- a/ietf/utils/test_smtpserver.py
+++ b/ietf/utils/test_smtpserver.py
@@ -1,8 +1,13 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import smtpd
 import threading
 import asyncore
+import six
 
 import debug                            # pyflakes:ignore
 
@@ -34,20 +39,26 @@ class SMTPTestChannel(smtpd.SMTPChannel):
 #    mail_options = ['BODY=8BITMIME', 'SMTPUTF8']
 
     def smtp_RCPT(self, arg):
-        self.rcpt_options = []
-        if not self.mailfrom:
-            self.push('503 Error: need MAIL command')
+        if (six.PY2 and not self._SMTPChannel__mailfrom) or (six.PY3 and not self.mailfrom):
+            self.push(str('503 Error: need MAIL command'))
             return
-        arg = self._strip_command_keyword('TO:', arg)
-        address, params = self._getaddr(arg)
+        if six.PY2:
+            address = self._SMTPChannel__getaddr('TO:', arg) if arg else None
+        else:
+            arg = self._strip_command_keyword('TO:', arg)
+            address, __ = self._getaddr(arg)
         if not address:
-            self.push('501 Syntax: RCPT TO: 
')
+            self.push(str('501 Syntax: RCPT TO: 
'))
             return
         if "poison" in address:
-           self.push('550 Error: Not touching that')
-           return
-        self.rcpttos.append(address)
-        self.push('250 Ok')
+            self.push(str('550 Error: Not touching that'))
+            return
+        if six.PY2:
+            self._SMTPChannel__rcpttos.append(address)
+        else:
+            self.rcpt_options = []
+            self.rcpttos.append(address)
+        self.push(str('250 Ok'))
 
 class SMTPTestServer(smtpd.SMTPServer):
 
diff --git a/ietf/utils/test_utils.py b/ietf/utils/test_utils.py
index bf1e3ce61..fc5df7ef6 100644
--- a/ietf/utils/test_utils.py
+++ b/ietf/utils/test_utils.py
@@ -1,5 +1,6 @@
 # Copyright The IETF Trust 2009-2019, All Rights Reserved
-
+# -*- coding: utf-8 -*-
+#
 # Portion Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved. Contact: Pasi Eronen 
 #
@@ -32,28 +33,36 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 import os
 import re
 import email
 import html5lib
+import six
 import sys
-import urllib.request, urllib.error, urllib.parse
+
+from six.moves.urllib.parse import unquote
 
 from unittest.util import strclass
 from bs4 import BeautifulSoup
 
 import django.test
 from django.conf import settings
+from django.utils.encoding import python_2_unicode_compatible
 from django.utils.text import slugify
 
 import debug                            # pyflakes:ignore
 
+from ietf.utils.mail import get_payload
+
 real_database_name = settings.DATABASES["default"]["NAME"]
 
 def split_url(url):
     if "?" in url:
         url, args = url.split("?", 1)
-        args = dict([ list(map(urllib.parse.unquote,arg.split("=", 1))) for arg in args.split("&") if "=" in arg ])
+        args = dict([ list(map(unquote,arg.split("=", 1))) for arg in args.split("&") if "=" in arg ])
     else:
         args = {}
     return url, args
@@ -92,6 +101,7 @@ class ReverseLazyTest(django.test.TestCase):
         response = self.client.get('/ipr/update/')
         self.assertRedirects(response, "/ipr/", status_code=301)
 
+@python_2_unicode_compatible
 class TestCase(django.test.TestCase):
     """
     Does basically the same as django.test.TestCase, but adds asserts for html5 validation.
@@ -123,6 +133,8 @@ class TestCase(django.test.TestCase):
     def tempdir(self, label):
         slug = slugify(self.__class__.__name__.replace('.','-'))
         dirname = "tmp-{label}-{slug}-dir".format(**locals())
+        if 'VIRTUAL_ENV' in os.environ:
+            dirname = os.path.join(os.environ['VIRTUAL_ENV'], dirname)
         path = os.path.abspath(dirname)
         if not os.path.exists(path):
             os.mkdir(path)
@@ -163,7 +175,8 @@ class TestCase(django.test.TestCase):
         if subject:
             mlist = [ m for m in mlist if subject in m["Subject"] ]
         if text:
-            mlist = [ m for m in mlist if text in m.get_payload() ]
+            assert isinstance(text, six.text_type)
+            mlist = [ m for m in mlist if text in get_payload(m) ]
         if count and len(mlist) != count:
             sys.stderr.write("Wrong count in assertMailboxContains().  The complete mailbox contains %s emails:\n\n" % len(mailbox))
             for m in mailbox:
@@ -175,6 +188,6 @@ class TestCase(django.test.TestCase):
             self.assertGreater(len(mlist), 0)
 
     def __str__(self):
-        return "%s (%s.%s)" % (self._testMethodName, strclass(self.__class__),self._testMethodName)
+        return u"%s (%s.%s)" % (self._testMethodName, strclass(self.__class__),self._testMethodName)
 
         
diff --git a/ietf/utils/tests.py b/ietf/utils/tests.py
index 815869ada..a54758148 100644
--- a/ietf/utils/tests.py
+++ b/ietf/utils/tests.py
@@ -2,17 +2,20 @@
 # -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
+import io
 import os.path
-import types
 import shutil
+import six
+import types
 
 from email.mime.image import MIMEImage
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 from fnmatch import fnmatch
 from importlib import import_module
-#from .pipe import pipe
-#from io import StringIO
+from .pipe import pipe
 from textwrap import dedent
 from unittest import skipIf
 from tempfile import mkdtemp
@@ -20,7 +23,7 @@ from tempfile import mkdtemp
 from django.apps import apps
 from django.contrib.auth.models import User
 from django.conf import settings
-#from django.core.management import call_command
+from django.core.management import call_command
 from django.template import Context
 from django.template.defaulttags import URLNode
 from django.template.loader import get_template
@@ -29,14 +32,14 @@ from django.urls import reverse as urlreverse
 
 import debug                            # pyflakes:ignore
 
-#from ietf.group.factories import GroupFactory
-#from ietf.group.models import Group
+from ietf.group.factories import GroupFactory
+from ietf.group.models import Group
 from ietf.person.name import name_parts, unidecode_name
 from ietf.submit.tests import submission_file
 from ietf.utils.bower_storage import BowerStorageFinder
 from ietf.utils.draft import Draft, getmeta
 from ietf.utils.log import unreachable, assertion
-from ietf.utils.mail import send_mail_preformatted, send_mail_text, send_mail_mime, outbox 
+from ietf.utils.mail import send_mail_preformatted, send_mail_text, send_mail_mime, outbox, get_payload
 from ietf.utils.test_runner import get_template_paths, set_coverage_checking
 from ietf.utils.test_utils import TestCase
 
@@ -68,7 +71,7 @@ body
         self.assertSameEmail(recv['Cc'], 'cc1@example.com, cc2@example.com')
         self.assertSameEmail(recv['Bcc'], None)
         self.assertEqual(recv['Subject'], 'subject')
-        self.assertEqual(recv.get_payload(), 'body\n')
+        self.assertEqual(get_payload(recv), 'body\n')
 
         override = {
             'To': 'oto1@example.net, oto2@example.net',
@@ -98,7 +101,7 @@ body
         self.assertSameEmail(recv['Cc'], ', occ2@example.net')
         self.assertSameEmail(recv['Bcc'], None)
         self.assertEqual(recv['Subject'], 'osubject')
-        self.assertEqual(recv.get_payload(), 'body\n')
+        self.assertEqual(get_payload(recv), 'body\n')
 
         extra = {'Fuzz': [ 'bucket' ]}
         send_mail_preformatted(request=None, preformatted=msg, extra=extra, override={})
@@ -157,12 +160,12 @@ def get_callbacks(urllist):
             callbacks.update(get_callbacks(entry.url_patterns))
         else:
             if hasattr(entry, '_callback_str'):
-                callbacks.add(str(entry._callback_str))
+                callbacks.add(six.ensure_text(entry._callback_str))
             if (hasattr(entry, 'callback') and entry.callback
                 and type(entry.callback) in [types.FunctionType, types.MethodType ]):
                 callbacks.add("%s.%s" % (entry.callback.__module__, entry.callback.__name__))
             if hasattr(entry, 'name') and entry.name:
-                callbacks.add(str(entry.name))
+                callbacks.add(six.ensure_text(entry.name))
             # There are some entries we don't handle here, mostly clases
             # (such as Feed subclasses)
 
@@ -275,6 +278,7 @@ class TemplateChecksTestCase(TestCase):
         r = self.client.get(url)        
         self.assertTemplateUsed(r, '500.html')
 
+@skipIf(six.PY3, "Trac not available for Python3 as of 14 Jul 2019")
 @skipIf(skip_wiki_glue_testing, skip_message)
 class TestWikiGlueManagementCommand(TestCase):
 
@@ -283,6 +287,7 @@ class TestWikiGlueManagementCommand(TestCase):
         # command through command line switches.  We have to do it this way because the
         # management command reads in its own copy of settings.py in its own python
         # environment, so we can't modify it here.
+        set_coverage_checking(False)
         self.wiki_dir_pattern = os.path.abspath('tmp-wiki-dir-root/%s')
         if not os.path.exists(os.path.dirname(self.wiki_dir_pattern)):
             os.mkdir(os.path.dirname(self.wiki_dir_pattern))
@@ -293,44 +298,45 @@ class TestWikiGlueManagementCommand(TestCase):
     def tearDown(self):
         shutil.rmtree(os.path.dirname(self.wiki_dir_pattern))
         shutil.rmtree(os.path.dirname(self.svn_dir_pattern))
+        set_coverage_checking(True)
 
-#     def test_wiki_create_output(self):
-#         for type in ['wg','rg','ag','area']:
-#             GroupFactory(type_id=type)
-#         groups = Group.objects.filter(
-#                         type__slug__in=['wg','rg','ag','area'],
-#                         state__slug='active'
-#                     ).order_by('acronym')
-#         out = StringIO()
-#         err = StringIO()
-#         call_command('create_group_wikis', stdout=out, stderr=err, verbosity=2,
-#             wiki_dir_pattern=self.wiki_dir_pattern,
-#             svn_dir_pattern=self.svn_dir_pattern,
-#         )
-#         command_output = out.getvalue()
-#         command_errors = err.getvalue()
-#         self.assertEqual("", command_errors)
-#         for group in groups:
-#             self.assertIn("Processing group '%s'" % group.acronym, command_output)
-#             # Do a bit of verification using trac-admin, too
-#             admin_code, admin_output, admin_error = pipe(
-#                 'trac-admin %s permission list' % (self.wiki_dir_pattern % group.acronym))
-#             self.assertEqual(admin_code, 0)
-#             roles = group.role_set.filter(name_id__in=['chair', 'secr', 'ad'])
-#             for role in roles:
-#                 user = role.email.address.lower()
-#                 self.assertIn("Granting admin permission for %s" % user, command_output)
-#                 self.assertIn(user, admin_output)
-#             docs = group.document_set.filter(states__slug='active', type_id='draft')
-#             for doc in docs:
-#                 name = doc.name
-#                 name = name.replace('draft-','')
-#                 name = name.replace(doc.stream_id+'-', '')
-#                 name = name.replace(group.acronym+'-', '')
-#                 self.assertIn("Adding component %s"%name, command_output)
-#         for page in settings.TRAC_WIKI_PAGES_TEMPLATES:
-#             self.assertIn("Adding page %s" % os.path.basename(page), command_output)
-#         self.assertIn("Indexing default repository", command_output)
+    def test_wiki_create_output(self):
+        for type in ['wg','rg','ag','area']:
+            GroupFactory(type_id=type)
+        groups = Group.objects.filter(
+                        type__slug__in=['wg','rg','ag','area'],
+                        state__slug='active'
+                    ).order_by('acronym')
+        out = six.StringIO()
+        err = six.StringIO()
+        call_command('create_group_wikis', stdout=out, stderr=err, verbosity=2,
+            wiki_dir_pattern=self.wiki_dir_pattern,
+            svn_dir_pattern=self.svn_dir_pattern,
+        )
+        command_output = out.getvalue()
+        command_errors = err.getvalue()
+        self.assertEqual("", command_errors)
+        for group in groups:
+            self.assertIn("Processing group '%s'" % group.acronym, command_output)
+            # Do a bit of verification using trac-admin, too
+            admin_code, admin_output, admin_error = pipe(
+                'trac-admin %s permission list' % (self.wiki_dir_pattern % group.acronym))
+            self.assertEqual(admin_code, 0)
+            roles = group.role_set.filter(name_id__in=['chair', 'secr', 'ad'])
+            for role in roles:
+                user = role.email.address.lower()
+                self.assertIn("Granting admin permission for %s" % user, command_output)
+                self.assertIn(user, admin_output)
+            docs = group.document_set.filter(states__slug='active', type_id='draft')
+            for doc in docs:
+                name = doc.name
+                name = name.replace('draft-','')
+                name = name.replace(doc.stream_id+'-', '')
+                name = name.replace(group.acronym+'-', '')
+                self.assertIn("Adding component %s"%name, command_output)
+        for page in settings.TRAC_WIKI_PAGES_TEMPLATES:
+            self.assertIn("Adding page %s" % os.path.basename(page), command_output)
+        self.assertIn("Indexing default repository", command_output)
 
 OMITTED_APPS = [
     'ietf.secr.meetings',
@@ -424,7 +430,7 @@ class DraftTests(TestCase):
     def test_get_meta(self):
         tempdir = mkdtemp()
         filename = os.path.join(tempdir,self.draft.source)
-        with open(filename,'w') as file:
+        with io.open(filename,'w') as file:
             file.write(self.draft.text)
         self.assertEqual(getmeta(filename)['docdeststatus'],'Informational')
         shutil.rmtree(tempdir)
diff --git a/ietf/utils/tests_restapi.py b/ietf/utils/tests_restapi.py
index 31f1be70f..b8eb591b6 100644
--- a/ietf/utils/tests_restapi.py
+++ b/ietf/utils/tests_restapi.py
@@ -1,6 +1,12 @@
 # Copyright The IETF Trust 2014-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
+import six
+import sys
+
 import debug
 debug.debug = True
 
@@ -20,12 +26,16 @@ class RestApi(ResourceTestCaseMixin, TestCase):
         """
         # print('  fetching %s' % resource)
         r = self.api_client.get(resource, format=format)
-        if format == 'json':
-            self.assertValidJSONResponse(r)
-        elif format == 'xml':
-            self.assertValidXMLResponse(r)
-        else:
-            raise Exception("Unknown format found when testing the RestApi: %s" % (format, ))
+        try:
+            if format == 'json':
+                self.assertValidJSONResponse(r)
+            elif format == 'xml':
+                self.assertValidXMLResponse(r)
+            else:
+                raise Exception("Unknown format found when testing the RestApi: %s" % (format, ))
+        except Exception:
+            sys.stderr.write(" * Exception for resource: %s, format: %s\n" % (resource, format))
+            raise
         data = self.deserialize(r)
         for name in data:
             if 'list_endpoint' in data[name]:
@@ -74,6 +84,6 @@ class RestApi(ResourceTestCaseMixin, TestCase):
         for doc in doclist:
             for key in doc:
                 value = doc[key]
-                if isinstance(value, str) and value.startswith('%s/'%apitop):
+                if isinstance(value, six.string_types) and value.startswith('%s/'%apitop):
                     self.api_client.get(value, format='json')
                     
diff --git a/ietf/utils/text.py b/ietf/utils/text.py
index fbcf1470e..3faa978fb 100644
--- a/ietf/utils/text.py
+++ b/ietf/utils/text.py
@@ -1,7 +1,11 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import re
+import six
 import textwrap
 import unicodedata
 
@@ -56,7 +60,7 @@ def fill(text, width):
 def wordwrap(text, width=80):
     """Wraps long lines without loosing the formatting and indentation
        of short lines"""
-    if not isinstance(text, (bytes,str)):
+    if not isinstance(text, six.string_types):
         return text
     width = int(width)                  # ensure we have an int, if this is used as a template filter
     text = re.sub(" *\r\n", "\n", text) # get rid of DOS line endings
@@ -133,7 +137,7 @@ def maybe_split(text, split=True, pos=5000):
     return text
 
 def decode(raw):
-    assert isinstance(raw, bytes)
+    assert isinstance(raw, six.binary_type)
     try:
         text = raw.decode('utf-8')
     except UnicodeDecodeError:
@@ -145,7 +149,7 @@ def decode(raw):
 def text_to_dict(t):
     "Converts text with RFC2822-formatted header fields into a dictionary-like object."
     # ensure we're handed a unicode parameter
-    assert isinstance(t, str)
+    assert isinstance(t, six.text_type)
     d = {}
     # Return {} for malformed input
     if not len(t.lstrip()) == len(t):
diff --git a/ietf/utils/urls.py b/ietf/utils/urls.py
index 46fe0cc20..a6a3abe9d 100644
--- a/ietf/utils/urls.py
+++ b/ietf/utils/urls.py
@@ -1,6 +1,12 @@
 # Copyright The IETF Trust 2016-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import debug                            # pyflakes:ignore
+import six
+
 from inspect import isclass
 
 from django.conf.urls import url as django_url
@@ -16,7 +22,7 @@ def url(regex, view, kwargs=None, name=None):
         branch = 'name'
     elif isinstance(view, (list, tuple)):
         branch = 'list'
-    elif isinstance(view, str):
+    elif isinstance(view, six.string_types):
         branch = 'string'
         name = view
     elif callable(view) and hasattr(view, '__name__'):
diff --git a/ietf/virtualenv-manage.py b/ietf/virtualenv-manage.py
index dc318c738..6cfe31e06 100755
--- a/ietf/virtualenv-manage.py
+++ b/ietf/virtualenv-manage.py
@@ -1,6 +1,11 @@
-# Copyright The IETF Trust 2016-2019, All Rights Reserved
 #!/usr/bin/env python
+# Copyright The IETF Trust 2016-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
 
+
+from __future__ import absolute_import, print_function, unicode_literals
+
+import io
 import os
 import sys
 
@@ -12,7 +17,7 @@ os.chdir(path)
 # Virtualenv support
 virtualenv_activation = os.path.join(path, "env", "bin", "activate_this.py")
 if os.path.exists(virtualenv_activation):
-    exec(compile(open(virtualenv_activation, "rb").read(), virtualenv_activation, 'exec'), dict(__file__=virtualenv_activation))
+    exec(compile(io.open(virtualenv_activation, "rb").read(), virtualenv_activation, 'exec'), dict(__file__=virtualenv_activation))
 else:
     raise RuntimeError("Could not find the expected virtual python environment.")
 
diff --git a/ietf/wsgi.py b/ietf/wsgi.py
index 01080e8b3..cacc8ed60 100644
--- a/ietf/wsgi.py
+++ b/ietf/wsgi.py
@@ -1,4 +1,9 @@
 # Copyright The IETF Trust 2013-2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+
+
+from __future__ import absolute_import, print_function, unicode_literals
+
 """
 WSGI configuration for the datatracker.
 
@@ -39,19 +44,20 @@ WSGIPythonEggs /var/www/.python-eggs/
 """
 
 
+import io
 import os
 import sys
 import syslog
 
 path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
-syslog.openlog("datatracker", syslog.LOG_PID, syslog.LOG_USER)
+syslog.openlog(str("datatracker"), syslog.LOG_PID, syslog.LOG_USER)
 
 # Virtualenv support
 virtualenv_activation = os.path.join(path, "env", "bin", "activate_this.py")
 if os.path.exists(virtualenv_activation):
     syslog.syslog("Starting datatracker wsgi with virtualenv %s" % os.path.dirname(os.path.dirname(virtualenv_activation)))
-    exec(compile(open(virtualenv_activation, "rb").read(), virtualenv_activation, 'exec'), dict(__file__=virtualenv_activation))
+    exec(compile(io.open(virtualenv_activation, "rb").read(), virtualenv_activation, 'exec'), dict(__file__=virtualenv_activation))
 else:
     syslog.syslog("Starting datatracker wsgi without virtualenv")
 

From 46aec6eb85d7785ce915703351154c5a269fade6 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Tue, 16 Jul 2019 13:17:12 +0000
Subject: [PATCH 112/114] Python2/3 compatibility: tentative version of
 create_group_wikis; may need more work.  - Legacy-Id: 16459

---
 .../management/commands/create_group_wikis.py | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/ietf/utils/management/commands/create_group_wikis.py b/ietf/utils/management/commands/create_group_wikis.py
index e648a5985..cf6d947d7 100644
--- a/ietf/utils/management/commands/create_group_wikis.py
+++ b/ietf/utils/management/commands/create_group_wikis.py
@@ -7,8 +7,9 @@ from __future__ import absolute_import, print_function, unicode_literals
 import os
 import copy
 import io
-import syslog
 import pkg_resources
+import six
+import syslog
 
 from trac.core import TracError
 from trac.env import Environment
@@ -29,7 +30,7 @@ from ietf.utils.pipe import pipe
 
 logtag = __name__.split('.')[-1]
 logname = "user.log"
-syslog.openlog(logtag, syslog.LOG_PID, syslog.LOG_USER)
+syslog.openlog(str(logtag), syslog.LOG_PID, syslog.LOG_USER)
 
 class Command(BaseCommand):
     help = "Create group wikis for WGs, RGs and Areas which don't have one."
@@ -64,9 +65,10 @@ class Command(BaseCommand):
         else:
             self.note("Running %s %s ..." % (os.path.basename(cmd), " ".join(quoted_args)))
             command = [ cmd, ] + list(args)
+            command = ' '.join(command).encode('utf-8')
             code, out, err = pipe(command)
-            out = out.decode()
-            err = err.decode()
+            out = out.decode('utf-8')
+            err = err.decode('utf-8')
             msg = None
             if code != 0:
                 msg = "Error %s: %s when executing '%s'" % (code, err, " ".join(command))
@@ -88,9 +90,8 @@ class Command(BaseCommand):
                 return msg
             err, out= self.svn_admin_cmd("create", svn )
             if err:
-                msg = "Error %s creating svn repository %s:\n   %s" % (err, svn, out)
-                self.log(msg)
-                return msg
+                self.log(err)
+                return err
         return ""
 
     # --- trac ---
@@ -137,8 +138,8 @@ class Command(BaseCommand):
                 name = unicode_unquote(name.encode('utf-8'))
                 if os.path.isfile(filename):
                     self.note("  Adding page %s" % name)
-                    with io.open(filename) as file:
-                        text = file.read().decode('utf-8')
+                    with io.open(filename, encoding='utf-8') as file:
+                        text = file.read()
                     self.add_wiki_page(env, name, text)
 
     def add_custom_wiki_pages(self, group, env):
@@ -208,7 +209,7 @@ class Command(BaseCommand):
             sect, key, val = options[i]
             val = val.format(**group.__dict__)
             options[i] = sect, key, val
-        # Try to creat ethe environment, remove unwanted defaults, and add
+        # Try to create the environment, remove unwanted defaults, and add
         # custom pages and settings.
         if self.dummy_run:
             self.note("Would create Trac for group '%s' at %s" % (group.acronym, group.trac_dir))
@@ -327,13 +328,13 @@ class Command(BaseCommand):
         self.svn_dir_pattern = options.get('svn_dir_pattern', settings.TRAC_SVN_DIR_PATTERN)
         self.group_list = options.get('group_list', None)
         self.dummy_run = options.get('dummy_run', False)
-        self.wiki_dir_pattern = os.path.join(settings.BASE_DIR, '..', self.wiki_dir_pattern)
+        self.wiki_dir_pattern = os.path.join(str(settings.BASE_DIR), str('..'), self.wiki_dir_pattern)
         self.svn_dir_pattern = os.path.join(settings.BASE_DIR, '..', self.svn_dir_pattern)
 
         if not self.group_list is None:
             self.group_list = self.group_list.split('.')
 
-        if isinstance(self.verbosity, (type(""), type(""))) and self.verbosity.isdigit():
+        if isinstance(self.verbosity, six.string_types) and self.verbosity.isdigit():
             self.verbosity = int(self.verbosity)
 
         if self.dummy_run and self.verbosity < 2:

From ef4a41c14bf6378e7a6cc0b88610603785e94dc6 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Tue, 16 Jul 2019 13:18:37 +0000
Subject: [PATCH 113/114] Fixed a bytes/str issue with the arguments to
 syslog.openlog()  - Legacy-Id: 16460

---
 ietf/person/utils.py                                       | 2 +-
 ietf/stats/management/commands/fetch_meeting_attendance.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ietf/person/utils.py b/ietf/person/utils.py
index c45ff423d..d496f8c70 100755
--- a/ietf/person/utils.py
+++ b/ietf/person/utils.py
@@ -25,7 +25,7 @@ def merge_persons(source, target, file=sys.stdout, verbose=False):
     changes = []
 
     # write log
-    syslog.openlog(os.path.basename(__file__), syslog.LOG_PID, syslog.LOG_USER)
+    syslog.openlog(str(os.path.basename(__file__)), syslog.LOG_PID, syslog.LOG_USER)
     syslog.syslog("Merging person records {} => {}".format(source.pk,target.pk))
     
     # handle primary emails
diff --git a/ietf/stats/management/commands/fetch_meeting_attendance.py b/ietf/stats/management/commands/fetch_meeting_attendance.py
index bc511d34f..5078c7cee 100644
--- a/ietf/stats/management/commands/fetch_meeting_attendance.py
+++ b/ietf/stats/management/commands/fetch_meeting_attendance.py
@@ -1,3 +1,4 @@
+# Copyright The IETF Trust 2017-2019, All Rights Reserved
 # Copyright 2016 IETF Trust
 
 import datetime
@@ -12,7 +13,7 @@ from ietf.stats.utils import get_meeting_registration_data
 
 logtag = __name__.split('.')[-1]
 logname = "user.log"
-syslog.openlog(logtag, syslog.LOG_PID, syslog.LOG_USER)
+syslog.openlog(str(logtag), syslog.LOG_PID, syslog.LOG_USER)
 
 class Command(BaseCommand):
     help = "Fetch meeting attendee figures from ietf.org/registration/attendees."

From bdc73e771a93ea2d32b5c1f39739af2c849e4b46 Mon Sep 17 00:00:00 2001
From: Henrik Levkowetz 
Date: Tue, 16 Jul 2019 13:20:05 +0000
Subject: [PATCH 114/114] Python2/3 compatibility: replaced six.ensure_text()
 with either six.text_type or django's force_text(), depending on the case,
 and fixed a variable scope issue.  - Legacy-Id: 16461

---
 changelog.py                          |  4 ++--
 ietf/api/serializer.py                |  2 +-
 ietf/community/views.py               |  2 +-
 ietf/doc/feeds.py                     |  2 +-
 ietf/doc/fields.py                    |  2 +-
 ietf/doc/mails.py                     | 12 +++++-----
 ietf/doc/models.py                    |  6 ++---
 ietf/doc/templatetags/ietf_filters.py |  5 ++--
 ietf/doc/tests_review.py              |  6 +++--
 ietf/doc/utils_charter.py             |  5 ++--
 ietf/doc/utils_search.py              |  2 +-
 ietf/doc/views_charter.py             |  4 ++--
 ietf/doc/views_doc.py                 |  2 +-
 ietf/doc/views_status_change.py       |  4 ++--
 ietf/group/tests_info.py              |  2 +-
 ietf/group/tests_review.py            |  2 +-
 ietf/group/views.py                   |  2 +-
 ietf/idindex/index.py                 |  2 +-
 ietf/idindex/tests.py                 |  2 +-
 ietf/iesg/views.py                    |  4 ++--
 ietf/ipr/feeds.py                     |  5 ++--
 ietf/ipr/fields.py                    |  2 +-
 ietf/ipr/views.py                     |  4 ++--
 ietf/liaisons/fields.py               |  2 +-
 ietf/liaisons/forms.py                |  2 +-
 ietf/meeting/tests_views.py           | 20 ++++++++--------
 ietf/nomcom/forms.py                  |  4 ++--
 ietf/nomcom/tests.py                  | 10 ++++----
 ietf/nomcom/utils.py                  |  6 ++---
 ietf/person/factories.py              |  4 ++--
 ietf/person/fields.py                 |  2 +-
 ietf/person/models.py                 |  2 +-
 ietf/person/tests.py                  |  2 +-
 ietf/review/utils.py                  |  2 +-
 ietf/secr/sreq/tests.py               |  4 ++--
 ietf/submit/tests.py                  | 34 +++++++++++++--------------
 ietf/sync/rfceditor.py                |  2 +-
 ietf/utils/admin.py                   |  6 +++--
 ietf/utils/mail.py                    |  4 ++--
 ietf/utils/pipe.py                    |  2 +-
 ietf/utils/tests.py                   | 21 ++++++++++-------
 requirements.txt                      |  2 +-
 42 files changed, 111 insertions(+), 103 deletions(-)

diff --git a/changelog.py b/changelog.py
index c7eb53a8e..bf27661de 100644
--- a/changelog.py
+++ b/changelog.py
@@ -43,8 +43,8 @@ class ChangeLogEntry:
     title = ""
 
 def parse(logfile):
-    ver_line = "^(\w+) \((\S+)\) (\S+;)? (?:urgency=(\S+))?$"
-    sig_line = "^ -- ([^<]+) <([^>]+)>  (.*?) *$"
+    ver_line = r"^(\w+) \((\S+)\) (\S+;)? (?:urgency=(\S+))?$"
+    sig_line = r"^ -- ([^<]+) <([^>]+)>  (.*?) *$"
     inf_line = r"^  \*\*(.*)\*\* *"
 
     entries = []
diff --git a/ietf/api/serializer.py b/ietf/api/serializer.py
index 0dfdb6aed..98e276efe 100644
--- a/ietf/api/serializer.py
+++ b/ietf/api/serializer.py
@@ -154,7 +154,7 @@ class AdminJsonSerializer(Serializer):
                             if hasattr(field_value, "_meta"):
                                 self._current[name] = self.expand_related(field_value, name)
                             else:
-                                self._current[name] = six.ensure_text(field_value)
+                                self._current[name] = six.text_type(field_value)
             except ObjectDoesNotExist:
                 pass
             except AttributeError:
diff --git a/ietf/community/views.py b/ietf/community/views.py
index 375287e29..427e72943 100644
--- a/ietf/community/views.py
+++ b/ietf/community/views.py
@@ -202,7 +202,7 @@ def export_to_csv(request, username=None, acronym=None, group_type=None):
         row.append(e.time.strftime("%Y-%m-%d") if e else "")
         row.append(strip_tags(doc.friendly_state()))
         row.append(doc.group.acronym if doc.group else "")
-        row.append(six.ensure_text(doc.ad) if doc.ad else "")
+        row.append(six.text_type(doc.ad) if doc.ad else "")
         e = doc.latest_event()
         row.append(e.time.strftime("%Y-%m-%d") if e else "")
         writer.writerow([v.encode("utf-8") for v in row])
diff --git a/ietf/doc/feeds.py b/ietf/doc/feeds.py
index 24a79568c..3fb50898d 100644
--- a/ietf/doc/feeds.py
+++ b/ietf/doc/feeds.py
@@ -49,7 +49,7 @@ class DocumentChangesFeed(Feed):
         return item.time
 
     def item_author_name(self, item):
-        return six.ensure_text(item.by)
+        return six.text_type(item.by)
 
     def item_link(self, item):
         return urlreverse('ietf.doc.views_doc.document_history', kwargs=dict(name=item.doc.canonical_name())) + "#history-%s" % item.pk
diff --git a/ietf/doc/fields.py b/ietf/doc/fields.py
index e8f76b222..9c358949f 100644
--- a/ietf/doc/fields.py
+++ b/ietf/doc/fields.py
@@ -83,7 +83,7 @@ class SearchableDocumentsField(forms.CharField):
             "model_name": self.model.__name__.lower()
         })
 
-        return ",".join(six.ensure_text(o.pk) for o in value)
+        return ",".join(six.text_type(o.pk) for o in value)
 
     def clean(self, value):
         value = super(SearchableDocumentsField, self).clean(value)
diff --git a/ietf/doc/mails.py b/ietf/doc/mails.py
index 9d9526751..7ff511903 100644
--- a/ietf/doc/mails.py
+++ b/ietf/doc/mails.py
@@ -13,7 +13,7 @@ from django.template.loader import render_to_string
 from django.utils.html import strip_tags
 from django.conf import settings
 from django.urls import reverse as urlreverse
-from django.utils.encoding import force_str
+from django.utils.encoding import force_str, force_text
 
 import debug                            # pyflakes:ignore
 
@@ -128,7 +128,7 @@ def generate_ballot_writeup(request, doc):
     e.doc = doc
     e.rev = doc.rev
     e.desc = "Ballot writeup was generated"
-    e.text = six.ensure_text(render_to_string("doc/mail/ballot_writeup.txt", {'iana': iana}))
+    e.text = force_text(render_to_string("doc/mail/ballot_writeup.txt", {'iana': iana}))
 
     # caller is responsible for saving, if necessary
     return e
@@ -140,7 +140,7 @@ def generate_ballot_rfceditornote(request, doc):
     e.doc = doc
     e.rev = doc.rev
     e.desc = "RFC Editor Note for ballot was generated"
-    e.text = six.ensure_text(render_to_string("doc/mail/ballot_rfceditornote.txt"))
+    e.text = force_text(render_to_string("doc/mail/ballot_rfceditornote.txt"))
     e.save()
     
     return e
@@ -185,7 +185,7 @@ def generate_last_call_announcement(request, doc):
     e.doc = doc
     e.rev = doc.rev
     e.desc = "Last call announcement was generated"
-    e.text = six.ensure_text(mail)
+    e.text = force_text(mail)
 
     # caller is responsible for saving, if necessary
     return e
@@ -205,7 +205,7 @@ def generate_approval_mail(request, doc):
     e.doc = doc
     e.rev = doc.rev
     e.desc = "Ballot approval text was generated"
-    e.text = six.ensure_text(mail)
+    e.text = force_text(mail)
 
     # caller is responsible for saving, if necessary
     return e
@@ -288,7 +288,7 @@ def generate_publication_request(request, doc):
         approving_body = "IRSG"
         consensus_body = doc.group.acronym.upper()
     else:
-        approving_body = six.ensure_text(doc.stream)
+        approving_body = six.text_type(doc.stream)
         consensus_body = approving_body
 
     e = doc.latest_event(WriteupDocEvent, type="changed_rfc_editor_note_text")
diff --git a/ietf/doc/models.py b/ietf/doc/models.py
index 65c3e4730..eaa5d9c91 100644
--- a/ietf/doc/models.py
+++ b/ietf/doc/models.py
@@ -17,7 +17,7 @@ from django.core.validators import URLValidator, RegexValidator
 from django.urls import reverse as urlreverse
 from django.contrib.contenttypes.models import ContentType
 from django.conf import settings
-from django.utils.encoding import python_2_unicode_compatible
+from django.utils.encoding import python_2_unicode_compatible, force_text
 from django.utils.html import mark_safe
 
 import debug                            # pyflakes:ignore
@@ -880,7 +880,7 @@ class DocHistory(DocumentInfo):
     name = models.CharField(max_length=255)
 
     def __str__(self):
-        return six.ensure_text(self.doc.name)
+        return force_text(self.doc.name)
 
     def canonical_name(self):
         if hasattr(self, '_canonical_name'):
@@ -930,7 +930,7 @@ class DocAlias(models.Model):
         return self.docs.first()
 
     def __str__(self):
-        return u"%s-->%s" % (self.name, ','.join([six.ensure_text(d.name) for d in self.docs.all() if isinstance(d, Document) ]))
+        return u"%s-->%s" % (self.name, ','.join([force_text(d.name) for d in self.docs.all() if isinstance(d, Document) ]))
     document_link = admin_link("document")
     class Meta:
         verbose_name = "document alias"
diff --git a/ietf/doc/templatetags/ietf_filters.py b/ietf/doc/templatetags/ietf_filters.py
index a8662bbc4..53428c359 100644
--- a/ietf/doc/templatetags/ietf_filters.py
+++ b/ietf/doc/templatetags/ietf_filters.py
@@ -17,6 +17,7 @@ from django.utils.html import escape
 from django.template.defaultfilters import truncatewords_html, linebreaksbr, stringfilter, striptags
 from django.utils.safestring import mark_safe, SafeData
 from django.utils.html import strip_tags
+from django.utils.encoding import force_text
 
 import debug                            # pyflakes:ignore
 
@@ -198,7 +199,7 @@ def rfcnospace(string):
 @register.filter
 def prettystdname(string):
     from ietf.doc.utils import prettify_std_name
-    return prettify_std_name(six.ensure_text(string or ""))
+    return prettify_std_name(force_text(string or ""))
 
 @register.filter(name='rfcurl')
 def rfclink(string):
@@ -341,7 +342,7 @@ def expires_soon(x,request):
 
 @register.filter(name='startswith')
 def startswith(x, y):
-    return six.ensure_text(x).startswith(y)
+    return six.text_type(x).startswith(y)
 
 @register.filter
 def has_role(user, role_names):
diff --git a/ietf/doc/tests_review.py b/ietf/doc/tests_review.py
index 1137cf141..48c1e61b5 100644
--- a/ietf/doc/tests_review.py
+++ b/ietf/doc/tests_review.py
@@ -101,10 +101,12 @@ class ReviewTests(TestCase):
 
         self.assertEqual(len(outbox),2)
         self.assertTrue('reviewteam Early' in outbox[0]['Subject'])
-#        debug.show("outbox[0]['To']")
+        if not 'reviewsecretary@' in outbox[0]['To']:
+            print(outbox[0].as_string())
         self.assertTrue('reviewsecretary@' in outbox[0]['To'])
         self.assertTrue('reviewteam3 Early' in outbox[1]['Subject'])
-#        debug.show("outbox[1]['To']")
+        if not 'reviewsecretary3@' in outbox[1]['To']:
+            print(outbox[1].as_string())
         self.assertTrue('reviewsecretary3@' in outbox[1]['To'])
 
         # set the reviewteamsetting for the secretary email alias, then do the post again
diff --git a/ietf/doc/utils_charter.py b/ietf/doc/utils_charter.py
index 3dae431a6..7b44ad3ff 100644
--- a/ietf/doc/utils_charter.py
+++ b/ietf/doc/utils_charter.py
@@ -9,12 +9,11 @@ import io
 import os
 import re
 import shutil
-import six
 
 from django.conf import settings
 from django.urls import reverse as urlreverse
 from django.template.loader import render_to_string
-from django.utils.encoding import smart_text
+from django.utils.encoding import smart_text, force_text
 
 import debug                            # pyflakes:ignore
 
@@ -152,7 +151,7 @@ def generate_ballot_writeup(request, doc):
     e.doc = doc
     e.rev = doc.rev,
     e.desc = "Ballot writeup was generated"
-    e.text = six.ensure_text(render_to_string("doc/charter/ballot_writeup.txt"))
+    e.text = force_text(render_to_string("doc/charter/ballot_writeup.txt"))
 
     # caller is responsible for saving, if necessary
     return e
diff --git a/ietf/doc/utils_search.py b/ietf/doc/utils_search.py
index 8756832d7..14227f4a8 100644
--- a/ietf/doc/utils_search.py
+++ b/ietf/doc/utils_search.py
@@ -106,7 +106,7 @@ def fill_in_document_table_attributes(docs, have_telechat_date=False):
         d.expirable = expirable_draft(d)
 
         if d.get_state_slug() != "rfc":
-            d.milestones = [ m for (t, s, d, m) in sorted(((m.time, m.state.slug, m.desc, m) for m in d.groupmilestone_set.all() if m.state_id == "active")) ]
+            d.milestones = [ m for (t, s, v, m) in sorted(((m.time, m.state.slug, m.desc, m) for m in d.groupmilestone_set.all() if m.state_id == "active")) ]
             d.reviewed_by_teams = sorted(set(r.team.acronym for r in d.reviewrequest_set.filter(state__in=["assigned","accepted","part-completed","completed"]).distinct().select_related('team')))
 
         e = d.latest_event_cache.get('started_iesg_process', None)
diff --git a/ietf/doc/views_charter.py b/ietf/doc/views_charter.py
index 2438f4241..bf827aaf7 100644
--- a/ietf/doc/views_charter.py
+++ b/ietf/doc/views_charter.py
@@ -8,7 +8,6 @@ import datetime
 import io
 import json
 import os
-import six
 import textwrap
 
 from django.http import HttpResponseRedirect, HttpResponseNotFound, HttpResponseForbidden, Http404
@@ -19,6 +18,7 @@ from django.utils.safestring import mark_safe
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
+from django.utils.encoding import force_text
 
 import debug                            # pyflakes:ignore
 
@@ -816,7 +816,7 @@ def charter_with_milestones_txt(request, name, rev):
 
     try:
         with io.open(os.path.join(settings.CHARTER_PATH, filename), 'r') as f:
-            charter_text = six.ensure_text(f.read(), errors='ignore')
+            charter_text = force_text(f.read(), errors='ignore')
     except IOError:
         charter_text = "Error reading charter text %s" % filename
 
diff --git a/ietf/doc/views_doc.py b/ietf/doc/views_doc.py
index cbdcfefe7..d10323ce5 100644
--- a/ietf/doc/views_doc.py
+++ b/ietf/doc/views_doc.py
@@ -1274,7 +1274,7 @@ def add_sessionpresentation(request,name):
     if doc.group:
         sessions = sorted(sessions,key=lambda x:0 if x.group==doc.group else 1)
 
-    session_choices = [(s.pk, six.ensure_text(s)) for s in sessions]
+    session_choices = [(s.pk, six.text_type(s)) for s in sessions]
 
     if request.method == 'POST':
         version_form = VersionForm(request.POST,choices=version_choices)
diff --git a/ietf/doc/views_status_change.py b/ietf/doc/views_status_change.py
index 14113f5d5..b52e7d0cf 100644
--- a/ietf/doc/views_status_change.py
+++ b/ietf/doc/views_status_change.py
@@ -8,7 +8,6 @@ import datetime
 import io
 import os
 import re
-import six
 
 from django import forms
 from django.shortcuts import render, get_object_or_404, redirect
@@ -16,6 +15,7 @@ from django.http import Http404, HttpResponseRedirect
 from django.urls import reverse
 from django.template.loader import render_to_string
 from django.conf import settings
+from django.utils.encoding import force_text
 
 import debug                            # pyflakes:ignore
 
@@ -641,7 +641,7 @@ def generate_last_call_text(request, doc):
     e.doc = doc
     e.rev = doc.rev
     e.desc = 'Last call announcement was generated'
-    e.text = six.ensure_text(new_text)
+    e.text = force_text(new_text)
     e.save()
 
     return e 
diff --git a/ietf/group/tests_info.py b/ietf/group/tests_info.py
index 11c227579..1829399b2 100644
--- a/ietf/group/tests_info.py
+++ b/ietf/group/tests_info.py
@@ -1268,7 +1268,7 @@ class StatusUpdateTests(TestCase):
             response = self.client.get(url)
             self.assertEqual(response.status_code,200)
             q=PyQuery(response.content)
-            self.assertTrue(bleach.linkify(escape(event.desc)) in six.ensure_text(q('pre')))
+            self.assertTrue(bleach.linkify(escape(event.desc)) in six.text_type(q('pre')))
             self.assertFalse(q('a#edit_button'))
             self.client.login(username=chair.person.user.username,password='%s+password'%chair.person.user.username)
             response = self.client.get(url)
diff --git a/ietf/group/tests_review.py b/ietf/group/tests_review.py
index 4d5f99c2a..66ee9a13e 100644
--- a/ietf/group/tests_review.py
+++ b/ietf/group/tests_review.py
@@ -264,7 +264,7 @@ class ReviewTests(TestCase):
         q = PyQuery(r.content)
         generated_text = q("[name=body]").text()
         self.assertTrue(review_req1.doc.name in generated_text)
-        self.assertTrue(six.ensure_text(Person.objects.get(user__username="marschairman")) in generated_text)
+        self.assertTrue(six.text_type(Person.objects.get(user__username="marschairman")) in generated_text)
 
         empty_outbox()
         r = self.client.post(url, {
diff --git a/ietf/group/views.py b/ietf/group/views.py
index ab15db3df..7844c74d2 100644
--- a/ietf/group/views.py
+++ b/ietf/group/views.py
@@ -1448,7 +1448,7 @@ def manage_review_requests(request, acronym, group_type=None, assignment_status=
         saving = form_action.startswith("save")
 
         # check for conflicts
-        review_requests_dict = { six.ensure_text(r.pk): r for r in review_requests }
+        review_requests_dict = { six.text_type(r.pk): r for r in review_requests }
         posted_reqs = set(request.POST.getlist("reviewrequest", []))
         current_reqs = set(review_requests_dict.keys())
 
diff --git a/ietf/idindex/index.py b/ietf/idindex/index.py
index b79308952..03d5f2b2d 100644
--- a/ietf/idindex/index.py
+++ b/ietf/idindex/index.py
@@ -195,7 +195,7 @@ def all_id2_txt():
                 area = d.group.parent.acronym
         fields.append(area)
         # 9 responsible AD name
-        fields.append(six.ensure_text(d.ad) if d.ad else "")
+        fields.append(six.text_type(d.ad) if d.ad else "")
         # 10
         fields.append(d.intended_std_level.name if d.intended_std_level else "")
         # 11
diff --git a/ietf/idindex/tests.py b/ietf/idindex/tests.py
index c073fbe0b..503a84a93 100644
--- a/ietf/idindex/tests.py
+++ b/ietf/idindex/tests.py
@@ -102,7 +102,7 @@ class IndexTests(TestCase):
         self.assertEqual(t[6], draft.latest_event(type="new_revision").time.strftime("%Y-%m-%d"))
         self.assertEqual(t[7], draft.group.acronym)
         self.assertEqual(t[8], draft.group.parent.acronym)
-        self.assertEqual(t[9], six.ensure_text(draft.ad))
+        self.assertEqual(t[9], six.text_type(draft.ad))
         self.assertEqual(t[10], draft.intended_std_level.name)
         self.assertEqual(t[11], "")
         self.assertEqual(t[12], ".pdf,.txt")
diff --git a/ietf/iesg/views.py b/ietf/iesg/views.py
index 35b9d0b96..41c25ca6d 100644
--- a/ietf/iesg/views.py
+++ b/ietf/iesg/views.py
@@ -316,9 +316,9 @@ def agenda_documents_txt(request):
         row = (
             d.computed_telechat_date.isoformat(),
             d.name,
-            six.ensure_text(d.intended_std_level),
+            six.text_type(d.intended_std_level),
             "1" if d.stream_id in ("ise", "irtf") else "0",
-            six.ensure_text(d.area_acronym()).lower(),
+            six.text_type(d.area_acronym()).lower(),
             d.ad.plain_name() if d.ad else "None Assigned",
             d.rev,
             )
diff --git a/ietf/ipr/feeds.py b/ietf/ipr/feeds.py
index 7482abf5e..7b8f1938f 100644
--- a/ietf/ipr/feeds.py
+++ b/ietf/ipr/feeds.py
@@ -4,12 +4,11 @@
 
 from __future__ import absolute_import, print_function, unicode_literals
 
-import six
-
 from django.contrib.syndication.views import Feed
 from django.utils.feedgenerator import Atom1Feed
 from django.urls import reverse_lazy
 from django.utils.safestring import mark_safe
+from django.utils.encoding import force_text
 
 from ietf.ipr.models import IprDisclosureBase
 
@@ -28,7 +27,7 @@ class LatestIprDisclosuresFeed(Feed):
         return mark_safe(item.title)
 
     def item_description(self, item):
-        return six.ensure_text(item.title)
+        return force_text(item.title)
         
     def item_pubdate(self, item):
         return item.time
diff --git a/ietf/ipr/fields.py b/ietf/ipr/fields.py
index d2a24268c..a6529c270 100644
--- a/ietf/ipr/fields.py
+++ b/ietf/ipr/fields.py
@@ -68,7 +68,7 @@ class SearchableIprDisclosuresField(forms.CharField):
         # patterns may not have been fully constructed there yet
         self.widget.attrs["data-ajax-url"] = urlreverse('ietf.ipr.views.ajax_search')
 
-        return ",".join(six.ensure_text(e.pk) for e in value)
+        return ",".join(six.text_type(e.pk) for e in value)
 
     def clean(self, value):
         value = super(SearchableIprDisclosuresField, self).clean(value)
diff --git a/ietf/ipr/views.py b/ietf/ipr/views.py
index 607b609ad..81df9ab95 100644
--- a/ietf/ipr/views.py
+++ b/ietf/ipr/views.py
@@ -456,7 +456,7 @@ def by_draft_txt(request):
 
     lines = [ "# Machine-readable list of IPR disclosures by draft name" ]
     for name, iprs in docipr.items():
-        lines.append(name + "\t" + "\t".join(six.ensure_text(ipr_id) for ipr_id in sorted(iprs)))
+        lines.append(name + "\t" + "\t".join(six.text_type(ipr_id) for ipr_id in sorted(iprs)))
 
     return HttpResponse("\n".join(lines), content_type="text/plain; charset=%s"%settings.DEFAULT_CHARSET)
 
@@ -478,7 +478,7 @@ def by_draft_recursive_txt(request):
 
     lines = [ "# Machine-readable list of IPR disclosures by draft name" ]
     for name, iprs in docipr.items():
-        lines.append(name + "\t" + "\t".join(six.ensure_text(ipr_id) for ipr_id in sorted(iprs)))
+        lines.append(name + "\t" + "\t".join(six.text_type(ipr_id) for ipr_id in sorted(iprs)))
 
     return HttpResponse("\n".join(lines), content_type="text/plain; charset=%s"%settings.DEFAULT_CHARSET)
 
diff --git a/ietf/liaisons/fields.py b/ietf/liaisons/fields.py
index b70572ff8..6f21b7c74 100644
--- a/ietf/liaisons/fields.py
+++ b/ietf/liaisons/fields.py
@@ -65,7 +65,7 @@ class SearchableLiaisonStatementsField(forms.CharField):
         # patterns may not have been fully constructed there yet
         self.widget.attrs["data-ajax-url"] = urlreverse("ietf.liaisons.views.ajax_select2_search_liaison_statements")
 
-        return ",".join(six.ensure_text(o.pk) for o in value)
+        return ",".join(six.text_type(o.pk) for o in value)
 
     def clean(self, value):
         value = super(SearchableLiaisonStatementsField, self).clean(value)
diff --git a/ietf/liaisons/forms.py b/ietf/liaisons/forms.py
index eeb128a0c..d9bb4da6d 100644
--- a/ietf/liaisons/forms.py
+++ b/ietf/liaisons/forms.py
@@ -452,7 +452,7 @@ class IncomingLiaisonForm(LiaisonModelForm):
             self.fields['from_contact'].initial = self.person.role_set.filter(group=queryset[0]).first().email.address
             self.fields['from_contact'].widget.attrs['readonly'] = True
         self.fields['from_groups'].queryset = queryset
-        self.fields['from_groups'].widget.submitter = six.ensure_text(self.person)
+        self.fields['from_groups'].widget.submitter = six.text_type(self.person)
 
         # if there's only one possibility make it the default
         if len(queryset) == 1:
diff --git a/ietf/meeting/tests_views.py b/ietf/meeting/tests_views.py
index a9a296923..89d033fb1 100644
--- a/ietf/meeting/tests_views.py
+++ b/ietf/meeting/tests_views.py
@@ -1727,7 +1727,7 @@ class MaterialsTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertIn('Upload', six.ensure_text(q("title")))
+        self.assertIn('Upload', six.text_type(q("title")))
         self.assertFalse(session.sessionpresentation_set.exists())
         test_file = StringIO('%PDF-1.4\n%âãÏÓ\nthis is some text for a test')
         test_file.name = "not_really.pdf"
@@ -1738,7 +1738,7 @@ class MaterialsTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertIn('Revise', six.ensure_text(q("title")))
+        self.assertIn('Revise', six.text_type(q("title")))
         test_file = StringIO('%PDF-1.4\n%âãÏÓ\nthis is some different text for a test')
         test_file.name = "also_not_really.pdf"
         r = self.client.post(url,dict(file=test_file))
@@ -1762,7 +1762,7 @@ class MaterialsTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertIn('Upload', six.ensure_text(q("title")))
+        self.assertIn('Upload', six.text_type(q("title")))
         self.assertFalse(session.sessionpresentation_set.exists())
         test_file = StringIO('%PDF-1.4\n%âãÏÓ\nthis is some text for a test')
         test_file.name = "not_really.pdf"
@@ -1780,7 +1780,7 @@ class MaterialsTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertIn('Upload', six.ensure_text(q("title")))
+        self.assertIn('Upload', six.text_type(q("title")))
         
 
     def test_upload_minutes_agenda(self):
@@ -1795,7 +1795,7 @@ class MaterialsTests(TestCase):
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
             q = PyQuery(r.content)
-            self.assertIn('Upload', six.ensure_text(q("Title")))
+            self.assertIn('Upload', six.text_type(q("Title")))
             self.assertFalse(session.sessionpresentation_set.exists())
             self.assertFalse(q('form input[type="checkbox"]'))
     
@@ -1849,7 +1849,7 @@ class MaterialsTests(TestCase):
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
             q = PyQuery(r.content)
-            self.assertIn('Revise', six.ensure_text(q("Title")))
+            self.assertIn('Revise', six.text_type(q("Title")))
             test_file = BytesIO(b'this is some different text for a test')
             test_file.name = "also_not_really.txt"
             r = self.client.post(url,dict(file=test_file,apply_to_all=True))
@@ -1883,7 +1883,7 @@ class MaterialsTests(TestCase):
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
             q = PyQuery(r.content)
-            self.assertIn('Upload', six.ensure_text(q("Title")))
+            self.assertIn('Upload', six.text_type(q("Title")))
             self.assertFalse(session.sessionpresentation_set.exists())
             self.assertFalse(q('form input[type="checkbox"]'))
 
@@ -1904,7 +1904,7 @@ class MaterialsTests(TestCase):
             r = self.client.get(url)
             self.assertEqual(r.status_code, 200)
             q = PyQuery(r.content)
-            self.assertIn('Upload', six.ensure_text(q("title")))
+            self.assertIn('Upload', six.text_type(q("title")))
             self.assertFalse(session.sessionpresentation_set.filter(document__type_id=doctype))
             test_file = BytesIO(b'this is some text for a test')
             test_file.name = "not_really.txt"
@@ -1927,7 +1927,7 @@ class MaterialsTests(TestCase):
         r = self.client.get(url)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertIn('Upload', six.ensure_text(q("title")))
+        self.assertIn('Upload', six.text_type(q("title")))
         self.assertFalse(session1.sessionpresentation_set.filter(document__type_id='slides'))
         test_file = BytesIO(b'this is not really a slide')
         test_file.name = 'not_really.txt'
@@ -1955,7 +1955,7 @@ class MaterialsTests(TestCase):
         r = self.client.get(url)
         self.assertTrue(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertIn('Revise', six.ensure_text(q("title")))
+        self.assertIn('Revise', six.text_type(q("title")))
         test_file = BytesIO(b'new content for the second slide deck')
         test_file.name = 'doesnotmatter.txt'
         r = self.client.post(url,dict(file=test_file,title='rename the presentation',apply_to_all=False))
diff --git a/ietf/nomcom/forms.py b/ietf/nomcom/forms.py
index 2f801a842..401bc6532 100644
--- a/ietf/nomcom/forms.py
+++ b/ietf/nomcom/forms.py
@@ -40,12 +40,12 @@ class PositionNomineeField(forms.ChoiceField):
         results = []
         for position in positions:
             accepted_nominees = [np.nominee for np in NomineePosition.objects.filter(position=position,state='accepted').exclude(nominee__duplicated__isnull=False)]
-            nominees = [('%s_%s' % (position.id, i.id), six.ensure_text(i)) for i in accepted_nominees]
+            nominees = [('%s_%s' % (position.id, i.id), six.text_type(i)) for i in accepted_nominees]
             if nominees:
                 results.append((position.name+" (Accepted)", nominees))
         for position in positions:
             other_nominees = [np.nominee for np in NomineePosition.objects.filter(position=position).exclude(state='accepted').exclude(nominee__duplicated__isnull=False)]
-            nominees = [('%s_%s' % (position.id, i.id), six.ensure_text(i)) for i in other_nominees]
+            nominees = [('%s_%s' % (position.id, i.id), six.text_type(i)) for i in other_nominees]
             if nominees:
                 results.append((position.name+" (Declined or Pending)", nominees))
         kwargs['choices'] = results
diff --git a/ietf/nomcom/tests.py b/ietf/nomcom/tests.py
index 49ada547b..7b13ee897 100644
--- a/ietf/nomcom/tests.py
+++ b/ietf/nomcom/tests.py
@@ -7,7 +7,6 @@ from __future__ import absolute_import, print_function, unicode_literals
 import datetime
 import io
 import random
-import six
 import shutil
 
 from pyquery import PyQuery
@@ -16,9 +15,10 @@ from six.moves.urllib.parse import urlparse
 from django.db import IntegrityError
 from django.db.models import Max
 from django.conf import settings
-from django.urls import reverse
 from django.core.files import File
 from django.contrib.auth.models import User
+from django.urls import reverse
+from django.utils.encoding import force_text
 
 import debug                            # pyflakes:ignore
 
@@ -526,7 +526,7 @@ class NomcomViewsTest(TestCase):
         self.assertEqual('Nomination receipt', outbox[-1]['Subject'])
         self.assertEqual(self.email_from, outbox[-1]['From'])
         self.assertIn('plain', outbox[-1]['To'])
-        self.assertIn('Comments with accents äöå', six.ensure_text(outbox[-1].get_payload(decode=True),"utf-8","replace"))
+        self.assertIn('Comments with accents äöå', force_text(outbox[-1].get_payload(decode=True),"utf-8","replace"))
 
         # Nominate the same person for the same position again without asking for confirmation 
 
@@ -567,7 +567,7 @@ class NomcomViewsTest(TestCase):
         self.assertEqual('Nomination receipt', outbox[-1]['Subject'])
         self.assertEqual(self.email_from, outbox[-1]['From'])
         self.assertIn('plain', outbox[-1]['To'])
-        self.assertIn('Comments with accents äöå', six.ensure_text(outbox[-1].get_payload(decode=True),"utf-8","replace"))
+        self.assertIn('Comments with accents äöå', force_text(outbox[-1].get_payload(decode=True),"utf-8","replace"))
 
         # Nominate the same person for the same position again without asking for confirmation 
 
@@ -812,7 +812,7 @@ class NomcomViewsTest(TestCase):
         self.assertNotIn('$', email_body)
         self.assertEqual(self.email_from, outbox[-2]['From'])
         self.assertIn('plain', outbox[2]['To'])
-        self.assertIn('Comments with accents äöå', six.ensure_text(outbox[2].get_payload(decode=True),"utf-8","replace"))
+        self.assertIn('Comments with accents äöå', force_text(outbox[2].get_payload(decode=True),"utf-8","replace"))
 
         empty_outbox()
         self.feedback_view(public=True)
diff --git a/ietf/nomcom/utils.py b/ietf/nomcom/utils.py
index 1d76fa11d..5f8da9b06 100644
--- a/ietf/nomcom/utils.py
+++ b/ietf/nomcom/utils.py
@@ -22,7 +22,7 @@ from django.core.exceptions import ObjectDoesNotExist
 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 force_str
+from django.utils.encoding import force_str, force_text
 
 from ietf.dbtemplate.models import DBTemplate
 from ietf.person.models import Email, Person
@@ -433,7 +433,7 @@ def get_body(message):
         body = []
         for part in text_parts:
             charset = get_charset(part, get_charset(message))
-            body.append(six.ensure_text(part.get_payload(decode=True),
+            body.append(force_text(part.get_payload(decode=True),
                                 charset,
                                 "replace"))
 
@@ -441,7 +441,7 @@ def get_body(message):
 
     else:  # if it is not multipart, the payload will be a string
            # representing the message body
-        body = six.ensure_text(message.get_payload(decode=True),
+        body = force_text(message.get_payload(decode=True),
                        get_charset(message),
                        "replace")
         return body.strip()
diff --git a/ietf/person/factories.py b/ietf/person/factories.py
index 0dca61037..e076b4ef7 100644
--- a/ietf/person/factories.py
+++ b/ietf/person/factories.py
@@ -10,13 +10,13 @@ import faker.config
 import os
 import random
 import shutil
-import six
 
 from unidecode import unidecode
 
 from django.conf import settings
 from django.contrib.auth.models import User
 from django.utils.text import slugify
+from django.utils.encoding import force_text
 
 import debug                            # pyflakes:ignore
 
@@ -58,7 +58,7 @@ class PersonFactory(factory.DjangoModelFactory):
 
     user = factory.SubFactory(UserFactory)
     name = factory.LazyAttribute(lambda p: normalize_name('%s %s'%(p.user.first_name, p.user.last_name)))
-    ascii = factory.LazyAttribute(lambda p: six.ensure_text(unidecode_name(p.name)))
+    ascii = factory.LazyAttribute(lambda p: force_text(unidecode_name(p.name)))
 
     class Params:
         with_bio = factory.Trait(biography = "\n\n".join(fake.paragraphs()))
diff --git a/ietf/person/fields.py b/ietf/person/fields.py
index f2ab5d756..1f1e79948 100644
--- a/ietf/person/fields.py
+++ b/ietf/person/fields.py
@@ -168,7 +168,7 @@ class PersonEmailChoiceField(forms.ModelChoiceField):
 
     def label_from_instance(self, email):
         if self.label_with == "person":
-            return six.ensure_text(email.person)
+            return six.text_type(email.person)
         elif self.label_with == "email":
             return email.address
         else:
diff --git a/ietf/person/models.py b/ietf/person/models.py
index 5025a900b..6e40686f8 100644
--- a/ietf/person/models.py
+++ b/ietf/person/models.py
@@ -86,7 +86,7 @@ class Person(models.Model):
         if not hasattr(self, '_cached_plain_ascii'):
             if self.ascii:
                 if isinstance(self.ascii, six.binary_type):
-                    uname = six.ensure_text(self.ascii)
+                    uname = six.text_type(self.ascii)
                     ascii = unidecode_name(uname)
                 else:
                     ascii = unidecode_name(self.ascii)
diff --git a/ietf/person/tests.py b/ietf/person/tests.py
index d4a2d9f67..410f89cbd 100644
--- a/ietf/person/tests.py
+++ b/ietf/person/tests.py
@@ -93,7 +93,7 @@ class PersonTests(TestCase):
         empty_outbox()
         p = PersonFactory(name="Föö Bär")
         PersonFactory(name=p.name)
-        self.assertTrue("possible duplicate" in six.ensure_text(outbox[0]["Subject"]).lower())
+        self.assertTrue("possible duplicate" in six.text_type(outbox[0]["Subject"]).lower())
 
     def test_merge(self):
         url = urlreverse("ietf.person.views.merge")
diff --git a/ietf/review/utils.py b/ietf/review/utils.py
index 236f85519..cfff82e8c 100644
--- a/ietf/review/utils.py
+++ b/ietf/review/utils.py
@@ -964,7 +964,7 @@ def make_assignment_choices(email_queryset, review_req):
         if stats:
             explanations.append(", ".join(stats))
 
-        label = six.ensure_text(e.person)
+        label = six.text_type(e.person)
         if explanations:
             label = "{}: {}".format(label, "; ".join(explanations))
 
diff --git a/ietf/secr/sreq/tests.py b/ietf/secr/sreq/tests.py
index 2725feae5..e95f592ae 100644
--- a/ietf/secr/sreq/tests.py
+++ b/ietf/secr/sreq/tests.py
@@ -184,14 +184,14 @@ class SubmitRequestCase(TestCase):
         r = self.client.post(url,post_data)
         self.assertEqual(r.status_code, 200)
         q = PyQuery(r.content)
-        self.assertTrue('Confirm' in six.ensure_text(q("title")))
+        self.assertTrue('Confirm' in six.text_type(q("title")))
         # confirm
         post_data['submit'] = 'Submit'
         r = self.client.post(confirm_url,post_data)
         self.assertRedirects(r, reverse('ietf.secr.sreq.views.main'))
         self.assertEqual(len(outbox),len_before+1)
         notification = outbox[-1]
-        notification_payload = six.ensure_text(notification.get_payload(decode=True),"utf-8","replace")
+        notification_payload = six.text_type(notification.get_payload(decode=True),"utf-8","replace")
         session = Session.objects.get(meeting=meeting,group=group)
         self.assertEqual(session.resources.count(),1)
         self.assertEqual(session.people_constraints.count(),1)
diff --git a/ietf/submit/tests.py b/ietf/submit/tests.py
index 4463cb367..d87d73885 100644
--- a/ietf/submit/tests.py
+++ b/ietf/submit/tests.py
@@ -19,7 +19,7 @@ from pyquery import PyQuery
 
 from django.conf import settings
 from django.urls import reverse as urlreverse
-from django.utils.encoding import force_str
+from django.utils.encoding import force_str, force_text
 
 import debug                            # pyflakes:ignore
 
@@ -38,7 +38,7 @@ from ietf.person.models import Person
 from ietf.person.factories import UserFactory, PersonFactory
 from ietf.submit.models import Submission, Preapproval
 from ietf.submit.mail import add_submission_email, process_response_email
-from ietf.utils.mail import outbox, empty_outbox
+from ietf.utils.mail import outbox, empty_outbox, get_payload
 from ietf.utils.models import VersionInfo
 from ietf.utils.test_utils import login_testing_unauthorized, TestCase
 from ietf.utils.draft import Draft
@@ -296,16 +296,16 @@ class SubmitTests(TestCase):
         self.assertTrue(draft.relations_that_doc("possibly-replaces").first().target, sug_replaced_alias)
         self.assertEqual(len(outbox), mailbox_before + 5)
         self.assertIn(("I-D Action: %s" % name), outbox[-4]["Subject"])
-        self.assertIn(author.ascii, six.ensure_text(outbox[-4]))
+        self.assertIn(author.ascii, get_payload(outbox[-4]))
         self.assertIn(("I-D Action: %s" % name), outbox[-3]["Subject"])
-        self.assertIn(author.ascii, six.ensure_text(outbox[-3]))
+        self.assertIn(author.ascii, get_payload(outbox[-3]))
         self.assertIn("New Version Notification",outbox[-2]["Subject"])
-        self.assertIn(name, six.ensure_text(outbox[-2]))
-        self.assertIn("mars", six.ensure_text(outbox[-2]))
+        self.assertIn(name, get_payload(outbox[-2]))
+        self.assertIn("mars", get_payload(outbox[-2]))
         # Check "Review of suggested possible replacements for..." mail
         self.assertIn("review", outbox[-1]["Subject"].lower())
-        self.assertIn(name, six.ensure_text(outbox[-1]))
-        self.assertIn(sug_replaced_alias.name, six.ensure_text(outbox[-1]))
+        self.assertIn(name, get_payload(outbox[-1]))
+        self.assertIn(sug_replaced_alias.name, get_payload(outbox[-1]))
         self.assertIn("ames-chairs@", outbox[-1]["To"].lower())
         self.assertIn("mars-chairs@", outbox[-1]["To"].lower())
 
@@ -413,7 +413,7 @@ class SubmitTests(TestCase):
         self.assertTrue("unknown-email-" not in confirm_email["To"])
         if change_authors:
             # Since authors changed, ensure chairs are copied (and that the message says why)
-            self.assertTrue("chairs have been copied" in six.ensure_text(confirm_email))
+            self.assertTrue("chairs have been copied" in six.text_type(confirm_email))
             if group_type in ['wg','rg','ag']:
                 self.assertTrue("mars-chairs@" in confirm_email["To"].lower())
             elif group_type == 'area':
@@ -423,7 +423,7 @@ class SubmitTests(TestCase):
             if stream_type=='ise':
                self.assertTrue("rfc-ise@" in confirm_email["To"].lower())
         else:
-            self.assertNotIn("chairs have been copied", six.ensure_text(confirm_email))
+            self.assertNotIn("chairs have been copied", six.text_type(confirm_email))
             self.assertNotIn("mars-chairs@", confirm_email["To"].lower())
 
         confirmation_url = self.extract_confirmation_url(confirm_email)
@@ -492,17 +492,17 @@ class SubmitTests(TestCase):
         self.assertEqual(len(outbox), mailbox_before + 3)
         self.assertTrue(("I-D Action: %s" % name) in outbox[-3]["Subject"])
         self.assertTrue(("I-D Action: %s" % name) in draft.message_set.order_by("-time")[0].subject)
-        self.assertTrue(author.ascii in six.ensure_text(outbox[-3]))
+        self.assertTrue(author.ascii in get_payload(outbox[-3]))
         self.assertTrue("i-d-announce@" in outbox[-3]['To'])
         self.assertTrue("New Version Notification" in outbox[-2]["Subject"])
-        self.assertTrue(name in six.ensure_text(outbox[-2]))
+        self.assertTrue(name in get_payload(outbox[-2]))
         interesting_address = {'ietf':'mars', 'irtf':'irtf-chair', 'iab':'iab-chair', 'ise':'rfc-ise'}[draft.stream_id]
-        self.assertTrue(interesting_address in six.ensure_text(outbox[-2]))
+        self.assertTrue(interesting_address in force_text(outbox[-2].as_string()))
         if draft.stream_id == 'ietf':
-            self.assertTrue(draft.ad.role_email("ad").address in six.ensure_text(outbox[-2]))
-            self.assertTrue(ballot_position.ad.role_email("ad").address in six.ensure_text(outbox[-2]))
+            self.assertTrue(draft.ad.role_email("ad").address in force_text(outbox[-2].as_string()))
+            self.assertTrue(ballot_position.ad.role_email("ad").address in force_text(outbox[-2].as_string()))
         self.assertTrue("New Version Notification" in outbox[-1]["Subject"])
-        self.assertTrue(name in six.ensure_text(outbox[-1]))
+        self.assertTrue(name in get_payload(outbox[-1]))
         r = self.client.get(urlreverse('ietf.doc.views_search.recent_drafts'))
         self.assertEqual(r.status_code, 200)
         self.assertContains(r, draft.name)
@@ -562,7 +562,7 @@ class SubmitTests(TestCase):
         # both submitter and author get email
         self.assertTrue(author.email().address.lower() in confirm_email["To"])
         self.assertTrue("submitter@example.com" in confirm_email["To"])
-        self.assertFalse("chairs have been copied" in six.ensure_text(confirm_email))
+        self.assertFalse("chairs have been copied" in six.text_type(confirm_email))
 
         confirmation_url = self.extract_confirmation_url(outbox[-1])
 
diff --git a/ietf/sync/rfceditor.py b/ietf/sync/rfceditor.py
index 6caf9ec87..609360215 100644
--- a/ietf/sync/rfceditor.py
+++ b/ietf/sync/rfceditor.py
@@ -552,6 +552,6 @@ def post_approved_draft(url, name):
         # catch everything so we don't leak exceptions, convert them
         # into string instead
         log("Exception on RFC-Editor notification for draft '%s': '%s'" % (name, e))
-        error = six.ensure_text(e)
+        error = six.text_type(e)
 
     return text, error
diff --git a/ietf/utils/admin.py b/ietf/utils/admin.py
index e01f1388c..ec141b78c 100644
--- a/ietf/utils/admin.py
+++ b/ietf/utils/admin.py
@@ -7,6 +7,8 @@ from __future__ import absolute_import, print_function, unicode_literals
 import six
 
 from django.contrib import admin
+from django.utils.encoding import force_text
+
 from ietf.utils.models import VersionInfo
 
 def name(obj):
@@ -16,10 +18,10 @@ def name(obj):
         if callable(obj.name):
             name = obj.name()
         else:
-            name = six.ensure_text(obj.name)
+            name = force_text(obj.name)
         if name:
             return name
-    return six.ensure_text(obj)
+    return six.text_type(obj)
     
 def admin_link(field, label=None, ordering="", display=name, suffix=""):
     if not label:
diff --git a/ietf/utils/mail.py b/ietf/utils/mail.py
index 4e3961bd5..91070b496 100644
--- a/ietf/utils/mail.py
+++ b/ietf/utils/mail.py
@@ -174,7 +174,7 @@ def mail_context(request):
         return RequestContext(request)
     else:
         return Context()
-  
+
 def send_mail(request, to, frm, subject, template, context, *args, **kwargs):
     '''
     Send an email to the destination [list], with the given return
@@ -321,7 +321,7 @@ def send_mail_mime(request, to, frm, subject, msg, cc=None, extra=None, toUser=F
     """Send MIME message with content already filled in."""
     
     condition_message(to, frm, subject, msg, cc, extra)
-
+    
     # start debug server with python -m smtpd -n -c DebuggingServer localhost:2025
     # then put USING_DEBUG_EMAIL_SERVER=True and EMAIL_HOST='localhost'
     # and EMAIL_PORT=2025 in settings_local.py
diff --git a/ietf/utils/pipe.py b/ietf/utils/pipe.py
index 62a67e671..e61fce373 100644
--- a/ietf/utils/pipe.py
+++ b/ietf/utils/pipe.py
@@ -26,7 +26,7 @@ def pipe(cmd, str=None):
         if str:
             out += str
         code = pipe.poll()
-        if code > -1:
+        if code != None:
             err = pipe.stderr.read()
             break
         if len(out) >= MAX:
diff --git a/ietf/utils/tests.py b/ietf/utils/tests.py
index a54758148..8c778cb2b 100644
--- a/ietf/utils/tests.py
+++ b/ietf/utils/tests.py
@@ -29,6 +29,7 @@ from django.template.defaulttags import URLNode
 from django.template.loader import get_template
 from django.templatetags.static import StaticNode
 from django.urls import reverse as urlreverse
+from django.utils.encoding import force_text
 
 import debug                            # pyflakes:ignore
 
@@ -160,12 +161,12 @@ def get_callbacks(urllist):
             callbacks.update(get_callbacks(entry.url_patterns))
         else:
             if hasattr(entry, '_callback_str'):
-                callbacks.add(six.ensure_text(entry._callback_str))
+                callbacks.add(force_text(entry._callback_str))
             if (hasattr(entry, 'callback') and entry.callback
                 and type(entry.callback) in [types.FunctionType, types.MethodType ]):
                 callbacks.add("%s.%s" % (entry.callback.__module__, entry.callback.__name__))
             if hasattr(entry, 'name') and entry.name:
-                callbacks.add(six.ensure_text(entry.name))
+                callbacks.add(force_text(entry.name))
             # There are some entries we don't handle here, mostly clases
             # (such as Feed subclasses)
 
@@ -278,7 +279,7 @@ class TemplateChecksTestCase(TestCase):
         r = self.client.get(url)        
         self.assertTemplateUsed(r, '500.html')
 
-@skipIf(six.PY3, "Trac not available for Python3 as of 14 Jul 2019")
+@skipIf(True, "Trac not available for Python3 as of 14 Jul 2019")
 @skipIf(skip_wiki_glue_testing, skip_message)
 class TestWikiGlueManagementCommand(TestCase):
 
@@ -301,14 +302,18 @@ class TestWikiGlueManagementCommand(TestCase):
         set_coverage_checking(True)
 
     def test_wiki_create_output(self):
-        for type in ['wg','rg','ag','area']:
-            GroupFactory(type_id=type)
+        for group_type in ['wg','rg','ag','area']:
+            GroupFactory(type_id=group_type)
         groups = Group.objects.filter(
                         type__slug__in=['wg','rg','ag','area'],
                         state__slug='active'
                     ).order_by('acronym')
         out = six.StringIO()
         err = six.StringIO()
+        debug.type('self.wiki_dir_pattern')
+        debug.show('self.wiki_dir_pattern')
+        debug.type('self.svn_dir_pattern')
+        debug.show('self.svn_dir_pattern')
         call_command('create_group_wikis', stdout=out, stderr=err, verbosity=2,
             wiki_dir_pattern=self.wiki_dir_pattern,
             svn_dir_pattern=self.svn_dir_pattern,
@@ -419,13 +424,13 @@ class DraftTests(TestCase):
         self.assertEqual(self.draft.get_status(),'Informational')
     
     def test_get_authors(self):
-        self.assertTrue(all(['@' in author for author in self.draft.get_authors()]))
+        self.assertTrue(all([u'@' in author for author in self.draft.get_authors()]))
 
     def test_get_authors_with_firm(self):
-        self.assertTrue(all(['@' in author for author in self.draft.get_authors_with_firm()]))
+        self.assertTrue(all([u'@' in author for author in self.draft.get_authors_with_firm()]))
         
     def test_old_get_refs(self):
-        self.assertEqual(self.draft.old_get_refs()[1][0],'rfc2119')
+        self.assertEqual(self.draft.old_get_refs()[1][0],u'rfc2119')
 
     def test_get_meta(self):
         tempdir = mkdtemp()
diff --git a/requirements.txt b/requirements.txt
index bca7b425d..cedd99532 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -57,7 +57,7 @@ six>=1.9.0
 sqlparse>=0.2.2
 tblib>=1.3.0
 tqdm>=3.7.0
-#Trac>=1.2.3
+Trac>=1.2.3
 Unidecode>=0.4.18
 #wsgiref>=0.1.2
 xml2rfc>=2.9.3,!=2.6.0