python 3

newsbox/admin.py

 # -*- coding: utf-8 -*-
+# Future imports
 from __future__ import unicode_literals
+
+# Standard libs
 import copy
 import itertools
 
+# Django imports
 from django.conf.urls import url
-from django.contrib import messages, admin
-from django.contrib.admin.models import LogEntry, CHANGE
-from django.contrib.admin.templatetags.admin_static import static
+from django.contrib import admin
+from django.contrib import messages
+from django.contrib.admin.models import CHANGE
+from django.contrib.admin.models import LogEntry
 from django.contrib.contenttypes.models import ContentType
+from django.templatetags.static import static
+
 try:
+    # Django imports
     from django.urls import reverse
 except ImportError:
     from django.core.urlresolvers import reverse
-from django.http import HttpResponseForbidden, HttpResponseRedirect
+
+# Django imports
+from django.http import HttpResponseForbidden
+from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404
-from django.utils.translation import ugettext_lazy as _,  ungettext_lazy
-from django.utils import six, formats
+from django.utils import formats
 from django.utils.html import format_html
+from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ungettext_lazy
+
+# Third Party
+import six
 
 
 def get_fieldset_by_field(name, fieldsets):

newsbox/models.py

 # -*- coding: utf-8 -*-
 
 # "Future imports"
+# Future imports
 from __future__ import unicode_literals
 
+# Standard libs
 # "Standard libs"
 import sys
 from warnings import warn
 
 # "Django imports"
 try:
+    # Django imports
     from django.urls import reverse
 except ImportError:
     from django.core.urlresolvers import reverse
+
+# Django imports
 from django.db import models
+<<<<<<< Updated upstream
 from django.utils import six
 try:
     from django.utils.encoding import python_2_unicode_compatible
 except ImportError:
     def python_2_unicode_compatible(f):
         return f
+=======
+>>>>>>> Stashed changes
 from django.utils.functional import lazy
 from django.utils.safestring import mark_safe
 from django.utils.timezone import now
 from django.utils.translation import ugettext_lazy as _
 
+# Third Party
+import six
+
 mark_safe_lazy = lazy(mark_safe, six.text_type)
 newsbox_models = []
 
@@ -213,7 +224,6 @@ class NewsboxModelBase(models.base.ModelBase):
 
 ###################################################################################################
 ###################################################################################################
-@python_2_unicode_compatible
 class NewsboxBase(six.with_metaclass(NewsboxModelBase, models.Model)):
     """
     Abstract class to build your own news

newsbox_cms/admin.py

 # -*- coding: utf-8 -*-
+# Future imports
 from __future__ import unicode_literals
 
+# Django imports
 from django.contrib import admin
+
 try:
+    # Django imports
     from django.urls import reverse
 except ImportError:
     from django.core.urlresolvers import reverse
+
+# Django imports
 from django.utils import formats
-from django.utils.translation import ugettext_lazy as _
-from django.utils import six
 from django.utils.html import format_html
+from django.utils.translation import ugettext_lazy as _
+
+# Third Party
+import six
 
 try:
-    from cms.admin.placeholderadmin import FrontendEditableAdminMixin, PlaceholderAdminMixin
+    # Third Party
+    from cms.admin.placeholderadmin import FrontendEditableAdminMixin
+    from cms.admin.placeholderadmin import PlaceholderAdminMixin
 except ImportError:
     # temporary django-cms backward compat
     from cms.admin.placeholderadmin import (
@@ -20,7 +30,10 @@ except ImportError:
         PlaceholderAdmin as PlaceholderAdminMixin
     )
 
-from newsbox.admin import NewsboxBaseAdmin, remove_field_from_fieldsets, add_fields_to_fieldset
+# Third Party
+from newsbox.admin import NewsboxBaseAdmin
+from newsbox.admin import add_fields_to_fieldset
+from newsbox.admin import remove_field_from_fieldsets
 
 
 class CustomModelCMSAdmin(admin.ModelAdmin):

newsbox_cms/models.py

 # -*- coding: utf-8 -*-
+# Future imports
 from __future__ import unicode_literals
 
+<<<<<<< Updated upstream
 from django.utils.translation import ugettext_lazy as _, ungettext_lazy
 from django.utils import six
 try:
@@ -8,12 +10,20 @@ try:
 except ImportError:
     def python_2_unicode_compatible(f):
         return f
+=======
+# Django imports
+>>>>>>> Stashed changes
 from django.db import models
+from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ungettext_lazy
+
+# Third Party
+from cms.models.fields import PageField
+from cms.models.fields import PlaceholderField
 from cms.models.pluginmodel import CMSPlugin
-from cms.models.fields import PageField, PlaceholderField
 from djangocms_text_ckeditor.fields import HTMLField
-
 from newsbox.models import NewsboxModelBase
+import six
 
 
 def newsboxcms_mcls_processor(mcls, class_name, class_bases, class_attrs, base, newsbox_opts):
@@ -28,7 +38,6 @@ def newsboxcms_mcls_processor(mcls, class_name, class_bases, class_attrs, base,
         newsbox_opts['trans_fieldnames'].remove('newsbox_body')
 
 
-@python_2_unicode_compatible
 class NewsboxPluginBase(CMSPlugin):
     title = models.CharField(
         verbose_name=_('Title'),

newsbox_i18n/models.py

 # -*- coding: utf-8 -*-
+# Future imports
 from __future__ import unicode_literals
 
 try:
+    # Django imports
     from django.urls import reverse
 except ImportError:
     from django.core.urlresolvers import reverse
+<<<<<<< Updated upstream
 from django.utils.translation import ugettext_lazy as _,  get_language
 from django.utils import six
 try:
@@ -14,8 +17,22 @@ except ImportError:
         return f
 from parler.managers import TranslatableManager, TranslatableQuerySet
 from parler.models import TranslatableModel, TranslatedFields
+=======
+
+# Django imports
+from django.utils.translation import get_language
+from django.utils.translation import ugettext_lazy as _
+
+# Third Party
+from newsbox.models import NewsboxManager
+from newsbox.models import NewsboxModelBase
+from parler.managers import TranslatableManager
+from parler.managers import TranslatableQuerySet
+from parler.models import TranslatableModel
+from parler.models import TranslatedFields
+>>>>>>> Stashed changes
 from parler.utils.context import switch_language
-from newsbox.models import NewsboxModelBase, NewsboxManager
+import six
 
 
 class NewsboxI18NQueryset(TranslatableQuerySet):
@@ -45,7 +62,6 @@ class NewsboxI18NModelBase(NewsboxModelBase):
     pass
 
 
-@python_2_unicode_compatible
 class NewsboxI18NBase(six.with_metaclass(NewsboxI18NModelBase, TranslatableModel)):
     """
     Define News which expires in time and will not be displayed in front