Skip to content

Commit

Permalink
import unicode_literals
Browse files Browse the repository at this point in the history
and remove it from empty __init__.py files
  • Loading branch information
Andrew Fyfe committed Feb 3, 2018
1 parent 87e8a32 commit 3159eca
Show file tree
Hide file tree
Showing 29 changed files with 31 additions and 25 deletions.
3 changes: 3 additions & 0 deletions doc/conf.py
Expand Up @@ -11,7 +11,10 @@
# All configuration values have a default; values that are commented out # All configuration values have a default; values that are commented out
# serve to show the default. # serve to show the default.


from __future__ import unicode_literals

import os import os

# import sys # import sys


# If extensions (or modules to document with autodoc) are in another directory, # If extensions (or modules to document with autodoc) are in another directory,
Expand Down
1 change: 0 additions & 1 deletion modoboa/admin/management/__init__.py
@@ -1 +0,0 @@
from __future__ import unicode_literals
1 change: 0 additions & 1 deletion modoboa/admin/management/commands/__init__.py
@@ -1 +0,0 @@
from __future__ import unicode_literals
1 change: 0 additions & 1 deletion modoboa/admin/management/commands/subcommands/__init__.py
@@ -1 +0,0 @@
from __future__ import unicode_literals
1 change: 0 additions & 1 deletion modoboa/admin/templatetags/__init__.py
@@ -1 +0,0 @@
from __future__ import unicode_literals
1 change: 0 additions & 1 deletion modoboa/admin/tests/__init__.py
@@ -1 +0,0 @@
from __future__ import unicode_literals
2 changes: 2 additions & 0 deletions modoboa/core/checks/__init__.py
@@ -1,4 +1,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-


from __future__ import unicode_literals

# Import these to force registration of checks # Import these to force registration of checks
from . import settings_checks # NOQA:F401 from . import settings_checks # NOQA:F401
1 change: 0 additions & 1 deletion modoboa/core/management/__init__.py
@@ -1 +0,0 @@
from __future__ import unicode_literals
1 change: 0 additions & 1 deletion modoboa/core/management/commands/__init__.py
@@ -1 +0,0 @@
from __future__ import unicode_literals
1 change: 0 additions & 1 deletion modoboa/core/templatetags/__init__.py
@@ -1 +0,0 @@
from __future__ import unicode_literals
1 change: 0 additions & 1 deletion modoboa/core/tests/__init__.py
@@ -1 +0,0 @@
from __future__ import unicode_literals
1 change: 0 additions & 1 deletion modoboa/core/tests/stupid_extension_1/__init__.py
@@ -1 +0,0 @@
from __future__ import unicode_literals
1 change: 0 additions & 1 deletion modoboa/core/tests/stupid_extension_2/__init__.py
@@ -1 +0,0 @@
from __future__ import unicode_literals
1 change: 0 additions & 1 deletion modoboa/lib/__init__.py
@@ -1 +0,0 @@
from __future__ import unicode_literals
14 changes: 7 additions & 7 deletions modoboa/lib/imap_utf7.py
Expand Up @@ -171,33 +171,33 @@ def utf7SequenceToUTF8(seq): # NOQA:N802


if __name__ == "__main__": if __name__ == "__main__":


# print u'bøx'.encode('imap4-utf-7') # print 'bøx'.encode('imap4-utf-7')
# print 'expected b&APg-x' # 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 'expected b&AOU-x'


print("#######") print("#######")
print("bøx") print("bøx")
e = imapUTF7Encode(u'bøx') e = imapUTF7Encode("bøx")
print(e) print(e)
print(imapUTF7Decode(e).encode("latin-1")) print(imapUTF7Decode(e).encode("latin-1"))


print("#######") print("#######")
print("båx") print("båx")
e = imapUTF7Encode(u'båx') e = imapUTF7Encode("båx")
print(e) print(e)
print(imapUTF7Decode(e).encode("latin-1")) print(imapUTF7Decode(e).encode("latin-1"))


print("#######") print("#######")
print("~/bågø") print("~/bågø")
e = imapUTF7Encode(u'~/bågø') e = imapUTF7Encode("~/bågø")
print(e) print(e)
print(imapUTF7Decode(e).encode("latin-1")) print(imapUTF7Decode(e).encode("latin-1"))


