From 3159eca2966a65ea956664365a714b17dac9f4f6 Mon Sep 17 00:00:00 2001 From: Andrew Fyfe Date: Fri, 2 Feb 2018 17:42:43 +0000 Subject: [PATCH] import unicode_literals and remove it from empty __init__.py files --- doc/conf.py | 3 +++ modoboa/admin/management/__init__.py | 1 - modoboa/admin/management/commands/__init__.py | 1 - .../management/commands/subcommands/__init__.py | 1 - modoboa/admin/templatetags/__init__.py | 1 - modoboa/admin/tests/__init__.py | 1 - modoboa/core/checks/__init__.py | 2 ++ modoboa/core/management/__init__.py | 1 - modoboa/core/management/commands/__init__.py | 1 - modoboa/core/templatetags/__init__.py | 1 - modoboa/core/tests/__init__.py | 1 - modoboa/core/tests/stupid_extension_1/__init__.py | 1 - modoboa/core/tests/stupid_extension_2/__init__.py | 1 - modoboa/lib/__init__.py | 1 - modoboa/lib/imap_utf7.py | 14 +++++++------- modoboa/lib/templatetags/__init__.py | 1 - modoboa/limits/tests/__init__.py | 1 - modoboa/limits/views.py | 3 --- modoboa/parameters/__init__.py | 1 - modoboa/relaydomains/serializers.py | 2 ++ modoboa/relaydomains/transport.py | 2 ++ modoboa/relaydomains/urls_api.py | 2 ++ modoboa/relaydomains/viewsets.py | 2 ++ modoboa/transport/__init__.py | 2 ++ modoboa/transport/backends.py | 2 ++ modoboa/transport/constants.py | 1 + modoboa/transport/factories.py | 2 ++ modoboa/transport/forms.py | 2 ++ tests.py | 2 ++ 29 files changed, 31 insertions(+), 25 deletions(-) delete mode 100644 modoboa/limits/views.py diff --git a/doc/conf.py b/doc/conf.py index 1c1daa194..4f11df49a 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -11,7 +11,10 @@ # All configuration values have a default; values that are commented out # serve to show the default. +from __future__ import unicode_literals + import os + # import sys # If extensions (or modules to document with autodoc) are in another directory, diff --git a/modoboa/admin/management/__init__.py b/modoboa/admin/management/__init__.py index baffc4882..e69de29bb 100644 --- a/modoboa/admin/management/__init__.py +++ b/modoboa/admin/management/__init__.py @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/modoboa/admin/management/commands/__init__.py b/modoboa/admin/management/commands/__init__.py index baffc4882..e69de29bb 100644 --- a/modoboa/admin/management/commands/__init__.py +++ b/modoboa/admin/management/commands/__init__.py @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/modoboa/admin/management/commands/subcommands/__init__.py b/modoboa/admin/management/commands/subcommands/__init__.py index baffc4882..e69de29bb 100644 --- a/modoboa/admin/management/commands/subcommands/__init__.py +++ b/modoboa/admin/management/commands/subcommands/__init__.py @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/modoboa/admin/templatetags/__init__.py b/modoboa/admin/templatetags/__init__.py index baffc4882..e69de29bb 100644 --- a/modoboa/admin/templatetags/__init__.py +++ b/modoboa/admin/templatetags/__init__.py @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/modoboa/admin/tests/__init__.py b/modoboa/admin/tests/__init__.py index baffc4882..e69de29bb 100644 --- a/modoboa/admin/tests/__init__.py +++ b/modoboa/admin/tests/__init__.py @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/modoboa/core/checks/__init__.py b/modoboa/core/checks/__init__.py index e41b8f04b..c043b6cf9 100644 --- a/modoboa/core/checks/__init__.py +++ b/modoboa/core/checks/__init__.py @@ -1,4 +1,6 @@ # -*- coding: utf-8 -*- +from __future__ import unicode_literals + # Import these to force registration of checks from . import settings_checks # NOQA:F401 diff --git a/modoboa/core/management/__init__.py b/modoboa/core/management/__init__.py index baffc4882..e69de29bb 100644 --- a/modoboa/core/management/__init__.py +++ b/modoboa/core/management/__init__.py @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/modoboa/core/management/commands/__init__.py b/modoboa/core/management/commands/__init__.py index baffc4882..e69de29bb 100644 --- a/modoboa/core/management/commands/__init__.py +++ b/modoboa/core/management/commands/__init__.py @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/modoboa/core/templatetags/__init__.py b/modoboa/core/templatetags/__init__.py index baffc4882..e69de29bb 100644 --- a/modoboa/core/templatetags/__init__.py +++ b/modoboa/core/templatetags/__init__.py @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/modoboa/core/tests/__init__.py b/modoboa/core/tests/__init__.py index baffc4882..e69de29bb 100644 --- a/modoboa/core/tests/__init__.py +++ b/modoboa/core/tests/__init__.py @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/modoboa/core/tests/stupid_extension_1/__init__.py b/modoboa/core/tests/stupid_extension_1/__init__.py index baffc4882..e69de29bb 100644 --- a/modoboa/core/tests/stupid_extension_1/__init__.py +++ b/modoboa/core/tests/stupid_extension_1/__init__.py @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/modoboa/core/tests/stupid_extension_2/__init__.py b/modoboa/core/tests/stupid_extension_2/__init__.py index baffc4882..e69de29bb 100644 --- a/modoboa/core/tests/stupid_extension_2/__init__.py +++ b/modoboa/core/tests/stupid_extension_2/__init__.py @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/modoboa/lib/__init__.py b/modoboa/lib/__init__.py index baffc4882..e69de29bb 100644 --- a/modoboa/lib/__init__.py +++ b/modoboa/lib/__init__.py @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/modoboa/lib/imap_utf7.py b/modoboa/lib/imap_utf7.py index 0e305c803..34efc3778 100644 --- a/modoboa/lib/imap_utf7.py +++ b/modoboa/lib/imap_utf7.py @@ -171,33 +171,33 @@ def utf7SequenceToUTF8(seq): # NOQA:N802 if __name__ == "__main__": - # print u'bøx'.encode('imap4-utf-7') + # print 'bøx'.encode('imap4-utf-7') # print 'expected b&APg-x' - # print u'båx'.encode('imap4-utf-7') + # print 'båx'.encode('imap4-utf-7') # print 'expected b&AOU-x' print("#######") print("bøx") - e = imapUTF7Encode(u'bøx') + e = imapUTF7Encode("bøx") print(e) print(imapUTF7Decode(e).encode("latin-1")) print("#######") print("båx") - e = imapUTF7Encode(u'båx') + e = imapUTF7Encode("båx") print(e) print(imapUTF7Decode(e).encode("latin-1")) print("#######") print("~/bågø") - e = imapUTF7Encode(u'~/bågø') + e = imapUTF7Encode("~/bågø") print(e) print(imapUTF7Decode(e).encode("latin-1")) print("#######") print("Ting & Såger") - e = imapUTF7Encode(u'Ting & Såger') + e = imapUTF7Encode("Ting & Såger") print(e) print(imapUTF7Decode(e).encode("latin-1")) @@ -209,7 +209,7 @@ def utf7SequenceToUTF8(seq): # NOQA:N802 print("#######") print("~/Følder/mailbåx & stuff + more") - n = u'~/Følder/mailbåx & stuff + more' + n = "~/Følder/mailbåx & stuff + more" e = imapUTF7Encode(n) print(e) print(imapUTF7Decode(e).encode("latin-1")) diff --git a/modoboa/lib/templatetags/__init__.py b/modoboa/lib/templatetags/__init__.py index baffc4882..e69de29bb 100644 --- a/modoboa/lib/templatetags/__init__.py +++ b/modoboa/lib/templatetags/__init__.py @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/modoboa/limits/tests/__init__.py b/modoboa/limits/tests/__init__.py index baffc4882..e69de29bb 100644 --- a/modoboa/limits/tests/__init__.py +++ b/modoboa/limits/tests/__init__.py @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/modoboa/limits/views.py b/modoboa/limits/views.py deleted file mode 100644 index e17c22b7f..000000000 --- a/modoboa/limits/views.py +++ /dev/null @@ -1,3 +0,0 @@ -# coding: utf-8 - -from __future__ import unicode_literals diff --git a/modoboa/parameters/__init__.py b/modoboa/parameters/__init__.py index baffc4882..e69de29bb 100644 --- a/modoboa/parameters/__init__.py +++ b/modoboa/parameters/__init__.py @@ -1 +0,0 @@ -from __future__ import unicode_literals diff --git a/modoboa/relaydomains/serializers.py b/modoboa/relaydomains/serializers.py index 28ec22173..073100c0f 100644 --- a/modoboa/relaydomains/serializers.py +++ b/modoboa/relaydomains/serializers.py @@ -1,5 +1,7 @@ """RelayDomain serializers.""" +from __future__ import unicode_literals + import json from django.utils.translation import ugettext as _ diff --git a/modoboa/relaydomains/transport.py b/modoboa/relaydomains/transport.py index 8c1c77aeb..d6963ddd0 100644 --- a/modoboa/relaydomains/transport.py +++ b/modoboa/relaydomains/transport.py @@ -1,5 +1,7 @@ """Transport backend definition.""" +from __future__ import unicode_literals + from django.utils.translation import ugettext_lazy as _ from modoboa.transport import backends diff --git a/modoboa/relaydomains/urls_api.py b/modoboa/relaydomains/urls_api.py index d877c6f65..844915aa7 100644 --- a/modoboa/relaydomains/urls_api.py +++ b/modoboa/relaydomains/urls_api.py @@ -1,5 +1,7 @@ """Transport API urls.""" +from __future__ import unicode_literals + from rest_framework import routers from . import viewsets diff --git a/modoboa/relaydomains/viewsets.py b/modoboa/relaydomains/viewsets.py index d7de1b82d..215dcb575 100644 --- a/modoboa/relaydomains/viewsets.py +++ b/modoboa/relaydomains/viewsets.py @@ -1,5 +1,7 @@ """RelayDomain viewsets.""" +from __future__ import unicode_literals + from rest_framework import viewsets from rest_framework.permissions import DjangoModelPermissions, IsAuthenticated diff --git a/modoboa/transport/__init__.py b/modoboa/transport/__init__.py index ba19ffc3c..fd449f1e1 100644 --- a/modoboa/transport/__init__.py +++ b/modoboa/transport/__init__.py @@ -1 +1,3 @@ +from __future__ import unicode_literals + default_app_config = "modoboa.transport.apps.TransportConfig" diff --git a/modoboa/transport/backends.py b/modoboa/transport/backends.py index b6923b16d..c531e6ca1 100644 --- a/modoboa/transport/backends.py +++ b/modoboa/transport/backends.py @@ -1,5 +1,7 @@ """Transport backend.""" +from __future__ import unicode_literals + from django import forms from django.core import validators from django.utils.translation import ugettext_lazy as _ diff --git a/modoboa/transport/constants.py b/modoboa/transport/constants.py index 80c50d66b..61fbc1ac9 100644 --- a/modoboa/transport/constants.py +++ b/modoboa/transport/constants.py @@ -1,4 +1,5 @@ """Transport constants.""" +from __future__ import unicode_literals PERMISSIONS = { diff --git a/modoboa/transport/factories.py b/modoboa/transport/factories.py index 332bd400a..e2c4e001b 100644 --- a/modoboa/transport/factories.py +++ b/modoboa/transport/factories.py @@ -1,5 +1,7 @@ """Transport factories.""" +from __future__ import unicode_literals + import factory from . import models diff --git a/modoboa/transport/forms.py b/modoboa/transport/forms.py index 9d7ec1787..cf6cbe656 100644 --- a/modoboa/transport/forms.py +++ b/modoboa/transport/forms.py @@ -1,5 +1,7 @@ """Transport forms.""" +from __future__ import unicode_literals + from django import forms from . import backends, models diff --git a/tests.py b/tests.py index 07180185f..5177a3ec3 100644 --- a/tests.py +++ b/tests.py @@ -1,4 +1,6 @@ # coding: utf-8 +from __future__ import unicode_literals + import os import tempfile import unittest