remove all occurences of import unicode_literals

drop Python 2 support

docs/release-notes/0.10.rst

@@ -53,8 +53,6 @@ merchant implementation. Such a migration file must contain a datamigration, for
 
 .. code-block:: python
 
-	from __future__ import unicode_literals
-
 	from django.db import migrations, models
 
 	def forwards(apps, schema_editor):

docs/release-notes/0.9.rst

@@ -20,9 +20,6 @@ Next, edit the migration file to look like this:
 
 .. code-block:: python
 
-    # -*- coding: utf-8 -*-
-    from __future__ import unicode_literals
-
     from django.db import models, migrations
 
 

setup.py

@@ -1,7 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from setuptools import setup, find_packages
 import shop
 

shop/admin/customer.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django import forms
 from django.contrib.auth import get_user_model
 from django.contrib.auth.admin import UserAdmin

shop/admin/defaults/commodity.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.conf import settings
 from django.contrib import admin
 from django.utils.translation import ugettext_lazy as _

shop/admin/defaults/customer.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.contrib import admin
 from django.utils.html import format_html_join
 from django.utils.translation import ugettext_lazy as _

shop/admin/defaults/order.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from shop.admin.order import BaseOrderAdmin, OrderPaymentInline
 
 

shop/admin/delivery.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.conf.urls import url
 from django.contrib import admin
 from django.db.models import Sum

shop/admin/notification.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from collections import OrderedDict
 
 from django.contrib import admin

shop/admin/order.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.conf.urls import url
 from django.contrib import admin
 from django.db.models.fields import Field, FieldDoesNotExist

shop/admin/product.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django import forms
 from django.core.exceptions import ImproperlyConfigured
 from django.contrib import admin

shop/cascade/breadcrumb.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.core.exceptions import ImproperlyConfigured
 from django.forms import fields, widgets
 from django.template import engines, TemplateDoesNotExist

shop/cascade/extensions.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.utils.translation import ugettext_lazy as _
 from cms.plugin_pool import plugin_pool
 from cmsplugin_cascade.plugin_base import TransparentContainer

shop/cascade/settings.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
 from cmsplugin_cascade.bootstrap4.mixins import BootstrapUtilities

shop/cms_apphooks.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.utils.translation import ugettext_lazy as _
 
 from cms.app_base import CMSApp

shop/cms_menus.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.utils.translation import ugettext_lazy as _, override
 
 from cms.menu_bases import CMSAttachMenu

shop/conf.py

@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-
 class DefaultSettings(object):
     def _setting(self, name, default=None):
         from django.conf import settings

shop/exceptions.py

@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-
 class ProductNotAvailable(Exception):
     """
     The product being purchased isn't available anymore.

shop/filters.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django_filters import filters
 
 from djng.forms import fields

shop/forms/auth.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.conf import settings
 from django.contrib.auth import get_user_model, authenticate, login, password_validation
 from django.contrib.auth.forms import PasswordResetForm

shop/forms/base.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from formtools.wizard.views import normalize_name
 
 from django.contrib.auth import get_user_model

shop/forms/checkout.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.contrib.auth import get_user_model
 from django.forms import widgets, Media
 from django.forms.utils import ErrorDict

shop/forms/widgets.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.forms import widgets
 
 

shop/forms/wizards.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.conf import settings
 from django.db.models import Max
 from django.forms import models, fields, widgets

shop/management/commands/shop.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from cms.models.static_placeholder import StaticPlaceholder
 from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError

shop/management/utils.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from djangocms_text_ckeditor.models import Text
 from djangocms_text_ckeditor.utils import plugin_tags_to_id_list, replace_plugin_tags
 from cms.api import add_plugin

shop/messages.py

@@ -1,8 +1,6 @@
-# -*- coding: utf-8 -*-
 """
 A wrapper around Django's messages framework for easier integration with Javascript based messages.
 """
-from __future__ import unicode_literals
 
 import json
 from django.contrib import messages as django_messages

shop/middleware.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.utils.deprecation import MiddlewareMixin
 from django.utils.functional import SimpleLazyObject
 from django.utils import timezone

shop/models/address.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 """
 Holds all the information relevant to the client (addresses for instance)
 """

shop/models/cart.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from six import with_metaclass
 import warnings
 from collections import OrderedDict

shop/models/customer.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import string
 from importlib import import_module
 import warnings

shop/models/defaults/address.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 

shop/models/defaults/cart.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db.models import SET_DEFAULT
 
 from shop import deferred

shop/models/defaults/cart_item.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db.models import PositiveIntegerField
 from shop.models import cart
 

shop/models/defaults/commodity.py

@@ -1,9 +1,7 @@
-# -*- coding: utf-8 -*-
 """
 In django-SHOP, a Commodity product-model is considered a very basic product without any attributes,
 which can be used on a generic CMS page to describe anything.
 """
-from __future__ import unicode_literals
 
 from django.conf import settings
 from django.core.validators import MinValueValidator

shop/models/defaults/customer.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models
 from django.template.loader import select_template
 from django.utils.translation import ugettext_lazy as _

shop/models/defaults/delivery.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.utils.translation import ugettext_lazy as _
 from shop.models.delivery import BaseDelivery
 

shop/models/defaults/delivery_item.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from shop.models.delivery import BaseDeliveryItem

shop/models/defaults/mapping.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
 """
 Some models in the merchant's implementation require a many-to-many relation with models from
 outside django-SHOP. Therefore these mapping tables must be materialized by the merchant's

shop/models/defaults/order.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import binascii
 from os import urandom
 from urllib.parse import urljoin

shop/models/defaults/order_item.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db.models import PositiveIntegerField
 from django.utils.translation import ugettext_lazy as _, pgettext_lazy
 from shop.models import order

shop/models/delivery.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from six import with_metaclass
 from django.core import checks
 from django.db import models

shop/models/fields.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 import enum
 import six
 from django.conf import settings

shop/models/inventory.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.core import checks
 from django.db import models
 from django.db.models.aggregates import Sum

shop/models/notification.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.conf import settings
 from django.db import models
 from django.db.models import Q

shop/models/order.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from decimal import Decimal
 import logging
 from urllib.parse import urljoin

shop/models/product.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from distutils.version import LooseVersion
 from functools import reduce
 import operator

shop/models/related.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models
 from django.utils.six import with_metaclass
 from django.utils.translation import ugettext_lazy as _

shop/modifiers/base.py

@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-
 class BaseCartModifier(object):
     """
     Cart Modifiers are the cart's counterpart to backends.

shop/modifiers/defaults.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from decimal import Decimal
 from django.utils.translation import ugettext_lazy as _
 from shop import messages

shop/modifiers/pool.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.core.exceptions import ImproperlyConfigured
 from shop.conf import app_settings
 

shop/modifiers/taxes.py

@@ -1,7 +1,5 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.utils.translation import ugettext_lazy as _
+
 from shop.conf import app_settings
 from shop.serializers.cart import ExtraCartRow
 from shop.modifiers.base import BaseCartModifier

shop/money/__init__.py

@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from shop.money.money_maker import MoneyMaker, AbstractMoney
 
 # The default Money type for this shop

shop/money/fields.py

@@ -1,12 +1,11 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from decimal import Decimal
+
 from django.core.exceptions import ValidationError
 from django import forms
 from django.db import models
 from django.utils.html import format_html
 from django.utils.translation import ugettext_lazy as _
+
 from shop.conf import app_settings
 from shop.money.iso4217 import CURRENCIES
 from shop.money.money_maker import MoneyMaker, AbstractMoney