print("#######") print("#######")
print("Ting & Såger") print("Ting & Såger")
e = imapUTF7Encode(u'Ting & Såger') e = imapUTF7Encode("Ting & Såger")
print(e) print(e)
print(imapUTF7Decode(e).encode("latin-1")) print(imapUTF7Decode(e).encode("latin-1"))


Expand All @@ -209,7 +209,7 @@ def utf7SequenceToUTF8(seq): # NOQA:N802


print("#######") print("#######")
print("~/Følder/mailbåx & stuff + more") 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) e = imapUTF7Encode(n)
print(e) print(e)
print(imapUTF7Decode(e).encode("latin-1")) print(imapUTF7Decode(e).encode("latin-1"))
Expand Down
1 change: 0 additions & 1 deletion modoboa/lib/templatetags/__init__.py
@@ -1 +0,0 @@
from __future__ import unicode_literals
1 change: 0 additions & 1 deletion modoboa/limits/tests/__init__.py
@@ -1 +0,0 @@
from __future__ import unicode_literals
3 changes: 0 additions & 3 deletions modoboa/limits/views.py

This file was deleted.

1 change: 0 additions & 1 deletion modoboa/parameters/__init__.py
@@ -1 +0,0 @@
from __future__ import unicode_literals
2 changes: 2 additions & 0 deletions modoboa/relaydomains/serializers.py
@@ -1,5 +1,7 @@
"""RelayDomain serializers.""" """RelayDomain serializers."""


from __future__ import unicode_literals

import json import json


from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
Expand Down
2 changes: 2 additions & 0 deletions modoboa/relaydomains/transport.py
@@ -1,5 +1,7 @@
"""Transport backend definition.""" """Transport backend definition."""


from __future__ import unicode_literals

from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _


from modoboa.transport import backends from modoboa.transport import backends
Expand Down
2 changes: 2 additions & 0 deletions modoboa/relaydomains/urls_api.py
@@ -1,5 +1,7 @@
"""Transport API urls.""" """Transport API urls."""


from __future__ import unicode_literals

from rest_framework import routers from rest_framework import routers


from . import viewsets from . import viewsets
Expand Down
2 changes: 2 additions & 0 deletions modoboa/relaydomains/viewsets.py
@@ -1,5 +1,7 @@
"""RelayDomain viewsets.""" """RelayDomain viewsets."""


from __future__ import unicode_literals

from rest_framework import viewsets from rest_framework import viewsets
from rest_framework.permissions import DjangoModelPermissions, IsAuthenticated from rest_framework.permissions import DjangoModelPermissions, IsAuthenticated


Expand Down
2 changes: 2 additions & 0 deletions modoboa/transport/__init__.py
@@ -1 +1,3 @@
from __future__ import unicode_literals

default_app_config = "modoboa.transport.apps.TransportConfig" default_app_config = "modoboa.transport.apps.TransportConfig"
2 changes: 2 additions & 0 deletions modoboa/transport/backends.py
@@ -1,5 +1,7 @@
"""Transport backend.""" """Transport backend."""


from __future__ import unicode_literals

from django import forms from django import forms
from django.core import validators from django.core import validators
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
Expand Down
1 change: 1 addition & 0 deletions modoboa/transport/constants.py
@@ -1,4 +1,5 @@
"""Transport constants.""" """Transport constants."""
from __future__ import unicode_literals


PERMISSIONS = { PERMISSIONS = {


Expand Down
2 changes: 2 additions & 0 deletions modoboa/transport/factories.py
@@ -1,5 +1,7 @@
"""Transport factories.""" """Transport factories."""


from __future__ import unicode_literals

import factory import factory


from . import models from . import models
Expand Down
2 changes: 2 additions & 0 deletions modoboa/transport/forms.py
@@ -1,5 +1,7 @@
"""Transport forms.""" """Transport forms."""


from __future__ import unicode_literals

from django import forms from django import forms


from . import backends, models from . import backends, models
Expand Down
2 changes: 2 additions & 0 deletions tests.py
@@ -1,4 +1,6 @@
# coding: utf-8 # coding: utf-8
from __future__ import unicode_literals

import os import os
import tempfile import tempfile
import unittest import unittest
Expand Down

0 comments on commit 3159eca

Please sign in to comment.