diff --git a/.travis.yml b/.travis.yml index b02f1b3828..d30204e36b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,6 @@ language: python env: - - DJANGO="111" - - DJANGO="20" - - DJANGO="21" + - DJANGO="22" - DJANGO="master" python: - "3.5" @@ -16,12 +14,8 @@ script: matrix: fast_finish: true include: - - python: "2.7" - env: DJANGO="111" - - python: "3.4" - env: DJANGO="111" - - python: "3.4" - env: DJANGO="20" + - python: "3.5" + env: DJANGO="22" allow_failures: - env: DJANGO="master" notifications: diff --git a/mezzanine/__init__.py b/mezzanine/__init__.py index 865d0f9985..ed48cdab09 100644 --- a/mezzanine/__init__.py +++ b/mezzanine/__init__.py @@ -1,2 +1 @@ - __version__ = "4.3.1" diff --git a/mezzanine/accounts/__init__.py b/mezzanine/accounts/__init__.py index f9a950018d..e480ccd8f8 100644 --- a/mezzanine/accounts/__init__.py +++ b/mezzanine/accounts/__init__.py @@ -5,8 +5,6 @@ setting. Some utility functions for probing the profile model are included below. """ -from __future__ import unicode_literals - from django.apps import apps from django.conf import settings from django.contrib.auth import get_user_model diff --git a/mezzanine/accounts/admin.py b/mezzanine/accounts/admin.py index 5fdf3b6a87..6b6b7ce39c 100644 --- a/mezzanine/accounts/admin.py +++ b/mezzanine/accounts/admin.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib import admin from django.contrib.auth import get_user_model from mezzanine.accounts import get_profile_model, ProfileNotConfigured diff --git a/mezzanine/accounts/defaults.py b/mezzanine/accounts/defaults.py index 18f46af48b..c255fc489b 100644 --- a/mezzanine/accounts/defaults.py +++ b/mezzanine/accounts/defaults.py @@ -9,8 +9,6 @@ that are only read during startup shouldn't be editable, since changing them would require an application reload. """ -from __future__ import unicode_literals - from django.utils.translation import ugettext_lazy as _ from mezzanine.conf import register_setting diff --git a/mezzanine/accounts/forms.py b/mezzanine/accounts/forms.py index 1014fd54d9..8f982eb0e9 100644 --- a/mezzanine/accounts/forms.py +++ b/mezzanine/accounts/forms.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.auth import authenticate, get_user_model from django.contrib.auth.tokens import default_token_generator from django.db.models import Q diff --git a/mezzanine/accounts/templatetags/accounts_tags.py b/mezzanine/accounts/templatetags/accounts_tags.py index f3168a7395..70fc8f60c7 100644 --- a/mezzanine/accounts/templatetags/accounts_tags.py +++ b/mezzanine/accounts/templatetags/accounts_tags.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from collections import OrderedDict from django.contrib.auth import get_user_model diff --git a/mezzanine/accounts/tests.py b/mezzanine/accounts/tests.py index 5d63846cd2..1ac4cb70d7 100644 --- a/mezzanine/accounts/tests.py +++ b/mezzanine/accounts/tests.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.auth import get_user_model from django.contrib.auth.tokens import default_token_generator from django.core import mail diff --git a/mezzanine/accounts/views.py b/mezzanine/accounts/views.py index be709248fa..74d4b78489 100644 --- a/mezzanine/accounts/views.py +++ b/mezzanine/accounts/views.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.auth import (login as auth_login, authenticate, logout as auth_logout, get_user_model) from django.contrib.auth.decorators import login_required diff --git a/mezzanine/bin/runtests.py b/mezzanine/bin/runtests.py index e82ed1a65b..90ce92e202 100755 --- a/mezzanine/bin/runtests.py +++ b/mezzanine/bin/runtests.py @@ -1,6 +1,4 @@ #!/usr/bin/env python -from __future__ import unicode_literals - import atexit import os import shutil diff --git a/mezzanine/blog/__init__.py b/mezzanine/blog/__init__.py index 03fc4334ee..46e9a56936 100644 --- a/mezzanine/blog/__init__.py +++ b/mezzanine/blog/__init__.py @@ -2,6 +2,4 @@ Provides a blogging app with posts, keywords, categories and comments. Posts can be listed by month, keyword, category or author. """ -from __future__ import unicode_literals - from mezzanine import __version__ # noqa diff --git a/mezzanine/blog/admin.py b/mezzanine/blog/admin.py index 522a37c946..2166ae872e 100644 --- a/mezzanine/blog/admin.py +++ b/mezzanine/blog/admin.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from copy import deepcopy from django.contrib import admin diff --git a/mezzanine/blog/defaults.py b/mezzanine/blog/defaults.py index 26514e6d79..87bfa2aa45 100644 --- a/mezzanine/blog/defaults.py +++ b/mezzanine/blog/defaults.py @@ -9,8 +9,6 @@ that are only read during startup shouldn't be editable, since changing them would require an application reload. """ -from __future__ import unicode_literals - from django.conf import settings from django.utils.translation import ugettext_lazy as _ diff --git a/mezzanine/blog/feeds.py b/mezzanine/blog/feeds.py index edeeb7bf3d..0189be521c 100644 --- a/mezzanine/blog/feeds.py +++ b/mezzanine/blog/feeds.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.auth import get_user_model from django.contrib.sites.models import Site from django.contrib.syndication.views import Feed, add_domain diff --git a/mezzanine/blog/forms.py b/mezzanine/blog/forms.py index 1db7c638d9..fc22b8537c 100644 --- a/mezzanine/blog/forms.py +++ b/mezzanine/blog/forms.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django import forms from mezzanine.blog.models import BlogPost diff --git a/mezzanine/blog/management/base.py b/mezzanine/blog/management/base.py index b88278b4ac..42d1b99d0e 100644 --- a/mezzanine/blog/management/base.py +++ b/mezzanine/blog/management/base.py @@ -1,9 +1,4 @@ -from __future__ import print_function, unicode_literals -from future.builtins import input, int -try: - from urllib.parse import urlparse -except: - from urlparse import urlparse +from urllib.parse import urlparse from django.contrib.auth import get_user_model from django.contrib.redirects.models import Redirect diff --git a/mezzanine/blog/management/commands/import_blogger.py b/mezzanine/blog/management/commands/import_blogger.py index ebfe964cc1..92c7a77682 100644 --- a/mezzanine/blog/management/commands/import_blogger.py +++ b/mezzanine/blog/management/commands/import_blogger.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from datetime import datetime, timedelta from time import timezone import re diff --git a/mezzanine/blog/management/commands/import_posterous.py b/mezzanine/blog/management/commands/import_posterous.py index e6f692b6a6..873816efa0 100644 --- a/mezzanine/blog/management/commands/import_posterous.py +++ b/mezzanine/blog/management/commands/import_posterous.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from datetime import datetime import json import time diff --git a/mezzanine/blog/management/commands/import_rss.py b/mezzanine/blog/management/commands/import_rss.py index 72583214f2..9d31883065 100644 --- a/mezzanine/blog/management/commands/import_rss.py +++ b/mezzanine/blog/management/commands/import_rss.py @@ -1,13 +1,8 @@ -from __future__ import unicode_literals - from datetime import timedelta from time import timezone -try: - from urllib.request import urlopen - from urllib.parse import urljoin -except ImportError: - from urllib import urlopen - from urlparse import urljoin + +from urllib.request import urlopen +from urllib.parse import urljoin from django.core.management.base import CommandError diff --git a/mezzanine/blog/management/commands/import_tumblr.py b/mezzanine/blog/management/commands/import_tumblr.py index 3d05edea14..e04a0dedd9 100644 --- a/mezzanine/blog/management/commands/import_tumblr.py +++ b/mezzanine/blog/management/commands/import_tumblr.py @@ -1,15 +1,8 @@ -from __future__ import print_function -from __future__ import unicode_literals -from future.builtins import int - from datetime import datetime from json import loads from time import sleep -try: - from urllib.request import urlopen -except ImportError: - from urllib import urlopen +from urllib.request import urlopen from django.core.management.base import CommandError from django.utils.html import strip_tags diff --git a/mezzanine/blog/management/commands/import_wordpress.py b/mezzanine/blog/management/commands/import_wordpress.py index 85ed271ecb..c7b1069512 100644 --- a/mezzanine/blog/management/commands/import_wordpress.py +++ b/mezzanine/blog/management/commands/import_wordpress.py @@ -1,6 +1,3 @@ -from __future__ import unicode_literals -from future.builtins import int - from collections import defaultdict from datetime import datetime, timedelta import re diff --git a/mezzanine/blog/migrations/0001_initial.py b/mezzanine/blog/migrations/0001_initial.py index 045c98b9f1..b9d3c9ddc4 100644 --- a/mezzanine/blog/migrations/0001_initial.py +++ b/mezzanine/blog/migrations/0001_initial.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import models, migrations import mezzanine.core.fields import mezzanine.utils.models diff --git a/mezzanine/blog/migrations/0002_auto_20150527_1555.py b/mezzanine/blog/migrations/0002_auto_20150527_1555.py index a5cb65cca7..7db9cdd480 100644 --- a/mezzanine/blog/migrations/0002_auto_20150527_1555.py +++ b/mezzanine/blog/migrations/0002_auto_20150527_1555.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import models, migrations diff --git a/mezzanine/blog/migrations/0003_auto_20170411_0504.py b/mezzanine/blog/migrations/0003_auto_20170411_0504.py index c57ae4f3da..ca8683a61a 100644 --- a/mezzanine/blog/migrations/0003_auto_20170411_0504.py +++ b/mezzanine/blog/migrations/0003_auto_20170411_0504.py @@ -1,7 +1,4 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11 on 2017-04-11 05:04 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/mezzanine/blog/models.py b/mezzanine/blog/models.py index 9bac43a4d4..67838acc67 100644 --- a/mezzanine/blog/models.py +++ b/mezzanine/blog/models.py @@ -1,6 +1,3 @@ -from __future__ import unicode_literals -from future.builtins import str - from django.db import models from django.urls import reverse from django.utils.translation import ugettext_lazy as _ diff --git a/mezzanine/blog/templates/blog/blog_post_detail.html b/mezzanine/blog/templates/blog/blog_post_detail.html index 24efbd2424..200582275a 100644 --- a/mezzanine/blog/templates/blog/blog_post_detail.html +++ b/mezzanine/blog/templates/blog/blog_post_detail.html @@ -18,7 +18,7 @@ {% block breadcrumb_menu %} {{ block.super }} -
  • {{ blog_post.title }}
  • + {% endblock %} {% block main %} diff --git a/mezzanine/blog/templates/blog/blog_post_list.html b/mezzanine/blog/templates/blog/blog_post_list.html index 8ec0f9584f..32b88a508e 100644 --- a/mezzanine/blog/templates/blog/blog_post_list.html +++ b/mezzanine/blog/templates/blog/blog_post_list.html @@ -26,7 +26,7 @@ {% block breadcrumb_menu %} {{ block.super }} {% if tag or category or year or month or author %} -
  • {% spaceless %} +