Added 'from __future__' imports all over the place, to bring code behaviour into closer alignment between python2 and python3

- Legacy-Id: 16446
This commit is contained in:
Henrik Levkowetz 2019-07-15 15:40:51 +00:00
parent 6ace81b25d
commit 2d7c9629aa
261 changed files with 735 additions and 11 deletions

View file

@ -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:

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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):

View file

@ -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):

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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):

View file

@ -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):

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

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

View file

@ -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

View file

@ -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 <pasi.eronen@nokia.com>
#
@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

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

View file

@ -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

View file

@ -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:

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

Some files were not shown because too many files have changed in this diff Show more