Remove __future__ imports

internationalflavor/countries/_cldr_data.py

@@ -2,7 +2,6 @@
 # This file is automatically generated based on the English CLDR file.
 # Do not edit manually.
 
-from __future__ import unicode_literals
 from django.utils.translation import ugettext_lazy as _
 
 COUNTRY_NAMES = {

internationalflavor/countries/data.py

@@ -53,8 +53,6 @@
 PR Puerto Rico
 """
 
-from __future__ import absolute_import
-from __future__ import unicode_literals
 from django.utils.functional import lazy
 from ._cldr_data import COUNTRY_NAMES
 

internationalflavor/iban/data.py

@@ -1,9 +1,6 @@
 """Contains a list of all known IBAN regexes.
 """
 
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 IBAN_REGEXES = {
     'AD': r'^\d{10}[0-9A-Z]{12}$',  # AD2!n4!n4!n12!c
     'AE': r'^\d{21}$',  # AE2!n3!n16!n

internationalflavor/iban/validators.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import re
 from django.core.exceptions import ValidationError
 from django.utils.translation import ugettext_lazy as _
@@ -25,7 +22,7 @@ class IBANValidator(object):
     are localized characters (the so-called BBAN).
 
     :param countries: If set, the list of source countries will be limited to the provided list. Otherwise, all
-        available IBANs are included (with the exception of Nordea IBANs if ``accept_nordea_extensions`` is not set).
+        available IBANs are included (with the exception of experimental IBANs if ``accept_experimental`` is not set).
 
     :param exclude: You can use this parameter to exclude items from the list of countries.
 
@@ -34,14 +31,14 @@ class IBANValidator(object):
         to perform direct debits, you can set this to True. This is equivalent to setting the exclude list to all
         countries without SEPA.
 
-    :param bool accept_nordea_extensions: By default, this validator will validate any IBAN that is recognized by the
-        SWIFT organization, but Nordea has  specified a few additional IBAN formats. By setting this parameter to True,
-        these extensions are also allowed.
+    :param bool accept_experimental: By default, this validator will validate any IBAN that is recognized by the
+        SWIFT organization, but SWIFT has specified a few additional IBAN formats and defined them as 'experimental'.
+        By setting this parameter to True, these extensions are also allowed.
 
     .. warning::
 
-       The validation of the Nordea extensions may be wrong for some countries, as there is no standard for these
-       numbers.
+       The validation of the experimental numbers may be wrong for some countries, as only their length is published
+       by the SWIFT organization
     """
 
     def __init__(self, countries=None, exclude=None, sepa_only=False, accept_experimental=False):

internationalflavor/timezone/_cldr_data.py

@@ -2,7 +2,6 @@
 # This file is automatically generated based on the English CLDR file.
 # Do not edit manually.
 
-from __future__ import unicode_literals
 from django.utils.translation import ugettext_lazy as _
 
 METAZONE_MAPPING_FROM_TZ = {

internationalflavor/timezone/data.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division
-
 import datetime
 
 from django.core.exceptions import ImproperlyConfigured

internationalflavor/timezone/models.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
 import datetime
 from django.core.exceptions import ValidationError
 from django.db import models

internationalflavor/vat_number/validators.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import re
 import socket
 import urllib.request

scripts/datafromcldr.py

@@ -1,8 +1,6 @@
-import argparse
 import json
 import os
 import sys
-import zipfile
 import django
 from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
@@ -81,7 +79,6 @@ def handle(self, *args, **options):
                 f.write(b"# coding=utf-8\n")
                 f.write(b"# This file is automatically generated based on the English CLDR file.\n")
                 f.write(b"# Do not edit manually.\n\n")
-                f.write(b"from __future__ import unicode_literals\n")
                 f.write(b"from django.utils.translation import ugettext_lazy as _\n\n")
 
                 f.write(b"COUNTRY_NAMES = {\n")
@@ -131,7 +128,6 @@ def handle(self, *args, **options):
                 f.write(b"# coding=utf-8\n")
                 f.write(b"# This file is automatically generated based on the English CLDR file.\n")
                 f.write(b"# Do not edit manually.\n\n")
-                f.write(b"from __future__ import unicode_literals\n")
                 f.write(b"from django.utils.translation import ugettext_lazy as _\n\n")
 
                 f.write(b"METAZONE_MAPPING_FROM_TZ = {\n")

scripts/mergemessages.py

@@ -1,4 +1,3 @@
-import argparse
 import os
 import sys