From ad602a2b6eb81bb90bd339bd0dedf6d8f99df1d8 Mon Sep 17 00:00:00 2001 From: Tim Gates Date: Wed, 20 Nov 2019 08:17:13 +1100 Subject: [PATCH 001/101] Fix simple typo: verficiation -> verification --- mezzanine/core/auth_backends.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mezzanine/core/auth_backends.py b/mezzanine/core/auth_backends.py index c06444d4bb..4845caf45e 100644 --- a/mezzanine/core/auth_backends.py +++ b/mezzanine/core/auth_backends.py @@ -21,7 +21,7 @@ class MezzanineBackend(ModelBackend): For login, is_active is not given, so that the login form can raise a specific error for inactive users. For password reset, True is given for is_active. - For signup verficiation, False is given for is_active. + For signup verification, False is given for is_active. """ def authenticate(self, *args, **kwargs): From 9524209aec6d7f1d0279809ee2d495235a216b4a Mon Sep 17 00:00:00 2001 From: Eugene Duboviy Date: Thu, 17 Oct 2019 14:42:17 +0300 Subject: [PATCH 002/101] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 927c288431..b02f1b3828 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,8 @@ env: python: - "3.5" - "3.6" + - "3.7" + - "3.8" install: - pip install --upgrade pip setuptools tox script: From efbb149ec8e739e5232b41aeae7ac3683f16d450 Mon Sep 17 00:00:00 2001 From: Eugene Duboviy Date: Thu, 17 Oct 2019 14:43:40 +0300 Subject: [PATCH 003/101] Update overview.rst --- docs/overview.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/overview.rst b/docs/overview.rst index 1ace7c15a4..cc274cc58f 100644 --- a/docs/overview.rst +++ b/docs/overview.rst @@ -45,7 +45,7 @@ standard Django environment), with the following dependencies, which unless noted as optional, should be installed automatically following the above instructions: -* `Python`_ 2.7 to 3.6 +* `Python`_ 2.7 to 3.8 * `Django`_ 1.8 to 1.11 * `django-contrib-comments`_ - for built-in threaded comments * `Pillow`_ - for image resizing (`Python Imaging Library`_ fork) From 7624b8f7a22901828d4242831ba6122d1cc03092 Mon Sep 17 00:00:00 2001 From: Eugene Duboviy Date: Thu, 17 Oct 2019 14:44:23 +0300 Subject: [PATCH 004/101] Update setup.py --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index c4df699e2d..4f08d8a7f5 100755 --- a/setup.py +++ b/setup.py @@ -82,6 +82,8 @@ "Programming Language :: Python :: 3.4", "Programming Language :: Python :: 3.5", "Programming Language :: Python :: 3.6", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", "Topic :: Internet :: WWW/HTTP", "Topic :: Internet :: WWW/HTTP :: Dynamic Content", "Topic :: Internet :: WWW/HTTP :: WSGI", From 9768b46f8377796d5d51d74db54589c9d3669a47 Mon Sep 17 00:00:00 2001 From: Pete Dermott Date: Wed, 12 Aug 2020 01:27:32 +0100 Subject: [PATCH 005/101] feat: Add Django 2.2 compatability (#1956) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BREAKING CHANGE: Support for Python 2 and Django < 2.2 has been dropped From: https://github.com/bors-ltd/mezzanine/commit/88aa6c9ea93321fd6754026ec858faaee971f580 Related to: https://github.com/stephenmcd/mezzanine/issues/1895 Co-authored-by: Frankie Robertson Co-authored-by: Marcos Sánchez Provencio Co-authored-by: zriv Co-authored-by: Tuk Bredsdorff Co-authored-by: Peter Dermott Co-authored-by: Diego Rabatone Oliveira --- .travis.yml | 12 +- mezzanine/__init__.py | 1 - mezzanine/accounts/__init__.py | 2 - mezzanine/accounts/admin.py | 2 - mezzanine/accounts/defaults.py | 2 - mezzanine/accounts/forms.py | 2 - .../accounts/templatetags/accounts_tags.py | 2 - mezzanine/accounts/tests.py | 2 - mezzanine/accounts/views.py | 2 - mezzanine/bin/runtests.py | 2 - mezzanine/blog/__init__.py | 2 - mezzanine/blog/admin.py | 2 - mezzanine/blog/defaults.py | 2 - mezzanine/blog/feeds.py | 2 - mezzanine/blog/forms.py | 2 - mezzanine/blog/management/base.py | 7 +- .../management/commands/import_blogger.py | 2 - .../management/commands/import_posterous.py | 2 - .../blog/management/commands/import_rss.py | 11 +- .../blog/management/commands/import_tumblr.py | 9 +- .../management/commands/import_wordpress.py | 3 - mezzanine/blog/migrations/0001_initial.py | 2 - .../migrations/0002_auto_20150527_1555.py | 2 - .../migrations/0003_auto_20170411_0504.py | 3 - mezzanine/blog/models.py | 3 - .../blog/templates/blog/blog_post_detail.html | 2 +- .../blog/templates/blog/blog_post_list.html | 2 +- mezzanine/blog/templatetags/blog_tags.py | 1 - mezzanine/blog/tests.py | 7 +- mezzanine/blog/urls.py | 32 +- mezzanine/blog/views.py | 3 - mezzanine/boot/__init__.py | 2 - mezzanine/conf/admin.py | 3 - mezzanine/conf/forms.py | 3 - mezzanine/conf/models.py | 4 - mezzanine/conf/tests.py | 3 - mezzanine/core/__init__.py | 2 - mezzanine/core/admin.py | 5 +- mezzanine/core/apps.py | 2 - mezzanine/core/auth_backends.py | 2 - mezzanine/core/checks.py | 2 - mezzanine/core/defaults.py | 6 +- mezzanine/core/exceptions.py | 3 - mezzanine/core/fields.py | 3 - mezzanine/core/forms.py | 38 +- mezzanine/core/management/__init__.py | 1 - .../management/commands/collecttemplates.py | 4 - .../core/management/commands/createdb.py | 3 - .../core/management/commands/runserver.py | 1 - mezzanine/core/managers.py | 14 +- mezzanine/core/middleware.py | 8 +- mezzanine/core/migrations/0001_initial.py | 2 - .../migrations/0002_auto_20150414_2140.py | 2 - mezzanine/core/models.py | 15 +- mezzanine/core/request.py | 2 - mezzanine/core/sitemaps.py | 2 - mezzanine/core/static/css/mezzanine.css | 11 + .../static/mezzanine/css/admin/global.css | 4 +- .../core/static/mezzanine/css/admin/rtl.css | 2 +- .../static/mezzanine/js/admin/ajax_csrf.js | 10 +- .../mezzanine/js/admin/keywords_field.js | 26 +- .../core/static/mezzanine/js/jquery-1.12.4.js | 11008 +++++++++ .../core/static/mezzanine/js/jquery-3.4.1.js | 10598 +++++++++ .../static/mezzanine/js/jquery-ui-1.12.1.js | 18706 ++++++++++++++++ mezzanine/core/templates/admin/base_site.html | 16 +- mezzanine/core/templatetags/mezzanine_tags.py | 15 +- mezzanine/core/tests.py | 13 +- mezzanine/core/urls.py | 18 +- mezzanine/core/views.py | 8 +- mezzanine/forms/__init__.py | 2 - mezzanine/forms/admin.py | 3 - mezzanine/forms/defaults.py | 2 - mezzanine/forms/fields.py | 8 +- mezzanine/forms/forms.py | 9 +- mezzanine/forms/migrations/0001_initial.py | 2 - .../migrations/0002_auto_20141227_0224.py | 2 - mezzanine/forms/migrations/0003_emailfield.py | 2 - .../migrations/0004_auto_20150517_0510.py | 2 - .../migrations/0005_auto_20151026_1600.py | 2 - .../migrations/0006_auto_20170425_2225.py | 3 - mezzanine/forms/page_processors.py | 2 - mezzanine/forms/signals.py | 2 - mezzanine/forms/tests.py | 2 - mezzanine/galleries/__init__.py | 2 - mezzanine/galleries/admin.py | 2 - .../galleries/migrations/0001_initial.py | 2 - .../migrations/0002_auto_20141227_0224.py | 2 - mezzanine/galleries/models.py | 6 +- mezzanine/galleries/tests.py | 6 +- mezzanine/generic/__init__.py | 2 - mezzanine/generic/admin.py | 2 - mezzanine/generic/defaults.py | 4 - mezzanine/generic/fields.py | 6 +- mezzanine/generic/forms.py | 8 +- mezzanine/generic/managers.py | 2 - mezzanine/generic/migrations/0001_initial.py | 2 - .../migrations/0002_auto_20141227_0224.py | 2 - .../migrations/0003_auto_20170411_0504.py | 3 - mezzanine/generic/models.py | 3 - .../generic/templatetags/comment_tags.py | 3 - mezzanine/generic/templatetags/disqus_tags.py | 3 - .../generic/templatetags/keyword_tags.py | 3 - mezzanine/generic/templatetags/rating_tags.py | 2 - mezzanine/generic/tests.py | 2 - mezzanine/generic/urls.py | 8 +- mezzanine/generic/views.py | 3 - mezzanine/pages/__init__.py | 2 - mezzanine/pages/admin.py | 30 +- mezzanine/pages/checks.py | 2 - mezzanine/pages/context_processors.py | 1 - mezzanine/pages/defaults.py | 2 - mezzanine/pages/fields.py | 2 - mezzanine/pages/managers.py | 3 - mezzanine/pages/middleware.py | 2 - mezzanine/pages/migrations/0001_initial.py | 2 - .../migrations/0002_auto_20141227_0224.py | 2 - .../migrations/0003_auto_20150527_1555.py | 2 - .../migrations/0004_auto_20170411_0504.py | 3 - mezzanine/pages/models.py | 7 +- mezzanine/pages/page_processors.py | 5 +- .../js/admin/jquery.mjs.nestedSortable.js | 799 +- .../admin/pages/page/change_list.html | 4 - mezzanine/pages/tests.py | 3 - mezzanine/pages/urls.py | 6 +- mezzanine/pages/views.py | 3 - .../project_template/project_name/settings.py | 61 +- .../project_template/project_name/urls.py | 14 +- mezzanine/project_template/requirements.txt | 2 +- mezzanine/template/loader_tags.py | 3 - mezzanine/template/loaders/host_themes.py | 2 - mezzanine/twitter/admin.py | 4 +- mezzanine/twitter/models.py | 11 +- mezzanine/urls.py | 29 +- mezzanine/utils/__init__.py | 1 - mezzanine/utils/admin.py | 2 - mezzanine/utils/cache.py | 2 - mezzanine/utils/conf.py | 2 - mezzanine/utils/docs.py | 3 - mezzanine/utils/email.py | 3 - mezzanine/utils/html.py | 3 - mezzanine/utils/importing.py | 2 - mezzanine/utils/models.py | 6 +- mezzanine/utils/sites.py | 2 - mezzanine/utils/static.py | 2 - mezzanine/utils/tests.py | 3 - mezzanine/utils/timezone.py | 2 - mezzanine/utils/urls.py | 5 +- mezzanine/utils/views.py | 12 +- setup.py | 2 +- tox.ini | 10 +- 150 files changed, 41135 insertions(+), 751 deletions(-) create mode 100644 mezzanine/core/static/mezzanine/js/jquery-1.12.4.js create mode 100644 mezzanine/core/static/mezzanine/js/jquery-3.4.1.js create mode 100644 mezzanine/core/static/mezzanine/js/jquery-ui-1.12.1.js 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 }}
    • +
  • {{ 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 %} +
  • {% spaceless %} {% if tag %} {% trans "Tag:" %} {{ tag }} {% else %}{% if category %} diff --git a/mezzanine/blog/templatetags/blog_tags.py b/mezzanine/blog/templatetags/blog_tags.py index 8d352536e9..5e193dbc28 100644 --- a/mezzanine/blog/templatetags/blog_tags.py +++ b/mezzanine/blog/templatetags/blog_tags.py @@ -1,4 +1,3 @@ -from __future__ import unicode_literals from datetime import datetime from django.contrib.auth import get_user_model diff --git a/mezzanine/blog/tests.py b/mezzanine/blog/tests.py index 33162d4ce9..6e89789c27 100644 --- a/mezzanine/blog/tests.py +++ b/mezzanine/blog/tests.py @@ -1,14 +1,9 @@ -from __future__ import unicode_literals - import re import pytz import datetime from unittest import skipUnless -try: - from urllib.parse import urlparse -except ImportError: - from urlparse import urlparse +from urllib.parse import urlparse from django.urls import reverse from django.template import Context, Template diff --git a/mezzanine/blog/urls.py b/mezzanine/blog/urls.py index 54d5d31fe7..84b238a0d6 100644 --- a/mezzanine/blog/urls.py +++ b/mezzanine/blog/urls.py @@ -1,6 +1,4 @@ -from __future__ import unicode_literals - -from django.conf.urls import url +from django.urls import re_path from mezzanine.blog import views from mezzanine.conf import settings @@ -11,32 +9,32 @@ # Blog patterns. urlpatterns = [ - url(r"^feeds/(?P.*)%s$" % _slash, + re_path(r"^feeds/(?P.*)%s$" % _slash, views.blog_post_feed, name="blog_post_feed"), - url(r"^tag/(?P.*)/feeds/(?P.*)%s$" % _slash, + re_path(r"^tag/(?P.*)/feeds/(?P.*)%s$" % _slash, views.blog_post_feed, name="blog_post_feed_tag"), - url(r"^tag/(?P.*)%s$" % _slash, + re_path(r"^tag/(?P.*)%s$" % _slash, views.blog_post_list, name="blog_post_list_tag"), - url(r"^category/(?P.*)/feeds/(?P.*)%s$" % _slash, + re_path(r"^category/(?P.*)/feeds/(?P.*)%s$" % _slash, views.blog_post_feed, name="blog_post_feed_category"), - url(r"^category/(?P.*)%s$" % _slash, + re_path(r"^category/(?P.*)%s$" % _slash, views.blog_post_list, name="blog_post_list_category"), - url(r"^author/(?P.*)/feeds/(?P.*)%s$" % _slash, + re_path(r"^author/(?P.*)/feeds/(?P.*)%s$" % _slash, views.blog_post_feed, name="blog_post_feed_author"), - url(r"^author/(?P.*)%s$" % _slash, + re_path(r"^author/(?P.*)%s$" % _slash, views.blog_post_list, name="blog_post_list_author"), - url(r"^archive/(?P\d{4})/(?P\d{1,2})%s$" % _slash, + re_path(r"^archive/(?P\d{4})/(?P\d{1,2})%s$" % _slash, views.blog_post_list, name="blog_post_list_month"), - url(r"^archive/(?P\d{4})%s$" % _slash, + re_path(r"^archive/(?P\d{4})%s$" % _slash, views.blog_post_list, name="blog_post_list_year"), - url(r"^(?P\d{4})/(?P\d{1,2})/(?P\d{1,2})/" + re_path(r"^(?P\d{4})/(?P\d{1,2})/(?P\d{1,2})/" "(?P.*)%s$" % _slash, views.blog_post_detail, name="blog_post_detail_day"), - url(r"^(?P\d{4})/(?P\d{1,2})/(?P.*)%s$" % _slash, + re_path(r"^(?P\d{4})/(?P\d{1,2})/(?P.*)%s$" % _slash, views.blog_post_detail, name="blog_post_detail_month"), - url(r"^(?P\d{4})/(?P.*)%s$" % _slash, + re_path(r"^(?P\d{4})/(?P.*)%s$" % _slash, views.blog_post_detail, name="blog_post_detail_year"), - url(r"^(?P.*)%s$" % _slash, + re_path(r"^(?P.*)%s$" % _slash, views.blog_post_detail, name="blog_post_detail"), - url(r"^$", views.blog_post_list, name="blog_post_list"), + re_path(r"^$", views.blog_post_list, name="blog_post_list"), ] diff --git a/mezzanine/blog/views.py b/mezzanine/blog/views.py index 3e41361e9f..825a8e30f5 100644 --- a/mezzanine/blog/views.py +++ b/mezzanine/blog/views.py @@ -1,6 +1,3 @@ -from __future__ import unicode_literals -from future.builtins import str, int - from calendar import month_name from django.contrib.auth import get_user_model diff --git a/mezzanine/boot/__init__.py b/mezzanine/boot/__init__.py index 119f49a2b0..2770d1127e 100644 --- a/mezzanine/boot/__init__.py +++ b/mezzanine/boot/__init__.py @@ -8,8 +8,6 @@ custom fields not being available when custom admin classes are registered. """ -from __future__ import unicode_literals - from collections import defaultdict from django import VERSION as DJANGO_VERSION diff --git a/mezzanine/conf/admin.py b/mezzanine/conf/admin.py index a4648854eb..c7dbc8c134 100644 --- a/mezzanine/conf/admin.py +++ b/mezzanine/conf/admin.py @@ -1,6 +1,3 @@ -from __future__ import unicode_literals -from future.builtins import str - from copy import copy from django.contrib import admin diff --git a/mezzanine/conf/forms.py b/mezzanine/conf/forms.py index 6cf6bd8bcf..df225eeb5f 100644 --- a/mezzanine/conf/forms.py +++ b/mezzanine/conf/forms.py @@ -1,6 +1,3 @@ -from __future__ import unicode_literals -from future.builtins import int - from collections import defaultdict from django import forms diff --git a/mezzanine/conf/models.py b/mezzanine/conf/models.py index c542a7c30f..e46b7a20ae 100644 --- a/mezzanine/conf/models.py +++ b/mezzanine/conf/models.py @@ -1,13 +1,9 @@ -from __future__ import unicode_literals - from django.db import models from django.utils.translation import ugettext_lazy as _ -from django.utils.encoding import python_2_unicode_compatible from mezzanine.core.models import SiteRelated -@python_2_unicode_compatible class Setting(SiteRelated): """ Stores values for ``mezzanine.conf`` that can be edited via the admin. diff --git a/mezzanine/conf/tests.py b/mezzanine/conf/tests.py index 49a7c8b612..65bb5318ad 100644 --- a/mezzanine/conf/tests.py +++ b/mezzanine/conf/tests.py @@ -1,6 +1,3 @@ -from __future__ import unicode_literals -from future.builtins import bytes, str - import sys from unittest import skipUnless import warnings diff --git a/mezzanine/core/__init__.py b/mezzanine/core/__init__.py index 363b5bffe2..e3c653ca3c 100644 --- a/mezzanine/core/__init__.py +++ b/mezzanine/core/__init__.py @@ -2,8 +2,6 @@ Provides abstract models and admin features used throughout the various Mezzanine apps. """ -from __future__ import unicode_literals - from mezzanine import __version__ # noqa diff --git a/mezzanine/core/admin.py b/mezzanine/core/admin.py index 9892bd67f5..f3f685d0a9 100644 --- a/mezzanine/core/admin.py +++ b/mezzanine/core/admin.py @@ -36,8 +36,8 @@ class BaseTranslationModelAdmin(TranslationAdmin): """ class Media: js = ( + 'admin/js/jquery.init.js', static("modeltranslation/js/force_jquery.js"), - static("mezzanine/js/%s" % settings.JQUERY_UI_FILENAME), static("mezzanine/js/admin/tabbed_translation_fields.js"), ) css = { @@ -301,7 +301,8 @@ def __init__(self, *args, **kwargs): self.model._meta.many_to_many) for field in reversed(fields): if field.name not in exclude_fields and field.editable: - if not hasattr(field, "translated_field"): + if not hasattr(field, "translated_field") and field.name \ + not in self.fieldsets[0][1]["fields"]: self.fieldsets[0][1]["fields"].insert(3, field.name) @property diff --git a/mezzanine/core/apps.py b/mezzanine/core/apps.py index b2b7c18b1d..2c2f255d71 100644 --- a/mezzanine/core/apps.py +++ b/mezzanine/core/apps.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django import VERSION as DJANGO_VERSION from django.apps import AppConfig diff --git a/mezzanine/core/auth_backends.py b/mezzanine/core/auth_backends.py index 4845caf45e..e4eee84619 100644 --- a/mezzanine/core/auth_backends.py +++ b/mezzanine/core/auth_backends.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.contrib.auth import get_user_model from django.contrib.auth.backends import ModelBackend from django.contrib.auth.tokens import default_token_generator diff --git a/mezzanine/core/checks.py b/mezzanine/core/checks.py index ff83ca27b7..d304f36a31 100644 --- a/mezzanine/core/checks.py +++ b/mezzanine/core/checks.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import pprint from django import VERSION as DJANGO_VERSION diff --git a/mezzanine/core/defaults.py b/mezzanine/core/defaults.py index 3b7f6921ff..d0d6fd20e8 100644 --- a/mezzanine/core/defaults.py +++ b/mezzanine/core/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 _ @@ -174,7 +172,7 @@ description=_("Name of the jQuery file found in " "mezzanine/core/static/mezzanine/js/"), editable=False, - default="jquery-1.8.3.min.js", + default="jquery-1.12.4.js", ) register_setting( @@ -183,7 +181,7 @@ description=_("Name of the jQuery UI file found in " "mezzanine/core/static/mezzanine/js/"), editable=False, - default="jquery-ui-1.8.24.min.js", + default="jquery-ui-1.12.1.js", ) register_setting( diff --git a/mezzanine/core/exceptions.py b/mezzanine/core/exceptions.py index ea56c29dcc..4d81531e06 100644 --- a/mezzanine/core/exceptions.py +++ b/mezzanine/core/exceptions.py @@ -1,6 +1,3 @@ -from __future__ import unicode_literals - - class FileSystemEncodingChanged(RuntimeError): def __init__(self): msg = ("Access was attempted on a file that contains unicode " diff --git a/mezzanine/core/fields.py b/mezzanine/core/fields.py index 8877472ab3..744903713d 100644 --- a/mezzanine/core/fields.py +++ b/mezzanine/core/fields.py @@ -1,6 +1,3 @@ -from __future__ import unicode_literals -from future.builtins import str - from django.conf import settings from django.contrib.admin.widgets import AdminTextareaWidget from django.core.exceptions import ImproperlyConfigured, ValidationError diff --git a/mezzanine/core/forms.py b/mezzanine/core/forms.py index 3bc03e2127..65bf3756ba 100644 --- a/mezzanine/core/forms.py +++ b/mezzanine/core/forms.py @@ -1,15 +1,8 @@ -from __future__ import unicode_literals -from future.builtins import str - from datetime import datetime from uuid import uuid4 from django import forms -try: - from django.forms.widgets import SelectDateWidget -except ImportError: - # Django 1.8 - from django.forms.extras.widgets import SelectDateWidget +from django.forms.widgets import SelectDateWidget from django.forms.utils import to_current_timezone from django.utils.safestring import mark_safe @@ -50,16 +43,28 @@ class TinyMceWidget(forms.Textarea): use TinyMCE. """ - class Media: - js = [static("mezzanine/tinymce/tinymce.min.js"), - static("mezzanine/tinymce/jquery.tinymce.min.js"), - static(settings.TINYMCE_SETUP_JS)] + @property + def media(self): + extra = '' if settings.DEBUG else '.min' + js = [ + 'admin/js/vendor/jquery/jquery%s.js' % extra, + 'admin/js/jquery.init.js', + static("mezzanine/tinymce/tinymce.min.js"), + static("mezzanine/tinymce/jquery.tinymce.min.js"), + static(settings.TINYMCE_SETUP_JS), + ] css = {'all': [static("mezzanine/tinymce/tinymce.css")]} + return forms.Media(js=js, css=css) def __init__(self, *args, **kwargs): super(TinyMceWidget, self).__init__(*args, **kwargs) self.attrs["class"] = "mceEditor" + def use_required_attribute(self, initial): + # TinyMCE does not put content back into the "; + support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue; + + // #11217 - WebKit loses check when the name is after the checked attribute + fragment.appendChild( div ); + + // Support: Windows Web Apps (WWA) + // `name` and `type` must use .setAttribute for WWA (#14901) + input = document.createElement( "input" ); + input.setAttribute( "type", "radio" ); + input.setAttribute( "checked", "checked" ); + input.setAttribute( "name", "t" ); + + div.appendChild( input ); + + // Support: Safari 5.1, iOS 5.1, Android 4.x, Android 2.3 + // old WebKit doesn't clone checked state correctly in fragments + support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked; + + // Support: IE<9 + // Cloned elements keep attachEvent handlers, we use addEventListener on IE9+ + support.noCloneEvent = !!div.addEventListener; + + // Support: IE<9 + // Since attributes and properties are the same in IE, + // cleanData must set properties to undefined rather than use removeAttribute + div[ jQuery.expando ] = 1; + support.attributes = !div.getAttribute( jQuery.expando ); +} )(); + + +// We have to close these tags to support XHTML (#13200) +var wrapMap = { + option: [ 1, "" ], + legend: [ 1, "
    ", "
    " ], + area: [ 1, "", "" ], + + // Support: IE8 + param: [ 1, "", "" ], + thead: [ 1, "", "
    " ], + tr: [ 2, "", "
    " ], + col: [ 2, "", "
    " ], + td: [ 3, "", "
    " ], + + // IE6-8 can't serialize link, script, style, or any html5 (NoScope) tags, + // unless wrapped in a div with non-breaking characters in front of it. + _default: support.htmlSerialize ? [ 0, "", "" ] : [ 1, "X
    ", "
    " ] +}; + +// Support: IE8-IE9 +wrapMap.optgroup = wrapMap.option; + +wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead; +wrapMap.th = wrapMap.td; + + +function getAll( context, tag ) { + var elems, elem, + i = 0, + found = typeof context.getElementsByTagName !== "undefined" ? + context.getElementsByTagName( tag || "*" ) : + typeof context.querySelectorAll !== "undefined" ? + context.querySelectorAll( tag || "*" ) : + undefined; + + if ( !found ) { + for ( found = [], elems = context.childNodes || context; + ( elem = elems[ i ] ) != null; + i++ + ) { + if ( !tag || jQuery.nodeName( elem, tag ) ) { + found.push( elem ); + } else { + jQuery.merge( found, getAll( elem, tag ) ); + } + } + } + + return tag === undefined || tag && jQuery.nodeName( context, tag ) ? + jQuery.merge( [ context ], found ) : + found; +} + + +// Mark scripts as having already been evaluated +function setGlobalEval( elems, refElements ) { + var elem, + i = 0; + for ( ; ( elem = elems[ i ] ) != null; i++ ) { + jQuery._data( + elem, + "globalEval", + !refElements || jQuery._data( refElements[ i ], "globalEval" ) + ); + } +} + + +var rhtml = /<|&#?\w+;/, + rtbody = / from table fragments + if ( !support.tbody ) { + + // String was a , *may* have spurious + elem = tag === "table" && !rtbody.test( elem ) ? + tmp.firstChild : + + // String was a bare or + wrap[ 1 ] === "
    " && !rtbody.test( elem ) ? + tmp : + 0; + + j = elem && elem.childNodes.length; + while ( j-- ) { + if ( jQuery.nodeName( ( tbody = elem.childNodes[ j ] ), "tbody" ) && + !tbody.childNodes.length ) { + + elem.removeChild( tbody ); + } + } + } + + jQuery.merge( nodes, tmp.childNodes ); + + // Fix #12392 for WebKit and IE > 9 + tmp.textContent = ""; + + // Fix #12392 for oldIE + while ( tmp.firstChild ) { + tmp.removeChild( tmp.firstChild ); + } + + // Remember the top-level container for proper cleanup + tmp = safe.lastChild; + } + } + } + + // Fix #11356: Clear elements from fragment + if ( tmp ) { + safe.removeChild( tmp ); + } + + // Reset defaultChecked for any radios and checkboxes + // about to be appended to the DOM in IE 6/7 (#8060) + if ( !support.appendChecked ) { + jQuery.grep( getAll( nodes, "input" ), fixDefaultChecked ); + } + + i = 0; + while ( ( elem = nodes[ i++ ] ) ) { + + // Skip elements already in the context collection (trac-4087) + if ( selection && jQuery.inArray( elem, selection ) > -1 ) { + if ( ignored ) { + ignored.push( elem ); + } + + continue; + } + + contains = jQuery.contains( elem.ownerDocument, elem ); + + // Append to fragment + tmp = getAll( safe.appendChild( elem ), "script" ); + + // Preserve script evaluation history + if ( contains ) { + setGlobalEval( tmp ); + } + + // Capture executables + if ( scripts ) { + j = 0; + while ( ( elem = tmp[ j++ ] ) ) { + if ( rscriptType.test( elem.type || "" ) ) { + scripts.push( elem ); + } + } + } + } + + tmp = null; + + return safe; +} + + +( function() { + var i, eventName, + div = document.createElement( "div" ); + + // Support: IE<9 (lack submit/change bubble), Firefox (lack focus(in | out) events) + for ( i in { submit: true, change: true, focusin: true } ) { + eventName = "on" + i; + + if ( !( support[ i ] = eventName in window ) ) { + + // Beware of CSP restrictions (https://developer.mozilla.org/en/Security/CSP) + div.setAttribute( eventName, "t" ); + support[ i ] = div.attributes[ eventName ].expando === false; + } + } + + // Null elements to avoid leaks in IE. + div = null; +} )(); + + +var rformElems = /^(?:input|select|textarea)$/i, + rkeyEvent = /^key/, + rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/, + rfocusMorph = /^(?:focusinfocus|focusoutblur)$/, + rtypenamespace = /^([^.]*)(?:\.(.+)|)/; + +function returnTrue() { + return true; +} + +function returnFalse() { + return false; +} + +// Support: IE9 +// See #13393 for more info +function safeActiveElement() { + try { + return document.activeElement; + } catch ( err ) { } +} + +function on( elem, types, selector, data, fn, one ) { + var origFn, type; + + // Types can be a map of types/handlers + if ( typeof types === "object" ) { + + // ( types-Object, selector, data ) + if ( typeof selector !== "string" ) { + + // ( types-Object, data ) + data = data || selector; + selector = undefined; + } + for ( type in types ) { + on( elem, type, selector, data, types[ type ], one ); + } + return elem; + } + + if ( data == null && fn == null ) { + + // ( types, fn ) + fn = selector; + data = selector = undefined; + } else if ( fn == null ) { + if ( typeof selector === "string" ) { + + // ( types, selector, fn ) + fn = data; + data = undefined; + } else { + + // ( types, data, fn ) + fn = data; + data = selector; + selector = undefined; + } + } + if ( fn === false ) { + fn = returnFalse; + } else if ( !fn ) { + return elem; + } + + if ( one === 1 ) { + origFn = fn; + fn = function( event ) { + + // Can use an empty set, since event contains the info + jQuery().off( event ); + return origFn.apply( this, arguments ); + }; + + // Use same guid so caller can remove using origFn + fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ ); + } + return elem.each( function() { + jQuery.event.add( this, types, fn, data, selector ); + } ); +} + +/* + * Helper functions for managing events -- not part of the public interface. + * Props to Dean Edwards' addEvent library for many of the ideas. + */ +jQuery.event = { + + global: {}, + + add: function( elem, types, handler, data, selector ) { + var tmp, events, t, handleObjIn, + special, eventHandle, handleObj, + handlers, type, namespaces, origType, + elemData = jQuery._data( elem ); + + // Don't attach events to noData or text/comment nodes (but allow plain objects) + if ( !elemData ) { + return; + } + + // Caller can pass in an object of custom data in lieu of the handler + if ( handler.handler ) { + handleObjIn = handler; + handler = handleObjIn.handler; + selector = handleObjIn.selector; + } + + // Make sure that the handler has a unique ID, used to find/remove it later + if ( !handler.guid ) { + handler.guid = jQuery.guid++; + } + + // Init the element's event structure and main handler, if this is the first + if ( !( events = elemData.events ) ) { + events = elemData.events = {}; + } + if ( !( eventHandle = elemData.handle ) ) { + eventHandle = elemData.handle = function( e ) { + + // Discard the second event of a jQuery.event.trigger() and + // when an event is called after a page has unloaded + return typeof jQuery !== "undefined" && + ( !e || jQuery.event.triggered !== e.type ) ? + jQuery.event.dispatch.apply( eventHandle.elem, arguments ) : + undefined; + }; + + // Add elem as a property of the handle fn to prevent a memory leak + // with IE non-native events + eventHandle.elem = elem; + } + + // Handle multiple events separated by a space + types = ( types || "" ).match( rnotwhite ) || [ "" ]; + t = types.length; + while ( t-- ) { + tmp = rtypenamespace.exec( types[ t ] ) || []; + type = origType = tmp[ 1 ]; + namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort(); + + // There *must* be a type, no attaching namespace-only handlers + if ( !type ) { + continue; + } + + // If event changes its type, use the special event handlers for the changed type + special = jQuery.event.special[ type ] || {}; + + // If selector defined, determine special event api type, otherwise given type + type = ( selector ? special.delegateType : special.bindType ) || type; + + // Update special based on newly reset type + special = jQuery.event.special[ type ] || {}; + + // handleObj is passed to all event handlers + handleObj = jQuery.extend( { + type: type, + origType: origType, + data: data, + handler: handler, + guid: handler.guid, + selector: selector, + needsContext: selector && jQuery.expr.match.needsContext.test( selector ), + namespace: namespaces.join( "." ) + }, handleObjIn ); + + // Init the event handler queue if we're the first + if ( !( handlers = events[ type ] ) ) { + handlers = events[ type ] = []; + handlers.delegateCount = 0; + + // Only use addEventListener/attachEvent if the special events handler returns false + if ( !special.setup || + special.setup.call( elem, data, namespaces, eventHandle ) === false ) { + + // Bind the global event handler to the element + if ( elem.addEventListener ) { + elem.addEventListener( type, eventHandle, false ); + + } else if ( elem.attachEvent ) { + elem.attachEvent( "on" + type, eventHandle ); + } + } + } + + if ( special.add ) { + special.add.call( elem, handleObj ); + + if ( !handleObj.handler.guid ) { + handleObj.handler.guid = handler.guid; + } + } + + // Add to the element's handler list, delegates in front + if ( selector ) { + handlers.splice( handlers.delegateCount++, 0, handleObj ); + } else { + handlers.push( handleObj ); + } + + // Keep track of which events have ever been used, for event optimization + jQuery.event.global[ type ] = true; + } + + // Nullify elem to prevent memory leaks in IE + elem = null; + }, + + // Detach an event or set of events from an element + remove: function( elem, types, handler, selector, mappedTypes ) { + var j, handleObj, tmp, + origCount, t, events, + special, handlers, type, + namespaces, origType, + elemData = jQuery.hasData( elem ) && jQuery._data( elem ); + + if ( !elemData || !( events = elemData.events ) ) { + return; + } + + // Once for each type.namespace in types; type may be omitted + types = ( types || "" ).match( rnotwhite ) || [ "" ]; + t = types.length; + while ( t-- ) { + tmp = rtypenamespace.exec( types[ t ] ) || []; + type = origType = tmp[ 1 ]; + namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort(); + + // Unbind all events (on this namespace, if provided) for the element + if ( !type ) { + for ( type in events ) { + jQuery.event.remove( elem, type + types[ t ], handler, selector, true ); + } + continue; + } + + special = jQuery.event.special[ type ] || {}; + type = ( selector ? special.delegateType : special.bindType ) || type; + handlers = events[ type ] || []; + tmp = tmp[ 2 ] && + new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" ); + + // Remove matching events + origCount = j = handlers.length; + while ( j-- ) { + handleObj = handlers[ j ]; + + if ( ( mappedTypes || origType === handleObj.origType ) && + ( !handler || handler.guid === handleObj.guid ) && + ( !tmp || tmp.test( handleObj.namespace ) ) && + ( !selector || selector === handleObj.selector || + selector === "**" && handleObj.selector ) ) { + handlers.splice( j, 1 ); + + if ( handleObj.selector ) { + handlers.delegateCount--; + } + if ( special.remove ) { + special.remove.call( elem, handleObj ); + } + } + } + + // Remove generic event handler if we removed something and no more handlers exist + // (avoids potential for endless recursion during removal of special event handlers) + if ( origCount && !handlers.length ) { + if ( !special.teardown || + special.teardown.call( elem, namespaces, elemData.handle ) === false ) { + + jQuery.removeEvent( elem, type, elemData.handle ); + } + + delete events[ type ]; + } + } + + // Remove the expando if it's no longer used + if ( jQuery.isEmptyObject( events ) ) { + delete elemData.handle; + + // removeData also checks for emptiness and clears the expando if empty + // so use it instead of delete + jQuery._removeData( elem, "events" ); + } + }, + + trigger: function( event, data, elem, onlyHandlers ) { + var handle, ontype, cur, + bubbleType, special, tmp, i, + eventPath = [ elem || document ], + type = hasOwn.call( event, "type" ) ? event.type : event, + namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split( "." ) : []; + + cur = tmp = elem = elem || document; + + // Don't do events on text and comment nodes + if ( elem.nodeType === 3 || elem.nodeType === 8 ) { + return; + } + + // focus/blur morphs to focusin/out; ensure we're not firing them right now + if ( rfocusMorph.test( type + jQuery.event.triggered ) ) { + return; + } + + if ( type.indexOf( "." ) > -1 ) { + + // Namespaced trigger; create a regexp to match event type in handle() + namespaces = type.split( "." ); + type = namespaces.shift(); + namespaces.sort(); + } + ontype = type.indexOf( ":" ) < 0 && "on" + type; + + // Caller can pass in a jQuery.Event object, Object, or just an event type string + event = event[ jQuery.expando ] ? + event : + new jQuery.Event( type, typeof event === "object" && event ); + + // Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true) + event.isTrigger = onlyHandlers ? 2 : 3; + event.namespace = namespaces.join( "." ); + event.rnamespace = event.namespace ? + new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" ) : + null; + + // Clean up the event in case it is being reused + event.result = undefined; + if ( !event.target ) { + event.target = elem; + } + + // Clone any incoming data and prepend the event, creating the handler arg list + data = data == null ? + [ event ] : + jQuery.makeArray( data, [ event ] ); + + // Allow special events to draw outside the lines + special = jQuery.event.special[ type ] || {}; + if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) { + return; + } + + // Determine event propagation path in advance, per W3C events spec (#9951) + // Bubble up to document, then to window; watch for a global ownerDocument var (#9724) + if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) { + + bubbleType = special.delegateType || type; + if ( !rfocusMorph.test( bubbleType + type ) ) { + cur = cur.parentNode; + } + for ( ; cur; cur = cur.parentNode ) { + eventPath.push( cur ); + tmp = cur; + } + + // Only add window if we got to document (e.g., not plain obj or detached DOM) + if ( tmp === ( elem.ownerDocument || document ) ) { + eventPath.push( tmp.defaultView || tmp.parentWindow || window ); + } + } + + // Fire handlers on the event path + i = 0; + while ( ( cur = eventPath[ i++ ] ) && !event.isPropagationStopped() ) { + + event.type = i > 1 ? + bubbleType : + special.bindType || type; + + // jQuery handler + handle = ( jQuery._data( cur, "events" ) || {} )[ event.type ] && + jQuery._data( cur, "handle" ); + + if ( handle ) { + handle.apply( cur, data ); + } + + // Native handler + handle = ontype && cur[ ontype ]; + if ( handle && handle.apply && acceptData( cur ) ) { + event.result = handle.apply( cur, data ); + if ( event.result === false ) { + event.preventDefault(); + } + } + } + event.type = type; + + // If nobody prevented the default action, do it now + if ( !onlyHandlers && !event.isDefaultPrevented() ) { + + if ( + ( !special._default || + special._default.apply( eventPath.pop(), data ) === false + ) && acceptData( elem ) + ) { + + // Call a native DOM method on the target with the same name name as the event. + // Can't use an .isFunction() check here because IE6/7 fails that test. + // Don't do default actions on window, that's where global variables be (#6170) + if ( ontype && elem[ type ] && !jQuery.isWindow( elem ) ) { + + // Don't re-trigger an onFOO event when we call its FOO() method + tmp = elem[ ontype ]; + + if ( tmp ) { + elem[ ontype ] = null; + } + + // Prevent re-triggering of the same event, since we already bubbled it above + jQuery.event.triggered = type; + try { + elem[ type ](); + } catch ( e ) { + + // IE<9 dies on focus/blur to hidden element (#1486,#12518) + // only reproducible on winXP IE8 native, not IE9 in IE8 mode + } + jQuery.event.triggered = undefined; + + if ( tmp ) { + elem[ ontype ] = tmp; + } + } + } + } + + return event.result; + }, + + dispatch: function( event ) { + + // Make a writable jQuery.Event from the native event object + event = jQuery.event.fix( event ); + + var i, j, ret, matched, handleObj, + handlerQueue = [], + args = slice.call( arguments ), + handlers = ( jQuery._data( this, "events" ) || {} )[ event.type ] || [], + special = jQuery.event.special[ event.type ] || {}; + + // Use the fix-ed jQuery.Event rather than the (read-only) native event + args[ 0 ] = event; + event.delegateTarget = this; + + // Call the preDispatch hook for the mapped type, and let it bail if desired + if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) { + return; + } + + // Determine handlers + handlerQueue = jQuery.event.handlers.call( this, event, handlers ); + + // Run delegates first; they may want to stop propagation beneath us + i = 0; + while ( ( matched = handlerQueue[ i++ ] ) && !event.isPropagationStopped() ) { + event.currentTarget = matched.elem; + + j = 0; + while ( ( handleObj = matched.handlers[ j++ ] ) && + !event.isImmediatePropagationStopped() ) { + + // Triggered event must either 1) have no namespace, or 2) have namespace(s) + // a subset or equal to those in the bound event (both can have no namespace). + if ( !event.rnamespace || event.rnamespace.test( handleObj.namespace ) ) { + + event.handleObj = handleObj; + event.data = handleObj.data; + + ret = ( ( jQuery.event.special[ handleObj.origType ] || {} ).handle || + handleObj.handler ).apply( matched.elem, args ); + + if ( ret !== undefined ) { + if ( ( event.result = ret ) === false ) { + event.preventDefault(); + event.stopPropagation(); + } + } + } + } + } + + // Call the postDispatch hook for the mapped type + if ( special.postDispatch ) { + special.postDispatch.call( this, event ); + } + + return event.result; + }, + + handlers: function( event, handlers ) { + var i, matches, sel, handleObj, + handlerQueue = [], + delegateCount = handlers.delegateCount, + cur = event.target; + + // Support (at least): Chrome, IE9 + // Find delegate handlers + // Black-hole SVG instance trees (#13180) + // + // Support: Firefox<=42+ + // Avoid non-left-click in FF but don't block IE radio events (#3861, gh-2343) + if ( delegateCount && cur.nodeType && + ( event.type !== "click" || isNaN( event.button ) || event.button < 1 ) ) { + + /* jshint eqeqeq: false */ + for ( ; cur != this; cur = cur.parentNode || this ) { + /* jshint eqeqeq: true */ + + // Don't check non-elements (#13208) + // Don't process clicks on disabled elements (#6911, #8165, #11382, #11764) + if ( cur.nodeType === 1 && ( cur.disabled !== true || event.type !== "click" ) ) { + matches = []; + for ( i = 0; i < delegateCount; i++ ) { + handleObj = handlers[ i ]; + + // Don't conflict with Object.prototype properties (#13203) + sel = handleObj.selector + " "; + + if ( matches[ sel ] === undefined ) { + matches[ sel ] = handleObj.needsContext ? + jQuery( sel, this ).index( cur ) > -1 : + jQuery.find( sel, this, null, [ cur ] ).length; + } + if ( matches[ sel ] ) { + matches.push( handleObj ); + } + } + if ( matches.length ) { + handlerQueue.push( { elem: cur, handlers: matches } ); + } + } + } + } + + // Add the remaining (directly-bound) handlers + if ( delegateCount < handlers.length ) { + handlerQueue.push( { elem: this, handlers: handlers.slice( delegateCount ) } ); + } + + return handlerQueue; + }, + + fix: function( event ) { + if ( event[ jQuery.expando ] ) { + return event; + } + + // Create a writable copy of the event object and normalize some properties + var i, prop, copy, + type = event.type, + originalEvent = event, + fixHook = this.fixHooks[ type ]; + + if ( !fixHook ) { + this.fixHooks[ type ] = fixHook = + rmouseEvent.test( type ) ? this.mouseHooks : + rkeyEvent.test( type ) ? this.keyHooks : + {}; + } + copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props; + + event = new jQuery.Event( originalEvent ); + + i = copy.length; + while ( i-- ) { + prop = copy[ i ]; + event[ prop ] = originalEvent[ prop ]; + } + + // Support: IE<9 + // Fix target property (#1925) + if ( !event.target ) { + event.target = originalEvent.srcElement || document; + } + + // Support: Safari 6-8+ + // Target should not be a text node (#504, #13143) + if ( event.target.nodeType === 3 ) { + event.target = event.target.parentNode; + } + + // Support: IE<9 + // For mouse/key events, metaKey==false if it's undefined (#3368, #11328) + event.metaKey = !!event.metaKey; + + return fixHook.filter ? fixHook.filter( event, originalEvent ) : event; + }, + + // Includes some event props shared by KeyEvent and MouseEvent + props: ( "altKey bubbles cancelable ctrlKey currentTarget detail eventPhase " + + "metaKey relatedTarget shiftKey target timeStamp view which" ).split( " " ), + + fixHooks: {}, + + keyHooks: { + props: "char charCode key keyCode".split( " " ), + filter: function( event, original ) { + + // Add which for key events + if ( event.which == null ) { + event.which = original.charCode != null ? original.charCode : original.keyCode; + } + + return event; + } + }, + + mouseHooks: { + props: ( "button buttons clientX clientY fromElement offsetX offsetY " + + "pageX pageY screenX screenY toElement" ).split( " " ), + filter: function( event, original ) { + var body, eventDoc, doc, + button = original.button, + fromElement = original.fromElement; + + // Calculate pageX/Y if missing and clientX/Y available + if ( event.pageX == null && original.clientX != null ) { + eventDoc = event.target.ownerDocument || document; + doc = eventDoc.documentElement; + body = eventDoc.body; + + event.pageX = original.clientX + + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - + ( doc && doc.clientLeft || body && body.clientLeft || 0 ); + event.pageY = original.clientY + + ( doc && doc.scrollTop || body && body.scrollTop || 0 ) - + ( doc && doc.clientTop || body && body.clientTop || 0 ); + } + + // Add relatedTarget, if necessary + if ( !event.relatedTarget && fromElement ) { + event.relatedTarget = fromElement === event.target ? + original.toElement : + fromElement; + } + + // Add which for click: 1 === left; 2 === middle; 3 === right + // Note: button is not normalized, so don't use it + if ( !event.which && button !== undefined ) { + event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) ); + } + + return event; + } + }, + + special: { + load: { + + // Prevent triggered image.load events from bubbling to window.load + noBubble: true + }, + focus: { + + // Fire native event if possible so blur/focus sequence is correct + trigger: function() { + if ( this !== safeActiveElement() && this.focus ) { + try { + this.focus(); + return false; + } catch ( e ) { + + // Support: IE<9 + // If we error on focus to hidden element (#1486, #12518), + // let .trigger() run the handlers + } + } + }, + delegateType: "focusin" + }, + blur: { + trigger: function() { + if ( this === safeActiveElement() && this.blur ) { + this.blur(); + return false; + } + }, + delegateType: "focusout" + }, + click: { + + // For checkbox, fire native event so checked state will be right + trigger: function() { + if ( jQuery.nodeName( this, "input" ) && this.type === "checkbox" && this.click ) { + this.click(); + return false; + } + }, + + // For cross-browser consistency, don't fire native .click() on links + _default: function( event ) { + return jQuery.nodeName( event.target, "a" ); + } + }, + + beforeunload: { + postDispatch: function( event ) { + + // Support: Firefox 20+ + // Firefox doesn't alert if the returnValue field is not set. + if ( event.result !== undefined && event.originalEvent ) { + event.originalEvent.returnValue = event.result; + } + } + } + }, + + // Piggyback on a donor event to simulate a different one + simulate: function( type, elem, event ) { + var e = jQuery.extend( + new jQuery.Event(), + event, + { + type: type, + isSimulated: true + + // Previously, `originalEvent: {}` was set here, so stopPropagation call + // would not be triggered on donor event, since in our own + // jQuery.event.stopPropagation function we had a check for existence of + // originalEvent.stopPropagation method, so, consequently it would be a noop. + // + // Guard for simulated events was moved to jQuery.event.stopPropagation function + // since `originalEvent` should point to the original event for the + // constancy with other events and for more focused logic + } + ); + + jQuery.event.trigger( e, null, elem ); + + if ( e.isDefaultPrevented() ) { + event.preventDefault(); + } + } +}; + +jQuery.removeEvent = document.removeEventListener ? + function( elem, type, handle ) { + + // This "if" is needed for plain objects + if ( elem.removeEventListener ) { + elem.removeEventListener( type, handle ); + } + } : + function( elem, type, handle ) { + var name = "on" + type; + + if ( elem.detachEvent ) { + + // #8545, #7054, preventing memory leaks for custom events in IE6-8 + // detachEvent needed property on element, by name of that event, + // to properly expose it to GC + if ( typeof elem[ name ] === "undefined" ) { + elem[ name ] = null; + } + + elem.detachEvent( name, handle ); + } + }; + +jQuery.Event = function( src, props ) { + + // Allow instantiation without the 'new' keyword + if ( !( this instanceof jQuery.Event ) ) { + return new jQuery.Event( src, props ); + } + + // Event object + if ( src && src.type ) { + this.originalEvent = src; + this.type = src.type; + + // Events bubbling up the document may have been marked as prevented + // by a handler lower down the tree; reflect the correct value. + this.isDefaultPrevented = src.defaultPrevented || + src.defaultPrevented === undefined && + + // Support: IE < 9, Android < 4.0 + src.returnValue === false ? + returnTrue : + returnFalse; + + // Event type + } else { + this.type = src; + } + + // Put explicitly provided properties onto the event object + if ( props ) { + jQuery.extend( this, props ); + } + + // Create a timestamp if incoming event doesn't have one + this.timeStamp = src && src.timeStamp || jQuery.now(); + + // Mark it as fixed + this[ jQuery.expando ] = true; +}; + +// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding +// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html +jQuery.Event.prototype = { + constructor: jQuery.Event, + isDefaultPrevented: returnFalse, + isPropagationStopped: returnFalse, + isImmediatePropagationStopped: returnFalse, + + preventDefault: function() { + var e = this.originalEvent; + + this.isDefaultPrevented = returnTrue; + if ( !e ) { + return; + } + + // If preventDefault exists, run it on the original event + if ( e.preventDefault ) { + e.preventDefault(); + + // Support: IE + // Otherwise set the returnValue property of the original event to false + } else { + e.returnValue = false; + } + }, + stopPropagation: function() { + var e = this.originalEvent; + + this.isPropagationStopped = returnTrue; + + if ( !e || this.isSimulated ) { + return; + } + + // If stopPropagation exists, run it on the original event + if ( e.stopPropagation ) { + e.stopPropagation(); + } + + // Support: IE + // Set the cancelBubble property of the original event to true + e.cancelBubble = true; + }, + stopImmediatePropagation: function() { + var e = this.originalEvent; + + this.isImmediatePropagationStopped = returnTrue; + + if ( e && e.stopImmediatePropagation ) { + e.stopImmediatePropagation(); + } + + this.stopPropagation(); + } +}; + +// Create mouseenter/leave events using mouseover/out and event-time checks +// so that event delegation works in jQuery. +// Do the same for pointerenter/pointerleave and pointerover/pointerout +// +// Support: Safari 7 only +// Safari sends mouseenter too often; see: +// https://code.google.com/p/chromium/issues/detail?id=470258 +// for the description of the bug (it existed in older Chrome versions as well). +jQuery.each( { + mouseenter: "mouseover", + mouseleave: "mouseout", + pointerenter: "pointerover", + pointerleave: "pointerout" +}, function( orig, fix ) { + jQuery.event.special[ orig ] = { + delegateType: fix, + bindType: fix, + + handle: function( event ) { + var ret, + target = this, + related = event.relatedTarget, + handleObj = event.handleObj; + + // For mouseenter/leave call the handler if related is outside the target. + // NB: No relatedTarget if the mouse left/entered the browser window + if ( !related || ( related !== target && !jQuery.contains( target, related ) ) ) { + event.type = handleObj.origType; + ret = handleObj.handler.apply( this, arguments ); + event.type = fix; + } + return ret; + } + }; +} ); + +// IE submit delegation +if ( !support.submit ) { + + jQuery.event.special.submit = { + setup: function() { + + // Only need this for delegated form submit events + if ( jQuery.nodeName( this, "form" ) ) { + return false; + } + + // Lazy-add a submit handler when a descendant form may potentially be submitted + jQuery.event.add( this, "click._submit keypress._submit", function( e ) { + + // Node name check avoids a VML-related crash in IE (#9807) + var elem = e.target, + form = jQuery.nodeName( elem, "input" ) || jQuery.nodeName( elem, "button" ) ? + + // Support: IE <=8 + // We use jQuery.prop instead of elem.form + // to allow fixing the IE8 delegated submit issue (gh-2332) + // by 3rd party polyfills/workarounds. + jQuery.prop( elem, "form" ) : + undefined; + + if ( form && !jQuery._data( form, "submit" ) ) { + jQuery.event.add( form, "submit._submit", function( event ) { + event._submitBubble = true; + } ); + jQuery._data( form, "submit", true ); + } + } ); + + // return undefined since we don't need an event listener + }, + + postDispatch: function( event ) { + + // If form was submitted by the user, bubble the event up the tree + if ( event._submitBubble ) { + delete event._submitBubble; + if ( this.parentNode && !event.isTrigger ) { + jQuery.event.simulate( "submit", this.parentNode, event ); + } + } + }, + + teardown: function() { + + // Only need this for delegated form submit events + if ( jQuery.nodeName( this, "form" ) ) { + return false; + } + + // Remove delegated handlers; cleanData eventually reaps submit handlers attached above + jQuery.event.remove( this, "._submit" ); + } + }; +} + +// IE change delegation and checkbox/radio fix +if ( !support.change ) { + + jQuery.event.special.change = { + + setup: function() { + + if ( rformElems.test( this.nodeName ) ) { + + // IE doesn't fire change on a check/radio until blur; trigger it on click + // after a propertychange. Eat the blur-change in special.change.handle. + // This still fires onchange a second time for check/radio after blur. + if ( this.type === "checkbox" || this.type === "radio" ) { + jQuery.event.add( this, "propertychange._change", function( event ) { + if ( event.originalEvent.propertyName === "checked" ) { + this._justChanged = true; + } + } ); + jQuery.event.add( this, "click._change", function( event ) { + if ( this._justChanged && !event.isTrigger ) { + this._justChanged = false; + } + + // Allow triggered, simulated change events (#11500) + jQuery.event.simulate( "change", this, event ); + } ); + } + return false; + } + + // Delegated event; lazy-add a change handler on descendant inputs + jQuery.event.add( this, "beforeactivate._change", function( e ) { + var elem = e.target; + + if ( rformElems.test( elem.nodeName ) && !jQuery._data( elem, "change" ) ) { + jQuery.event.add( elem, "change._change", function( event ) { + if ( this.parentNode && !event.isSimulated && !event.isTrigger ) { + jQuery.event.simulate( "change", this.parentNode, event ); + } + } ); + jQuery._data( elem, "change", true ); + } + } ); + }, + + handle: function( event ) { + var elem = event.target; + + // Swallow native change events from checkbox/radio, we already triggered them above + if ( this !== elem || event.isSimulated || event.isTrigger || + ( elem.type !== "radio" && elem.type !== "checkbox" ) ) { + + return event.handleObj.handler.apply( this, arguments ); + } + }, + + teardown: function() { + jQuery.event.remove( this, "._change" ); + + return !rformElems.test( this.nodeName ); + } + }; +} + +// Support: Firefox +// Firefox doesn't have focus(in | out) events +// Related ticket - https://bugzilla.mozilla.org/show_bug.cgi?id=687787 +// +// Support: Chrome, Safari +// focus(in | out) events fire after focus & blur events, +// which is spec violation - http://www.w3.org/TR/DOM-Level-3-Events/#events-focusevent-event-order +// Related ticket - https://code.google.com/p/chromium/issues/detail?id=449857 +if ( !support.focusin ) { + jQuery.each( { focus: "focusin", blur: "focusout" }, function( orig, fix ) { + + // Attach a single capturing handler on the document while someone wants focusin/focusout + var handler = function( event ) { + jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ) ); + }; + + jQuery.event.special[ fix ] = { + setup: function() { + var doc = this.ownerDocument || this, + attaches = jQuery._data( doc, fix ); + + if ( !attaches ) { + doc.addEventListener( orig, handler, true ); + } + jQuery._data( doc, fix, ( attaches || 0 ) + 1 ); + }, + teardown: function() { + var doc = this.ownerDocument || this, + attaches = jQuery._data( doc, fix ) - 1; + + if ( !attaches ) { + doc.removeEventListener( orig, handler, true ); + jQuery._removeData( doc, fix ); + } else { + jQuery._data( doc, fix, attaches ); + } + } + }; + } ); +} + +jQuery.fn.extend( { + + on: function( types, selector, data, fn ) { + return on( this, types, selector, data, fn ); + }, + one: function( types, selector, data, fn ) { + return on( this, types, selector, data, fn, 1 ); + }, + off: function( types, selector, fn ) { + var handleObj, type; + if ( types && types.preventDefault && types.handleObj ) { + + // ( event ) dispatched jQuery.Event + handleObj = types.handleObj; + jQuery( types.delegateTarget ).off( + handleObj.namespace ? + handleObj.origType + "." + handleObj.namespace : + handleObj.origType, + handleObj.selector, + handleObj.handler + ); + return this; + } + if ( typeof types === "object" ) { + + // ( types-object [, selector] ) + for ( type in types ) { + this.off( type, selector, types[ type ] ); + } + return this; + } + if ( selector === false || typeof selector === "function" ) { + + // ( types [, fn] ) + fn = selector; + selector = undefined; + } + if ( fn === false ) { + fn = returnFalse; + } + return this.each( function() { + jQuery.event.remove( this, types, fn, selector ); + } ); + }, + + trigger: function( type, data ) { + return this.each( function() { + jQuery.event.trigger( type, data, this ); + } ); + }, + triggerHandler: function( type, data ) { + var elem = this[ 0 ]; + if ( elem ) { + return jQuery.event.trigger( type, data, elem, true ); + } + } +} ); + + +var rinlinejQuery = / jQuery\d+="(?:null|\d+)"/g, + rnoshimcache = new RegExp( "<(?:" + nodeNames + ")[\\s/>]", "i" ), + rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi, + + // Support: IE 10-11, Edge 10240+ + // In IE/Edge using regex groups here causes severe slowdowns. + // See https://connect.microsoft.com/IE/feedback/details/1736512/ + rnoInnerhtml = /\s*$/g, + safeFragment = createSafeFragment( document ), + fragmentDiv = safeFragment.appendChild( document.createElement( "div" ) ); + +// Support: IE<8 +// Manipulating tables requires a tbody +function manipulationTarget( elem, content ) { + return jQuery.nodeName( elem, "table" ) && + jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ? + + elem.getElementsByTagName( "tbody" )[ 0 ] || + elem.appendChild( elem.ownerDocument.createElement( "tbody" ) ) : + elem; +} + +// Replace/restore the type attribute of script elements for safe DOM manipulation +function disableScript( elem ) { + elem.type = ( jQuery.find.attr( elem, "type" ) !== null ) + "/" + elem.type; + return elem; +} +function restoreScript( elem ) { + var match = rscriptTypeMasked.exec( elem.type ); + if ( match ) { + elem.type = match[ 1 ]; + } else { + elem.removeAttribute( "type" ); + } + return elem; +} + +function cloneCopyEvent( src, dest ) { + if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) { + return; + } + + var type, i, l, + oldData = jQuery._data( src ), + curData = jQuery._data( dest, oldData ), + events = oldData.events; + + if ( events ) { + delete curData.handle; + curData.events = {}; + + for ( type in events ) { + for ( i = 0, l = events[ type ].length; i < l; i++ ) { + jQuery.event.add( dest, type, events[ type ][ i ] ); + } + } + } + + // make the cloned public data object a copy from the original + if ( curData.data ) { + curData.data = jQuery.extend( {}, curData.data ); + } +} + +function fixCloneNodeIssues( src, dest ) { + var nodeName, e, data; + + // We do not need to do anything for non-Elements + if ( dest.nodeType !== 1 ) { + return; + } + + nodeName = dest.nodeName.toLowerCase(); + + // IE6-8 copies events bound via attachEvent when using cloneNode. + if ( !support.noCloneEvent && dest[ jQuery.expando ] ) { + data = jQuery._data( dest ); + + for ( e in data.events ) { + jQuery.removeEvent( dest, e, data.handle ); + } + + // Event data gets referenced instead of copied if the expando gets copied too + dest.removeAttribute( jQuery.expando ); + } + + // IE blanks contents when cloning scripts, and tries to evaluate newly-set text + if ( nodeName === "script" && dest.text !== src.text ) { + disableScript( dest ).text = src.text; + restoreScript( dest ); + + // IE6-10 improperly clones children of object elements using classid. + // IE10 throws NoModificationAllowedError if parent is null, #12132. + } else if ( nodeName === "object" ) { + if ( dest.parentNode ) { + dest.outerHTML = src.outerHTML; + } + + // This path appears unavoidable for IE9. When cloning an object + // element in IE9, the outerHTML strategy above is not sufficient. + // If the src has innerHTML and the destination does not, + // copy the src.innerHTML into the dest.innerHTML. #10324 + if ( support.html5Clone && ( src.innerHTML && !jQuery.trim( dest.innerHTML ) ) ) { + dest.innerHTML = src.innerHTML; + } + + } else if ( nodeName === "input" && rcheckableType.test( src.type ) ) { + + // IE6-8 fails to persist the checked state of a cloned checkbox + // or radio button. Worse, IE6-7 fail to give the cloned element + // a checked appearance if the defaultChecked value isn't also set + + dest.defaultChecked = dest.checked = src.checked; + + // IE6-7 get confused and end up setting the value of a cloned + // checkbox/radio button to an empty string instead of "on" + if ( dest.value !== src.value ) { + dest.value = src.value; + } + + // IE6-8 fails to return the selected option to the default selected + // state when cloning options + } else if ( nodeName === "option" ) { + dest.defaultSelected = dest.selected = src.defaultSelected; + + // IE6-8 fails to set the defaultValue to the correct value when + // cloning other types of input fields + } else if ( nodeName === "input" || nodeName === "textarea" ) { + dest.defaultValue = src.defaultValue; + } +} + +function domManip( collection, args, callback, ignored ) { + + // Flatten any nested arrays + args = concat.apply( [], args ); + + var first, node, hasScripts, + scripts, doc, fragment, + i = 0, + l = collection.length, + iNoClone = l - 1, + value = args[ 0 ], + isFunction = jQuery.isFunction( value ); + + // We can't cloneNode fragments that contain checked, in WebKit + if ( isFunction || + ( l > 1 && typeof value === "string" && + !support.checkClone && rchecked.test( value ) ) ) { + return collection.each( function( index ) { + var self = collection.eq( index ); + if ( isFunction ) { + args[ 0 ] = value.call( this, index, self.html() ); + } + domManip( self, args, callback, ignored ); + } ); + } + + if ( l ) { + fragment = buildFragment( args, collection[ 0 ].ownerDocument, false, collection, ignored ); + first = fragment.firstChild; + + if ( fragment.childNodes.length === 1 ) { + fragment = first; + } + + // Require either new content or an interest in ignored elements to invoke the callback + if ( first || ignored ) { + scripts = jQuery.map( getAll( fragment, "script" ), disableScript ); + hasScripts = scripts.length; + + // Use the original fragment for the last item + // instead of the first because it can end up + // being emptied incorrectly in certain situations (#8070). + for ( ; i < l; i++ ) { + node = fragment; + + if ( i !== iNoClone ) { + node = jQuery.clone( node, true, true ); + + // Keep references to cloned scripts for later restoration + if ( hasScripts ) { + + // Support: Android<4.1, PhantomJS<2 + // push.apply(_, arraylike) throws on ancient WebKit + jQuery.merge( scripts, getAll( node, "script" ) ); + } + } + + callback.call( collection[ i ], node, i ); + } + + if ( hasScripts ) { + doc = scripts[ scripts.length - 1 ].ownerDocument; + + // Reenable scripts + jQuery.map( scripts, restoreScript ); + + // Evaluate executable scripts on first document insertion + for ( i = 0; i < hasScripts; i++ ) { + node = scripts[ i ]; + if ( rscriptType.test( node.type || "" ) && + !jQuery._data( node, "globalEval" ) && + jQuery.contains( doc, node ) ) { + + if ( node.src ) { + + // Optional AJAX dependency, but won't run scripts if not present + if ( jQuery._evalUrl ) { + jQuery._evalUrl( node.src ); + } + } else { + jQuery.globalEval( + ( node.text || node.textContent || node.innerHTML || "" ) + .replace( rcleanScript, "" ) + ); + } + } + } + } + + // Fix #11809: Avoid leaking memory + fragment = first = null; + } + } + + return collection; +} + +function remove( elem, selector, keepData ) { + var node, + elems = selector ? jQuery.filter( selector, elem ) : elem, + i = 0; + + for ( ; ( node = elems[ i ] ) != null; i++ ) { + + if ( !keepData && node.nodeType === 1 ) { + jQuery.cleanData( getAll( node ) ); + } + + if ( node.parentNode ) { + if ( keepData && jQuery.contains( node.ownerDocument, node ) ) { + setGlobalEval( getAll( node, "script" ) ); + } + node.parentNode.removeChild( node ); + } + } + + return elem; +} + +jQuery.extend( { + htmlPrefilter: function( html ) { + return html.replace( rxhtmlTag, "<$1>" ); + }, + + clone: function( elem, dataAndEvents, deepDataAndEvents ) { + var destElements, node, clone, i, srcElements, + inPage = jQuery.contains( elem.ownerDocument, elem ); + + if ( support.html5Clone || jQuery.isXMLDoc( elem ) || + !rnoshimcache.test( "<" + elem.nodeName + ">" ) ) { + + clone = elem.cloneNode( true ); + + // IE<=8 does not properly clone detached, unknown element nodes + } else { + fragmentDiv.innerHTML = elem.outerHTML; + fragmentDiv.removeChild( clone = fragmentDiv.firstChild ); + } + + if ( ( !support.noCloneEvent || !support.noCloneChecked ) && + ( elem.nodeType === 1 || elem.nodeType === 11 ) && !jQuery.isXMLDoc( elem ) ) { + + // We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2 + destElements = getAll( clone ); + srcElements = getAll( elem ); + + // Fix all IE cloning issues + for ( i = 0; ( node = srcElements[ i ] ) != null; ++i ) { + + // Ensure that the destination node is not null; Fixes #9587 + if ( destElements[ i ] ) { + fixCloneNodeIssues( node, destElements[ i ] ); + } + } + } + + // Copy the events from the original to the clone + if ( dataAndEvents ) { + if ( deepDataAndEvents ) { + srcElements = srcElements || getAll( elem ); + destElements = destElements || getAll( clone ); + + for ( i = 0; ( node = srcElements[ i ] ) != null; i++ ) { + cloneCopyEvent( node, destElements[ i ] ); + } + } else { + cloneCopyEvent( elem, clone ); + } + } + + // Preserve script evaluation history + destElements = getAll( clone, "script" ); + if ( destElements.length > 0 ) { + setGlobalEval( destElements, !inPage && getAll( elem, "script" ) ); + } + + destElements = srcElements = node = null; + + // Return the cloned set + return clone; + }, + + cleanData: function( elems, /* internal */ forceAcceptData ) { + var elem, type, id, data, + i = 0, + internalKey = jQuery.expando, + cache = jQuery.cache, + attributes = support.attributes, + special = jQuery.event.special; + + for ( ; ( elem = elems[ i ] ) != null; i++ ) { + if ( forceAcceptData || acceptData( elem ) ) { + + id = elem[ internalKey ]; + data = id && cache[ id ]; + + if ( data ) { + if ( data.events ) { + for ( type in data.events ) { + if ( special[ type ] ) { + jQuery.event.remove( elem, type ); + + // This is a shortcut to avoid jQuery.event.remove's overhead + } else { + jQuery.removeEvent( elem, type, data.handle ); + } + } + } + + // Remove cache only if it was not already removed by jQuery.event.remove + if ( cache[ id ] ) { + + delete cache[ id ]; + + // Support: IE<9 + // IE does not allow us to delete expando properties from nodes + // IE creates expando attributes along with the property + // IE does not have a removeAttribute function on Document nodes + if ( !attributes && typeof elem.removeAttribute !== "undefined" ) { + elem.removeAttribute( internalKey ); + + // Webkit & Blink performance suffers when deleting properties + // from DOM nodes, so set to undefined instead + // https://code.google.com/p/chromium/issues/detail?id=378607 + } else { + elem[ internalKey ] = undefined; + } + + deletedIds.push( id ); + } + } + } + } + } +} ); + +jQuery.fn.extend( { + + // Keep domManip exposed until 3.0 (gh-2225) + domManip: domManip, + + detach: function( selector ) { + return remove( this, selector, true ); + }, + + remove: function( selector ) { + return remove( this, selector ); + }, + + text: function( value ) { + return access( this, function( value ) { + return value === undefined ? + jQuery.text( this ) : + this.empty().append( + ( this[ 0 ] && this[ 0 ].ownerDocument || document ).createTextNode( value ) + ); + }, null, value, arguments.length ); + }, + + append: function() { + return domManip( this, arguments, function( elem ) { + if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { + var target = manipulationTarget( this, elem ); + target.appendChild( elem ); + } + } ); + }, + + prepend: function() { + return domManip( this, arguments, function( elem ) { + if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) { + var target = manipulationTarget( this, elem ); + target.insertBefore( elem, target.firstChild ); + } + } ); + }, + + before: function() { + return domManip( this, arguments, function( elem ) { + if ( this.parentNode ) { + this.parentNode.insertBefore( elem, this ); + } + } ); + }, + + after: function() { + return domManip( this, arguments, function( elem ) { + if ( this.parentNode ) { + this.parentNode.insertBefore( elem, this.nextSibling ); + } + } ); + }, + + empty: function() { + var elem, + i = 0; + + for ( ; ( elem = this[ i ] ) != null; i++ ) { + + // Remove element nodes and prevent memory leaks + if ( elem.nodeType === 1 ) { + jQuery.cleanData( getAll( elem, false ) ); + } + + // Remove any remaining nodes + while ( elem.firstChild ) { + elem.removeChild( elem.firstChild ); + } + + // If this is a select, ensure that it displays empty (#12336) + // Support: IE<9 + if ( elem.options && jQuery.nodeName( elem, "select" ) ) { + elem.options.length = 0; + } + } + + return this; + }, + + clone: function( dataAndEvents, deepDataAndEvents ) { + dataAndEvents = dataAndEvents == null ? false : dataAndEvents; + deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents; + + return this.map( function() { + return jQuery.clone( this, dataAndEvents, deepDataAndEvents ); + } ); + }, + + html: function( value ) { + return access( this, function( value ) { + var elem = this[ 0 ] || {}, + i = 0, + l = this.length; + + if ( value === undefined ) { + return elem.nodeType === 1 ? + elem.innerHTML.replace( rinlinejQuery, "" ) : + undefined; + } + + // See if we can take a shortcut and just use innerHTML + if ( typeof value === "string" && !rnoInnerhtml.test( value ) && + ( support.htmlSerialize || !rnoshimcache.test( value ) ) && + ( support.leadingWhitespace || !rleadingWhitespace.test( value ) ) && + !wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) { + + value = jQuery.htmlPrefilter( value ); + + try { + for ( ; i < l; i++ ) { + + // Remove element nodes and prevent memory leaks + elem = this[ i ] || {}; + if ( elem.nodeType === 1 ) { + jQuery.cleanData( getAll( elem, false ) ); + elem.innerHTML = value; + } + } + + elem = 0; + + // If using innerHTML throws an exception, use the fallback method + } catch ( e ) {} + } + + if ( elem ) { + this.empty().append( value ); + } + }, null, value, arguments.length ); + }, + + replaceWith: function() { + var ignored = []; + + // Make the changes, replacing each non-ignored context element with the new content + return domManip( this, arguments, function( elem ) { + var parent = this.parentNode; + + if ( jQuery.inArray( this, ignored ) < 0 ) { + jQuery.cleanData( getAll( this ) ); + if ( parent ) { + parent.replaceChild( elem, this ); + } + } + + // Force callback invocation + }, ignored ); + } +} ); + +jQuery.each( { + appendTo: "append", + prependTo: "prepend", + insertBefore: "before", + insertAfter: "after", + replaceAll: "replaceWith" +}, function( name, original ) { + jQuery.fn[ name ] = function( selector ) { + var elems, + i = 0, + ret = [], + insert = jQuery( selector ), + last = insert.length - 1; + + for ( ; i <= last; i++ ) { + elems = i === last ? this : this.clone( true ); + jQuery( insert[ i ] )[ original ]( elems ); + + // Modern browsers can apply jQuery collections as arrays, but oldIE needs a .get() + push.apply( ret, elems.get() ); + } + + return this.pushStack( ret ); + }; +} ); + + +var iframe, + elemdisplay = { + + // Support: Firefox + // We have to pre-define these values for FF (#10227) + HTML: "block", + BODY: "block" + }; + +/** + * Retrieve the actual display of a element + * @param {String} name nodeName of the element + * @param {Object} doc Document object + */ + +// Called only from within defaultDisplay +function actualDisplay( name, doc ) { + var elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ), + + display = jQuery.css( elem[ 0 ], "display" ); + + // We don't have any data stored on the element, + // so use "detach" method as fast way to get rid of the element + elem.detach(); + + return display; +} + +/** + * Try to determine the default display value of an element + * @param {String} nodeName + */ +function defaultDisplay( nodeName ) { + var doc = document, + display = elemdisplay[ nodeName ]; + + if ( !display ) { + display = actualDisplay( nodeName, doc ); + + // If the simple way fails, read from inside an iframe + if ( display === "none" || !display ) { + + // Use the already-created iframe if possible + iframe = ( iframe || jQuery( "':""),a._keyEvent=!1,K},_generateMonthYearHeader:function(a,b,c,d,e,f,g,h){var i=this._get(a,"changeMonth"),j=this._get(a,"changeYear"),k=this._get(a,"showMonthAfterYear"),l='
    ',m="";if(f||!i)m+=''+g[b]+"";else{var n=d&&d.getFullYear()==c,o=e&&e.getFullYear()==c;m+='"}k||(l+=m+(f||!i||!j?" ":""));if(!a.yearshtml){a.yearshtml="";if(f||!j)l+=''+c+"";else{var q=this._get(a,"yearRange").split(":"),r=(new Date).getFullYear(),s=function(a){var b=a.match(/c[+-].*/)?c+parseInt(a.substring(1),10):a.match(/[+-].*/)?r+parseInt(a,10):parseInt(a,10);return isNaN(b)?r:b},t=s(q[0]),u=Math.max(t,s(q[1]||""));t=d?Math.max(t,d.getFullYear()):t,u=e?Math.min(u,e.getFullYear()):u,a.yearshtml+='",l+=a.yearshtml,a.yearshtml=null}}return l+=this._get(a,"yearSuffix"),k&&(l+=(f||!i||!j?" ":"")+m),l+="
    ",l},_adjustInstDate:function(a,b,c){var d=a.drawYear+(c=="Y"?b:0),e=a.drawMonth+(c=="M"?b:0),f=Math.min(a.selectedDay,this._getDaysInMonth(d,e))+(c=="D"?b:0),g=this._restrictMinMax(a,this._daylightSavingAdjust(new Date(d,e,f)));a.selectedDay=g.getDate(),a.drawMonth=a.selectedMonth=g.getMonth(),a.drawYear=a.selectedYear=g.getFullYear(),(c=="M"||c=="Y")&&this._notifyChange(a)},_restrictMinMax:function(a,b){var c=this._getMinMaxDate(a,"min"),d=this._getMinMaxDate(a,"max"),e=c&&bd?d:e,e},_notifyChange:function(a){var b=this._get(a,"onChangeMonthYear");b&&b.apply(a.input?a.input[0]:null,[a.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:function(a){var b=this._get(a,"numberOfMonths");return b==null?[1,1]:typeof b=="number"?[1,b]:b},_getMinMaxDate:function(a,b){return this._determineDate(a,this._get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){return 32-this._daylightSavingAdjust(new Date(a,b,32)).getDate()},_getFirstDayOfMonth:function(a,b){return(new Date(a,b,1)).getDay()},_canAdjustMonth:function(a,b,c,d){var e=this._getNumberOfMonths(a),f=this._daylightSavingAdjust(new Date(c,d+(b<0?b:e[0]*e[1]),1));return b<0&&f.setDate(this._getDaysInMonth(f.getFullYear(),f.getMonth())),this._isInRange(a,f)},_isInRange:function(a,b){var c=this._getMinMaxDate(a,"min"),d=this._getMinMaxDate(a,"max");return(!c||b.getTime()>=c.getTime())&&(!d||b.getTime()<=d.getTime())},_getFormatConfig:function(a){var b=this._get(a,"shortYearCutoff");return b=typeof b!="string"?b:(new Date).getFullYear()%100+parseInt(b,10),{shortYearCutoff:b,dayNamesShort:this._get(a,"dayNamesShort"),dayNames:this._get(a,"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,d){b||(a.currentDay=a.selectedDay,a.currentMonth=a.selectedMonth,a.currentYear=a.selectedYear);var e=b?typeof b=="object"?b:this._daylightSavingAdjust(new Date(d,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return this.formatDate(this._get(a,"dateFormat"),e,this._getFormatConfig(a))}}),$.fn.datepicker=function(a){if(!this.length)return this;$.datepicker.initialized||($(document).mousedown($.datepicker._checkExternalClick).find("body").append($.datepicker.dpDiv),$.datepicker.initialized=!0);var b=Array.prototype.slice.call(arguments,1);return typeof a!="string"||a!="isDisabled"&&a!="getDate"&&a!="widget"?a=="option"&&arguments.length==2&&typeof arguments[1]=="string"?$.datepicker["_"+a+"Datepicker"].apply($.datepicker,[this[0]].concat(b)):this.each(function(){typeof a=="string"?$.datepicker["_"+a+"Datepicker"].apply($.datepicker,[this].concat(b)):$.datepicker._attachDatepicker(this,a)}):$.datepicker["_"+a+"Datepicker"].apply($.datepicker,[this[0]].concat(b))},$.datepicker=new Datepicker,$.datepicker.initialized=!1,$.datepicker.uuid=(new Date).getTime(),$.datepicker.version="1.8.24",window["DP_jQuery_"+dpuuid]=$}(jQuery),function(a,b){var c="ui-dialog ui-widget ui-widget-content ui-corner-all ",d={buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},e={maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0};a.widget("ui.dialog",{options:{autoOpen:!0,buttons:{},closeOnEscape:!0,closeText:"close",dialogClass:"",draggable:!0,hide:null,height:"auto",maxHeight:!1,maxWidth:!1,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",collision:"fit",using:function(b){var c=a(this).css(b).offset().top;c<0&&a(this).css("top",b.top-c)}},resizable:!0,show:null,stack:!0,title:"",width:300,zIndex:1e3},_create:function(){this.originalTitle=this.element.attr("title"),typeof this.originalTitle!="string"&&(this.originalTitle=""),this.options.title=this.options.title||this.originalTitle;var b=this,d=b.options,e=d.title||" ",f=a.ui.dialog.getTitleId(b.element),g=(b.uiDialog=a("
    ")).appendTo(document.body).hide().addClass(c+d.dialogClass).css({zIndex:d.zIndex}).attr("tabIndex",-1).css("outline",0).keydown(function(c){d.closeOnEscape&&!c.isDefaultPrevented()&&c.keyCode&&c.keyCode===a.ui.keyCode.ESCAPE&&(b.close(c),c.preventDefault())}).attr({role:"dialog","aria-labelledby":f}).mousedown(function(a){b.moveToTop(!1,a)}),h=b.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(g),i=(b.uiDialogTitlebar=a("
    ")).addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(g),j=a('').addClass("ui-dialog-titlebar-close ui-corner-all").attr("role","button").hover(function(){j.addClass("ui-state-hover")},function(){j.removeClass("ui-state-hover")}).focus(function(){j.addClass("ui-state-focus")}).blur(function(){j.removeClass("ui-state-focus")}).click(function(a){return b.close(a),!1}).appendTo(i),k=(b.uiDialogTitlebarCloseText=a("")).addClass("ui-icon ui-icon-closethick").text(d.closeText).appendTo(j),l=a("").addClass("ui-dialog-title").attr("id",f).html(e).prependTo(i);a.isFunction(d.beforeclose)&&!a.isFunction(d.beforeClose)&&(d.beforeClose=d.beforeclose),i.find("*").add(i).disableSelection(),d.draggable&&a.fn.draggable&&b._makeDraggable(),d.resizable&&a.fn.resizable&&b._makeResizable(),b._createButtons(d.buttons),b._isOpen=!1,a.fn.bgiframe&&g.bgiframe()},_init:function(){this.options.autoOpen&&this.open()},destroy:function(){var a=this;return a.overlay&&a.overlay.destroy(),a.uiDialog.hide(),a.element.unbind(".dialog").removeData("dialog").removeClass("ui-dialog-content ui-widget-content").hide().appendTo("body"),a.uiDialog.remove(),a.originalTitle&&a.element.attr("title",a.originalTitle),a},widget:function(){return this.uiDialog},close:function(b){var c=this,d,e;if(!1===c._trigger("beforeClose",b))return;return c.overlay&&c.overlay.destroy(),c.uiDialog.unbind("keypress.ui-dialog"),c._isOpen=!1,c.options.hide?c.uiDialog.hide(c.options.hide,function(){c._trigger("close",b)}):(c.uiDialog.hide(),c._trigger("close",b)),a.ui.dialog.overlay.resize(),c.options.modal&&(d=0,a(".ui-dialog").each(function(){this!==c.uiDialog[0]&&(e=a(this).css("z-index"),isNaN(e)||(d=Math.max(d,e)))}),a.ui.dialog.maxZ=d),c},isOpen:function(){return this._isOpen},moveToTop:function(b,c){var d=this,e=d.options,f;return e.modal&&!b||!e.stack&&!e.modal?d._trigger("focus",c):(e.zIndex>a.ui.dialog.maxZ&&(a.ui.dialog.maxZ=e.zIndex),d.overlay&&(a.ui.dialog.maxZ+=1,d.overlay.$el.css("z-index",a.ui.dialog.overlay.maxZ=a.ui.dialog.maxZ)),f={scrollTop:d.element.scrollTop(),scrollLeft:d.element.scrollLeft()},a.ui.dialog.maxZ+=1,d.uiDialog.css("z-index",a.ui.dialog.maxZ),d.element.attr(f),d._trigger("focus",c),d)},open:function(){if(this._isOpen)return;var b=this,c=b.options,d=b.uiDialog;return b.overlay=c.modal?new a.ui.dialog.overlay(b):null,b._size(),b._position(c.position),d.show(c.show),b.moveToTop(!0),c.modal&&d.bind("keydown.ui-dialog",function(b){if(b.keyCode!==a.ui.keyCode.TAB)return;var c=a(":tabbable",this),d=c.filter(":first"),e=c.filter(":last");if(b.target===e[0]&&!b.shiftKey)return d.focus(1),!1;if(b.target===d[0]&&b.shiftKey)return e.focus(1),!1}),a(b.element.find(":tabbable").get().concat(d.find(".ui-dialog-buttonpane :tabbable").get().concat(d.get()))).eq(0).focus(),b._isOpen=!0,b._trigger("open"),b},_createButtons:function(b){var c=this,d=!1,e=a("
    ").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),f=a("
    ").addClass("ui-dialog-buttonset").appendTo(e);c.uiDialog.find(".ui-dialog-buttonpane").remove(),typeof b=="object"&&b!==null&&a.each(b,function(){return!(d=!0)}),d&&(a.each(b,function(b,d){d=a.isFunction(d)?{click:d,text:b}:d;var e=a('').click(function(){d.click.apply(c.element[0],arguments)}).appendTo(f);a.each(d,function(a,b){if(a==="click")return;a in e?e[a](b):e.attr(a,b)}),a.fn.button&&e.button()}),e.appendTo(c.uiDialog))},_makeDraggable:function(){function f(a){return{position:a.position,offset:a.offset}}var b=this,c=b.options,d=a(document),e;b.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(d,g){e=c.height==="auto"?"auto":a(this).height(),a(this).height(a(this).height()).addClass("ui-dialog-dragging"),b._trigger("dragStart",d,f(g))},drag:function(a,c){b._trigger("drag",a,f(c))},stop:function(g,h){c.position=[h.position.left-d.scrollLeft(),h.position.top-d.scrollTop()],a(this).removeClass("ui-dialog-dragging").height(e),b._trigger("dragStop",g,f(h)),a.ui.dialog.overlay.resize()}})},_makeResizable:function(c){function h(a){return{originalPosition:a.originalPosition,originalSize:a.originalSize,position:a.position,size:a.size}}c=c===b?this.options.resizable:c;var d=this,e=d.options,f=d.uiDialog.css("position"),g=typeof c=="string"?c:"n,e,s,w,se,sw,ne,nw";d.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:d.element,maxWidth:e.maxWidth,maxHeight:e.maxHeight,minWidth:e.minWidth,minHeight:d._minHeight(),handles:g,start:function(b,c){a(this).addClass("ui-dialog-resizing"),d._trigger("resizeStart",b,h(c))},resize:function(a,b){d._trigger("resize",a,h(b))},stop:function(b,c){a(this).removeClass("ui-dialog-resizing"),e.height=a(this).height(),e.width=a(this).width(),d._trigger("resizeStop",b,h(c)),a.ui.dialog.overlay.resize()}}).css("position",f).find(".ui-resizable-se").addClass("ui-icon ui-icon-grip-diagonal-se")},_minHeight:function(){var a=this.options;return a.height==="auto"?a.minHeight:Math.min(a.minHeight,a.height)},_position:function(b){var c=[],d=[0,0],e;if(b){if(typeof b=="string"||typeof b=="object"&&"0"in b)c=b.split?b.split(" "):[b[0],b[1]],c.length===1&&(c[1]=c[0]),a.each(["left","top"],function(a,b){+c[a]===c[a]&&(d[a]=c[a],c[a]=b)}),b={my:c.join(" "),at:c.join(" "),offset:d.join(" ")};b=a.extend({},a.ui.dialog.prototype.options.position,b)}else b=a.ui.dialog.prototype.options.position;e=this.uiDialog.is(":visible"),e||this.uiDialog.show(),this.uiDialog.css({top:0,left:0}).position(a.extend({of:window},b)),e||this.uiDialog.hide()},_setOptions:function(b){var c=this,f={},g=!1;a.each(b,function(a,b){c._setOption(a,b),a in d&&(g=!0),a in e&&(f[a]=b)}),g&&this._size(),this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option",f)},_setOption:function(b,d){var e=this,f=e.uiDialog;switch(b){case"beforeclose":b="beforeClose";break;case"buttons":e._createButtons(d);break;case"closeText":e.uiDialogTitlebarCloseText.text(""+d);break;case"dialogClass":f.removeClass(e.options.dialogClass).addClass(c+d);break;case"disabled":d?f.addClass("ui-dialog-disabled"):f.removeClass("ui-dialog-disabled");break;case"draggable":var g=f.is(":data(draggable)");g&&!d&&f.draggable("destroy"),!g&&d&&e._makeDraggable();break;case"position":e._position(d);break;case"resizable":var h=f.is(":data(resizable)");h&&!d&&f.resizable("destroy"),h&&typeof d=="string"&&f.resizable("option","handles",d),!h&&d!==!1&&e._makeResizable(d);break;case"title":a(".ui-dialog-title",e.uiDialogTitlebar).html(""+(d||" "))}a.Widget.prototype._setOption.apply(e,arguments)},_size:function(){var b=this.options,c,d,e=this.uiDialog.is(":visible");this.element.show().css({width:"auto",minHeight:0,height:0}),b.minWidth>b.width&&(b.width=b.minWidth),c=this.uiDialog.css({height:"auto",width:b.width}).height(),d=Math.max(0,b.minHeight-c);if(b.height==="auto")if(a.support.minHeight)this.element.css({minHeight:d,height:"auto"});else{this.uiDialog.show();var f=this.element.css("height","auto").height();e||this.uiDialog.hide(),this.element.height(Math.max(f,d))}else this.element.height(Math.max(b.height-c,0));this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())}}),a.extend(a.ui.dialog,{version:"1.8.24",uuid:0,maxZ:0,getTitleId:function(a){var b=a.attr("id");return b||(this.uuid+=1,b=this.uuid),"ui-dialog-title-"+b},overlay:function(b){this.$el=a.ui.dialog.overlay.create(b)}}),a.extend(a.ui.dialog.overlay,{instances:[],oldInstances:[],maxZ:0,events:a.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),function(a){return a+".dialog-overlay"}).join(" "),create:function(b){this.instances.length===0&&(setTimeout(function(){a.ui.dialog.overlay.instances.length&&a(document).bind(a.ui.dialog.overlay.events,function(b){if(a(b.target).zIndex()").addClass("ui-widget-overlay")).appendTo(document.body).css({width:this.width(),height:this.height()});return a.fn.bgiframe&&c.bgiframe(),this.instances.push(c),c},destroy:function(b){var c=a.inArray(b,this.instances);c!=-1&&this.oldInstances.push(this.instances.splice(c,1)[0]),this.instances.length===0&&a([document,window]).unbind(".dialog-overlay"),b.remove();var d=0;a.each(this.instances,function(){d=Math.max(d,this.css("z-index"))}),this.maxZ=d},height:function(){var b,c;return a.browser.msie&&a.browser.version<7?(b=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight),c=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight),b0?b.left-e:Math.max(b.left-c.collisionPosition.left,b.left)},top:function(b,c){var d=a(window),e=c.collisionPosition.top+c.collisionHeight-d.height()-d.scrollTop();b.top=e>0?b.top-e:Math.max(b.top-c.collisionPosition.top,b.top)}},flip:{left:function(b,c){if(c.at[0]===e)return;var d=a(window),f=c.collisionPosition.left+c.collisionWidth-d.width()-d.scrollLeft(),g=c.my[0]==="left"?-c.elemWidth:c.my[0]==="right"?c.elemWidth:0,h=c.at[0]==="left"?c.targetWidth:-c.targetWidth,i=-2*c.offset[0];b.left+=c.collisionPosition.left<0?g+h+i:f>0?g+h+i:0},top:function(b,c){if(c.at[1]===e)return;var d=a(window),f=c.collisionPosition.top+c.collisionHeight-d.height()-d.scrollTop(),g=c.my[1]==="top"?-c.elemHeight:c.my[1]==="bottom"?c.elemHeight:0,h=c.at[1]==="top"?c.targetHeight:-c.targetHeight,i=-2*c.offset[1];b.top+=c.collisionPosition.top<0?g+h+i:f>0?g+h+i:0}}},a.offset.setOffset||(a.offset.setOffset=function(b,c){/static/.test(a.curCSS(b,"position"))&&(b.style.position="relative");var d=a(b),e=d.offset(),f=parseInt(a.curCSS(b,"top",!0),10)||0,g=parseInt(a.curCSS(b,"left",!0),10)||0,h={top:c.top-e.top+f,left:c.left-e.left+g};"using"in c?c.using.call(b,h):d.css(h)},a.fn.offset=function(b){var c=this[0];return!c||!c.ownerDocument?null:b?a.isFunction(b)?this.each(function(c){a(this).offset(b.call(this,c,a(this).offset()))}):this.each(function(){a.offset.setOffset(this,b)}):h.call(this)}),a.curCSS||(a.curCSS=a.css),function(){var b=document.getElementsByTagName("body")[0],c=document.createElement("div"),d,e,g,h,i;d=document.createElement(b?"div":"body"),g={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},b&&a.extend(g,{position:"absolute",left:"-1000px",top:"-1000px"});for(var j in g)d.style[j]=g[j];d.appendChild(c),e=b||document.documentElement,e.insertBefore(d,e.firstChild),c.style.cssText="position: absolute; left: 10.7432222px; top: 10.432325px; height: 30px; width: 201px;",h=a(c).offset(function(a,b){return b}).offset(),d.innerHTML="",e.removeChild(d),i=h.top+h.left+(b?2e3:0),f.fractions=i>21&&i<22}()}(jQuery),function(a,b){a.widget("ui.progressbar",{options:{value:0,max:100},min:0,_create:function(){this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min,"aria-valuemax":this.options.max,"aria-valuenow":this._value()}),this.valueDiv=a("
    ").appendTo(this.element),this.oldValue=this._value(),this._refreshValue()},destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow"),this.valueDiv.remove(),a.Widget.prototype.destroy.apply(this,arguments)},value:function(a){return a===b?this._value():(this._setOption("value",a),this)},_setOption:function(b,c){b==="value"&&(this.options.value=c,this._refreshValue(),this._value()===this.options.max&&this._trigger("complete")),a.Widget.prototype._setOption.apply(this,arguments)},_value:function(){var a=this.options.value;return typeof a!="number"&&(a=0),Math.min(this.options.max,Math.max(this.min,a))},_percentage:function(){return 100*this._value()/this.options.max},_refreshValue:function(){var a=this.value(),b=this._percentage();this.oldValue!==a&&(this.oldValue=a,this._trigger("change")),this.valueDiv.toggle(a>this.min).toggleClass("ui-corner-right",a===this.options.max).width(b.toFixed(0)+"%"),this.element.attr("aria-valuenow",a)}}),a.extend(a.ui.progressbar,{version:"1.8.24"})}(jQuery),function(a,b){var c=5;a.widget("ui.slider",a.ui.mouse,{widgetEventPrefix:"slide",options:{animate:!1,distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null},_create:function(){var b=this,d=this.options,e=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),f="",g=d.values&&d.values.length||1,h=[];this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget"+" ui-widget-content"+" ui-corner-all"+(d.disabled?" ui-slider-disabled ui-disabled":"")),this.range=a([]),d.range&&(d.range===!0&&(d.values||(d.values=[this._valueMin(),this._valueMin()]),d.values.length&&d.values.length!==2&&(d.values=[d.values[0],d.values[0]])),this.range=a("
    ").appendTo(this.element).addClass("ui-slider-range ui-widget-header"+(d.range==="min"||d.range==="max"?" ui-slider-range-"+d.range:"")));for(var i=e.length;ic&&(f=c,g=a(this),i=b)}),c.range===!0&&this.values(1)===c.min&&(i+=1,g=a(this.handles[i])),j=this._start(b,i),j===!1?!1:(this._mouseSliding=!0,h._handleIndex=i,g.addClass("ui-state-active").focus(),k=g.offset(),l=!a(b.target).parents().andSelf().is(".ui-slider-handle"),this._clickOffset=l?{left:0,top:0}:{left:b.pageX-k.left-g.width()/2,top:b.pageY-k.top-g.height()/2-(parseInt(g.css("borderTopWidth"),10)||0)-(parseInt(g.css("borderBottomWidth"),10)||0)+(parseInt(g.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(b,i,e),this._animateOff=!0,!0))},_mouseStart:function(a){return!0},_mouseDrag:function(a){var b={x:a.pageX,y:a.pageY},c=this._normValueFromMouse(b);return this._slide(a,this._handleIndex,c),!1},_mouseStop:function(a){return this.handles.removeClass("ui-state-active"),this._mouseSliding=!1,this._stop(a,this._handleIndex),this._change(a,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(a){var b,c,d,e,f;return this.orientation==="horizontal"?(b=this.elementSize.width,c=a.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(b=this.elementSize.height,c=a.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),d=c/b,d>1&&(d=1),d<0&&(d=0),this.orientation==="vertical"&&(d=1-d),e=this._valueMax()-this._valueMin(),f=this._valueMin()+d*e,this._trimAlignValue(f)},_start:function(a,b){var c={handle:this.handles[b],value:this.value()};return this.options.values&&this.options.values.length&&(c.value=this.values(b),c.values=this.values()),this._trigger("start",a,c)},_slide:function(a,b,c){var d,e,f;this.options.values&&this.options.values.length?(d=this.values(b?0:1),this.options.values.length===2&&this.options.range===!0&&(b===0&&c>d||b===1&&c1){this.options.values[b]=this._trimAlignValue(c),this._refreshValue(),this._change(null,b);return}if(!arguments.length)return this._values();if(!a.isArray(arguments[0]))return this.options.values&&this.options.values.length?this._values(b):this.value();d=this.options.values,e=arguments[0];for(f=0;f=this._valueMax())return this._valueMax();var b=this.options.step>0?this.options.step:1,c=(a-this._valueMin())%b,d=a-c;return Math.abs(c)*2>=b&&(d+=c>0?b:-b),parseFloat(d.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},_refreshValue:function(){var b=this.options.range,c=this.options,d=this,e=this._animateOff?!1:c.animate,f,g={},h,i,j,k;this.options.values&&this.options.values.length?this.handles.each(function(b,i){f=(d.values(b)-d._valueMin())/(d._valueMax()-d._valueMin())*100,g[d.orientation==="horizontal"?"left":"bottom"]=f+"%",a(this).stop(1,1)[e?"animate":"css"](g,c.animate),d.options.range===!0&&(d.orientation==="horizontal"?(b===0&&d.range.stop(1,1)[e?"animate":"css"]({left:f+"%"},c.animate),b===1&&d.range[e?"animate":"css"]({width:f-h+"%"},{queue:!1,duration:c.animate})):(b===0&&d.range.stop(1,1)[e?"animate":"css"]({bottom:f+"%"},c.animate),b===1&&d.range[e?"animate":"css"]({height:f-h+"%"},{queue:!1,duration:c.animate}))),h=f}):(i=this.value(),j=this._valueMin(),k=this._valueMax(),f=k!==j?(i-j)/(k-j)*100:0,g[d.orientation==="horizontal"?"left":"bottom"]=f+"%",this.handle.stop(1,1)[e?"animate":"css"](g,c.animate),b==="min"&&this.orientation==="horizontal"&&this.range.stop(1,1)[e?"animate":"css"]({width:f+"%"},c.animate),b==="max"&&this.orientation==="horizontal"&&this.range[e?"animate":"css"]({width:100-f+"%"},{queue:!1,duration:c.animate}),b==="min"&&this.orientation==="vertical"&&this.range.stop(1,1)[e?"animate":"css"]({height:f+"%"},c.animate),b==="max"&&this.orientation==="vertical"&&this.range[e?"animate":"css"]({height:100-f+"%"},{queue:!1,duration:c.animate}))}}),a.extend(a.ui.slider,{version:"1.8.24"})}(jQuery),function(a,b){function e(){return++c}function f(){return++d}var c=0,d=0;a.widget("ui.tabs",{options:{add:null,ajaxOptions:null,cache:!1,cookie:null,collapsible:!1,disable:null,disabled:[],enable:null,event:"click",fx:null,idPrefix:"ui-tabs-",load:null,panelTemplate:"
    ",remove:null,select:null,show:null,spinner:"Loading…",tabTemplate:"
  • #{label}
    • "},_create:function(){this._tabify(!0)},_setOption:function(a,b){if(a=="selected"){if(this.options.collapsible&&b==this.options.selected)return;this.select(b)}else this.options[a]=b,this._tabify()},_tabId:function(a){return a.title&&a.title.replace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF-]/g,"")||this.options.idPrefix+e()},_sanitizeSelector:function(a){return a.replace(/:/g,"\\:")},_cookie:function(){var b=this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+f());return a.cookie.apply(null,[b].concat(a.makeArray(arguments)))},_ui:function(a,b){return{tab:a,panel:b,index:this.anchors.index(a)}},_cleanup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-state-processing").find("span:data(label.tabs)").each(function(){var b=a(this);b.html(b.data("label.tabs")).removeData("label.tabs")})},_tabify:function(c){function m(b,c){b.css("display",""),!a.support.opacity&&c.opacity&&b[0].style.removeAttribute("filter")}var d=this,e=this.options,f=/^#.+/;this.list=this.element.find("ol,ul").eq(0),this.lis=a(" > li:has(a[href])",this.list),this.anchors=this.lis.map(function(){return a("a",this)[0]}),this.panels=a([]),this.anchors.each(function(b,c){var g=a(c).attr("href"),h=g.split("#")[0],i;h&&(h===location.toString().split("#")[0]||(i=a("base")[0])&&h===i.href)&&(g=c.hash,c.href=g);if(f.test(g))d.panels=d.panels.add(d.element.find(d._sanitizeSelector(g)));else if(g&&g!=="#"){a.data(c,"href.tabs",g),a.data(c,"load.tabs",g.replace(/#.*$/,""));var j=d._tabId(c);c.href="#"+j;var k=d.element.find("#"+j);k.length||(k=a(e.panelTemplate).attr("id",j).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").insertAfter(d.panels[b-1]||d.list),k.data("destroy.tabs",!0)),d.panels=d.panels.add(k)}else e.disabled.push(b)}),c?(this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all"),this.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all"),this.lis.addClass("ui-state-default ui-corner-top"),this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom"),e.selected===b?(location.hash&&this.anchors.each(function(a,b){if(b.hash==location.hash)return e.selected=a,!1}),typeof e.selected!="number"&&e.cookie&&(e.selected=parseInt(d._cookie(),10)),typeof e.selected!="number"&&this.lis.filter(".ui-tabs-selected").length&&(e.selected=this.lis.index(this.lis.filter(".ui-tabs-selected"))),e.selected=e.selected||(this.lis.length?0:-1)):e.selected===null&&(e.selected=-1),e.selected=e.selected>=0&&this.anchors[e.selected]||e.selected<0?e.selected:0,e.disabled=a.unique(e.disabled.concat(a.map(this.lis.filter(".ui-state-disabled"),function(a,b){return d.lis.index(a)}))).sort(),a.inArray(e.selected,e.disabled)!=-1&&e.disabled.splice(a.inArray(e.selected,e.disabled),1),this.panels.addClass("ui-tabs-hide"),this.lis.removeClass("ui-tabs-selected ui-state-active"),e.selected>=0&&this.anchors.length&&(d.element.find(d._sanitizeSelector(d.anchors[e.selected].hash)).removeClass("ui-tabs-hide"),this.lis.eq(e.selected).addClass("ui-tabs-selected ui-state-active"),d.element.queue("tabs",function(){d._trigger("show",null,d._ui(d.anchors[e.selected],d.element.find(d._sanitizeSelector(d.anchors[e.selected].hash))[0]))}),this.load(e.selected)),a(window).bind("unload",function(){d.lis.add(d.anchors).unbind(".tabs"),d.lis=d.anchors=d.panels=null})):e.selected=this.lis.index(this.lis.filter(".ui-tabs-selected")),this.element[e.collapsible?"addClass":"removeClass"]("ui-tabs-collapsible"),e.cookie&&this._cookie(e.selected,e.cookie);for(var g=0,h;h=this.lis[g];g++)a(h)[a.inArray(g,e.disabled)!=-1&&!a(h).hasClass("ui-tabs-selected")?"addClass":"removeClass"]("ui-state-disabled");e.cache===!1&&this.anchors.removeData("cache.tabs"),this.lis.add(this.anchors).unbind(".tabs");if(e.event!=="mouseover"){var i=function(a,b){b.is(":not(.ui-state-disabled)")&&b.addClass("ui-state-"+a)},j=function(a,b){b.removeClass("ui-state-"+a)};this.lis.bind("mouseover.tabs",function(){i("hover",a(this))}),this.lis.bind("mouseout.tabs",function(){j("hover",a(this))}),this.anchors.bind("focus.tabs",function(){i("focus",a(this).closest("li"))}),this.anchors.bind("blur.tabs",function(){j("focus",a(this).closest("li"))})}var k,l;e.fx&&(a.isArray(e.fx)?(k=e.fx[0],l=e.fx[1]):k=l=e.fx);var n=l?function(b,c){a(b).closest("li").addClass("ui-tabs-selected ui-state-active"),c.hide().removeClass("ui-tabs-hide").animate(l,l.duration||"normal",function(){m(c,l),d._trigger("show",null,d._ui(b,c[0]))})}:function(b,c){a(b).closest("li").addClass("ui-tabs-selected ui-state-active"),c.removeClass("ui-tabs-hide"),d._trigger("show",null,d._ui(b,c[0]))},o=k?function(a,b){b.animate(k,k.duration||"normal",function(){d.lis.removeClass("ui-tabs-selected ui-state-active"),b.addClass("ui-tabs-hide"),m(b,k),d.element.dequeue("tabs")})}:function(a,b,c){d.lis.removeClass("ui-tabs-selected ui-state-active"),b.addClass("ui-tabs-hide"),d.element.dequeue("tabs")};this.anchors.bind(e.event+".tabs",function(){var b=this,c=a(b).closest("li"),f=d.panels.filter(":not(.ui-tabs-hide)"),g=d.element.find(d._sanitizeSelector(b.hash));if(c.hasClass("ui-tabs-selected")&&!e.collapsible||c.hasClass("ui-state-disabled")||c.hasClass("ui-state-processing")||d.panels.filter(":animated").length||d._trigger("select",null,d._ui(this,g[0]))===!1)return this.blur(),!1;e.selected=d.anchors.index(this),d.abort();if(e.collapsible){if(c.hasClass("ui-tabs-selected"))return e.selected=-1,e.cookie&&d._cookie(e.selected,e.cookie),d.element.queue("tabs",function(){o(b,f)}).dequeue("tabs"),this.blur(),!1;if(!f.length)return e.cookie&&d._cookie(e.selected,e.cookie),d.element.queue("tabs",function(){n(b,g)}),d.load(d.anchors.index(this)),this.blur(),!1}e.cookie&&d._cookie(e.selected,e.cookie);if(g.length)f.length&&d.element.queue("tabs",function(){o(b,f)}),d.element.queue("tabs",function(){n(b,g)}),d.load(d.anchors.index(this));else throw"jQuery UI Tabs: Mismatching fragment identifier.";a.browser.msie&&this.blur()}),this.anchors.bind("click.tabs",function(){return!1})},_getIndex:function(a){return typeof a=="string"&&(a=this.anchors.index(this.anchors.filter("[href$='"+a+"']"))),a},destroy:function(){var b=this.options;return this.abort(),this.element.unbind(".tabs").removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible").removeData("tabs"),this.list.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all"),this.anchors.each(function(){var b=a.data(this,"href.tabs");b&&(this.href=b);var c=a(this).unbind(".tabs");a.each(["href","load","cache"],function(a,b){c.removeData(b+".tabs")})}),this.lis.unbind(".tabs").add(this.panels).each(function(){a.data(this,"destroy.tabs")?a(this).remove():a(this).removeClass(["ui-state-default","ui-corner-top","ui-tabs-selected","ui-state-active","ui-state-hover","ui-state-focus","ui-state-disabled","ui-tabs-panel","ui-widget-content","ui-corner-bottom","ui-tabs-hide"].join(" "))}),b.cookie&&this._cookie(null,b.cookie),this},add:function(c,d,e){e===b&&(e=this.anchors.length);var f=this,g=this.options,h=a(g.tabTemplate.replace(/#\{href\}/g,c).replace(/#\{label\}/g,d)),i=c.indexOf("#")?this._tabId(a("a",h)[0]):c.replace("#","");h.addClass("ui-state-default ui-corner-top").data("destroy.tabs",!0);var j=f.element.find("#"+i);return j.length||(j=a(g.panelTemplate).attr("id",i).data("destroy.tabs",!0)),j.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide"),e>=this.lis.length?(h.appendTo(this.list),j.appendTo(this.list[0].parentNode)):(h.insertBefore(this.lis[e]),j.insertBefore(this.panels[e])),g.disabled=a.map(g.disabled,function(a,b){return a>=e?++a:a}),this._tabify(),this.anchors.length==1&&(g.selected=0,h.addClass("ui-tabs-selected ui-state-active"),j.removeClass("ui-tabs-hide"),this.element.queue("tabs",function(){f._trigger("show",null,f._ui(f.anchors[0],f.panels[0]))}),this.load(0)),this._trigger("add",null,this._ui(this.anchors[e],this.panels[e])),this},remove:function(b){b=this._getIndex(b);var c=this.options,d=this.lis.eq(b).remove(),e=this.panels.eq(b).remove();return d.hasClass("ui-tabs-selected")&&this.anchors.length>1&&this.select(b+(b+1=b?--a:a}),this._tabify(),this._trigger("remove",null,this._ui(d.find("a")[0],e[0])),this},enable:function(b){b=this._getIndex(b);var c=this.options;if(a.inArray(b,c.disabled)==-1)return;return this.lis.eq(b).removeClass("ui-state-disabled"),c.disabled=a.grep(c.disabled,function(a,c){return a!=b}),this._trigger("enable",null,this._ui(this.anchors[b],this.panels[b])),this},disable:function(a){a=this._getIndex(a);var b=this,c=this.options;return a!=c.selected&&(this.lis.eq(a).addClass("ui-state-disabled"),c.disabled.push(a),c.disabled.sort(),this._trigger("disable",null,this._ui(this.anchors[a],this.panels[a]))),this},select:function(a){a=this._getIndex(a);if(a==-1)if(this.options.collapsible&&this.options.selected!=-1)a=this.options.selected;else return this;return this.anchors.eq(a).trigger(this.options.event+".tabs"),this},load:function(b){b=this._getIndex(b);var c=this,d=this.options,e=this.anchors.eq(b)[0],f=a.data(e,"load.tabs");this.abort();if(!f||this.element.queue("tabs").length!==0&&a.data(e,"cache.tabs")){this.element.dequeue("tabs");return}this.lis.eq(b).addClass("ui-state-processing");if(d.spinner){var g=a("span",e);g.data("label.tabs",g.html()).html(d.spinner)}return this.xhr=a.ajax(a.extend({},d.ajaxOptions,{url:f,success:function(f,g){c.element.find(c._sanitizeSelector(e.hash)).html(f),c._cleanup(),d.cache&&a.data(e,"cache.tabs",!0),c._trigger("load",null,c._ui(c.anchors[b],c.panels[b]));try{d.ajaxOptions.success(f,g)}catch(h){}},error:function(a,f,g){c._cleanup(),c._trigger("load",null,c._ui(c.anchors[b],c.panels[b]));try{d.ajaxOptions.error(a,f,b,e)}catch(g){}}})),c.element.dequeue("tabs"),this},abort:function(){return this.element.queue([]),this.panels.stop(!1,!0),this.element.queue("tabs",this.element.queue("tabs").splice(-2,2)),this.xhr&&(this.xhr.abort(),delete this.xhr),this._cleanup(),this},url:function(a,b){return this.anchors.eq(a).removeData("cache.tabs").data("load.tabs",b),this},length:function(){return this.anchors.length}}),a.extend(a.ui.tabs,{version:"1.8.24"}),a.extend(a.ui.tabs.prototype,{rotation:null,rotate:function(a,b){var c=this,d=this.options,e=c._rotate||(c._rotate=function(b){clearTimeout(c.rotation),c.rotation=setTimeout(function(){var a=d.selected;c.select(++a{% endif %} + + -{% if not settings.GRAPPELLI_INSTALLED %} - -{% endif %} -{{ block.super }} - -{% endblock %} +{{ media }} +{% endblock extrahead %} {% block stylesheets %} {{ block.super }} @@ -80,12 +61,23 @@ - {% endif %} + + {% if settings.GRAPPELLI_INSTALLED %} {% endif %} {% endif %} {% endif %} -{% endblock %} + +{% endblock footer %} diff --git a/mezzanine/pages/templates/admin/pages/page/change_list.html b/mezzanine/pages/templates/admin/pages/page/change_list.html index 02dadd7bb1..46cfd36047 100644 --- a/mezzanine/pages/templates/admin/pages/page/change_list.html +++ b/mezzanine/pages/templates/admin/pages/page/change_list.html @@ -9,10 +9,11 @@ .grappelli-delete {width:11px; height:11px; margin:4px 4px 0 10px; background:url('{% static settings.MEZZANINE_ADMIN_PREFIX|add:"img/icons/icon-inline_item_tools-deletelink.png" %}');} .grappelli-delete:hover {background:url('{% static settings.MEZZANINE_ADMIN_PREFIX|add:"img/icons/icon-inline_item_tools-deletelink-hover.png" %}');} + -{% endblock %} +{% endblock extrahead %} {% block content %}
    @@ -27,4 +28,4 @@ {% endif %}
    -{% endblock %} +{% endblock content %} From 404810ada3d06d89173feb08b2c65a20b44742e1 Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Mon, 10 Aug 2020 11:22:28 -0600 Subject: [PATCH 009/101] fix: remove unused style declarations --- mezzanine/core/static/css/mezzanine.css | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/mezzanine/core/static/css/mezzanine.css b/mezzanine/core/static/css/mezzanine.css index 512ce07d69..fa9623a88a 100644 --- a/mezzanine/core/static/css/mezzanine.css +++ b/mezzanine/core/static/css/mezzanine.css @@ -426,17 +426,6 @@ float the buttons inside it. This prevents collapsing. */ margin-bottom: 30px; background-color: #FEFFEE; } -span.page-model { - float: left; - font-size: 0.6rem; - padding: 2px 8px 0; - text-transform: uppercase; -} - -textarea#id_description[readonly] { - background: #ddd; - color: #eee; -} /*======================================== MEZZANINE TWEETS From e9111cc7f0260e67453c3dda6450589322a4a315 Mon Sep 17 00:00:00 2001 From: ChrisKuper Date: Tue, 18 Aug 2020 22:40:33 +0200 Subject: [PATCH 010/101] feat: add radio field support for dynamic_inline.js (#1955) When using radio buttons in dynamic inlines this raised an 'Unhandled field in dynamic_inline.js:' alert. This was fixed by dublicating the 'checkbox' case in the function 'anyFieldDirty' in 'dynamic_inline.js' Co-authored-by: Christian Kuper --- AUTHORS | 1 + mezzanine/core/static/mezzanine/js/admin/dynamic_inline.js | 2 ++ 2 files changed, 3 insertions(+) diff --git a/AUTHORS b/AUTHORS index 621cd6884c..da2ddb6903 100644 --- a/AUTHORS +++ b/AUTHORS @@ -279,3 +279,4 @@ * Geoffrey Royer * Chris Hawes * Andrii Soldatenko +* Christian Kuper diff --git a/mezzanine/core/static/mezzanine/js/admin/dynamic_inline.js b/mezzanine/core/static/mezzanine/js/admin/dynamic_inline.js index f696581d5a..585d152a57 100644 --- a/mezzanine/core/static/mezzanine/js/admin/dynamic_inline.js +++ b/mezzanine/core/static/mezzanine/js/admin/dynamic_inline.js @@ -26,6 +26,8 @@ jQuery(function($) { return field.value && field.value != field.defaultValue; case 'checkbox': return field.checked != field.defaultChecked; + case 'radio': + return field.checked != field.defaultChecked; case 'hidden': return false; default: From 58aea59f5fa6708ee4563c332aa01c11ae8b17b8 Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Tue, 18 Aug 2020 14:55:21 -0600 Subject: [PATCH 011/101] fix: restore jQuery UI on model-translation admin See #1967 --- mezzanine/core/admin.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mezzanine/core/admin.py b/mezzanine/core/admin.py index ef5da77018..65e9013963 100644 --- a/mezzanine/core/admin.py +++ b/mezzanine/core/admin.py @@ -36,6 +36,7 @@ class BaseTranslationModelAdmin(TranslationAdmin): """ class Media: js = ( + static("mezzanine/js/%s" % settings.JQUERY_UI_FILENAME), static("mezzanine/js/admin/tabbed_translation_fields.js"), ) css = { From 82dd9f1d4752da402573adc37b53b2e8573fe76a Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Sun, 6 Sep 2020 20:31:54 -0600 Subject: [PATCH 012/101] style: format code with black --- docs/_ext/djangodocs.py | 8 +- docs/conf.py | 50 +- docs/docs_settings.py | 5 +- mezzanine/accounts/__init__.py | 29 +- mezzanine/accounts/admin.py | 1 + mezzanine/accounts/defaults.py | 49 +- mezzanine/accounts/forms.py | 78 +- mezzanine/accounts/models.py | 3 +- .../accounts/templatetags/accounts_tags.py | 8 +- mezzanine/accounts/tests.py | 15 +- mezzanine/accounts/urls.py | 88 +- mezzanine/accounts/views.py | 69 +- .../management/commands/mezzanine_project.py | 33 +- mezzanine/bin/mezzanine_project.py | 4 +- mezzanine/bin/runtests.py | 6 +- mezzanine/blog/admin.py | 19 +- mezzanine/blog/defaults.py | 19 +- mezzanine/blog/feeds.py | 10 +- mezzanine/blog/management/base.py | 149 ++-- .../management/commands/import_blogger.py | 48 +- .../blog/management/commands/import_blogml.py | 87 +- .../management/commands/import_posterous.py | 73 +- .../blog/management/commands/import_rss.py | 47 +- .../blog/management/commands/import_tumblr.py | 24 +- .../management/commands/import_wordpress.py | 48 +- mezzanine/blog/models.py | 29 +- mezzanine/blog/tests.py | 56 +- mezzanine/blog/translation.py | 9 +- mezzanine/blog/urls.py | 87 +- mezzanine/blog/views.py | 57 +- mezzanine/boot/__init__.py | 21 +- mezzanine/boot/lazy_admin.py | 46 +- mezzanine/conf/__init__.py | 84 +- mezzanine/conf/admin.py | 17 +- mezzanine/conf/context_processors.py | 9 +- mezzanine/conf/forms.py | 37 +- mezzanine/conf/tests.py | 65 +- mezzanine/conf/translation.py | 3 +- mezzanine/core/__init__.py | 2 +- mezzanine/core/admin.py | 139 +-- mezzanine/core/apps.py | 3 +- mezzanine/core/auth_backends.py | 2 +- mezzanine/core/checks.py | 99 ++- mezzanine/core/defaults.py | 831 ++++++++++++++---- mezzanine/core/exceptions.py | 10 +- mezzanine/core/fields.py | 26 +- mezzanine/core/forms.py | 34 +- .../management/commands/collecttemplates.py | 64 +- .../core/management/commands/createdb.py | 71 +- .../core/management/commands/runserver.py | 42 +- mezzanine/core/managers.py | 104 ++- mezzanine/core/middleware.py | 78 +- mezzanine/core/models.py | 147 ++-- mezzanine/core/templatetags/mezzanine_tags.py | 168 ++-- mezzanine/core/tests.py | 293 +++--- mezzanine/core/translation.py | 6 +- mezzanine/core/urls.py | 24 +- mezzanine/core/views.py | 14 +- mezzanine/forms/admin.py | 66 +- mezzanine/forms/defaults.py | 17 +- mezzanine/forms/fields.py | 18 +- mezzanine/forms/forms.py | 143 +-- mezzanine/forms/models.py | 84 +- mezzanine/forms/page_processors.py | 30 +- mezzanine/forms/tests.py | 51 +- mezzanine/forms/translation.py | 16 +- mezzanine/galleries/admin.py | 1 - mezzanine/galleries/models.py | 56 +- mezzanine/galleries/tests.py | 11 +- mezzanine/galleries/translation.py | 3 +- mezzanine/generic/__init__.py | 2 + mezzanine/generic/admin.py | 12 +- mezzanine/generic/defaults.py | 50 +- mezzanine/generic/fields.py | 36 +- mezzanine/generic/forms.py | 53 +- mezzanine/generic/managers.py | 1 - mezzanine/generic/models.py | 57 +- .../generic/templatetags/comment_tags.py | 34 +- mezzanine/generic/templatetags/disqus_tags.py | 22 +- .../generic/templatetags/keyword_tags.py | 4 +- mezzanine/generic/templatetags/rating_tags.py | 2 +- mezzanine/generic/tests.py | 75 +- mezzanine/generic/views.py | 14 +- mezzanine/mobile/__init__.py | 4 +- mezzanine/pages/__init__.py | 2 +- mezzanine/pages/admin.py | 4 +- mezzanine/pages/apps.py | 2 +- mezzanine/pages/checks.py | 22 +- mezzanine/pages/defaults.py | 24 +- mezzanine/pages/fields.py | 4 +- mezzanine/pages/managers.py | 8 +- mezzanine/pages/middleware.py | 18 +- mezzanine/pages/models.py | 37 +- mezzanine/pages/page_processors.py | 10 +- mezzanine/pages/templatetags/pages_tags.py | 28 +- mezzanine/pages/tests.py | 137 +-- mezzanine/pages/translation.py | 6 +- mezzanine/pages/urls.py | 7 +- mezzanine/pages/views.py | 32 +- mezzanine/project_template/fabfile.py | 188 ++-- .../project_template/project_name/settings.py | 80 +- .../project_template/project_name/urls.py | 13 +- .../project_template/project_name/wsgi.py | 5 +- mezzanine/template/__init__.py | 14 +- mezzanine/template/loader_tags.py | 29 +- mezzanine/template/loaders/host_themes.py | 1 + mezzanine/twitter/__init__.py | 11 +- mezzanine/twitter/admin.py | 9 +- mezzanine/twitter/defaults.py | 20 +- mezzanine/twitter/managers.py | 1 + mezzanine/twitter/models.py | 57 +- .../twitter/templatetags/twitter_tags.py | 8 +- mezzanine/urls.py | 21 +- mezzanine/utils/cache.py | 12 +- mezzanine/utils/conf.py | 88 +- mezzanine/utils/deprecation.py | 4 + mezzanine/utils/docs.py | 100 ++- mezzanine/utils/email.py | 75 +- mezzanine/utils/html.py | 36 +- mezzanine/utils/models.py | 26 +- mezzanine/utils/sites.py | 4 +- mezzanine/utils/tests.py | 22 +- mezzanine/utils/timezone.py | 2 +- mezzanine/utils/urls.py | 4 +- mezzanine/utils/views.py | 43 +- setup.cfg | 19 +- setup.py | 13 +- 127 files changed, 3692 insertions(+), 2063 deletions(-) diff --git a/docs/_ext/djangodocs.py b/docs/_ext/djangodocs.py index 9f22077f68..2551233aaa 100644 --- a/docs/_ext/djangodocs.py +++ b/docs/_ext/djangodocs.py @@ -1,6 +1,6 @@ def setup(app): app.add_crossref_type( - directivename = "setting", - rolename = "setting", - indextemplate = "pair: %s; setting", - ) + directivename="setting", + rolename="setting", + indextemplate="pair: %s; setting", + ) diff --git a/docs/conf.py b/docs/conf.py index 629671f251..fbe6778d1f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -27,6 +27,7 @@ os.environ["DJANGO_SETTINGS_MODULE"] = "docs_settings" # Django 1.7's setup is required before touching translated strings. import django + try: django.setup() except AttributeError: # < 1.7 @@ -36,6 +37,7 @@ # run all the Mezzanine utils for dynamically generated docs. if sys.argv[-2:] == ["docs", "docs/build"]: from mezzanine.utils import docs + docs.build_settings_docs(docs_path) docs.build_deploy_docs(docs_path) docs.build_changelog(docs_path) @@ -47,39 +49,42 @@ # documentation root, use os.path.abspath to make it absolute, like shown here. # sys.path.append(os.path.abspath('.')) # For sphinx to recognize costum Django tags extensions are required. -sys.path.append( - os.path.abspath(os.path.join(os.path.dirname(__file__), "_ext"))) +sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), "_ext"))) # -- General configuration ----------------------------------------------------- # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. extensions = [ - "djangodocs", - "sphinx.ext.intersphinx", - "sphinx.ext.autodoc", - "sphinx.ext.viewcode"] + "djangodocs", + "sphinx.ext.intersphinx", + "sphinx.ext.autodoc", + "sphinx.ext.viewcode", +] # Add any paths that contain templates here, relative to this directory. -templates_path = ['_templates'] +templates_path = ["_templates"] # The suffix of source filenames. -source_suffix = '.rst' +source_suffix = ".rst" -# Links for intersphinx mapping +#  Links for intersphinx mapping intersphinx_mapping = { - 'django':('http://docs.djangoproject.com/en/dev/', 'http://docs.djangoproject.com/en/dev/_objects/'), - } + "django": ( + "http://docs.djangoproject.com/en/dev/", + "http://docs.djangoproject.com/en/dev/_objects/", + ), +} # The encoding of source files. # source_encoding = 'utf-8' # The master toctree document. -master_doc = 'index' +master_doc = "index" # General information about the project. -project = 'Mezzanine' -copyright = '2009 - %s, Stephen McDonald' % datetime.now().year +project = "Mezzanine" +copyright = "2009 - %s, Stephen McDonald" % datetime.now().year # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -105,12 +110,12 @@ # List of directories, relative to source directory, that shouldn't be searched # for source files. -exclude_trees = ['_build'] +exclude_trees = ["_build"] # List of files to be excluded when looking for source files. -# Added settings.rst its still will be included in configuration.rst -# only that prevents error of duplicate reference labels. -exclude_patterns = ['settings.rst', 'fabfile.rst'] +#  Added settings.rst its still will be included in configuration.rst +#  only that prevents error of duplicate reference labels. +exclude_patterns = ["settings.rst", "fabfile.rst"] # The reST default role (used for this markup: `text`) to use for all documents. # default_role = None @@ -127,7 +132,7 @@ # show_authors = False # The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' +pygments_style = "sphinx" # A list of ignored prefixes for module index sorting. # modindex_common_prefix = [] @@ -204,7 +209,7 @@ # html_file_suffix = '' # Output file base name for HTML help builder. -htmlhelp_basename = 'Mezzaninedoc' +htmlhelp_basename = "Mezzaninedoc" # -- Options for LaTeX output -------------------------------------------------- @@ -218,8 +223,7 @@ # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [ - ('index', 'Mezzanine.tex', 'Mezzanine Documentation', - 'Stephen McDonald', 'manual'), + ("index", "Mezzanine.tex", "Mezzanine Documentation", "Stephen McDonald", "manual"), ] # The name of an image file (relative to this directory) to place at the top of @@ -242,4 +246,4 @@ html_theme_path = ["."] html_theme = "mezzanine_theme" -locale_dirs = ['./locale/'] +locale_dirs = ["./locale/"] diff --git a/docs/docs_settings.py b/docs/docs_settings.py index ff10e92b24..8d28f5b51b 100644 --- a/docs/docs_settings.py +++ b/docs/docs_settings.py @@ -9,8 +9,9 @@ # Generate a SECRET_KEY for this build from random import choice -characters = 'abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)' -SECRET_KEY = ''.join([choice(characters) for i in range(50)]) + +characters = "abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)" +SECRET_KEY = "".join([choice(characters) for i in range(50)]) if "mezzanine.accounts" not in INSTALLED_APPS: INSTALLED_APPS = tuple(INSTALLED_APPS) + ("mezzanine.accounts",) diff --git a/mezzanine/accounts/__init__.py b/mezzanine/accounts/__init__.py index e480ccd8f8..fbbb00ea12 100644 --- a/mezzanine/accounts/__init__.py +++ b/mezzanine/accounts/__init__.py @@ -31,12 +31,14 @@ def get_profile_model(): try: return apps.get_model(settings.ACCOUNTS_PROFILE_MODEL) except ValueError: - raise ImproperlyConfigured("ACCOUNTS_PROFILE_MODEL must be of " - "the form 'app_label.model_name'") + raise ImproperlyConfigured( + "ACCOUNTS_PROFILE_MODEL must be of " "the form 'app_label.model_name'" + ) except LookupError: - raise ImproperlyConfigured("ACCOUNTS_PROFILE_MODEL refers to " - "model '%s' that has not been installed" - % settings.ACCOUNTS_PROFILE_MODEL) + raise ImproperlyConfigured( + "ACCOUNTS_PROFILE_MODEL refers to " + "model '%s' that has not been installed" % settings.ACCOUNTS_PROFILE_MODEL + ) def get_profile_for_user(user): @@ -46,7 +48,7 @@ def get_profile_for_user(user): set, and ``ImproperlyConfigured`` if the corresponding model can't be found. """ - if not hasattr(user, '_mezzanine_profile'): + if not hasattr(user, "_mezzanine_profile"): # Raises ProfileNotConfigured if not bool(ACCOUNTS_PROFILE_MODEL) profile_model = get_profile_model() profile_manager = profile_model._default_manager.using(user._state.db) @@ -66,12 +68,14 @@ def get_profile_form(): ``settings.ACCOUNTS_PROFILE_FORM_CLASS``. """ from mezzanine.conf import settings + try: return import_dotted_path(settings.ACCOUNTS_PROFILE_FORM_CLASS) except ImportError: - raise ImproperlyConfigured("Value for ACCOUNTS_PROFILE_FORM_CLASS " - "could not be imported: %s" % - settings.ACCOUNTS_PROFILE_FORM_CLASS) + raise ImproperlyConfigured( + "Value for ACCOUNTS_PROFILE_FORM_CLASS " + "could not be imported: %s" % settings.ACCOUNTS_PROFILE_FORM_CLASS + ) def get_profile_user_fieldname(profile_model=None, user_model=None): @@ -84,6 +88,7 @@ def get_profile_user_fieldname(profile_model=None, user_model=None): for field in Profile._meta.get_fields(): if get_related_model(field) == User: return field.name - raise ImproperlyConfigured("Value for ACCOUNTS_PROFILE_MODEL does not " - "contain a ForeignKey field for auth.User: %s" - % Profile.__name__) + raise ImproperlyConfigured( + "Value for ACCOUNTS_PROFILE_MODEL does not " + "contain a ForeignKey field for auth.User: %s" % Profile.__name__ + ) diff --git a/mezzanine/accounts/admin.py b/mezzanine/accounts/admin.py index 6b6b7ce39c..18b4813cd9 100644 --- a/mezzanine/accounts/admin.py +++ b/mezzanine/accounts/admin.py @@ -44,6 +44,7 @@ def save_model(self, request, obj, form, change): try: + class ProfileInline(admin.StackedInline): model = get_profile_model() can_delete = False diff --git a/mezzanine/accounts/defaults.py b/mezzanine/accounts/defaults.py index c255fc489b..19448219c4 100644 --- a/mezzanine/accounts/defaults.py +++ b/mezzanine/accounts/defaults.py @@ -15,16 +15,22 @@ from django.conf import settings + profile_model_default = getattr(settings, "AUTH_PROFILE_MODULE", None) if profile_model_default: from warnings import warn - warn("Django's AUTH_PROFILE_MODULE setting is deprecated, use " - "Mezzanine's ACCOUNTS_PROFILE_MODEL instead.") + + warn( + "Django's AUTH_PROFILE_MODULE setting is deprecated, use " + "Mezzanine's ACCOUNTS_PROFILE_MODEL instead." + ) register_setting( name="ACCOUNTS_PROFILE_MODEL", - description=_("String in the form `app_label.model_name` for the model " - "used for account profiles."), + description=_( + "String in the form `app_label.model_name` for the model " + "used for account profiles." + ), editable=False, default=profile_model_default, ) @@ -38,8 +44,10 @@ register_setting( name="ACCOUNTS_NO_USERNAME", - description=_("If ``True``, the username field will be excluded " - "from sign up and account update forms."), + description=_( + "If ``True``, the username field will be excluded " + "from sign up and account update forms." + ), editable=False, default=False, ) @@ -53,35 +61,40 @@ register_setting( name="ACCOUNTS_PROFILE_FORM_CLASS", - description=_("Dotted package path and class name of profile form to use " + description=_( + "Dotted package path and class name of profile form to use " "for users signing up and updating their profile, when " - "``mezzanine.accounts`` is installed."), + "``mezzanine.accounts`` is installed." + ), editable=False, default="mezzanine.accounts.forms.ProfileForm", ) register_setting( name="ACCOUNTS_PROFILE_VIEWS_ENABLED", - description=_("If ``True``, users will have their own public profile " - "pages."), + description=_("If ``True``, users will have their own public profile " "pages."), editable=False, default=False, ) register_setting( name="ACCOUNTS_VERIFICATION_REQUIRED", - description=_("If ``True``, when users create an account, they will be " + description=_( + "If ``True``, when users create an account, they will be " "sent an email with a verification link, which they must click to " - "enable their account."), + "enable their account." + ), editable=False, default=False, ) register_setting( name="ACCOUNTS_APPROVAL_REQUIRED", - description=_("If ``True``, when users create an account, they will " + description=_( + "If ``True``, when users create an account, they will " "not be enabled by default and a staff member will need to activate " - "their account in the admin interface."), + "their account in the admin interface." + ), editable=False, default=False, ) @@ -89,9 +102,11 @@ register_setting( name="ACCOUNTS_APPROVAL_EMAILS", label=_("Account approval email addresses"), - description=_("A comma separated list of email addresses that " - "will receive an email notification each time a " - "new account is created that requires approval."), + description=_( + "A comma separated list of email addresses that " + "will receive an email notification each time a " + "new account is created that requires approval." + ), editable=True, default="", ) diff --git a/mezzanine/accounts/forms.py b/mezzanine/accounts/forms.py index 8f982eb0e9..08e10f707c 100644 --- a/mezzanine/accounts/forms.py +++ b/mezzanine/accounts/forms.py @@ -6,8 +6,12 @@ from django.utils.http import int_to_base36 from django.utils.translation import ugettext, ugettext_lazy as _ -from mezzanine.accounts import (get_profile_model, get_profile_user_fieldname, - get_profile_for_user, ProfileNotConfigured) +from mezzanine.accounts import ( + get_profile_model, + get_profile_user_fieldname, + get_profile_for_user, + ProfileNotConfigured, +) from mezzanine.conf import settings from mezzanine.core.forms import Html5Mixin from mezzanine.utils.urls import slugify, unique_slug @@ -15,17 +19,19 @@ User = get_user_model() -_exclude_fields = tuple(getattr(settings, - "ACCOUNTS_PROFILE_FORM_EXCLUDE_FIELDS", ())) +_exclude_fields = tuple(getattr(settings, "ACCOUNTS_PROFILE_FORM_EXCLUDE_FIELDS", ())) # If a profile model has been configured with the ``ACCOUNTS_PROFILE_MODEL`` # setting, create a model form for it that will have its fields added to # ``ProfileForm``. try: + class ProfileFieldsForm(forms.ModelForm): class Meta: model = get_profile_model() exclude = (get_profile_user_fieldname(),) + _exclude_fields + + except ProfileNotConfigured: pass @@ -41,9 +47,11 @@ class LoginForm(Html5Mixin, forms.Form): """ Fields for login. """ + username = forms.CharField(label=username_label) - password = forms.CharField(label=_("Password"), - widget=forms.PasswordInput(render_value=False)) + password = forms.CharField( + label=_("Password"), widget=forms.PasswordInput(render_value=False) + ) def clean(self): """ @@ -54,8 +62,7 @@ def clean(self): password = self.cleaned_data.get("password") self._user = authenticate(username=username, password=password) if self._user is None: - raise forms.ValidationError( - ugettext("Invalid username/email and password")) + raise forms.ValidationError(ugettext("Invalid username/email and password")) elif not self._user.is_active: raise forms.ValidationError(ugettext("Your account is inactive")) return self.cleaned_data @@ -74,10 +81,12 @@ class ProfileForm(Html5Mixin, forms.ModelForm): fields are injected into the form. """ - password1 = forms.CharField(label=_("Password"), - widget=forms.PasswordInput(render_value=False)) - password2 = forms.CharField(label=_("Password (again)"), - widget=forms.PasswordInput(render_value=False)) + password1 = forms.CharField( + label=_("Password"), widget=forms.PasswordInput(render_value=False) + ) + password2 = forms.CharField( + label=_("Password (again)"), widget=forms.PasswordInput(render_value=False) + ) class Meta: model = User @@ -90,7 +99,8 @@ def __init__(self, *args, **kwargs): user_fields = set([f.name for f in User._meta.get_fields()]) try: self.fields["username"].help_text = ugettext( - "Only letters, numbers, dashes or underscores please") + "Only letters, numbers, dashes or underscores please" + ) except KeyError: pass for field in self.fields: @@ -106,8 +116,8 @@ def __init__(self, *args, **kwargs): self.fields[field].required = False if field == "password1": self.fields[field].help_text = ugettext( - "Leave blank unless you want " - "to change your password") + "Leave blank unless you want " "to change your password" + ) # Add any profile fields to the form. try: @@ -134,15 +144,17 @@ def clean_username(self): username = self.cleaned_data.get("username") if username.lower() != slugify(username).lower(): raise forms.ValidationError( - ugettext("Username can only contain letters, numbers, dashes " - "or underscores.")) + ugettext( + "Username can only contain letters, numbers, dashes " + "or underscores." + ) + ) lookup = {"username__iexact": username} try: User.objects.exclude(id=self.instance.id).get(**lookup) except User.DoesNotExist: return username - raise forms.ValidationError( - ugettext("This username is already registered")) + raise forms.ValidationError(ugettext("This username is already registered")) def clean_password2(self): """ @@ -158,8 +170,9 @@ def clean_password2(self): errors.append(ugettext("Passwords do not match")) if len(password1) < settings.ACCOUNTS_MIN_PASSWORD_LENGTH: errors.append( - ugettext("Password must be at least %s characters") % - settings.ACCOUNTS_MIN_PASSWORD_LENGTH) + ugettext("Password must be at least %s characters") + % settings.ACCOUNTS_MIN_PASSWORD_LENGTH + ) if errors: self._errors["password1"] = self.error_class(errors) return password2 @@ -172,8 +185,7 @@ def clean_email(self): qs = User.objects.exclude(id=self.instance.id).filter(email=email) if len(qs) == 0: return email - raise forms.ValidationError( - ugettext("This email is already registered")) + raise forms.ValidationError(ugettext("This email is already registered")) def save(self, *args, **kwargs): """ @@ -191,8 +203,9 @@ def save(self, *args, **kwargs): except KeyError: if not self.instance.username: try: - username = ("%(first_name)s %(last_name)s" % - self.cleaned_data).strip() + username = ( + "%(first_name)s %(last_name)s" % self.cleaned_data + ).strip() except KeyError: username = "" if not username: @@ -219,15 +232,17 @@ def save(self, *args, **kwargs): pass if self._signup: - if (settings.ACCOUNTS_VERIFICATION_REQUIRED or - settings.ACCOUNTS_APPROVAL_REQUIRED): + if ( + settings.ACCOUNTS_VERIFICATION_REQUIRED + or settings.ACCOUNTS_APPROVAL_REQUIRED + ): user.is_active = False user.save() else: token = default_token_generator.make_token(user) - user = authenticate(uidb36=int_to_base36(user.id), - token=token, - is_active=True) + user = authenticate( + uidb36=int_to_base36(user.id), token=token, is_active=True + ) return user def get_profile_fields_form(self): @@ -251,8 +266,7 @@ def clean(self): try: user = User.objects.get(username_or_email, is_active=True) except User.DoesNotExist: - raise forms.ValidationError( - ugettext("Invalid username/email")) + raise forms.ValidationError(ugettext("Invalid username/email")) else: self._user = user return self.cleaned_data diff --git a/mezzanine/accounts/models.py b/mezzanine/accounts/models.py index 61f12fb740..87a9250b6e 100644 --- a/mezzanine/accounts/models.py +++ b/mezzanine/accounts/models.py @@ -20,5 +20,4 @@ def create_profile(**kwargs): # gets re-opened, allowing syncdb to continue and complete. connection.close() - post_save.connect(create_profile, sender=settings.AUTH_USER_MODEL, - weak=False) + post_save.connect(create_profile, sender=settings.AUTH_USER_MODEL, weak=False) diff --git a/mezzanine/accounts/templatetags/accounts_tags.py b/mezzanine/accounts/templatetags/accounts_tags.py index 70fc8f60c7..b806e02fd8 100644 --- a/mezzanine/accounts/templatetags/accounts_tags.py +++ b/mezzanine/accounts/templatetags/accounts_tags.py @@ -4,8 +4,12 @@ from mezzanine import template from mezzanine.conf import settings -from mezzanine.accounts import (get_profile_form, get_profile_user_fieldname, - get_profile_for_user, ProfileNotConfigured) +from mezzanine.accounts import ( + get_profile_form, + get_profile_user_fieldname, + get_profile_for_user, + ProfileNotConfigured, +) from mezzanine.accounts.forms import LoginForm diff --git a/mezzanine/accounts/tests.py b/mezzanine/accounts/tests.py index 1ac4cb70d7..943ed8e1f5 100644 --- a/mezzanine/accounts/tests.py +++ b/mezzanine/accounts/tests.py @@ -15,15 +15,13 @@ class AccountsTests(TestCase): - def account_data(self, test_value): """ Returns a dict with test data for all the user/profile fields. """ # User fields data = {"email": test_value + "@example.com"} - for field in ("first_name", "last_name", "username", - "password1", "password2"): + for field in ("first_name", "last_name", "username", "password1", "password2"): if field.startswith("password"): value = "x" * settings.ACCOUNTS_MIN_PASSWORD_LENGTH else: @@ -71,10 +69,13 @@ def test_account(self): self.assertEqual(mail.outbox[0].to[0], data["email"]) # Test the verification link. new_user = users[0] - verification_url = reverse("signup_verify", kwargs={ - "uidb36": int_to_base36(new_user.id), - "token": default_token_generator.make_token(new_user), - }) + verification_url = reverse( + "signup_verify", + kwargs={ + "uidb36": int_to_base36(new_user.id), + "token": default_token_generator.make_token(new_user), + }, + ) response = self.client.get(verification_url, follow=True) self.assertEqual(response.status_code, 200) users = User.objects.filter(email=data["email"], is_active=True) diff --git a/mezzanine/accounts/urls.py b/mezzanine/accounts/urls.py index 18aaedeff0..118b36cdbb 100644 --- a/mezzanine/accounts/urls.py +++ b/mezzanine/accounts/urls.py @@ -7,50 +7,70 @@ ACCOUNT_URL = getattr(settings, "ACCOUNT_URL", "/accounts/") -SIGNUP_URL = getattr(settings, "SIGNUP_URL", - "/%s/signup/" % ACCOUNT_URL.strip("/")) -SIGNUP_VERIFY_URL = getattr(settings, "SIGNUP_VERIFY_URL", - "/%s/verify/" % ACCOUNT_URL.strip("/")) +SIGNUP_URL = getattr(settings, "SIGNUP_URL", "/%s/signup/" % ACCOUNT_URL.strip("/")) +SIGNUP_VERIFY_URL = getattr( + settings, "SIGNUP_VERIFY_URL", "/%s/verify/" % ACCOUNT_URL.strip("/") +) LOGIN_URL = settings.LOGIN_URL -LOGOUT_URL = getattr(settings, "LOGOUT_URL", - "/%s/logout/" % ACCOUNT_URL.strip("/")) +LOGOUT_URL = getattr(settings, "LOGOUT_URL", "/%s/logout/" % ACCOUNT_URL.strip("/")) PROFILE_URL = getattr(settings, "PROFILE_URL", "/users/") -PROFILE_UPDATE_URL = getattr(settings, "PROFILE_UPDATE_URL", - "/%s/update/" % ACCOUNT_URL.strip("/")) -PASSWORD_RESET_URL = getattr(settings, "PASSWORD_RESET_URL", - "/%s/password/reset/" % ACCOUNT_URL.strip("/")) -PASSWORD_RESET_VERIFY_URL = getattr(settings, "PASSWORD_RESET_VERIFY_URL", - "/%s/password/verify/" % - ACCOUNT_URL.strip("/")) +PROFILE_UPDATE_URL = getattr( + settings, "PROFILE_UPDATE_URL", "/%s/update/" % ACCOUNT_URL.strip("/") +) +PASSWORD_RESET_URL = getattr( + settings, "PASSWORD_RESET_URL", "/%s/password/reset/" % ACCOUNT_URL.strip("/") +) +PASSWORD_RESET_VERIFY_URL = getattr( + settings, + "PASSWORD_RESET_VERIFY_URL", + "/%s/password/verify/" % ACCOUNT_URL.strip("/"), +) _verify_pattern = r"/(?P[-\w]+)/(?P[-\w]+)" _slash = "/" if settings.APPEND_SLASH else "" urlpatterns = [ - url(r"^%s%s$" % (LOGIN_URL.strip("/"), _slash), - views.login, name="login"), - url(r"^%s%s$" % (LOGOUT_URL.strip("/"), _slash), - views.logout, name="logout"), - url(r"^%s%s$" % (SIGNUP_URL.strip("/"), _slash), - views.signup, name="signup"), - url(r"^%s%s%s$" % (SIGNUP_VERIFY_URL.strip("/"), _verify_pattern, _slash), - views.signup_verify, name="signup_verify"), - url(r"^%s%s$" % (PROFILE_UPDATE_URL.strip("/"), _slash), - views.profile_update, name="profile_update"), - url(r"^%s%s$" % (PASSWORD_RESET_URL.strip("/"), _slash), - views.password_reset, name="mezzanine_password_reset"), - url(r"^%s%s%s$" % - (PASSWORD_RESET_VERIFY_URL.strip("/"), _verify_pattern, _slash), - views.password_reset_verify, name="password_reset_verify"), - url(r"^%s%s$" % (ACCOUNT_URL.strip("/"), _slash), - views.account_redirect, name="account_redirect"), + url(r"^%s%s$" % (LOGIN_URL.strip("/"), _slash), views.login, name="login"), + url(r"^%s%s$" % (LOGOUT_URL.strip("/"), _slash), views.logout, name="logout"), + url(r"^%s%s$" % (SIGNUP_URL.strip("/"), _slash), views.signup, name="signup"), + url( + r"^%s%s%s$" % (SIGNUP_VERIFY_URL.strip("/"), _verify_pattern, _slash), + views.signup_verify, + name="signup_verify", + ), + url( + r"^%s%s$" % (PROFILE_UPDATE_URL.strip("/"), _slash), + views.profile_update, + name="profile_update", + ), + url( + r"^%s%s$" % (PASSWORD_RESET_URL.strip("/"), _slash), + views.password_reset, + name="mezzanine_password_reset", + ), + url( + r"^%s%s%s$" % (PASSWORD_RESET_VERIFY_URL.strip("/"), _verify_pattern, _slash), + views.password_reset_verify, + name="password_reset_verify", + ), + url( + r"^%s%s$" % (ACCOUNT_URL.strip("/"), _slash), + views.account_redirect, + name="account_redirect", + ), ] if settings.ACCOUNTS_PROFILE_VIEWS_ENABLED: urlpatterns += [ - url(r"^%s%s$" % (PROFILE_URL.strip("/"), _slash), - views.profile_redirect, name="profile_redirect"), - url(r"^%s/(?P.*)%s$" % (PROFILE_URL.strip("/"), _slash), - views.profile, name="profile"), + url( + r"^%s%s$" % (PROFILE_URL.strip("/"), _slash), + views.profile_redirect, + name="profile_redirect", + ), + url( + r"^%s/(?P.*)%s$" % (PROFILE_URL.strip("/"), _slash), + views.profile, + name="profile", + ), ] diff --git a/mezzanine/accounts/views.py b/mezzanine/accounts/views.py index 74d4b78489..83be66937f 100644 --- a/mezzanine/accounts/views.py +++ b/mezzanine/accounts/views.py @@ -1,5 +1,9 @@ -from django.contrib.auth import (login as auth_login, authenticate, - logout as auth_logout, get_user_model) +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 from django.contrib.messages import info, error from django.urls import NoReverseMatch, get_script_prefix @@ -17,8 +21,12 @@ User = get_user_model() -def login(request, template="accounts/account_login.html", - form_class=LoginForm, extra_context=None): +def login( + request, + template="accounts/account_login.html", + form_class=LoginForm, + extra_context=None, +): """ Login form. """ @@ -42,8 +50,7 @@ def logout(request): return redirect(next_url(request) or get_script_prefix()) -def signup(request, template="accounts/account_signup.html", - extra_context=None): +def signup(request, template="accounts/account_signup.html", extra_context=None): """ Signup form. """ @@ -54,12 +61,22 @@ def signup(request, template="accounts/account_signup.html", if not new_user.is_active: if settings.ACCOUNTS_APPROVAL_REQUIRED: send_approve_mail(request, new_user) - info(request, _("Thanks for signing up! You'll receive " - "an email when your account is activated.")) + info( + request, + _( + "Thanks for signing up! You'll receive " + "an email when your account is activated." + ), + ) else: send_verification_mail(request, new_user, "signup_verify") - info(request, _("A verification email has been sent with " - "a link for activating your account.")) + info( + request, + _( + "A verification email has been sent with " + "a link for activating your account." + ), + ) return redirect(next_url(request) or "/") else: info(request, _("Successfully signed up")) @@ -98,8 +115,9 @@ def profile_redirect(request): return redirect("profile", username=request.user.username) -def profile(request, username, template="accounts/account_profile.html", - extra_context=None): +def profile( + request, username, template="accounts/account_profile.html", extra_context=None +): """ Display a profile. """ @@ -119,14 +137,16 @@ def account_redirect(request): @login_required -def profile_update(request, template="accounts/account_profile_update.html", - extra_context=None): +def profile_update( + request, template="accounts/account_profile_update.html", extra_context=None +): """ Profile update form. """ profile_form = get_profile_form() - form = profile_form(request.POST or None, request.FILES or None, - instance=request.user) + form = profile_form( + request.POST or None, request.FILES or None, instance=request.user + ) if request.method == "POST" and form.is_valid(): user = form.save() info(request, _("Profile updated")) @@ -139,14 +159,23 @@ def profile_update(request, template="accounts/account_profile_update.html", return TemplateResponse(request, template, context) -def password_reset(request, template="accounts/account_password_reset.html", - form_class=PasswordResetForm, extra_context=None): +def password_reset( + request, + template="accounts/account_password_reset.html", + form_class=PasswordResetForm, + extra_context=None, +): form = form_class(request.POST or None) if request.method == "POST" and form.is_valid(): user = form.save() send_verification_mail(request, user, "password_reset_verify") - info(request, _("A verification email has been sent with " - "a link for resetting your password.")) + info( + request, + _( + "A verification email has been sent with " + "a link for resetting your password." + ), + ) context = {"form": form, "title": _("Password Reset")} context.update(extra_context or {}) return TemplateResponse(request, template, context) diff --git a/mezzanine/bin/management/commands/mezzanine_project.py b/mezzanine/bin/management/commands/mezzanine_project.py index b4593096ab..cd2f998bfc 100644 --- a/mezzanine/bin/management/commands/mezzanine_project.py +++ b/mezzanine/bin/management/commands/mezzanine_project.py @@ -1,4 +1,3 @@ - from distutils.dir_util import copy_tree from importlib import import_module import os @@ -19,25 +18,30 @@ class Command(BaseCommand): def add_arguments(self, parser): super(Command, self).add_arguments(parser) - parser.add_argument("-a", "--alternate", dest="alt", metavar="PACKAGE", - help="Alternate package to use, containing a project_template") + parser.add_argument( + "-a", + "--alternate", + dest="alt", + metavar="PACKAGE", + help="Alternate package to use, containing a project_template", + ) def handle(self, *args, **options): # Overridden to provide a template value for nevercache_key. The # method is copied verbatim from startproject.Command. - chars = 'abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)' - options['nevercache_key'] = get_random_string(50, chars) + chars = "abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)" + options["nevercache_key"] = get_random_string(50, chars) # Indicate that local_settings.py.template should be rendered - options['files'].append('local_settings.py.template') + options["files"].append("local_settings.py.template") super(Command, self).handle(*args, **options) target = options.get("target", None) - name = options['name'] + name = options["name"] if target is None: - target = options['directory'] + target = options["directory"] project_dir = self.get_project_directory(name, target) project_app_dir = os.path.join(project_dir, name) @@ -53,8 +57,11 @@ def handle(self, *args, **options): alt = options.pop("alt", "") if alt: options["template"] = six.text_type( - os.path.join(os.path.dirname(os.path.abspath( - import_module(alt).__file__)), "project_template")) + os.path.join( + os.path.dirname(os.path.abspath(import_module(alt).__file__)), + "project_template", + ) + ) options["directory"] = mkdtemp() self.handle(*args, **options) copy_tree(options["directory"], project_dir) @@ -77,8 +84,10 @@ def get_project_directory(self, name, target): else: top_dir = os.path.abspath(os.path.expanduser(target)) if not os.path.exists(top_dir): - raise CommandError("Destination directory '%s' does not " - "exist, please create it first." % top_dir) + raise CommandError( + "Destination directory '%s' does not " + "exist, please create it first." % top_dir + ) return top_dir diff --git a/mezzanine/bin/mezzanine_project.py b/mezzanine/bin/mezzanine_project.py index 7d2f2433d5..da48867e80 100755 --- a/mezzanine/bin/mezzanine_project.py +++ b/mezzanine/bin/mezzanine_project.py @@ -9,8 +9,8 @@ def create_project(): # Put mezzanine.conf in INSTALLED_APPS so call_command can find # our command, settings.configure() - settings.INSTALLED_APPS = list(settings.INSTALLED_APPS) + ['mezzanine.bin'] - argv = sys.argv[:1] + ['mezzanine_project'] + sys.argv[1:] + settings.INSTALLED_APPS = list(settings.INSTALLED_APPS) + ["mezzanine.bin"] + argv = sys.argv[:1] + ["mezzanine_project"] + sys.argv[1:] management.execute_from_command_line(argv) diff --git a/mezzanine/bin/runtests.py b/mezzanine/bin/runtests.py index 90ce92e202..ac008ae8f1 100755 --- a/mezzanine/bin/runtests.py +++ b/mezzanine/bin/runtests.py @@ -16,6 +16,7 @@ def main(package="mezzanine", args=()): """ from mezzanine.utils.importing import path_for_import + package_path = path_for_import(package) project_path = os.path.join(package_path, "project_template") @@ -53,16 +54,19 @@ def main(package="mezzanine", args=()): def cleanup_test_settings(): import os # Outer scope sometimes unavailable in atexit functions. - for fn in [test_settings_path, test_settings_path + 'c']: + + for fn in [test_settings_path, test_settings_path + "c"]: try: os.remove(fn) except OSError: pass + atexit.register(cleanup_test_settings) django.setup() from django.core.management.commands import test + if django.VERSION < (1, 10): sys.exit(test.Command().execute(*args, verbosity=1)) sys.exit(call_command(test.Command(), *args, verbosity=1)) diff --git a/mezzanine/blog/admin.py b/mezzanine/blog/admin.py index 2166ae872e..8069c5dffe 100644 --- a/mezzanine/blog/admin.py +++ b/mezzanine/blog/admin.py @@ -5,8 +5,11 @@ from mezzanine.blog.models import BlogPost, BlogCategory from mezzanine.conf import settings -from mezzanine.core.admin import (DisplayableAdmin, OwnableAdmin, - BaseTranslationModelAdmin) +from mezzanine.core.admin import ( + DisplayableAdmin, + OwnableAdmin, + BaseTranslationModelAdmin, +) from mezzanine.twitter.admin import TweetableAdminMixin blogpost_fieldsets = deepcopy(DisplayableAdmin.fieldsets) @@ -17,9 +20,10 @@ blogpost_fieldsets[0][1]["fields"].insert(-2, "featured_image") blogpost_list_display.insert(0, "admin_thumb") blogpost_fieldsets = list(blogpost_fieldsets) -blogpost_fieldsets.insert(1, (_("Other posts"), { - "classes": ("collapse-closed",), - "fields": ("related_posts",)})) +blogpost_fieldsets.insert( + 1, + (_("Other posts"), {"classes": ("collapse-closed",), "fields": ("related_posts",)}), +) blogpost_list_filter = deepcopy(DisplayableAdmin.list_filter) + ("categories",) @@ -31,7 +35,10 @@ class BlogPostAdmin(TweetableAdminMixin, DisplayableAdmin, OwnableAdmin): fieldsets = blogpost_fieldsets list_display = blogpost_list_display list_filter = blogpost_list_filter - filter_horizontal = ("categories", "related_posts",) + filter_horizontal = ( + "categories", + "related_posts", + ) def save_form(self, request, form, change): """ diff --git a/mezzanine/blog/defaults.py b/mezzanine/blog/defaults.py index 87bfa2aa45..437b4dfca8 100644 --- a/mezzanine/blog/defaults.py +++ b/mezzanine/blog/defaults.py @@ -26,19 +26,24 @@ if getattr(settings, "BLOG_URLS_USE_DATE", False): _BLOG_URLS_DATE_FORMAT = "day" from warnings import warn - warn("BLOG_URLS_USE_DATE setting is deprecated, please use the " + + warn( + "BLOG_URLS_USE_DATE setting is deprecated, please use the " "BLOG_URLS_DATE_FORMAT setting with a value of 'year', 'month', " - "or 'day'.") + "or 'day'." + ) register_setting( name="BLOG_URLS_DATE_FORMAT", label=_("Blog post URL date format"), - description=_("A string containing the value ``year``, ``month``, or " + description=_( + "A string containing the value ``year``, ``month``, or " "``day``, which controls the granularity of the date portion in the " "URL for each blog post. Eg: ``year`` will define URLs in the format " "/blog/yyyy/slug/, while ``day`` will define URLs with the format " "/blog/yyyy/mm/dd/slug/. An empty string means the URLs will only " - "use the slug, and not contain any portion of the date at all."), + "use the slug, and not contain any portion of the date at all." + ), editable=False, default=_BLOG_URLS_DATE_FORMAT, ) @@ -54,8 +59,10 @@ register_setting( name="BLOG_RSS_LIMIT", label=_("Blog posts RSS limit"), - description=_("Number of most recent blog posts shown in the RSS feed. " - "Set to ``None`` to display all blog posts in the RSS feed."), + description=_( + "Number of most recent blog posts shown in the RSS feed. " + "Set to ``None`` to display all blog posts in the RSS feed." + ), editable=False, default=20, ) diff --git a/mezzanine/blog/feeds.py b/mezzanine/blog/feeds.py index 0189be521c..b93b408694 100644 --- a/mezzanine/blog/feeds.py +++ b/mezzanine/blog/feeds.py @@ -43,6 +43,7 @@ def __init__(self, *args, **kwargs): page = None if "mezzanine.pages" in settings.INSTALLED_APPS: from mezzanine.pages.models import Page + try: page = Page.objects.published().get(slug=settings.BLOG_SLUG) except Page.DoesNotExist: @@ -77,8 +78,11 @@ def link(self): def items(self): if not self._public: return [] - blog_posts = BlogPost.objects.published().select_related("user" - ).prefetch_related("categories") + blog_posts = ( + BlogPost.objects.published() + .select_related("user") + .prefetch_related("categories") + ) if self.tag: tag = get_object_or_404(Keyword, slug=self.tag) blog_posts = blog_posts.filter(keywords__keyword=tag) @@ -90,7 +94,7 @@ def items(self): blog_posts = blog_posts.filter(user=author) limit = settings.BLOG_RSS_LIMIT if limit is not None: - blog_posts = blog_posts[:settings.BLOG_RSS_LIMIT] + blog_posts = blog_posts[: settings.BLOG_RSS_LIMIT] return blog_posts def item_description(self, item): diff --git a/mezzanine/blog/management/base.py b/mezzanine/blog/management/base.py index 42d1b99d0e..20b580f1f5 100644 --- a/mezzanine/blog/management/base.py +++ b/mezzanine/blog/management/base.py @@ -28,26 +28,48 @@ class BaseImporterCommand(BaseCommand): def add_arguments(self, parser): parser.add_argument( - "-m", "--mezzanine-user", dest="mezzanine_user", - help="Mezzanine username to assign the imported blog posts to.") + "-m", + "--mezzanine-user", + dest="mezzanine_user", + help="Mezzanine username to assign the imported blog posts to.", + ) parser.add_argument( - "--noinput", action="store_false", dest="interactive", + "--noinput", + action="store_false", + dest="interactive", help="Do NOT prompt for input of any kind. " - "Fields will be truncated if too long.") + "Fields will be truncated if too long.", + ) parser.add_argument( - "-n", "--navigation", action="store_true", dest="in_navigation", - help="Add any imported pages to navigation") + "-n", + "--navigation", + action="store_true", + dest="in_navigation", + help="Add any imported pages to navigation", + ) parser.add_argument( - "-f", "--footer", action="store_true", dest="in_footer", - help="Add any imported pages to footer navigation") + "-f", + "--footer", + action="store_true", + dest="in_footer", + help="Add any imported pages to footer navigation", + ) def __init__(self, **kwargs): self.posts = [] self.pages = [] super(BaseImporterCommand, self).__init__(**kwargs) - def add_post(self, title=None, content=None, old_url=None, pub_date=None, - tags=None, categories=None, comments=None): + def add_post( + self, + title=None, + content=None, + old_url=None, + pub_date=None, + tags=None, + categories=None, + comments=None, + ): """ Adds a post to the post list for processing. @@ -67,19 +89,28 @@ def add_post(self, title=None, content=None, old_url=None, pub_date=None, tags = [] if comments is None: comments = [] - self.posts.append({ - "title": force_text(title), - "publish_date": pub_date, - "content": force_text(content), - "categories": categories, - "tags": tags, - "comments": comments, - "old_url": old_url, - }) + self.posts.append( + { + "title": force_text(title), + "publish_date": pub_date, + "content": force_text(content), + "categories": categories, + "tags": tags, + "comments": comments, + "old_url": old_url, + } + ) return self.posts[-1] - def add_page(self, title=None, content=None, old_url=None, - tags=None, old_id=None, old_parent_id=None): + def add_page( + self, + title=None, + content=None, + old_url=None, + tags=None, + old_id=None, + old_parent_id=None, + ): """ Adds a page to the list of pages to be imported - used by the Wordpress importer. @@ -89,17 +120,20 @@ def add_page(self, title=None, content=None, old_url=None, title = text.split(". ")[0] if tags is None: tags = [] - self.pages.append({ - "title": title, - "content": content, - "tags": tags, - "old_url": old_url, - "old_id": old_id, - "old_parent_id": old_parent_id, - }) + self.pages.append( + { + "title": title, + "content": content, + "tags": tags, + "old_url": old_url, + "old_id": old_id, + "old_parent_id": old_parent_id, + } + ) - def add_comment(self, post=None, name=None, email=None, pub_date=None, - website=None, body=None): + def add_comment( + self, post=None, name=None, email=None, pub_date=None, website=None, body=None + ): """ Adds a comment to the post provided. """ @@ -107,13 +141,15 @@ def add_comment(self, post=None, name=None, email=None, pub_date=None, if not self.posts: raise CommandError("Cannot add comments without posts") post = self.posts[-1] - post["comments"].append({ - "user_name": name, - "user_email": email, - "submit_date": pub_date, - "user_url": website, - "comment": body, - }) + post["comments"].append( + { + "user_name": name, + "user_email": email, + "submit_date": pub_date, + "user_url": website, + "comment": body, + } + ) def trunc(self, model, prompt, **fields): """ @@ -130,10 +166,12 @@ def trunc(self, model, prompt, **fields): continue while len(value) > max_length: encoded_value = value.encode("utf-8") - new_value = input("The value for the field %s.%s exceeds " + new_value = input( + "The value for the field %s.%s exceeds " "its maximum length of %s chars: %s\n\nEnter a new value " - "for it, or press return to have it truncated: " % - (model.__name__, field_name, max_length, encoded_value)) + "for it, or press return to have it truncated: " + % (model.__name__, field_name, max_length, encoded_value) + ) value = new_value if new_value else value[:max_length] fields[field_name] = value return fields @@ -199,8 +237,11 @@ def handle(self, *args, **options): # Create any pages imported (Wordpress can include pages) in_menus = [] - footer = [menu[0] for menu in settings.PAGE_MENU_TEMPLATES - if menu[-1] == "pages/menus/footer.html"] + footer = [ + menu[0] + for menu in settings.PAGE_MENU_TEMPLATES + if menu[-1] == "pages/menus/footer.html" + ] if options["in_navigation"]: in_menus = [menu[0] for menu in settings.PAGE_MENU_TEMPLATES] if footer and not options["in_footer"]: @@ -220,18 +261,20 @@ def handle(self, *args, **options): if created and verbosity >= 1: print("Imported page: %s" % page) self.add_meta(page, tags, prompt, verbosity, old_url) - parents.append({ - 'old_id': old_id, - 'old_parent_id': old_parent_id, - 'page': page, - }) + parents.append( + { + "old_id": old_id, + "old_parent_id": old_parent_id, + "page": page, + } + ) for obj in parents: - if obj['old_parent_id']: + if obj["old_parent_id"]: for parent in parents: - if parent['old_id'] == obj['old_parent_id']: - obj['page'].parent = parent['page'] - obj['page'].save() + if parent["old_id"] == obj["old_parent_id"]: + obj["page"].parent = parent["page"] + obj["page"].save() break def add_meta(self, obj, tags, prompt, verbosity, old_url=None): @@ -250,7 +293,7 @@ def add_meta(self, obj, tags, prompt, verbosity, old_url=None): if not old_path.strip("/"): return redirect = self.trunc(Redirect, prompt, old_path=old_path) - redirect['site'] = Site.objects.get_current() + redirect["site"] = Site.objects.get_current() redirect, created = Redirect.objects.get_or_create(**redirect) redirect.new_path = obj.get_absolute_url() redirect.save() diff --git a/mezzanine/blog/management/commands/import_blogger.py b/mezzanine/blog/management/commands/import_blogger.py index 92c7a77682..ed62cb8362 100644 --- a/mezzanine/blog/management/commands/import_blogger.py +++ b/mezzanine/blog/management/commands/import_blogger.py @@ -17,8 +17,11 @@ class Command(BaseImporterCommand): def add_arguments(self, parser): super(Command, self).add_arguments(parser) parser.add_argument( - "-b", "--blogger-id", dest="blog_id", - help="Blogger Blog ID from blogger dashboard") + "-b", + "--blogger-id", + dest="blog_id", + help="Blogger Blog ID from blogger dashboard", + ) def handle_import(self, options): """ @@ -53,10 +56,13 @@ def handle_import(self, options): try: feed = blogger.Get(query.ToUri()) except service.RequestError as err: - message = "There was a service error. The response was: " \ + message = ( + "There was a service error. The response was: " "%(status)s %(reason)s - %(body)s" % err.message - raise CommandError(message, blogger.server + query.feed, - err.message["status"]) + ) + raise CommandError( + message, blogger.server + query.feed, err.message["status"] + ) for (i, entry) in enumerate(feed.entry): # this basically gets the unique post ID from the URL to itself @@ -70,16 +76,18 @@ def handle_import(self, options): title = entry.title.text content = entry.content.text # this strips off the time zone info off the end as we want UTC - clean_date = entry.published.text[:re.search(r"\.\d{3}", - entry.published.text).end()] + clean_date = entry.published.text[ + : re.search(r"\.\d{3}", entry.published.text).end() + ] published_date = self.parse_datetime(clean_date) # TODO - issues with content not generating correct

    tags tags = [tag.term for tag in entry.category] - post = self.add_post(title=title, content=content, - pub_date=published_date, tags=tags) + post = self.add_post( + title=title, content=content, pub_date=published_date, tags=tags + ) # get the comments from the post feed and then add them to # the post details @@ -90,8 +98,9 @@ def handle_import(self, options): email = comment.author[0].email.text author_name = comment.author[0].name.text # Strip off the time zone info off the end as we want UTC - clean_date = comment.published.text[:re.search(r"\.\d{3}", - comment.published.text).end()] + clean_date = comment.published.text[ + : re.search(r"\.\d{3}", comment.published.text).end() + ] comment_date = self.parse_datetime(clean_date) @@ -101,9 +110,14 @@ def handle_import(self, options): body = comment.content.text # add the comment as a dict to the end of the comments list - self.add_comment(post=post, name=author_name, email=email, - body=body, website=website, - pub_date=comment_date) + self.add_comment( + post=post, + name=author_name, + email=email, + body=body, + website=website, + pub_date=comment_date, + ) processed_posts.append(post_id) new_posts += 1 @@ -112,11 +126,9 @@ def handle_import(self, options): def parse_datetime(self, datetime_string): try: - parsed_datetime = datetime.strptime(datetime_string, - "%Y-%m-%dT%H:%M:%S.%f") + parsed_datetime = datetime.strptime(datetime_string, "%Y-%m-%dT%H:%M:%S.%f") except ValueError: - parsed_datetime = datetime.strptime(datetime_string, - "%Y-%m-%dT%H:%M:%S") + parsed_datetime = datetime.strptime(datetime_string, "%Y-%m-%dT%H:%M:%S") parsed_datetime -= timedelta(seconds=timezone) return parsed_datetime diff --git a/mezzanine/blog/management/commands/import_blogml.py b/mezzanine/blog/management/commands/import_blogml.py index 9311b40fb3..d2058193e5 100644 --- a/mezzanine/blog/management/commands/import_blogml.py +++ b/mezzanine/blog/management/commands/import_blogml.py @@ -20,8 +20,10 @@ class Command(BaseImporterCommand): def add_arguments(self, parser): super(Command, self).add_arguments(parser) parser.add_argument( - "-x", "--xmldumpfname", dest="xmlfilename", - help="xml file to import blog from" + "-x", + "--xmldumpfname", + dest="xmlfilename", + help="xml file to import blog from", ) def handle_import(self, options): @@ -40,38 +42,39 @@ def handle_import(self, options): tree = xml.etree.ElementTree.parse(xmlfname) # namespace for easier searching ns = {"blogml": "http://www.blogml.com/2006/09/BlogML"} - search_paths = {"find_posts": ".blogml:posts/blogml:post", - "find_comments": ".blogml:comments/blogml:comment", - "find_categories": "blogml:categories/blogml:category", - "find_tags": "blogml:tags/blogml:tag"} + search_paths = { + "find_posts": ".blogml:posts/blogml:post", + "find_comments": ".blogml:comments/blogml:comment", + "find_categories": "blogml:categories/blogml:category", + "find_tags": "blogml:tags/blogml:tag", + } def _process_post_element(post_element, blog_categories): """ Converts post BlogML element into post data. """ post_dict = dict() - post_dict["title"] = post_element.find("blogml:title", - namespaces=ns).text - post_dict["content"] = post_element.find("blogml:content", - namespaces=ns).text + post_dict["title"] = post_element.find("blogml:title", namespaces=ns).text + post_dict["content"] = post_element.find( + "blogml:content", namespaces=ns + ).text post_dict["post-url"] = post_element.attrib["post-url"] post_dict["date-created"] = parse( post_element.attrib["date-created"] ).replace(tzinfo=set_tz) post_category_refs = [ - cat_element.attrib["ref"] for cat_element in - post_element.findall( - search_paths["find_categories"], - namespaces=ns + cat_element.attrib["ref"] + for cat_element in post_element.findall( + search_paths["find_categories"], namespaces=ns ) - ] + ] post_dict["categories"] = list( - (blog_categories[category_id] for category_id in - post_category_refs)) - post_dict["tags"] = [x.attrib["ref"] for x in - post_element.findall("blogml:tags/blogml:tag", - namespaces=ns) - ] + (blog_categories[category_id] for category_id in post_category_refs) + ) + post_dict["tags"] = [ + x.attrib["ref"] + for x in post_element.findall("blogml:tags/blogml:tag", namespaces=ns) + ] return post_dict def _process_comment_element(comment_element): @@ -85,20 +88,22 @@ def _process_comment_element(comment_element): comment_element.attrib["date-created"] ).replace(tzinfo=set_tz) comment_dict["website"] = comment_element.attrib["user-url"] - comment_dict["body"] = comment_element.find("blogml:content", - namespaces=ns).text + comment_dict["body"] = comment_element.find( + "blogml:content", namespaces=ns + ).text return comment_dict def _process_categories(root_tree): """ Finds all categories within BlogMl root tree """ - cat_elements = root_tree.findall(search_paths["find_categories"], - namespaces=ns) + cat_elements = root_tree.findall( + search_paths["find_categories"], namespaces=ns + ) cat_ids = tuple((x.attrib["id"] for x in cat_elements)) cat_title_txt = tuple( - (x.find("blogml:title", namespaces=ns).text - for x in cat_elements)) + (x.find("blogml:title", namespaces=ns).text for x in cat_elements) + ) categories_dict = dict(zip(cat_ids, cat_title_txt)) return categories_dict @@ -107,17 +112,21 @@ def _process_categories(root_tree): for post in posts_found: post_info = _process_post_element(post, categories_found) - post_entered = self.add_post(title=post_info["title"], - content=post_info["content"], - old_url=post_info["post-url"], - pub_date=post_info["date-created"], - categories=post_info["categories"]) - comments_found = post.findall(search_paths["find_comments"], - namespaces=ns) + post_entered = self.add_post( + title=post_info["title"], + content=post_info["content"], + old_url=post_info["post-url"], + pub_date=post_info["date-created"], + categories=post_info["categories"], + ) + comments_found = post.findall(search_paths["find_comments"], namespaces=ns) for comment in comments_found: comment_info = _process_comment_element(comment) - self.add_comment(post=post_entered, name=comment_info["name"], - email=comment_info["email"], - pub_date=comment_info["pub_date"], - website=comment_info["website"], - body=comment_info["body"]) + self.add_comment( + post=post_entered, + name=comment_info["name"], + email=comment_info["email"], + pub_date=comment_info["pub_date"], + website=comment_info["website"], + body=comment_info["body"], + ) diff --git a/mezzanine/blog/management/commands/import_posterous.py b/mezzanine/blog/management/commands/import_posterous.py index 873816efa0..70a37db5e2 100644 --- a/mezzanine/blog/management/commands/import_posterous.py +++ b/mezzanine/blog/management/commands/import_posterous.py @@ -15,17 +15,20 @@ class Command(BaseImporterCommand): def add_arguments(self, parser): super(Command, self).add_arguments(parser) parser.add_argument( - "-a", "--api-token", dest="api_token", - help="Posterous API Key") + "-a", "--api-token", dest="api_token", help="Posterous API Key" + ) parser.add_argument( - "-u", "--posterous-user", dest="username", - help="Posterous Username") + "-u", "--posterous-user", dest="username", help="Posterous Username" + ) parser.add_argument( - "-p", "--posterous-pass", dest="password", - help="Posterous Password") + "-p", "--posterous-pass", dest="password", help="Posterous Password" + ) parser.add_argument( - "-d", "--posterous-host", dest="hostname", - help="Posterous Blog Hostname (no http.. eg. 'foo.com')") + "-d", + "--posterous-host", + dest="hostname", + help="Posterous Blog Hostname (no http.. eg. 'foo.com')", + ) help = "Import Posterous blog posts into the blog app." @@ -33,18 +36,14 @@ def request(self, path, data=None): try: import requests except ImportError: - raise CommandError("Posterous importer requires the requests" - "library installed") + raise CommandError( + "Posterous importer requires the requests" "library installed" + ) data = data or {} - params = { - 'api_token': self.api_token - } + params = {"api_token": self.api_token} params.update(data) url = "http://posterous.com/api/2/%s" % path - r = requests.get(url, - data=params, - auth=(self.username, self.password) - ) + r = requests.get(url, data=params, auth=(self.username, self.password)) if r.text.startswith("403"): raise CommandError(r.text) try: @@ -59,10 +58,10 @@ def handle_import(self, options): self.password = options.get("password") hostname = options.get("hostname") - sites = self.request('sites') + sites = self.request("sites") site = None for s in sites: - if s['full_hostname'] == hostname: + if s["full_hostname"] == hostname: site = s time.sleep(2) break @@ -76,53 +75,51 @@ def handle_import(self, options): ) page = 1 while True: - path = 'sites/%s/posts' % site['id'] + path = "sites/%s/posts" % site["id"] time.sleep(2) - posts = self.request(path, data={'page': page}) + posts = self.request(path, data={"page": page}) if not posts: break for post in posts: - content = post['body_full'] - title = post['title'] - old_url = post['full_url'] - tags = [t['name'] for t in post['tags']] + content = post["body_full"] + title = post["title"] + old_url = post["full_url"] + tags = [t["name"] for t in post["tags"]] pub_date = datetime.strptime( - post['display_date'][:-6], - "%Y/%m/%d %H:%M:%S" + post["display_date"][:-6], "%Y/%m/%d %H:%M:%S" ) self.add_post( title=title, content=content, pub_date=pub_date, tags=tags, - old_url=old_url + old_url=old_url, ) - if not post['comments_count']: + if not post["comments_count"]: continue - path = "sites/%s/posts/%s/comments" % (site['id'], post['id']) + path = "sites/%s/posts/%s/comments" % (site["id"], post["id"]) time.sleep(2) comments = self.request(path) for comment in comments: post = None email = "" pub_date = datetime.strptime( - comment['created_at'][:-6], - "%Y/%m/%d %H:%M:%S" + comment["created_at"][:-6], "%Y/%m/%d %H:%M:%S" ) website = "" - if 'user' in comment: - website = comment['user']['profile_url'] - name = comment['user']['display_name'] + if "user" in comment: + website = comment["user"]["profile_url"] + name = comment["user"]["display_name"] else: - name = comment['name'] + name = comment["name"] website = "http://twitter.com/%s" % name - body = comment['body'] + body = comment["body"] self.add_comment( post=post, name=name, email=email, pub_date=pub_date, website=website, - body=body + body=body, ) page += 1 diff --git a/mezzanine/blog/management/commands/import_rss.py b/mezzanine/blog/management/commands/import_rss.py index 9d31883065..5e8f2a48a4 100644 --- a/mezzanine/blog/management/commands/import_rss.py +++ b/mezzanine/blog/management/commands/import_rss.py @@ -16,24 +16,28 @@ class Command(BaseImporterCommand): def add_arguments(self, parser): super(Command, self).add_arguments(parser) + parser.add_argument("-r", "--rss-url", dest="rss_url", help="RSS feed URL") parser.add_argument( - "-r", "--rss-url", dest="rss_url", - help="RSS feed URL") - parser.add_argument( - "-p", "--page-url", dest="page_url", - help="URL for a web page containing the RSS link") + "-p", + "--page-url", + dest="page_url", + help="URL for a web page containing the RSS link", + ) - help = ("Import an RSS feed into the blog app. Requires the " - "dateutil and feedparser packages installed, and also " - "BeautifulSoup if using the --page-url option.") + help = ( + "Import an RSS feed into the blog app. Requires the " + "dateutil and feedparser packages installed, and also " + "BeautifulSoup if using the --page-url option." + ) def handle_import(self, options): rss_url = options.get("rss_url") page_url = options.get("page_url") if not (page_url or rss_url): - raise CommandError("Either --rss-url or --page-url option " - "must be specified") + raise CommandError( + "Either --rss-url or --page-url option " "must be specified" + ) try: from dateutil import parser @@ -51,8 +55,9 @@ def handle_import(self, options): except ImportError: raise CommandError("BeautifulSoup package is required") for l in BeautifulSoup(urlopen(page_url).read()).findAll("link"): - if ("application/rss" in l.get("type", "") or - "application/atom" in l.get("type", "")): + if "application/rss" in l.get( + "type", "" + ) or "application/atom" in l.get("type", ""): rss_url = urljoin(page_url, l["href"]) break else: @@ -60,15 +65,21 @@ def handle_import(self, options): posts = parse(rss_url)["entries"] for post in posts: - if hasattr(post, 'content'): + if hasattr(post, "content"): content = post.content[0]["value"] else: content = post.summary - tags = [tag["term"] for tag in getattr(post, 'tags', [])] + tags = [tag["term"] for tag in getattr(post, "tags", [])] try: - pub_date = parser.parse(getattr(post, "published", - post.updated)) - timedelta(seconds=timezone) + pub_date = parser.parse( + getattr(post, "published", post.updated) + ) - timedelta(seconds=timezone) except AttributeError: pub_date = None - self.add_post(title=post.title, content=content, - pub_date=pub_date, tags=tags, old_url=None) + self.add_post( + title=post.title, + content=content, + pub_date=pub_date, + tags=tags, + old_url=None, + ) diff --git a/mezzanine/blog/management/commands/import_tumblr.py b/mezzanine/blog/management/commands/import_tumblr.py index e04a0dedd9..e8dca93374 100644 --- a/mezzanine/blog/management/commands/import_tumblr.py +++ b/mezzanine/blog/management/commands/import_tumblr.py @@ -34,8 +34,8 @@ class Command(BaseImporterCommand): def add_arguments(self, parser): super(Command, self).add_arguments(parser) parser.add_argument( - "-t", "--tumblr-user", dest="tumblr_user", - help="Tumblr username") + "-t", "--tumblr-user", dest="tumblr_user", help="Tumblr username" + ) help = "Import Tumblr blog posts into the blog app." @@ -84,9 +84,13 @@ def handle_import(self, options): if handler is not None: title, content = handler(post) pub_date = datetime.strptime(post["date"], date_format) - self.add_post(title=title, content=content, - pub_date=pub_date, tags=post.get("tags"), - old_url=post["url-with-slug"]) + self.add_post( + title=title, + content=content, + pub_date=pub_date, + tags=post.get("tags"), + old_url=post["url-with-slug"], + ) if len(posts) < MAX_POSTS_PER_CALL: break @@ -95,14 +99,16 @@ def handle_regular_post(self, post): def handle_link_post(self, post): title = post["link-text"] - content = ('

    %(link-text)s

    ' - '%(link-description)s') % post + content = ( + '

    %(link-text)s

    ' "%(link-description)s" + ) % post return title, content def handle_quote_post(self, post): title = post["quote-text"] - content = ("
    %(quote-text)s
    " - "

    %(quote-source)s

    ") % post + content = ( + "
    %(quote-text)s
    " "

    %(quote-source)s

    " + ) % post return title, content def handle_photo_post(self, post): diff --git a/mezzanine/blog/management/commands/import_wordpress.py b/mezzanine/blog/management/commands/import_wordpress.py index c7b1069512..80193c5670 100644 --- a/mezzanine/blog/management/commands/import_wordpress.py +++ b/mezzanine/blog/management/commands/import_wordpress.py @@ -19,8 +19,7 @@ class Command(BaseImporterCommand): def add_arguments(self, parser): super(Command, self).add_arguments(parser) - parser.add_argument( - "-u", "--url", dest="url", help="URL to import file") + parser.add_argument("-u", "--url", dest="url", help="URL to import file") def get_text(self, xml, name): """ @@ -70,10 +69,14 @@ def handle_import(self, options): terms[item.scheme].add(item.term) if entry.wp_post_type == "post": - post = self.add_post(title=entry.title, content=content, - pub_date=pub_date, tags=terms["tag"], - categories=terms["category"], - old_url=entry.get('link', entry.id)) + post = self.add_post( + title=entry.title, + content=content, + pub_date=pub_date, + tags=terms["tag"], + categories=terms["category"], + old_url=entry.get("link", entry.id), + ) # Get the comments from the xml doc. for c in xmlitem.getElementsByTagName("wp:comment"): @@ -85,16 +88,25 @@ def handle_import(self, options): fmt = "%Y-%m-%d %H:%M:%S" pub_date = datetime.strptime(pub_date, fmt) pub_date -= timedelta(seconds=timezone) - self.add_comment(post=post, name=name, email=email, - body=body, website=url, - pub_date=pub_date) + self.add_comment( + post=post, + name=name, + email=email, + body=body, + website=url, + pub_date=pub_date, + ) elif entry.wp_post_type == "page": old_id = getattr(entry, "wp_post_id") parent_id = getattr(entry, "wp_post_parent") - self.add_page(title=entry.title, content=content, - tags=terms["tag"], old_id=old_id, - old_parent_id=parent_id) + self.add_page( + title=entry.title, + content=content, + tags=terms["tag"], + old_id=old_id, + old_parent_id=parent_id, + ) def wp_caption(self, post): """ @@ -102,17 +114,17 @@ def wp_caption(self, post): match HTML. """ for match in re.finditer(r"\[caption (.*?)\](.*?)\[/caption\]", post): - meta = '
    0) @@ -59,13 +60,14 @@ def test_blog_post_list_can_use_any_page_type(self): class BlogTemplatetagsTests(TestCase): - def test_blog_months(self): def make_blog_post(*datetime_args): publish_date = datetime.datetime(*datetime_args, tzinfo=pytz.utc) blog_post = BlogPost.objects.create( - user=self._user, status=CONTENT_STATUS_PUBLISHED, - publish_date=publish_date) + user=self._user, + status=CONTENT_STATUS_PUBLISHED, + publish_date=publish_date, + ) blog_post.save() make_blog_post(2016, 4, 15) @@ -73,32 +75,42 @@ def make_blog_post(*datetime_args): make_blog_post(2017, 4, 20) make_blog_post(2014, 5, 15) - html = Template("""\n + html = Template( + """\n {% load blog_tags %} {% blog_months as months %} {% for month in months %} {{ month.date.year }}-{{ month.date.month}}: {{month.post_count}} - {% endfor %}""").render(Context({})) - months = re.sub(r'\n\s*', ', ', html.strip()) + {% endfor %}""" + ).render(Context({})) + months = re.sub(r"\n\s*", ", ", html.strip()) - self.assertEqual(months, '2017-4: 2, 2016-4: 1, 2014-5: 1') + self.assertEqual(months, "2017-4: 2, 2016-4: 1, 2014-5: 1") @override_settings(USE_TZ=True) def test_blog_months_timezone(self): """ Months should be relative to timezone. """ blog_post = BlogPost.objects.create( - user=self._user, status=CONTENT_STATUS_PUBLISHED, - publish_date=datetime.datetime(2017, 4, 30, 23, tzinfo=pytz.utc)) + user=self._user, + status=CONTENT_STATUS_PUBLISHED, + publish_date=datetime.datetime(2017, 4, 30, 23, tzinfo=pytz.utc), + ) blog_post.save() def render_blog_months(): - return Template("""\n + return ( + Template( + """\n {% load blog_tags %} {% blog_months as months %} {% for month in months %}{{ month.date }}{% endfor %} - """).render(Context({})).strip() + """ + ) + .render(Context({})) + .strip() + ) - self.assertEqual(render_blog_months(), 'April 1, 2017, midnight') + self.assertEqual(render_blog_months(), "April 1, 2017, midnight") - with self.settings(TIME_ZONE='Etc/GMT-1'): - self.assertEqual(render_blog_months(), 'May 1, 2017, midnight') + with self.settings(TIME_ZONE="Etc/GMT-1"): + self.assertEqual(render_blog_months(), "May 1, 2017, midnight") diff --git a/mezzanine/blog/translation.py b/mezzanine/blog/translation.py index dfb9e828d7..1a9382a798 100644 --- a/mezzanine/blog/translation.py +++ b/mezzanine/blog/translation.py @@ -1,7 +1,9 @@ from modeltranslation.translator import translator -from mezzanine.core.translation import (TranslatedSlugged, - TranslatedDisplayable, - TranslatedRichText) +from mezzanine.core.translation import ( + TranslatedSlugged, + TranslatedDisplayable, + TranslatedRichText, +) from mezzanine.blog.models import BlogCategory, BlogPost @@ -12,5 +14,6 @@ class TranslatedBlogPost(TranslatedDisplayable, TranslatedRichText): class TranslatedBlogCategory(TranslatedSlugged): fields = () + translator.register(BlogCategory, TranslatedBlogCategory) translator.register(BlogPost, TranslatedBlogPost) diff --git a/mezzanine/blog/urls.py b/mezzanine/blog/urls.py index 84b238a0d6..ed491264f9 100644 --- a/mezzanine/blog/urls.py +++ b/mezzanine/blog/urls.py @@ -9,32 +9,67 @@ # Blog patterns. urlpatterns = [ - re_path(r"^feeds/(?P.*)%s$" % _slash, - views.blog_post_feed, name="blog_post_feed"), - re_path(r"^tag/(?P.*)/feeds/(?P.*)%s$" % _slash, - views.blog_post_feed, name="blog_post_feed_tag"), - re_path(r"^tag/(?P.*)%s$" % _slash, - views.blog_post_list, name="blog_post_list_tag"), - re_path(r"^category/(?P.*)/feeds/(?P.*)%s$" % _slash, - views.blog_post_feed, name="blog_post_feed_category"), - re_path(r"^category/(?P.*)%s$" % _slash, - views.blog_post_list, name="blog_post_list_category"), - re_path(r"^author/(?P.*)/feeds/(?P.*)%s$" % _slash, - views.blog_post_feed, name="blog_post_feed_author"), - re_path(r"^author/(?P.*)%s$" % _slash, - views.blog_post_list, name="blog_post_list_author"), - re_path(r"^archive/(?P\d{4})/(?P\d{1,2})%s$" % _slash, - views.blog_post_list, name="blog_post_list_month"), - re_path(r"^archive/(?P\d{4})%s$" % _slash, - views.blog_post_list, name="blog_post_list_year"), - re_path(r"^(?P\d{4})/(?P\d{1,2})/(?P\d{1,2})/" + re_path( + r"^feeds/(?P.*)%s$" % _slash, + views.blog_post_feed, + name="blog_post_feed", + ), + re_path( + r"^tag/(?P.*)/feeds/(?P.*)%s$" % _slash, + views.blog_post_feed, + name="blog_post_feed_tag", + ), + re_path( + r"^tag/(?P.*)%s$" % _slash, views.blog_post_list, name="blog_post_list_tag" + ), + re_path( + r"^category/(?P.*)/feeds/(?P.*)%s$" % _slash, + views.blog_post_feed, + name="blog_post_feed_category", + ), + re_path( + r"^category/(?P.*)%s$" % _slash, + views.blog_post_list, + name="blog_post_list_category", + ), + re_path( + r"^author/(?P.*)/feeds/(?P.*)%s$" % _slash, + views.blog_post_feed, + name="blog_post_feed_author", + ), + re_path( + r"^author/(?P.*)%s$" % _slash, + views.blog_post_list, + name="blog_post_list_author", + ), + re_path( + r"^archive/(?P\d{4})/(?P\d{1,2})%s$" % _slash, + views.blog_post_list, + name="blog_post_list_month", + ), + re_path( + r"^archive/(?P\d{4})%s$" % _slash, + views.blog_post_list, + name="blog_post_list_year", + ), + re_path( + r"^(?P\d{4})/(?P\d{1,2})/(?P\d{1,2})/" "(?P.*)%s$" % _slash, - views.blog_post_detail, name="blog_post_detail_day"), - re_path(r"^(?P\d{4})/(?P\d{1,2})/(?P.*)%s$" % _slash, - views.blog_post_detail, name="blog_post_detail_month"), - re_path(r"^(?P\d{4})/(?P.*)%s$" % _slash, - views.blog_post_detail, name="blog_post_detail_year"), - re_path(r"^(?P.*)%s$" % _slash, - views.blog_post_detail, name="blog_post_detail"), + views.blog_post_detail, + name="blog_post_detail_day", + ), + re_path( + r"^(?P\d{4})/(?P\d{1,2})/(?P.*)%s$" % _slash, + views.blog_post_detail, + name="blog_post_detail_month", + ), + re_path( + r"^(?P\d{4})/(?P.*)%s$" % _slash, + views.blog_post_detail, + name="blog_post_detail_year", + ), + re_path( + r"^(?P.*)%s$" % _slash, views.blog_post_detail, name="blog_post_detail" + ), re_path(r"^$", views.blog_post_list, name="blog_post_list"), ] diff --git a/mezzanine/blog/views.py b/mezzanine/blog/views.py index 825a8e30f5..f73de04e58 100644 --- a/mezzanine/blog/views.py +++ b/mezzanine/blog/views.py @@ -15,9 +15,16 @@ User = get_user_model() -def blog_post_list(request, tag=None, year=None, month=None, username=None, - category=None, template="blog/blog_post_list.html", - extra_context=None): +def blog_post_list( + request, + tag=None, + year=None, + month=None, + username=None, + category=None, + template="blog/blog_post_list.html", + extra_context=None, +): """ Display a list of blog posts that are filtered by tag, year, month, author or category. Custom templates are checked for using the name @@ -40,8 +47,7 @@ def blog_post_list(request, tag=None, year=None, month=None, username=None, if category is not None: category = get_object_or_404(BlogCategory, slug=category) blog_posts = blog_posts.filter(categories=category) - templates.append(u"blog/blog_post_list_%s.html" % - str(category.slug)) + templates.append(u"blog/blog_post_list_%s.html" % str(category.slug)) author = None if username is not None: author = get_object_or_404(User, username=username) @@ -50,29 +56,46 @@ def blog_post_list(request, tag=None, year=None, month=None, username=None, prefetch = ("categories", "keywords__keyword") blog_posts = blog_posts.select_related("user").prefetch_related(*prefetch) - blog_posts = paginate(blog_posts, request.GET.get("page", 1), - settings.BLOG_POST_PER_PAGE, - settings.MAX_PAGING_LINKS) - context = {"blog_posts": blog_posts, "year": year, "month": month, - "tag": tag, "category": category, "author": author} + blog_posts = paginate( + blog_posts, + request.GET.get("page", 1), + settings.BLOG_POST_PER_PAGE, + settings.MAX_PAGING_LINKS, + ) + context = { + "blog_posts": blog_posts, + "year": year, + "month": month, + "tag": tag, + "category": category, + "author": author, + } context.update(extra_context or {}) templates.append(template) return TemplateResponse(request, templates, context) -def blog_post_detail(request, slug, year=None, month=None, day=None, - template="blog/blog_post_detail.html", - extra_context=None): +def blog_post_detail( + request, + slug, + year=None, + month=None, + day=None, + template="blog/blog_post_detail.html", + extra_context=None, +): """. Custom templates are checked for using the name ``blog/blog_post_detail_XXX.html`` where ``XXX`` is the blog posts's slug. """ - blog_posts = BlogPost.objects.published( - for_user=request.user).select_related() + blog_posts = BlogPost.objects.published(for_user=request.user).select_related() blog_post = get_object_or_404(blog_posts, slug=slug) related_posts = blog_post.related_posts.published(for_user=request.user) - context = {"blog_post": blog_post, "editable_obj": blog_post, - "related_posts": related_posts} + context = { + "blog_post": blog_post, + "editable_obj": blog_post, + "related_posts": related_posts, + } context.update(extra_context or {}) templates = [u"blog/blog_post_detail_%s.html" % str(slug), template] return TemplateResponse(request, templates, context) diff --git a/mezzanine/boot/__init__.py b/mezzanine/boot/__init__.py index 2770d1127e..807b852e69 100644 --- a/mezzanine/boot/__init__.py +++ b/mezzanine/boot/__init__.py @@ -28,8 +28,8 @@ def parse_field_path(field_path): and a field name, e.g. "feature_image". """ model_path, field_name = field_path.rsplit(".", 1) - app_name, model_name = model_path.split('.models.') - _, app_label = app_name.rsplit('.', 1) + app_name, model_name = model_path.split(".models.") + _, app_label = app_name.rsplit(".", 1) return (app_label, model_name.lower()), field_name @@ -38,16 +38,18 @@ def import_field(field_classpath): Imports a field by its dotted class path, prepending "django.db.models" to raw class names and raising an exception if the import fails. """ - if '.' in field_classpath: + if "." in field_classpath: fully_qualified = field_classpath else: fully_qualified = "django.db.models.%s" % field_classpath try: return import_dotted_path(fully_qualified) except ImportError: - raise ImproperlyConfigured("The EXTRA_MODEL_FIELDS setting contains " - "the field '%s' which could not be " - "imported." % field_classpath) + raise ImproperlyConfigured( + "The EXTRA_MODEL_FIELDS setting contains " + "the field '%s' which could not be " + "imported." % field_classpath + ) def parse_extra_model_fields(extra_model_fields): @@ -67,7 +69,8 @@ def parse_extra_model_fields(extra_model_fields): except TypeError as e: raise ImproperlyConfigured( "The EXTRA_MODEL_FIELDS setting contains arguments for the " - "field '%s' which could not be applied: %s" % (entry[1], e)) + "field '%s' which could not be applied: %s" % (entry[1], e) + ) fields[model_key].append((field_name, field)) return fields @@ -88,8 +91,7 @@ def add_extra_model_fields(sender, **kwargs): if DJANGO_VERSION < (1, 9): if fields: - class_prepared.connect(add_extra_model_fields, - dispatch_uid="FQFEQ#rfq3r") + class_prepared.connect(add_extra_model_fields, dispatch_uid="FQFEQ#rfq3r") else: for model_key in fields: apps.lazy_model_operation(add_extra_model_fields, model_key) @@ -112,4 +114,5 @@ def autodiscover(*args, **kwargs): django_autodiscover(*args, **kwargs) admin_site.lazy_registration() + admin.autodiscover = autodiscover diff --git a/mezzanine/boot/lazy_admin.py b/mezzanine/boot/lazy_admin.py index 9cdd3c9bab..e768e748fc 100644 --- a/mezzanine/boot/lazy_admin.py +++ b/mezzanine/boot/lazy_admin.py @@ -3,8 +3,12 @@ from django.conf import settings from django.conf.urls import include, url from django.contrib.auth import get_user_model -from django.contrib.admin.sites import (AdminSite, site as default_site, - NotRegistered, AlreadyRegistered) +from django.contrib.admin.sites import ( + AdminSite, + site as default_site, + NotRegistered, + AlreadyRegistered, +) from django.shortcuts import redirect from mezzanine.utils.importing import import_dotted_path @@ -73,8 +77,11 @@ def urls(self): # doesn't provide), so that we can target it in the # ADMIN_MENU_ORDER setting, allowing each view to correctly # highlight its left-hand admin nav item. - url(r"^media-library/$", lambda r: redirect("fb_browse"), - name="media-library"), + url( + r"^media-library/$", + lambda r: redirect("fb_browse"), + name="media-library", + ), url(r"^media-library/", include(fb_urls)), ] + urls @@ -87,9 +94,11 @@ def urls(self): if user_change_password: bits = (User._meta.app_label, User._meta.object_name.lower()) urls = [ - url(r"^%s/%s/(\d+)/password/$" % bits, + url( + r"^%s/%s/(\d+)/password/$" % bits, self.admin_view(user_change_password), - name="user_change_password"), + name="user_change_password", + ), ] + urls break @@ -97,16 +106,29 @@ def urls(self): # specifically for compatibility with SSLRedirectMiddleware. from mezzanine.core.views import displayable_links_js, static_proxy from mezzanine.generic.views import admin_keywords_submit + urls += [ - url(r"^admin_keywords_submit/$", admin_keywords_submit, - name="admin_keywords_submit"), + url( + r"^admin_keywords_submit/$", + admin_keywords_submit, + name="admin_keywords_submit", + ), url(r"^asset_proxy/$", static_proxy, name="static_proxy"), - url(r"^displayable_links.js$", displayable_links_js, - name="displayable_links_js"), + url( + r"^displayable_links.js$", + displayable_links_js, + name="displayable_links_js", + ), ] if "mezzanine.pages" in settings.INSTALLED_APPS: from mezzanine.pages.views import admin_page_ordering - urls.append(url(r"^admin_page_ordering/$", admin_page_ordering, - name="admin_page_ordering")) + + urls.append( + url( + r"^admin_page_ordering/$", + admin_page_ordering, + name="admin_page_ordering", + ) + ) return urls diff --git a/mezzanine/conf/__init__.py b/mezzanine/conf/__init__.py index 8fde39e33c..2ad9c060d9 100644 --- a/mezzanine/conf/__init__.py +++ b/mezzanine/conf/__init__.py @@ -22,20 +22,30 @@ registry = {} -def register_setting(name=None, label=None, editable=False, description=None, - default=None, choices=None, append=False, - translatable=False): +def register_setting( + name=None, + label=None, + editable=False, + description=None, + default=None, + choices=None, + append=False, + translatable=False, +): """ Registers a setting that can be edited via the admin. This mostly equates to storing the given args as a dict in the ``registry`` dict by name. """ if name is None: - raise TypeError("mezzanine.conf.register_setting requires the " - "'name' keyword argument.") + raise TypeError( + "mezzanine.conf.register_setting requires the " "'name' keyword argument." + ) if editable and default is None: - raise TypeError("mezzanine.conf.register_setting requires the " - "'default' keyword argument when 'editable' is True.") + raise TypeError( + "mezzanine.conf.register_setting requires the " + "'default' keyword argument when 'editable' is True." + ) # append is True when called from an app (typically external) # after the setting has already been registered, with the @@ -70,10 +80,16 @@ def register_setting(name=None, label=None, editable=False, description=None, setting_type = bytes else: setting_type = type(default) - registry[name] = {"name": name, "label": label, "editable": editable, - "description": description, "default": default, - "choices": choices, "type": setting_type, - "translatable": translatable} + registry[name] = { + "name": name, + "label": label, + "editable": editable, + "description": description, + "default": default, + "choices": choices, + "type": setting_type, + "translatable": translatable, + } class Settings(object): @@ -96,6 +112,7 @@ class Settings(object): class Placeholder(object): """A Weakly-referable wrapper of ``object``.""" + pass NULL_REQUEST = Placeholder() @@ -105,7 +122,7 @@ class Placeholder(object): # If a type doesn't appear in this map, the type itself will be used. TYPE_FUNCTIONS = { bool: lambda val: val != "False", - bytes: partial(bytes, encoding='utf8') + bytes: partial(bytes, encoding="utf8"), } def __init__(self): @@ -128,12 +145,14 @@ def use_editable(self): is the default, so this is deprecated in favour of ``clear_cache()``. """ self.clear_cache() - warn("Because editable settings are now used by default, " - "settings.use_editable() is deprecated. If you need to re-load " - "settings from the database during a request, please use " - "settings.clear_cache() instead.", - DeprecationWarning, - stacklevel=2) + warn( + "Because editable settings are now used by default, " + "settings.use_editable() is deprecated. If you need to re-load " + "settings from the database during a request, please use " + "settings.clear_cache() instead.", + DeprecationWarning, + stacklevel=2, + ) def clear_cache(self): """Clear the settings cache for the current request.""" @@ -168,11 +187,17 @@ def _to_python(cls, setting, raw_value): except ValueError: # Shouldn't occur, but just a safeguard in case # the db value somehow ended up as an invalid type. - warn("The setting %s should be of type %s, but the value " - "retrieved from the database (%s) could not be converted. " - "Using the default instead: %s" - % (setting["name"], setting["type"].__name__, - repr(raw_value), repr(setting["default"]))) + warn( + "The setting %s should be of type %s, but the value " + "retrieved from the database (%s) could not be converted. " + "Using the default instead: %s" + % ( + setting["name"], + setting["type"].__name__, + repr(raw_value), + repr(setting["default"]), + ) + ) value = setting["default"] return value @@ -218,9 +243,11 @@ def _load(self): Setting.objects.filter(name__in=removed_settings).delete() if conflicting_settings: - warn("These settings are defined in both settings.py and " - "the database: %s. The settings.py values will be used." - % ", ".join(conflicting_settings)) + warn( + "These settings are defined in both settings.py and " + "the database: %s. The settings.py values will be used." + % ", ".join(conflicting_settings) + ) return new_cache @@ -236,8 +263,9 @@ def __getattr__(self, name): # fetched from the database, then the registered default. if setting["editable"]: editable_cache = self._get_editable(request=self._current_request) - return getattr(django_settings, name, - editable_cache.get(name, setting["default"])) + return getattr( + django_settings, name, editable_cache.get(name, setting["default"]) + ) # If if isn't editable, just try Django and then default. return getattr(django_settings, name, setting["default"]) diff --git a/mezzanine/conf/admin.py b/mezzanine/conf/admin.py index c7dbc8c134..86741b0191 100644 --- a/mezzanine/conf/admin.py +++ b/mezzanine/conf/admin.py @@ -23,9 +23,13 @@ class SettingsAdmin(admin.ModelAdmin): class Media(BaseTranslationModelAdmin.Media): css = copy(BaseTranslationModelAdmin.Media.css) css["all"] += (static("mezzanine/css/admin/settings.css"),) - js = [js.replace(str(static("tabbed_translation_fields.js")), - str(static("tabbed_translatable_settings.js"))) - for js in BaseTranslationModelAdmin.Media.js] + js = [ + js.replace( + str(static("tabbed_translation_fields.js")), + str(static("tabbed_translatable_settings.js")), + ) + for js in BaseTranslationModelAdmin.Media.js + ] def changelist_redirect(self): changelist_url = admin_url(Setting, "changelist") @@ -48,9 +52,10 @@ def changelist_view(self, request, extra_context=None): return self.changelist_redirect() extra_context["settings_form"] = settings_form extra_context["title"] = u"%s %s" % ( - _("Change"), force_text(Setting._meta.verbose_name_plural)) - return super(SettingsAdmin, self).changelist_view(request, - extra_context) + _("Change"), + force_text(Setting._meta.verbose_name_plural), + ) + return super(SettingsAdmin, self).changelist_view(request, extra_context) admin.site.register(Setting, SettingsAdmin) diff --git a/mezzanine/conf/context_processors.py b/mezzanine/conf/context_processors.py index 082624e601..12c9071bb9 100644 --- a/mezzanine/conf/context_processors.py +++ b/mezzanine/conf/context_processors.py @@ -51,8 +51,13 @@ def __setitem__(self, k, v): super(TemplateSettings, self).__setitem__(k, v) def __repr__(self): - return repr(dict((k, self[k]) for k in self.allowed_settings - if hasattr(self.settings, k) or k in self)) + return repr( + dict( + (k, self[k]) + for k in self.allowed_settings + if hasattr(self.settings, k) or k in self + ) + ) def __str__(self): return repr(self) diff --git a/mezzanine/conf/forms.py b/mezzanine/conf/forms.py index df225eeb5f..fd47e5af0d 100644 --- a/mezzanine/conf/forms.py +++ b/mezzanine/conf/forms.py @@ -41,22 +41,37 @@ def __init__(self, *args, **kwargs): except: pass else: - self._init_field(setting, field_class, name, code, - active_language,) + self._init_field( + setting, + field_class, + name, + code, + active_language, + ) else: self._init_field(setting, field_class, name) activate(active_language) - def _init_field(self, setting, field_class, name, code=None, - active_language=None,): + def _init_field( + self, + setting, + field_class, + name, + code=None, + active_language=None, + ): """ Initialize a field whether it is built with a custom name for a specific translation language or not. """ initial = getattr(settings, name) - if (code and code != active_language and - settings.USE_MODELTRANSLATION and setting["translatable"]): + if ( + code + and code != active_language + and settings.USE_MODELTRANSLATION + and setting["translatable"] + ): try: initial = Setting.objects.get(name=name).value except Setting.DoesNotExist: @@ -72,7 +87,7 @@ def _init_field(self, setting, field_class, name, code=None, field_class = forms.ChoiceField kwargs["choices"] = setting["choices"] field_instance = field_class(**kwargs) - code_name = ('_modeltranslation_' + code if code else '') + code_name = "_modeltranslation_" + code if code else "" self.fields[name + code_name] = field_instance css_class = field_class.__name__.lower() field_instance.widget.attrs["class"] = css_class @@ -103,7 +118,7 @@ def save(self): active_language = get_language() for (name, value) in self.cleaned_data.items(): if name not in registry: - name, code = name.rsplit('_modeltranslation_', 1) + name, code = name.rsplit("_modeltranslation_", 1) else: code = None setting_obj, created = Setting.objects.get_or_create(name=name) @@ -119,9 +134,9 @@ def save(self): else: # Duplicate the value of the setting for every language for code in OrderedDict(settings.LANGUAGES): - setattr(setting_obj, - build_localized_fieldname('value', code), - value) + setattr( + setting_obj, build_localized_fieldname("value", code), value + ) else: setting_obj.value = value setting_obj.save() diff --git a/mezzanine/conf/tests.py b/mezzanine/conf/tests.py index 65bb5318ad..39684c1051 100644 --- a/mezzanine/conf/tests.py +++ b/mezzanine/conf/tests.py @@ -14,18 +14,19 @@ class ConfTests(TestCase): - @skipUnless(False, "Only run manually - see Github issue #1126") def test_threading_race(self): import multiprocessing.pool import random from django.db import connections - type_modifiers = {int: lambda s: s + 1, - float: lambda s: s + 1.0, - bool: lambda s: not s, - str: lambda s: s + u"test", - bytes: lambda s: s + b"test"} + type_modifiers = { + int: lambda s: s + 1, + float: lambda s: s + 1.0, + bool: lambda s: not s, + str: lambda s: s + u"test", + bytes: lambda s: s + b"test", + } # Store a non-default value for every editable setting in the database editable_settings = {} @@ -44,8 +45,7 @@ def test_threading_race(self): for conn in connections.all(): # If using in-memory sqlite databases, pass the connections to # the server thread. - if (conn.vendor == 'sqlite' and - conn.settings_dict['NAME'] == ':memory:'): + if conn.vendor == "sqlite" and conn.settings_dict["NAME"] == ":memory:": # Explicitly enable thread-shareability for this connection conn._old_allow_thread_sharing = conn.allow_thread_sharing conn.allow_thread_sharing = True @@ -66,8 +66,9 @@ def choose_random_setting(length=5000): yield random.choice(choices) try: - for setting in thread_pool.imap_unordered(retrieve_setting, - choose_random_setting()): + for setting in thread_pool.imap_unordered( + retrieve_setting, choose_random_setting() + ): name, retrieved_value = setting self.assertEqual(retrieved_value, editable_settings[name]) finally: @@ -134,8 +135,7 @@ def test_bytes_conversion(self): settings.clear_cache() register_setting(name="BYTES_TEST_SETTING", editable=True, default=b"") - Setting.objects.create(name="BYTES_TEST_SETTING", - value="A unicode value") + Setting.objects.create(name="BYTES_TEST_SETTING", value="A unicode value") self.assertEqual(settings.BYTES_TEST_SETTING, b"A unicode value") def test_invalid_value_warning(self): @@ -147,10 +147,10 @@ def test_invalid_value_warning(self): settings.clear_cache() register_setting(name="INVALID_INT_SETTING", editable=True, default=0) - Setting.objects.create(name="INVALID_INT_SETTING", value='zero') + Setting.objects.create(name="INVALID_INT_SETTING", value="zero") with warnings.catch_warnings(): - warning_re = r'The setting \w+ should be of type' - warnings.filterwarnings('error', warning_re, UserWarning) + warning_re = r"The setting \w+ should be of type" + warnings.filterwarnings("error", warning_re, UserWarning) with self.assertRaises(UserWarning): settings.INVALID_INT_SETTING self.assertEqual(settings.INVALID_INT_SETTING, 0) @@ -164,7 +164,7 @@ def test_unregistered_setting(self): settings.clear_cache() register_setting(name="REGISTERED_SETTING", editable=True, default="") - Setting.objects.create(name="UNREGISTERED_SETTING", value='') + Setting.objects.create(name="UNREGISTERED_SETTING", value="") with self.assertRaises(AttributeError): settings.UNREGISTERED_SETTING @@ -190,9 +190,10 @@ def test_conflicting_setting(self): settings.CONFLICTING_SETTING = 3 with warnings.catch_warnings(): - warning_re = ("These settings are defined in both " - r"settings\.py and the database") - warnings.filterwarnings('error', warning_re, UserWarning) + warning_re = ( + "These settings are defined in both " r"settings\.py and the database" + ) + warnings.filterwarnings("error", warning_re, UserWarning) with self.assertRaises(UserWarning): settings.CONFLICTING_SETTING @@ -215,12 +216,13 @@ def test_editable_caching(self): # Ensure usage with no current request does not break caching from mezzanine.core.request import _thread_local + try: del _thread_local.request except AttributeError: pass - setting = Setting.objects.create(name='SITE_TITLE', value="Mezzanine") + setting = Setting.objects.create(name="SITE_TITLE", value="Mezzanine") original_site_title = settings.SITE_TITLE setting.value = "Foobar" setting.save() @@ -232,33 +234,32 @@ def test_editable_caching(self): class TemplateSettingsTests(TestCase): def test_allowed(self): # We choose a setting that will definitely exist: - ts = TemplateSettings(settings, ['INSTALLED_APPS']) + ts = TemplateSettings(settings, ["INSTALLED_APPS"]) self.assertEqual(ts.INSTALLED_APPS, settings.INSTALLED_APPS) - self.assertEqual(ts['INSTALLED_APPS'], settings.INSTALLED_APPS) + self.assertEqual(ts["INSTALLED_APPS"], settings.INSTALLED_APPS) def test_not_allowed(self): ts = TemplateSettings(settings, []) with warnings.catch_warnings(): warnings.simplefilter("ignore") self.assertRaises(AttributeError, lambda: ts.INSTALLED_APPS) - self.assertRaises(KeyError, lambda: ts['INSTALLED_APPS']) + self.assertRaises(KeyError, lambda: ts["INSTALLED_APPS"]) def test_add(self): - ts = TemplateSettings(settings, ['INSTALLED_APPS']) - ts['EXTRA_THING'] = 'foo' - self.assertEqual(ts.EXTRA_THING, 'foo') - self.assertEqual(ts['EXTRA_THING'], 'foo') + ts = TemplateSettings(settings, ["INSTALLED_APPS"]) + ts["EXTRA_THING"] = "foo" + self.assertEqual(ts.EXTRA_THING, "foo") + self.assertEqual(ts["EXTRA_THING"], "foo") def test_repr(self): ts = TemplateSettings(settings, []) - self.assertEqual(repr(ts), '{}') + self.assertEqual(repr(ts), "{}") - ts2 = TemplateSettings(settings, - ['DEBUG', 'SOME_NON_EXISTANT_SETTING']) + ts2 = TemplateSettings(settings, ["DEBUG", "SOME_NON_EXISTANT_SETTING"]) self.assertIn("'DEBUG': False", repr(ts2)) ts3 = TemplateSettings(settings, []) - ts3['EXTRA_THING'] = 'foo' + ts3["EXTRA_THING"] = "foo" self.assertIn("'EXTRA_THING'", repr(ts3)) self.assertIn("'foo'", repr(ts3)) @@ -266,5 +267,5 @@ def test_force_text(self): ts = TemplateSettings(settings, []) with warnings.catch_warnings(record=True) as w: warnings.simplefilter("always") - self.assertEqual(force_text(ts), '{}') + self.assertEqual(force_text(ts), "{}") self.assertEqual(len(w), 0) diff --git a/mezzanine/conf/translation.py b/mezzanine/conf/translation.py index d3b075e52f..48ffe77759 100644 --- a/mezzanine/conf/translation.py +++ b/mezzanine/conf/translation.py @@ -3,6 +3,7 @@ class TranslatedSetting(TranslationOptions): - fields = ('value',) + fields = ("value",) + translator.register(Setting, TranslatedSetting) diff --git a/mezzanine/core/__init__.py b/mezzanine/core/__init__.py index e3c653ca3c..be27a47aae 100644 --- a/mezzanine/core/__init__.py +++ b/mezzanine/core/__init__.py @@ -5,4 +5,4 @@ from mezzanine import __version__ # noqa -default_app_config = 'mezzanine.core.apps.CoreConfig' +default_app_config = "mezzanine.core.apps.CoreConfig" diff --git a/mezzanine/core/admin.py b/mezzanine/core/admin.py index 65e9013963..85895834ce 100644 --- a/mezzanine/core/admin.py +++ b/mezzanine/core/admin.py @@ -17,7 +17,11 @@ from mezzanine.conf import settings from mezzanine.core.forms import DynamicInlineAdminForm from mezzanine.core.models import ( - Orderable, ContentTyped, SitePermission, CONTENT_STATUS_PUBLISHED) + Orderable, + ContentTyped, + SitePermission, + CONTENT_STATUS_PUBLISHED, +) from mezzanine.utils.models import base_concrete_model from mezzanine.utils.sites import current_site_id from mezzanine.utils.static import static_lazy as static @@ -26,25 +30,26 @@ if settings.USE_MODELTRANSLATION: from collections import OrderedDict from django.utils.translation import activate, get_language - from modeltranslation.admin import (TranslationAdmin, - TranslationInlineModelAdmin) + from modeltranslation.admin import TranslationAdmin, TranslationInlineModelAdmin class BaseTranslationModelAdmin(TranslationAdmin): """ Mimic modeltranslation's TabbedTranslationAdmin but uses a custom tabbed_translation_fields.js """ + class Media: js = ( static("mezzanine/js/%s" % settings.JQUERY_UI_FILENAME), static("mezzanine/js/admin/tabbed_translation_fields.js"), ) css = { - "all": (static( - "mezzanine/css/admin/tabbed_translation_fields.css"),), + "all": (static("mezzanine/css/admin/tabbed_translation_fields.css"),), } + else: + class BaseTranslationModelAdmin(admin.ModelAdmin): """ Abstract class used to handle the switch between translation @@ -52,6 +57,7 @@ class BaseTranslationModelAdmin(admin.ModelAdmin): for the Media class so we can extend it consistently regardless of whether or not modeltranslation is used. """ + class Media: js = () css = {"all": ()} @@ -61,13 +67,13 @@ class Media: class DisplayableAdminForm(ModelForm): - def clean_content(form): status = form.cleaned_data.get("status") content = form.cleaned_data.get("content") if status == CONTENT_STATUS_PUBLISHED and not content: - raise ValidationError(_("This field is required if status " - "is set to published.")) + raise ValidationError( + _("This field is required if status " "is set to published.") + ) return content @@ -86,15 +92,25 @@ class DisplayableAdmin(BaseTranslationModelAdmin): date_hierarchy = None if settings.USE_MODELTRANSLATION else "publish_date" radio_fields = {"status": admin.HORIZONTAL} fieldsets = ( - (None, { - "fields": ["title", "status", ("publish_date", "expiry_date")], - }), - (_("Meta data"), { - "fields": ["_meta_title", "slug", - ("description", "gen_description"), - "keywords", "in_sitemap"], - "classes": ("collapse-closed",) - }), + ( + None, + { + "fields": ["title", "status", ("publish_date", "expiry_date")], + }, + ), + ( + _("Meta data"), + { + "fields": [ + "_meta_title", + "slug", + ("description", "gen_description"), + "keywords", + "in_sitemap", + ], + "classes": ("collapse-closed",), + }, + ), ) form = DisplayableAdminForm @@ -102,8 +118,12 @@ class DisplayableAdmin(BaseTranslationModelAdmin): def __init__(self, *args, **kwargs): super(DisplayableAdmin, self).__init__(*args, **kwargs) try: - self.search_fields = list(set(list(self.search_fields) + list( - self.model.objects.get_search_fields().keys()))) + self.search_fields = list( + set( + list(self.search_fields) + + list(self.model.objects.get_search_fields().keys()) + ) + ) except AttributeError: pass @@ -163,12 +183,14 @@ def get_fieldsets(self, request, obj=None): """ Same as above, but for fieldsets. """ - fieldsets = super(BaseDynamicInlineAdmin, self).get_fieldsets( - request, obj) + fieldsets = super(BaseDynamicInlineAdmin, self).get_fieldsets(request, obj) if issubclass(self.model, Orderable): for fieldset in fieldsets: - fields = [f for f in list(fieldset[1]["fields"]) - if not hasattr(f, "translated_field")] + fields = [ + f + for f in list(fieldset[1]["fields"]) + if not hasattr(f, "translated_field") + ] try: fields.remove("_order") except ValueError: @@ -180,25 +202,29 @@ def get_fieldsets(self, request, obj=None): def get_inline_base_class(cls): if settings.USE_MODELTRANSLATION: + class InlineBase(TranslationInlineModelAdmin, cls): """ Abstract class that mimics django-modeltranslation's Translation{Tabular,Stacked}Inline. Used as a placeholder for future improvement. """ + pass + return InlineBase return cls -class TabularDynamicInlineAdmin(BaseDynamicInlineAdmin, - get_inline_base_class(admin.TabularInline)): +class TabularDynamicInlineAdmin( + BaseDynamicInlineAdmin, get_inline_base_class(admin.TabularInline) +): pass -class StackedDynamicInlineAdmin(BaseDynamicInlineAdmin, - get_inline_base_class(admin.StackedInline)): - +class StackedDynamicInlineAdmin( + BaseDynamicInlineAdmin, get_inline_base_class(admin.StackedInline) +): def __init__(self, *args, **kwargs): """ Stacked dynamic inlines won't work without grappelli @@ -257,7 +283,6 @@ class has been added to the sequence in the setting class ContentTypedAdmin(object): - def __init__(self, *args, **kwargs): """ For subclasses that are registered with an Admin class @@ -271,8 +296,10 @@ def __init__(self, *args, **kwargs): self.concrete_model = base_concrete_model(ContentTyped, self.model) # Test that the fieldsets don't differ from the concrete admin's. - if (self.model is not self.concrete_model and - self.fieldsets == self.base_concrete_modeladmin.fieldsets): + if ( + self.model is not self.concrete_model + and self.fieldsets == self.base_concrete_modeladmin.fieldsets + ): # Make a copy so that we aren't modifying other Admin # classes' fieldsets. @@ -282,8 +309,9 @@ def __init__(self, *args, **kwargs): # fields. Do so in reverse order to retain the order of # the model's fields. model_fields = self.concrete_model._meta.get_fields() - concrete_field = '{concrete_model}_ptr'.format( - concrete_model=self.concrete_model.get_content_model_name()) + concrete_field = "{concrete_model}_ptr".format( + concrete_model=self.concrete_model.get_content_model_name() + ) exclude_fields = [f.name for f in model_fields] + [concrete_field] try: @@ -296,12 +324,13 @@ def __init__(self, *args, **kwargs): except (AttributeError, TypeError): pass - fields = (self.model._meta.get_fields() + - self.model._meta.many_to_many) + fields = self.model._meta.get_fields() + self.model._meta.many_to_many for field in reversed(fields): if field.name not in exclude_fields and field.editable: - if not hasattr(field, "translated_field") and field.name \ - not in self.fieldsets[0][1]["fields"]: + if ( + not hasattr(field, "translated_field") + and field.name not in self.fieldsets[0][1]["fields"] + ): self.fieldsets[0][1]["fields"].insert(3, field.name) @property @@ -333,24 +362,20 @@ def change_view(self, request, object_id, **kwargs): self.check_permission(request, content_model, "change") if content_model.__class__ != self.model: - change_url = admin_url(content_model.__class__, "change", - content_model.id) + change_url = admin_url(content_model.__class__, "change", content_model.id) return HttpResponseRedirect(change_url) - return super(ContentTypedAdmin, self).change_view( - request, object_id, **kwargs) + return super(ContentTypedAdmin, self).change_view(request, object_id, **kwargs) def changelist_view(self, request, extra_context=None): """ Redirect to the changelist view for subclasses. """ if self.model is not self.concrete_model: - return HttpResponseRedirect( - admin_url(self.concrete_model, "changelist")) + return HttpResponseRedirect(admin_url(self.concrete_model, "changelist")) extra_context = extra_context or {} extra_context["content_models"] = self.get_content_models() - return super(ContentTypedAdmin, self).changelist_view( - request, extra_context) + return super(ContentTypedAdmin, self).changelist_view(request, extra_context) def get_content_models(self): """ Return all subclasses that are admin registered. """ @@ -373,6 +398,7 @@ def get_content_models(self): # User Admin with Site Permissions # #################################### + class SitePermissionInline(admin.TabularInline): model = SitePermission max_num = 1 @@ -380,7 +406,6 @@ class SitePermissionInline(admin.TabularInline): class SitePermissionUserAdminForm(UserAdmin.form): - def clean_email(form): email = form.cleaned_data.get("email") try: @@ -399,16 +424,22 @@ def save_model(self, request, obj, form, change): """ Provides a warning if the user is an active admin with no admin access. """ - super(SitePermissionUserAdmin, self).save_model( - request, obj, form, change) + super(SitePermissionUserAdmin, self).save_model(request, obj, form, change) user = self.model.objects.get(id=obj.id) has_perms = len(user.get_all_permissions()) > 0 has_sites = SitePermission.objects.filter(user=user).count() > 0 - if user.is_active and user.is_staff and not user.is_superuser and not ( - has_perms and has_sites): - error(request, "The user is active but won't be able to access " - "the admin, due to no edit/site permissions being " - "selected") + if ( + user.is_active + and user.is_staff + and not user.is_superuser + and not (has_perms and has_sites) + ): + error( + request, + "The user is active but won't be able to access " + "the admin, due to no edit/site permissions being " + "selected", + ) # only register if User hasn't been overridden @@ -419,7 +450,6 @@ def save_model(self, request, obj, form, change): class SiteRedirectAdminForm(RedirectAdmin.form): - def clean_old_path(form): path = form.cleaned_data.get("old_path") try: @@ -460,6 +490,7 @@ def save_form(self, request, form, change): if "django.contrib.redirects" in settings.INSTALLED_APPS: from django.contrib.redirects.models import Redirect + if Redirect in admin.site._registry: admin.site.unregister(Redirect) admin.site.register(Redirect, SiteRedirectAdmin) diff --git a/mezzanine/core/apps.py b/mezzanine/core/apps.py index 2c2f255d71..cb1b9f9aa4 100644 --- a/mezzanine/core/apps.py +++ b/mezzanine/core/apps.py @@ -4,7 +4,7 @@ class CoreConfig(AppConfig): - name = 'mezzanine.core' + name = "mezzanine.core" def ready(self): from . import checks # noqa @@ -13,4 +13,5 @@ def ready(self): # add_to_builtins was removed in 1.9 and replaced with a # documented public API configured by the TEMPLATES setting. from django.template.base import add_to_builtins + add_to_builtins("mezzanine.template.loader_tags") diff --git a/mezzanine/core/auth_backends.py b/mezzanine/core/auth_backends.py index e4eee84619..7672c70da7 100644 --- a/mezzanine/core/auth_backends.py +++ b/mezzanine/core/auth_backends.py @@ -36,7 +36,7 @@ def authenticate(self, *args, **kwargs): if user.check_password(password): return user else: - if 'uidb36' not in kwargs: + if "uidb36" not in kwargs: return kwargs["id"] = base36_to_int(kwargs.pop("uidb36")) token = kwargs.pop("token") diff --git a/mezzanine/core/checks.py b/mezzanine/core/checks.py index d304f36a31..9993196182 100644 --- a/mezzanine/core/checks.py +++ b/mezzanine/core/checks.py @@ -18,44 +18,51 @@ def check_template_settings(app_configs, **kwargs): suggested_config = _build_suggested_template_config(settings) - declaration = 'TEMPLATES = ' + declaration = "TEMPLATES = " config_formatted = pprint.pformat(suggested_config) - config_formatted = "\n".join(' ' * len(declaration) + line - for line in config_formatted.splitlines()) - config_formatted = declaration + config_formatted[len(declaration):] - - issues.append(Warning( - "Please update your settings to use the TEMPLATES setting rather " - "than the deprecated individual TEMPLATE_ settings. The latter " - "are unsupported and correct behaviour is not guaranteed. Here's " - "a suggestion based on on your existing configuration:\n\n%s\n" - % config_formatted, - id="mezzanine.core.W01" - )) + config_formatted = "\n".join( + " " * len(declaration) + line for line in config_formatted.splitlines() + ) + config_formatted = declaration + config_formatted[len(declaration) :] + + issues.append( + Warning( + "Please update your settings to use the TEMPLATES setting rather " + "than the deprecated individual TEMPLATE_ settings. The latter " + "are unsupported and correct behaviour is not guaranteed. Here's " + "a suggestion based on on your existing configuration:\n\n%s\n" + % config_formatted, + id="mezzanine.core.W01", + ) + ) if settings.DEBUG != settings.TEMPLATE_DEBUG: - issues.append(Warning( - "TEMPLATE_DEBUG and DEBUG settings have different values, " - "which may not be what you want. Mezzanine used to fix this " - "for you, but doesn't any more. Update your settings.py to " - "use the TEMPLATES setting to have template debugging " - "controlled by the DEBUG setting.", - id="mezzanine.core.W02" - )) + issues.append( + Warning( + "TEMPLATE_DEBUG and DEBUG settings have different values, " + "which may not be what you want. Mezzanine used to fix this " + "for you, but doesn't any more. Update your settings.py to " + "use the TEMPLATES setting to have template debugging " + "controlled by the DEBUG setting.", + id="mezzanine.core.W02", + ) + ) else: loader_tags_built_in = any( - 'mezzanine.template.loader_tags' - in config.get('OPTIONS', {}).get('builtins', {}) + "mezzanine.template.loader_tags" + in config.get("OPTIONS", {}).get("builtins", {}) for config in settings.TEMPLATES ) if not DJANGO_VERSION < (1, 9) and not loader_tags_built_in: - issues.append(Warning( - "You haven't included 'mezzanine.template.loader_tags' as a " - "builtin in any of your template configurations. Mezzanine's " - "'overextends' tag will not be available in your templates.", - id="mezzanine.core.W03" - )) + issues.append( + Warning( + "You haven't included 'mezzanine.template.loader_tags' as a " + "builtin in any of your template configurations. Mezzanine's " + "'overextends' tag will not be available in your templates.", + id="mezzanine.core.W03", + ) + ) return issues @@ -89,6 +96,7 @@ def getter(name): if value == getattr(global_settings, name): value = default return value + return getter default_context_processors = [ @@ -132,20 +140,23 @@ def get_loaders(_): def set_loaders(name, value): template_loaders, app_dirs = value set_option(name, template_loaders) - set_setting('APP_DIRS', app_dirs, unconditional=True) + set_setting("APP_DIRS", app_dirs, unconditional=True) old_settings = [ - ('ALLOWED_INCLUDE_ROOTS', settings.__getattr__, set_option), - ('TEMPLATE_STRING_IF_INVALID', settings.__getattr__, set_option), - ('TEMPLATE_DIRS', settings.__getattr__, set_setting), - ('TEMPLATE_CONTEXT_PROCESSORS', - get_default(default_context_processors), set_option), - ('TEMPLATE_DEBUG', get_debug, set_option), - ('TEMPLATE_LOADERS', get_loaders, set_loaders), + ("ALLOWED_INCLUDE_ROOTS", settings.__getattr__, set_option), + ("TEMPLATE_STRING_IF_INVALID", settings.__getattr__, set_option), + ("TEMPLATE_DIRS", settings.__getattr__, set_setting), + ( + "TEMPLATE_CONTEXT_PROCESSORS", + get_default(default_context_processors), + set_option, + ), + ("TEMPLATE_DEBUG", get_debug, set_option), + ("TEMPLATE_LOADERS", get_loaders, set_loaders), ] def convert_setting_name(old_name): - return old_name.rpartition('TEMPLATE_')[2] + return old_name.rpartition("TEMPLATE_")[2] for setting_name, getter, setter in old_settings: value = getter(setting_name) @@ -159,8 +170,12 @@ def convert_setting_name(old_name): def check_sites_middleware(app_configs, **kwargs): if not middlewares_or_subclasses_installed([SITE_PERMISSION_MIDDLEWARE]): - return [Warning(SITE_PERMISSION_MIDDLEWARE + - " missing from settings.MIDDLEWARE - per site" - " permissions not applied", - id="mezzanine.core.W04")] + return [ + Warning( + SITE_PERMISSION_MIDDLEWARE + + " missing from settings.MIDDLEWARE - per site" + " permissions not applied", + id="mezzanine.core.W04", + ) + ] return [] diff --git a/mezzanine/core/defaults.py b/mezzanine/core/defaults.py index b87bc76a8f..7ee3d60b52 100644 --- a/mezzanine/core/defaults.py +++ b/mezzanine/core/defaults.py @@ -20,35 +20,52 @@ description=_("Controls the ordering and grouping of the admin menu."), editable=False, default=( - (_("Content"), ("pages.Page", "blog.BlogPost", - "generic.ThreadedComment", (_("Media Library"), "media-library"),)), + ( + _("Content"), + ( + "pages.Page", + "blog.BlogPost", + "generic.ThreadedComment", + (_("Media Library"), "media-library"), + ), + ), (_("Site"), ("sites.Site", "redirects.Redirect", "conf.Setting")), - (_("Users"), ("auth.User", "auth.Group",)), + ( + _("Users"), + ( + "auth.User", + "auth.Group", + ), + ), ), ) register_setting( name="ADMIN_MENU_COLLAPSED", label=_("Collapse the Admin menu"), - description=_("Controls whether or not the left-hand admin menu is " - "collapsed by default."), + description=_( + "Controls whether or not the left-hand admin menu is " "collapsed by default." + ), editable=True, default=False, ) register_setting( name="ADMIN_REMOVAL", - description=_("A sequence of Python dotted paths to models " + description=_( + "A sequence of Python dotted paths to models " "(eg: ``['mezzanine.blog.models.BlogPost',]``) that should be " - "removed from the admin."), + "removed from the admin." + ), editable=False, default=(), ) register_setting( name="ADMIN_THUMB_SIZE", - description=_("Size of thumbnail previews for image fields in the " - "admin interface."), + description=_( + "Size of thumbnail previews for image fields in the " "admin interface." + ), editable=False, default="24x24", ) @@ -56,8 +73,10 @@ register_setting( name="AKISMET_API_KEY", label=_("Akismet API Key"), - description=_("Key for http://akismet.com spam filtering service. Used " - "for filtering comments and forms."), + description=_( + "Key for http://akismet.com spam filtering service. Used " + "for filtering comments and forms." + ), editable=True, default="", ) @@ -72,7 +91,8 @@ register_setting( name="CACHE_SET_DELAY_SECONDS", - description=_("Mezzanine's caching uses a technique know as mint " + description=_( + "Mezzanine's caching uses a technique know as mint " "caching. This is where the requested expiry for a cache entry " "is stored with the cache entry in cache, and the real expiry " "used has the ``CACHE_SET_DELAY`` added to it. Then on a cache get, " @@ -80,7 +100,8 @@ "is set again, and no entry is returned. This tries to ensure that " "cache misses never occur, and if many clients were to get a cache " "miss at once, only one would actually need to re-generated the " - "cache entry."), + "cache entry." + ), editable=False, default=30, ) @@ -100,8 +121,10 @@ register_setting( name="DASHBOARD_TAGS", - description=_("A three item sequence, each containing a sequence of " - "template tags used to render the admin dashboard."), + description=_( + "A three item sequence, each containing a sequence of " + "template tags used to render the admin dashboard." + ), editable=False, default=dashboard_tags, ) @@ -115,16 +138,19 @@ register_setting( name="EMAIL_FAIL_SILENTLY", - description=_("If ``True``, failures to send email will happen " - "silently, otherwise an exception is raised. " - "Defaults to ``settings.DEBUG``."), + description=_( + "If ``True``, failures to send email will happen " + "silently, otherwise an exception is raised. " + "Defaults to ``settings.DEBUG``." + ), editable=False, default=settings.DEBUG, ) register_setting( name="EXTRA_MODEL_FIELDS", - description=_("A sequence of fields that will be injected into " + description=_( + "A sequence of fields that will be injected into " "Mezzanine's (or any library's) models. Each item in the sequence is " "a four item sequence. The first two items are the dotted path to the " "model and its field name to be added, and the dotted path to the " @@ -132,7 +158,8 @@ "sequence of positional args and a dictionary of keyword args, to use " "when creating the field instance. When specifying the field class, " "the path ``django.models.db.`` can be omitted for regular Django " - "model fields."), + "model fields." + ), editable=False, default=(), ) @@ -147,14 +174,16 @@ register_setting( name="HOST_THEMES", - description=_("A sequence mapping host names to themes, allowing " - "different templates to be served per HTTP host. " - "Each item in the sequence is a two item sequence, " - "containing a host such as ``othersite.example.com``, and " - "the name of an importable Python package for the theme. " - "If the host is matched for a request, the templates " - "directory inside the theme package will be first searched " - "when loading templates."), + description=_( + "A sequence mapping host names to themes, allowing " + "different templates to be served per HTTP host. " + "Each item in the sequence is a two item sequence, " + "containing a host such as ``othersite.example.com``, and " + "the name of an importable Python package for the theme. " + "If the host is matched for a request, the templates " + "directory inside the theme package will be first searched " + "when loading templates." + ), editable=False, default=(), ) @@ -169,8 +198,9 @@ register_setting( name="JQUERY_FILENAME", label=_("Name of the jQuery file."), - description=_("Name of the jQuery file found in " - "mezzanine/core/static/mezzanine/js/"), + description=_( + "Name of the jQuery file found in " "mezzanine/core/static/mezzanine/js/" + ), editable=False, default="jquery-3.4.1.js", ) @@ -178,8 +208,9 @@ register_setting( name="JQUERY_UI_FILENAME", label=_("Name of the jQuery UI file."), - description=_("Name of the jQuery UI file found in " - "mezzanine/core/static/mezzanine/js/"), + description=_( + "Name of the jQuery UI file found in " "mezzanine/core/static/mezzanine/js/" + ), editable=False, default="jquery-ui-1.12.1.js", ) @@ -195,81 +226,242 @@ register_setting( name="MEDIA_LIBRARY_PER_SITE", label=_("Media library per site"), - description=_("If ``True``, each site will use its own directory within " - "the filebrowser media library."), + description=_( + "If ``True``, each site will use its own directory within " + "the filebrowser media library." + ), editable=False, default=False, ) register_setting( name="OWNABLE_MODELS_ALL_EDITABLE", - description=_("Models that subclass ``Ownable`` and use the " + description=_( + "Models that subclass ``Ownable`` and use the " "``OwnableAdmin`` have their admin change-list records filtered " "down to records owned by the current user. This setting contains a " "sequence of models in the format ``app_label.object_name``, that " "when subclassing ``Ownable``, will still show all records in the " - "admin change-list interface, regardless of the current user."), + "admin change-list interface, regardless of the current user." + ), editable=False, default=(), ) register_setting( name="RICHTEXT_WIDGET_CLASS", - description=_("Dotted package path and class name of the widget to use " - "for the ``RichTextField``."), + description=_( + "Dotted package path and class name of the widget to use " + "for the ``RichTextField``." + ), editable=False, default="mezzanine.core.forms.TinyMceWidget", ) register_setting( name="RICHTEXT_ALLOWED_TAGS", - description=_("List of HTML tags that won't be stripped from " - "``RichTextField`` instances."), + description=_( + "List of HTML tags that won't be stripped from " "``RichTextField`` instances." + ), editable=False, - default=("a", "abbr", "acronym", "address", "area", "article", "aside", - "b", "bdo", "big", "blockquote", "br", "button", "caption", "center", - "cite", "code", "col", "colgroup", "dd", "del", "dfn", "dir", "div", - "dl", "dt", "em", "fieldset", "figure", "font", "footer", "form", - "h1", "h2", "h3", "h4", "h5", "h6", "header", "hr", "i", "img", - "input", "ins", "kbd", "label", "legend", "li", "map", "menu", - "nav", "ol", "optgroup", "option", "p", "pre", "q", "s", "samp", - "section", "select", "small", "span", "strike", "strong", - "sub", "sup", "table", "tbody", "td", "textarea", - "tfoot", "th", "thead", "tr", "tt", "u", "ul", "var", "wbr"), + default=( + "a", + "abbr", + "acronym", + "address", + "area", + "article", + "aside", + "b", + "bdo", + "big", + "blockquote", + "br", + "button", + "caption", + "center", + "cite", + "code", + "col", + "colgroup", + "dd", + "del", + "dfn", + "dir", + "div", + "dl", + "dt", + "em", + "fieldset", + "figure", + "font", + "footer", + "form", + "h1", + "h2", + "h3", + "h4", + "h5", + "h6", + "header", + "hr", + "i", + "img", + "input", + "ins", + "kbd", + "label", + "legend", + "li", + "map", + "menu", + "nav", + "ol", + "optgroup", + "option", + "p", + "pre", + "q", + "s", + "samp", + "section", + "select", + "small", + "span", + "strike", + "strong", + "sub", + "sup", + "table", + "tbody", + "td", + "textarea", + "tfoot", + "th", + "thead", + "tr", + "tt", + "u", + "ul", + "var", + "wbr", + ), ) register_setting( name="RICHTEXT_ALLOWED_ATTRIBUTES", - description=_("List of HTML attributes that won't be stripped from " - "``RichTextField`` instances."), + description=_( + "List of HTML attributes that won't be stripped from " + "``RichTextField`` instances." + ), editable=False, - default=("abbr", "accept", "accept-charset", "accesskey", "action", - "align", "alt", "axis", "border", "cellpadding", "cellspacing", - "char", "charoff", "charset", "checked", "cite", "class", "clear", - "cols", "colspan", "color", "compact", "coords", "datetime", "dir", - "disabled", "enctype", "for", "frame", "headers", "height", "href", - "hreflang", "hspace", "id", "ismap", "label", "lang", "longdesc", - "maxlength", "media", "method", "multiple", "name", "nohref", - "noshade", "nowrap", "prompt", "readonly", "rel", "rev", "rows", - "rowspan", "rules", "scope", "selected", "shape", "size", "span", - "src", "start", "style", "summary", "tabindex", "target", "title", - "type", "usemap", "valign", "value", "vspace", "width", "xml:lang"), + default=( + "abbr", + "accept", + "accept-charset", + "accesskey", + "action", + "align", + "alt", + "axis", + "border", + "cellpadding", + "cellspacing", + "char", + "charoff", + "charset", + "checked", + "cite", + "class", + "clear", + "cols", + "colspan", + "color", + "compact", + "coords", + "datetime", + "dir", + "disabled", + "enctype", + "for", + "frame", + "headers", + "height", + "href", + "hreflang", + "hspace", + "id", + "ismap", + "label", + "lang", + "longdesc", + "maxlength", + "media", + "method", + "multiple", + "name", + "nohref", + "noshade", + "nowrap", + "prompt", + "readonly", + "rel", + "rev", + "rows", + "rowspan", + "rules", + "scope", + "selected", + "shape", + "size", + "span", + "src", + "start", + "style", + "summary", + "tabindex", + "target", + "title", + "type", + "usemap", + "valign", + "value", + "vspace", + "width", + "xml:lang", + ), ) register_setting( name="RICHTEXT_ALLOWED_STYLES", - description=_("List of inline CSS styles that won't be stripped from " - "``RichTextField`` instances."), + description=_( + "List of inline CSS styles that won't be stripped from " + "``RichTextField`` instances." + ), editable=False, - default=("border", "display", "float", "list-style-type", "margin", - "margin-bottom", "margin-left", "margin-right", "margin-top", - "padding-left", "text-align", "text-decoration", "vertical-align"), + default=( + "border", + "display", + "float", + "list-style-type", + "margin", + "margin-bottom", + "margin-left", + "margin-right", + "margin-top", + "padding-left", + "text-align", + "text-decoration", + "vertical-align", + ), ) register_setting( name="RICHTEXT_FILTERS", - description=_("List of dotted paths to functions, called in order, on a " - "``RichTextField`` value before it is rendered to the template."), + description=_( + "List of dotted paths to functions, called in order, on a " + "``RichTextField`` value before it is rendered to the template." + ), editable=False, default=("mezzanine.utils.html.thumbnails",), ) @@ -286,7 +478,8 @@ register_setting( name="RICHTEXT_FILTER_LEVEL", label=_("Rich Text filter level"), - description=_("*Do not change this setting unless you know what you're " + description=_( + "*Do not change this setting unless you know what you're " "doing.*\n\nWhen content is saved in a Rich Text (WYSIWYG) field, " "unsafe HTML tags and attributes are stripped from the content to " "protect against staff members intentionally adding code that could " @@ -301,7 +494,8 @@ "when the filtering level is set to high.\n\n" "Setting the filtering level to no filtering, will disable all " "filtering, and allow any code to be entered by staff members, " - "including script tags."), + "including script tags." + ), editable=True, choices=RICHTEXT_FILTER_LEVELS, default=RICHTEXT_FILTER_LEVEL_HIGH, @@ -309,10 +503,12 @@ register_setting( name="SEARCH_MODEL_CHOICES", - description=_("Sequence of models that will be provided by default as " + description=_( + "Sequence of models that will be provided by default as " "choices in the search form. Each model should be in the format " "``app_label.model_name``. Only models that subclass " - "``mezzanine.core.models.Displayable`` should be used."), + "``mezzanine.core.models.Displayable`` should be used." + ), editable=False, default=("pages.Page", "blog.BlogPost"), ) @@ -328,22 +524,26 @@ register_setting( name="SEARCH_AGE_SCALE_FACTOR", label=_("Emphasis to put on age when ranking search results"), - description=_("The amount of emphasis to put on age when ranking search " - "results. A higher number gives more emphasis to age, " - "ranking newer results higher with less regard to their " - "ordinary score. Setting this to zero disables weighing " - "search results by age."), + description=_( + "The amount of emphasis to put on age when ranking search " + "results. A higher number gives more emphasis to age, " + "ranking newer results higher with less regard to their " + "ordinary score. Setting this to zero disables weighing " + "search results by age." + ), editable=False, default=1.5, ) register_setting( name="SITE_PREFIX", - description=_("A URL prefix for mounting all of Mezzanine's urlpatterns " + description=_( + "A URL prefix for mounting all of Mezzanine's urlpatterns " "under. When using this, you'll also need to manually apply it to " "your project's root ``urls.py`` module. The root ``urls.py`` module " "provided by Mezzanine's ``mezzanine-project`` command contains an " - "example of this towards its end."), + "example of this towards its end." + ), editable=False, default="", ) @@ -351,8 +551,10 @@ register_setting( name="SITE_TITLE", label=_("Site Title"), - description=_("Title that will display at the top of the site, and be " - "appended to the content of the HTML title tags on every page."), + description=_( + "Title that will display at the top of the site, and be " + "appended to the content of the HTML title tags on every page." + ), editable=True, default="Mezzanine", translatable=True, @@ -369,24 +571,28 @@ register_setting( name="SLUGIFY", - description=_("Dotted Python path to the callable for converting " + description=_( + "Dotted Python path to the callable for converting " "strings into URL slugs. Defaults to " "``mezzanine.utils.urls.slugify_unicode`` which allows for non-ascii " "URLs. Change to ``django.template.defaultfilters.slugify`` to use " - "Django's slugify function, or something of your own if required."), + "Django's slugify function, or something of your own if required." + ), editable=False, default="mezzanine.utils.urls.slugify_unicode", ) register_setting( name="SPAM_FILTERS", - description=_("Sequence of dotted Python paths to callable functions " + description=_( + "Sequence of dotted Python paths to callable functions " "used for checking posted content (such as forms or comments) is " "spam. Each function should accept three arguments: the request " "object, the form object, and the URL that was posted from. " "Defaults to ``mezzanine.utils.views.is_spam_akismet`` which will " "use the http://akismet.com spam filtering service when the " - "``AKISMET_API_KEY`` setting is configured."), + "``AKISMET_API_KEY`` setting is configured." + ), editable=False, default=("mezzanine.utils.views.is_spam_akismet",), ) @@ -394,9 +600,11 @@ register_setting( name="SSL_ENABLED", label=_("Enable SSL"), - description=_("If ``True``, users will be automatically redirected to " + description=_( + "If ``True``, users will be automatically redirected to " "HTTPS for the URLs specified by the ``SSL_FORCE_URL_PREFIXES`` " - "setting."), + "setting." + ), editable=False, default=False, ) @@ -404,8 +612,10 @@ register_setting( name="SSL_FORCE_HOST", label=_("Force Host"), - description=_("Host name that the site should always be accessed via that " - "matches the SSL certificate."), + description=_( + "Host name that the site should always be accessed via that " + "matches the SSL certificate." + ), editable=False, default="", ) @@ -413,19 +623,21 @@ register_setting( name="SSL_FORCE_URL_PREFIXES", description="Sequence of URL prefixes that will be forced to run over " - "SSL when ``SSL_ENABLED`` is ``True``. i.e. " - "('/admin', '/example') would force all URLs beginning with " - "/admin or /example to run over SSL.", + "SSL when ``SSL_ENABLED`` is ``True``. i.e. " + "('/admin', '/example') would force all URLs beginning with " + "/admin or /example to run over SSL.", editable=False, default=("/admin", "/account"), ) register_setting( name="SSL_FORCED_PREFIXES_ONLY", - description=_("If ``True``, only URLs specified by the " + description=_( + "If ``True``, only URLs specified by the " "``SSL_FORCE_URL_PREFIXES`` setting will be accessible over SSL, " "and all other URLs will be redirected back to HTTP if accessed " - "over HTTPS."), + "over HTTPS." + ), editable=False, default=True, ) @@ -435,55 +647,325 @@ description=_("List of words which will be stripped from search queries."), editable=False, default=( - "a", "about", "above", "above", "across", "after", - "afterwards", "again", "against", "all", "almost", "alone", - "along", "already", "also", "although", "always", "am", - "among", "amongst", "amoungst", "amount", "an", "and", - "another", "any", "anyhow", "anyone", "anything", "anyway", - "anywhere", "are", "around", "as", "at", "back", "be", - "became", "because", "become", "becomes", "becoming", "been", - "before", "beforehand", "behind", "being", "below", "beside", - "besides", "between", "beyond", "bill", "both", "bottom", - "but", "by", "call", "can", "cannot", "cant", "co", "con", - "could", "couldnt", "cry", "de", "describe", "detail", "do", - "done", "down", "due", "during", "each", "eg", "eight", - "either", "eleven", "else", "elsewhere", "empty", "enough", - "etc", "even", "ever", "every", "everyone", "everything", - "everywhere", "except", "few", "fifteen", "fifty", "fill", - "find", "fire", "first", "five", "for", "former", "formerly", - "forty", "found", "four", "from", "front", "full", "further", - "get", "give", "go", "had", "has", "hasnt", "have", "he", - "hence", "her", "here", "hereafter", "hereby", "herein", - "hereupon", "hers", "herself", "him", "himself", "his", - "how", "however", "hundred", "ie", "if", "in", "inc", - "indeed", "interest", "into", "is", "it", "its", "itself", - "keep", "last", "latter", "latterly", "least", "less", "ltd", - "made", "many", "may", "me", "meanwhile", "might", "mill", - "mine", "more", "moreover", "most", "mostly", "move", "much", - "must", "my", "myself", "name", "namely", "neither", "never", - "nevertheless", "next", "nine", "no", "nobody", "none", - "noone", "nor", "not", "nothing", "now", "nowhere", "of", - "off", "often", "on", "once", "one", "only", "onto", "or", - "other", "others", "otherwise", "our", "ours", "ourselves", - "out", "over", "own", "part", "per", "perhaps", "please", - "put", "rather", "re", "same", "see", "seem", "seemed", - "seeming", "seems", "serious", "several", "she", "should", - "show", "side", "since", "sincere", "six", "sixty", "so", - "some", "somehow", "someone", "something", "sometime", - "sometimes", "somewhere", "still", "such", "system", "take", - "ten", "than", "that", "the", "their", "them", "themselves", - "then", "thence", "there", "thereafter", "thereby", - "therefore", "therein", "thereupon", "these", "they", - "thickv", "thin", "third", "this", "those", "though", - "three", "through", "throughout", "thru", "thus", "to", - "together", "too", "top", "toward", "towards", "twelve", - "twenty", "two", "un", "under", "until", "up", "upon", "us", - "very", "via", "was", "we", "well", "were", "what", "whatever", - "when", "whence", "whenever", "where", "whereafter", "whereas", - "whereby", "wherein", "whereupon", "wherever", "whether", - "which", "while", "whither", "who", "whoever", "whole", "whom", - "whose", "why", "will", "with", "within", "without", "would", - "yet", "you", "your", "yours", "yourself", "yourselves", "the", + "a", + "about", + "above", + "above", + "across", + "after", + "afterwards", + "again", + "against", + "all", + "almost", + "alone", + "along", + "already", + "also", + "although", + "always", + "am", + "among", + "amongst", + "amoungst", + "amount", + "an", + "and", + "another", + "any", + "anyhow", + "anyone", + "anything", + "anyway", + "anywhere", + "are", + "around", + "as", + "at", + "back", + "be", + "became", + "because", + "become", + "becomes", + "becoming", + "been", + "before", + "beforehand", + "behind", + "being", + "below", + "beside", + "besides", + "between", + "beyond", + "bill", + "both", + "bottom", + "but", + "by", + "call", + "can", + "cannot", + "cant", + "co", + "con", + "could", + "couldnt", + "cry", + "de", + "describe", + "detail", + "do", + "done", + "down", + "due", + "during", + "each", + "eg", + "eight", + "either", + "eleven", + "else", + "elsewhere", + "empty", + "enough", + "etc", + "even", + "ever", + "every", + "everyone", + "everything", + "everywhere", + "except", + "few", + "fifteen", + "fifty", + "fill", + "find", + "fire", + "first", + "five", + "for", + "former", + "formerly", + "forty", + "found", + "four", + "from", + "front", + "full", + "further", + "get", + "give", + "go", + "had", + "has", + "hasnt", + "have", + "he", + "hence", + "her", + "here", + "hereafter", + "hereby", + "herein", + "hereupon", + "hers", + "herself", + "him", + "himself", + "his", + "how", + "however", + "hundred", + "ie", + "if", + "in", + "inc", + "indeed", + "interest", + "into", + "is", + "it", + "its", + "itself", + "keep", + "last", + "latter", + "latterly", + "least", + "less", + "ltd", + "made", + "many", + "may", + "me", + "meanwhile", + "might", + "mill", + "mine", + "more", + "moreover", + "most", + "mostly", + "move", + "much", + "must", + "my", + "myself", + "name", + "namely", + "neither", + "never", + "nevertheless", + "next", + "nine", + "no", + "nobody", + "none", + "noone", + "nor", + "not", + "nothing", + "now", + "nowhere", + "of", + "off", + "often", + "on", + "once", + "one", + "only", + "onto", + "or", + "other", + "others", + "otherwise", + "our", + "ours", + "ourselves", + "out", + "over", + "own", + "part", + "per", + "perhaps", + "please", + "put", + "rather", + "re", + "same", + "see", + "seem", + "seemed", + "seeming", + "seems", + "serious", + "several", + "she", + "should", + "show", + "side", + "since", + "sincere", + "six", + "sixty", + "so", + "some", + "somehow", + "someone", + "something", + "sometime", + "sometimes", + "somewhere", + "still", + "such", + "system", + "take", + "ten", + "than", + "that", + "the", + "their", + "them", + "themselves", + "then", + "thence", + "there", + "thereafter", + "thereby", + "therefore", + "therein", + "thereupon", + "these", + "they", + "thickv", + "thin", + "third", + "this", + "those", + "though", + "three", + "through", + "throughout", + "thru", + "thus", + "to", + "together", + "too", + "top", + "toward", + "towards", + "twelve", + "twenty", + "two", + "un", + "under", + "until", + "up", + "upon", + "us", + "very", + "via", + "was", + "we", + "well", + "were", + "what", + "whatever", + "when", + "whence", + "whenever", + "where", + "whereafter", + "whereas", + "whereby", + "wherein", + "whereupon", + "wherever", + "whether", + "which", + "while", + "whither", + "who", + "whoever", + "whole", + "whom", + "whose", + "why", + "will", + "with", + "within", + "without", + "would", + "yet", + "you", + "your", + "yours", + "yourself", + "yourselves", + "the", ), ) @@ -501,41 +983,60 @@ editable=False, append=True, default=( - "ACCOUNTS_APPROVAL_REQUIRED", "ACCOUNTS_VERIFICATION_REQUIRED", + "ACCOUNTS_APPROVAL_REQUIRED", + "ACCOUNTS_VERIFICATION_REQUIRED", "ADMIN_MENU_COLLAPSED", - "BITLY_ACCESS_TOKEN", "BLOG_USE_FEATURED_IMAGE", - "COMMENTS_DISQUS_SHORTNAME", "COMMENTS_NUM_LATEST", - "COMMENTS_DISQUS_API_PUBLIC_KEY", "COMMENTS_DISQUS_API_SECRET_KEY", - "COMMENTS_USE_RATINGS", "DEV_SERVER", "FORMS_USE_HTML5", - "GRAPPELLI_INSTALLED", "GOOGLE_ANALYTICS_ID", "JQUERY_FILENAME", - "JQUERY_UI_FILENAME", "LOGIN_URL", "LOGOUT_URL", "SITE_TITLE", - "SITE_TAGLINE", "USE_L10N", "USE_MODELTRANSLATION", + "BITLY_ACCESS_TOKEN", + "BLOG_USE_FEATURED_IMAGE", + "COMMENTS_DISQUS_SHORTNAME", + "COMMENTS_NUM_LATEST", + "COMMENTS_DISQUS_API_PUBLIC_KEY", + "COMMENTS_DISQUS_API_SECRET_KEY", + "COMMENTS_USE_RATINGS", + "DEV_SERVER", + "FORMS_USE_HTML5", + "GRAPPELLI_INSTALLED", + "GOOGLE_ANALYTICS_ID", + "JQUERY_FILENAME", + "JQUERY_UI_FILENAME", + "LOGIN_URL", + "LOGOUT_URL", + "SITE_TITLE", + "SITE_TAGLINE", + "USE_L10N", + "USE_MODELTRANSLATION", ), ) register_setting( name="THUMBNAILS_DIR_NAME", - description=_("Directory name to store thumbnails in, that will be " - "created relative to the original image's directory."), + description=_( + "Directory name to store thumbnails in, that will be " + "created relative to the original image's directory." + ), editable=False, default=".thumbnails", ) register_setting( name="TINYMCE_SETUP_JS", - description=_("URL for the JavaScript file (relative to ``STATIC_URL``) " + description=_( + "URL for the JavaScript file (relative to ``STATIC_URL``) " "that handles configuring TinyMCE when the default " - "``RICHTEXT_WIDGET_CLASS`` is used."), + "``RICHTEXT_WIDGET_CLASS`` is used." + ), editable=False, default="mezzanine/js/tinymce_setup.js", ) register_setting( name="UPLOAD_TO_HANDLERS", - description=_("Dict mapping file field names in the format " + description=_( + "Dict mapping file field names in the format " "``app_label.model_name.field_name`` to the Python dotted path " "to function names that will be used for the file field's " - "``upload_to`` argument."), + "``upload_to`` argument." + ), editable=False, default={}, ) @@ -548,17 +1049,21 @@ register_setting( name="USE_MODELTRANSLATION", - description=_("If ``True``, the django-modeltranslation application will " - "be automatically added to the ``INSTALLED_APPS`` setting."), + description=_( + "If ``True``, the django-modeltranslation application will " + "be automatically added to the ``INSTALLED_APPS`` setting." + ), editable=False, default=False, ) register_setting( name="NEVERCACHE_KEY", - description=_("Unique random string like ``SECRET_KEY``, but used for " + description=_( + "Unique random string like ``SECRET_KEY``, but used for " "two-phased cache responses. Like ``SECRET_KEY``, should be " - "automatically generated by the ``mezzanine-project`` command."), + "automatically generated by the ``mezzanine-project`` command." + ), editable=False, default="", ) diff --git a/mezzanine/core/exceptions.py b/mezzanine/core/exceptions.py index 4d81531e06..eb937f765b 100644 --- a/mezzanine/core/exceptions.py +++ b/mezzanine/core/exceptions.py @@ -1,7 +1,9 @@ class FileSystemEncodingChanged(RuntimeError): def __init__(self): - msg = ("Access was attempted on a file that contains unicode " - "characters in its path, but somehow the current locale " - "does not support utf-8. You may need to set 'LC_ALL' " - "to a correct value, eg: 'en_US.UTF-8'.") + msg = ( + "Access was attempted on a file that contains unicode " + "characters in its path, but somehow the current locale " + "does not support utf-8. You may need to set 'LC_ALL' " + "to a correct value, eg: 'en_US.UTF-8'." + ) RuntimeError.__init__(self, msg) diff --git a/mezzanine/core/fields.py b/mezzanine/core/fields.py index 744903713d..9f560230df 100644 --- a/mezzanine/core/fields.py +++ b/mezzanine/core/fields.py @@ -13,8 +13,7 @@ class OrderField(models.IntegerField): def formfield(self, **kwargs): - kwargs.update({'widget': OrderWidget, - 'required': False}) + kwargs.update({"widget": OrderWidget, "required": False}) return super(OrderField, self).formfield(**kwargs) @@ -31,13 +30,18 @@ def formfield(self, **kwargs): default = kwargs.get("widget", None) or AdminTextareaWidget if default is AdminTextareaWidget: from mezzanine.conf import settings + richtext_widget_path = settings.RICHTEXT_WIDGET_CLASS try: widget_class = import_dotted_path(richtext_widget_path) except ImportError: - raise ImproperlyConfigured(_("Could not import the value of " - "settings.RICHTEXT_WIDGET_CLASS: " - "%s" % richtext_widget_path)) + raise ImproperlyConfigured( + _( + "Could not import the value of " + "settings.RICHTEXT_WIDGET_CLASS: " + "%s" % richtext_widget_path + ) + ) kwargs["widget"] = widget_class() kwargs.setdefault("required", False) formfield = super(RichTextField, self).formfield(**kwargs) @@ -58,6 +62,7 @@ class MultiChoiceField(models.CharField): def formfield(self, *args, **kwargs): from mezzanine.core.forms import CheckboxSelectMultiple + defaults = { "required": not self.blank, "label": capfirst(self.verbose_name), @@ -85,7 +90,7 @@ def to_python(self, value): def validate(self, value, instance): choices = [str(choice[0]) for choice in self.choices] if set(value) - set(choices): - error = self.error_messages["invalid_choice"] % {'value': value} + error = self.error_messages["invalid_choice"] % {"value": value} raise ValidationError(error) def value_to_string(self, obj): @@ -96,15 +101,20 @@ def value_to_string(self, obj): # Define a ``FileField`` that maps to filebrowser's ``FileBrowseField`` # if available, falling back to Django's ``FileField`` otherwise. try: - FileBrowseField = import_dotted_path("%s.fields.FileBrowseField" % - settings.PACKAGE_NAME_FILEBROWSER) + FileBrowseField = import_dotted_path( + "%s.fields.FileBrowseField" % settings.PACKAGE_NAME_FILEBROWSER + ) except ImportError: + class FileField(models.FileField): def __init__(self, *args, **kwargs): for fb_arg in ("format", "extensions"): kwargs.pop(fb_arg, None) super(FileField, self).__init__(*args, **kwargs) + + else: + class FileField(FileBrowseField): def __init__(self, *args, **kwargs): kwargs.setdefault("directory", kwargs.pop("upload_to", None)) diff --git a/mezzanine/core/forms.py b/mezzanine/core/forms.py index e98e638bd1..4cd855507e 100644 --- a/mezzanine/core/forms.py +++ b/mezzanine/core/forms.py @@ -50,7 +50,7 @@ def media(self): static("mezzanine/tinymce/jquery.tinymce.min.js"), static(settings.TINYMCE_SETUP_JS), ] - css = {'all': [static("mezzanine/tinymce/tinymce.css")]} + css = {"all": [static("mezzanine/tinymce/tinymce.css")]} return forms.Media(js=js, css=css) def __init__(self, *args, **kwargs): @@ -75,8 +75,11 @@ def is_hidden(self): def render(self, *args, **kwargs): rendered = super(OrderWidget, self).render(*args, **kwargs) - arrows = ["" % - (settings.STATIC_URL, arrow) for arrow in ("up", "down")] + arrows = [ + "" + % (settings.STATIC_URL, arrow) + for arrow in ("up", "down") + ] arrows = "%s" % "".join(arrows) return rendered + mark_safe(arrows) @@ -90,9 +93,9 @@ class DynamicInlineAdminForm(forms.ModelForm): class Media: js = [ # Ensure Django's noConflict jQuery has loaded BEFORE our scripts - 'admin/js/jquery.init.js', + "admin/js/jquery.init.js", static("mezzanine/js/%s" % settings.JQUERY_UI_FILENAME), - static("mezzanine/js/admin/dynamic_inline.js") + static("mezzanine/js/admin/dynamic_inline.js"), ] @@ -100,6 +103,7 @@ class SplitSelectDateTimeWidget(forms.SplitDateTimeWidget): """ Combines Django's ``SelectDateTimeWidget`` and ``SelectDateWidget``. """ + def __init__(self, attrs=None, date_format=None, time_format=None): date_widget = SelectDateWidget(attrs=attrs) time_widget = forms.TimeInput(attrs=attrs, format=time_format) @@ -114,14 +118,21 @@ def decompress(self, value): return [None, None] def value_from_datadict(self, data, files, name): - return " ".join([x or "" for x in super(SplitSelectDateTimeWidget, - self).value_from_datadict(data, files, name)]) + return " ".join( + [ + x or "" + for x in super(SplitSelectDateTimeWidget, self).value_from_datadict( + data, files, name + ) + ] + ) class CheckboxSelectMultiple(forms.CheckboxSelectMultiple): """ Wraps render with a CSS class for styling. """ + dont_use_model_field_default_for_empty_data = True def render(self, *args, **kwargs): @@ -137,6 +148,7 @@ def get_edit_form(obj, field_names, data=None, files=None): # Map these form fields to their types defined in the forms app so # we can make use of their custom widgets. from mezzanine.forms import fields + widget_overrides = { forms.DateField: fields.DATE, forms.DateTimeField: fields.DATE_TIME, @@ -175,6 +187,10 @@ def __init__(self, *args, **kwargs): if settings.FORMS_USE_HTML5 and self.fields[f].required: self.fields[f].widget.attrs["required"] = "" - initial = {"app": obj._meta.app_label, "id": obj.id, - "fields": field_names, "model": obj._meta.object_name.lower()} + initial = { + "app": obj._meta.app_label, + "id": obj.id, + "fields": field_names, + "model": obj._meta.object_name.lower(), + } return EditForm(instance=obj, initial=initial, data=data, files=files) diff --git a/mezzanine/core/management/commands/collecttemplates.py b/mezzanine/core/management/commands/collecttemplates.py index 0c7e64e92c..53279695de 100644 --- a/mezzanine/core/management/commands/collecttemplates.py +++ b/mezzanine/core/management/commands/collecttemplates.py @@ -18,41 +18,53 @@ class Command(BaseCommand): can_import_settings = True def add_arguments(self, parser): + parser.add_argument("app_label", nargs="*") parser.add_argument( - 'app_label', nargs='*' - ) - parser.add_argument( - '--noinput', action='store_false', dest='interactive', + "--noinput", + action="store_false", + dest="interactive", help="Do NOT prompt for input of any kind. " - "Existing templates will be overwritten.") + "Existing templates will be overwritten.", + ) parser.add_argument( - '-t', '--template', dest='template', + "-t", + "--template", + dest="template", help="The template name and relative path of a single template " - "to copy, eg: blog/blog_post_list.html") + "to copy, eg: blog/blog_post_list.html", + ) parser.add_argument( - '-a', '--admin', action='store_true', dest='admin', - help="Include admin templates.") + "-a", + "--admin", + action="store_true", + dest="admin", + help="Include admin templates.", + ) def handle(self, *apps, **options): admin = options.get("admin") single_template = options.get("template") - verbosity = int(options.get('verbosity', 1)) + verbosity = int(options.get("verbosity", 1)) to_dir = settings.TEMPLATES[0]["DIRS"][0] templates = [] - apps = apps or options.get('app_label') + apps = apps or options.get("app_label") # Build a list of apps to copy templates from. if apps: # Ensure specified apps are installed. not_installed = set(apps) - set(settings.INSTALLED_APPS) if not_installed: - raise CommandError("Apps are not in INSTALLED_APPS: " + - ", ".join(not_installed)) + raise CommandError( + "Apps are not in INSTALLED_APPS: " + ", ".join(not_installed) + ) else: # No apps specified - default to all in Mezzanine/Cartridge. - apps = [a for a in settings.INSTALLED_APPS - if a.split(".")[0] in ("mezzanine", "cartridge")] + apps = [ + a + for a in settings.INSTALLED_APPS + if a.split(".")[0] in ("mezzanine", "cartridge") + ] # Build a list of name/path pairs of all templates to copy. for app in apps: @@ -61,7 +73,7 @@ def handle(self, *apps, **options): for (dirpath, dirnames, filenames) in os.walk(from_dir): for f in filenames: path = os.path.join(dirpath, f) - name = path[len(from_dir) + 1:] + name = path[len(from_dir) + 1 :] # Bail if template isn't single template requested, # or an admin template without the admin option # specified. @@ -79,23 +91,23 @@ def handle(self, *apps, **options): # Prompt user to overwrite template if interactive and # template exists. if verbosity >= 2: - self.stdout.write("\nCopying: %s" - "\nFrom: %s" - "\nTo: %s" - "\n" % (name, path, dest)) + self.stdout.write( + "\nCopying: %s" + "\nFrom: %s" + "\nTo: %s" + "\n" % (name, path, dest) + ) copy = True if options.get("interactive") and os.path.exists(dest): if name in template_src: - prev = ' [copied from %s]' % template_src[name] + prev = " [copied from %s]" % template_src[name] else: - prev = '' - self.stdout.write("While copying %s [from %s]:\n" % - (name, app)) + prev = "" + self.stdout.write("While copying %s [from %s]:\n" % (name, app)) self.stdout.write("Template exists%s.\n" % prev) confirm = input("Overwrite? (yes/no/abort): ") while confirm not in ("yes", "no", "abort"): - confirm = input( - "Please enter either 'yes', 'no' or 'abort': ") + confirm = input("Please enter either 'yes', 'no' or 'abort': ") if confirm == "abort": self.stdout.write("Aborted\n") break # exit templates copying loop diff --git a/mezzanine/core/management/commands/createdb.py b/mezzanine/core/management/commands/createdb.py index 1b9afb3400..2b210f0b51 100644 --- a/mezzanine/core/management/commands/createdb.py +++ b/mezzanine/core/management/commands/createdb.py @@ -25,31 +25,41 @@ def add_arguments(self, parser): Adds extra command options (executed only by Django >= 1.8). """ parser.add_argument( - "--nodata", action="store_true", dest="nodata", - help="Do not add demo data.") + "--nodata", action="store_true", dest="nodata", help="Do not add demo data." + ) parser.add_argument( - "--noinput", action="store_false", dest="interactive", - help="Do not prompt the user for input of any kind.") + "--noinput", + action="store_false", + dest="interactive", + help="Do not prompt the user for input of any kind.", + ) def handle(self, **options): if "conf_setting" in connection.introspection.table_names(): - raise CommandError("Database already created, you probably " - "want the migrate command") + raise CommandError( + "Database already created, you probably " "want the migrate command" + ) self.verbosity = int(options.get("verbosity", 0)) self.interactive = int(options.get("interactive", 0)) self.no_data = int(options.get("nodata", 0)) - call_command("migrate", verbosity=self.verbosity, - interactive=self.interactive) + call_command("migrate", verbosity=self.verbosity, interactive=self.interactive) mapping = [ [self.create_site, ["django.contrib.sites"]], [self.create_user, ["django.contrib.auth"]], [self.translation_fields, ["modeltranslation"]], - [self.create_pages, ["mezzanine.pages", "mezzanine.forms", - "mezzanine.blog", "mezzanine.galleries"]], + [ + self.create_pages, + [ + "mezzanine.pages", + "mezzanine.forms", + "mezzanine.blog", + "mezzanine.galleries", + ], + ], [self.create_shop, ["cartridge.shop"]], ] @@ -68,12 +78,13 @@ def confirm(self, prompt): def create_site(self): domain = "127.0.0.1:8000" if settings.DEBUG else gethostname() if self.interactive: - entered = input("\nA site record is required.\nPlease " - "enter the domain and optional port in " - "the format 'domain:port'.\nFor example " - "'localhost:8000' or 'www.example.com'. " - "\nHit enter to use the default (%s): " % - domain) + entered = input( + "\nA site record is required.\nPlease " + "enter the domain and optional port in " + "the format 'domain:port'.\nFor example " + "'localhost:8000' or 'www.example.com'. " + "\nHit enter to use the default (%s): " % domain + ) if entered: domain = entered.strip("': ") if self.verbosity >= 1: @@ -96,9 +107,11 @@ def create_user(self): call_command("createsuperuser") else: if self.verbosity >= 1: - print("\nCreating default account " - "(username: %s / password: %s) ...\n" % - (DEFAULT_USERNAME, DEFAULT_PASSWORD)) + print( + "\nCreating default account " + "(username: %s / password: %s) ...\n" + % (DEFAULT_USERNAME, DEFAULT_PASSWORD) + ) args = (DEFAULT_USERNAME, DEFAULT_EMAIL, DEFAULT_PASSWORD) User.objects.create_superuser(*args) @@ -107,12 +120,13 @@ def create_pages(self): install_optional = not self.no_data and self.confirm( "\nWould you like to install some initial " "demo pages?\nEg: About us, Contact form, " - "Gallery. (yes/no): ") + "Gallery. (yes/no): " + ) if install_optional: if self.verbosity >= 1: - print("\nCreating demo pages: About us, Contact form, " - "Gallery ...\n") + print("\nCreating demo pages: About us, Contact form, " "Gallery ...\n") from mezzanine.galleries.models import Gallery + call_command("loaddata", "mezzanine_optional.json") zip_name = "gallery.zip" copy_test_to_media("mezzanine.core", zip_name) @@ -124,7 +138,8 @@ def create_shop(self): call_command("loaddata", "cartridge_required.json") install_optional = not self.no_data and self.confirm( "\nWould you like to install an initial " - "demo product and sale? (yes/no): ") + "demo product and sale? (yes/no): " + ) if install_optional: if self.verbosity >= 1: print("\nCreating demo product and sale ...\n") @@ -133,16 +148,18 @@ def create_shop(self): def translation_fields(self): try: - from modeltranslation.management.commands \ - import (update_translation_fields as update_fields, - sync_translation_fields as create_fields) + from modeltranslation.management.commands import ( + update_translation_fields as update_fields, + sync_translation_fields as create_fields, + ) except ImportError: return update = self.confirm( "\nDjango-modeltranslation is installed for " "this project and you have specified to use " "i18n.\nWould you like to update translation " - "fields from the default ones? (yes/no): ") + "fields from the default ones? (yes/no): " + ) if update: options = { "verbosity": self.verbosity, diff --git a/mezzanine/core/management/commands/runserver.py b/mezzanine/core/management/commands/runserver.py index 4ec4cdb475..c0082682a6 100644 --- a/mezzanine/core/management/commands/runserver.py +++ b/mezzanine/core/management/commands/runserver.py @@ -15,7 +15,6 @@ class MezzStaticFilesHandler(StaticFilesHandler): - def _should_handle(self, path): return path.startswith((settings.STATIC_URL, settings.MEDIA_URL)) @@ -46,8 +45,10 @@ def banner(): db_name = { "microsoft": "sql server", }.get(conn.vendor, conn.vendor) - db_name = "%s%s" % (db_name[:1].upper(), - db_name.replace("sql", "SQL").replace("db", "DB")[1:]) + db_name = "%s%s" % ( + db_name[:1].upper(), + db_name.replace("sql", "SQL").replace("db", "DB")[1:], + ) # Database version - vendor names mapped to functions that # retrieve the version, which should be a sequence of things @@ -70,7 +71,8 @@ def banner(): db_version = ".".join(map(str, db_version_func())) # The raw banner split into lines. - lines = (""" + lines = ( + """ ..... _d^^^^^^^^^b_ @@ -89,15 +91,17 @@ def banner(): '''' -""" % { - "mezzanine_version": mezzanine.__version__, - "django_version": django.get_version(), - "python_version": sys.version.split(" ", 1)[0], - "db_name": db_name, - "db_version": db_version, - "os_name": platform.system(), - "os_version": platform.release(), - }).splitlines()[2:] +""" + % { + "mezzanine_version": mezzanine.__version__, + "django_version": django.get_version(), + "python_version": sys.version.split(" ", 1)[0], + "db_name": db_name, + "db_version": db_version, + "os_name": platform.system(), + "os_version": platform.release(), + } + ).splitlines()[2:] if not supports_color(): return "\n".join(lines) @@ -109,8 +113,10 @@ def banner(): color_states = [ (lambda c: c != " ", {}), (lambda c: c == " ", {"fg": "red"}), - (lambda c: c != " " and not c.isupper(), - {"fg": "white", "bg": "red", "opts": ["bold"]}), + ( + lambda c: c != " " and not c.isupper(), + {"fg": "white", "bg": "red", "opts": ["bold"]}, + ), (lambda c: c == " ", {"fg": "red"}), (lambda c: c == "*", {}), (lambda c: c != "*", {"fg": "red"}), @@ -144,9 +150,11 @@ class Command(runserver.Command): def add_arguments(self, parser): super(Command, self).add_arguments(parser) parser.add_argument( - '--nobanner', action="store_false", dest='show_banner', + "--nobanner", + action="store_false", + dest="show_banner", default=True, - help='Tells Mezzanine not to show a banner at startup.', + help="Tells Mezzanine not to show a banner at startup.", ) def inner_run(self, *args, **kwargs): diff --git a/mezzanine/core/managers.py b/mezzanine/core/managers.py index dccd36cd80..aca16fa51e 100644 --- a/mezzanine/core/managers.py +++ b/mezzanine/core/managers.py @@ -19,11 +19,13 @@ if django.VERSION >= (1, 10): + class ManagerDescriptor(ManagerDescriptor): """ This class exists purely to skip the abstract model check in the __get__ method of Django's ManagerDescriptor. """ + def __get__(self, instance, cls=None): if instance is not None: raise AttributeError( @@ -36,7 +38,8 @@ def __get__(self, instance, cls=None): if cls._meta.swapped: raise AttributeError( "Manager isn't available; " - "'%s.%s' has been swapped for '%s'" % ( + "'%s.%s' has been swapped for '%s'" + % ( cls._meta.app_label, cls._meta.object_name, cls._meta.swapped, @@ -59,12 +62,14 @@ def published(self, for_user=None): current date when specified. """ from mezzanine.core.models import CONTENT_STATUS_PUBLISHED + if for_user is not None and for_user.is_staff: return self.all() return self.filter( Q(publish_date__lte=now()) | Q(publish_date__isnull=True), Q(expiry_date__gte=now()) | Q(expiry_date__isnull=True), - Q(status=CONTENT_STATUS_PUBLISHED)) + Q(status=CONTENT_STATUS_PUBLISHED), + ) def get_by_natural_key(self, slug): return self.get(slug=slug) @@ -119,23 +124,28 @@ def search(self, query, search_fields=None): # ### BUILD LIST OF TERMS TO SEARCH FOR ### # Remove extra spaces, put modifiers inside quoted terms. - terms = " ".join(query.split()).replace("+ ", "+") \ - .replace('+"', '"+') \ - .replace("- ", "-") \ - .replace('-"', '"-') \ - .split('"') + terms = ( + " ".join(query.split()) + .replace("+ ", "+") + .replace('+"', '"+') + .replace("- ", "-") + .replace('-"', '"-') + .split('"') + ) # Strip punctuation other than modifiers from terms and create # terms list, first from quoted terms and then remaining words. - terms = [("" if t[0:1] not in "+-" else t[0:1]) + t.strip(punctuation) - for t in terms[1::2] + "".join(terms[::2]).split()] + terms = [ + ("" if t[0:1] not in "+-" else t[0:1]) + t.strip(punctuation) + for t in terms[1::2] + "".join(terms[::2]).split() + ] # Remove stop words from terms that aren't quoted or use # modifiers, since words with these are an explicit part of # the search query. If doing so ends up with an empty term # list, then keep the stop words. - terms_no_stopwords = [t for t in terms if t.lower() not in - settings.STOP_WORDS] - get_positive_terms = lambda terms: [t.lower().strip(punctuation) - for t in terms if t[0:1] != "-"] + terms_no_stopwords = [t for t in terms if t.lower() not in settings.STOP_WORDS] + get_positive_terms = lambda terms: [ + t.lower().strip(punctuation) for t in terms if t[0:1] != "-" + ] positive_terms = get_positive_terms(terms_no_stopwords) if positive_terms: terms = terms_no_stopwords @@ -151,12 +161,32 @@ def search(self, query, search_fields=None): # ### BUILD QUERYSET FILTER ### # Create the queryset combining each set of terms. - excluded = [reduce(iand, [~Q(**{"%s__icontains" % f: t[1:]}) for f in - self._search_fields.keys()]) for t in terms if t[0:1] == "-"] - required = [reduce(ior, [Q(**{"%s__icontains" % f: t[1:]}) for f in - self._search_fields.keys()]) for t in terms if t[0:1] == "+"] - optional = [reduce(ior, [Q(**{"%s__icontains" % f: t}) for f in - self._search_fields.keys()]) for t in terms if t[0:1] not in "+-"] + excluded = [ + reduce( + iand, + [ + ~Q(**{"%s__icontains" % f: t[1:]}) + for f in self._search_fields.keys() + ], + ) + for t in terms + if t[0:1] == "-" + ] + required = [ + reduce( + ior, + [Q(**{"%s__icontains" % f: t[1:]}) for f in self._search_fields.keys()], + ) + for t in terms + if t[0:1] == "+" + ] + optional = [ + reduce( + ior, [Q(**{"%s__icontains" % f: t}) for f in self._search_fields.keys()] + ) + for t in terms + if t[0:1] not in "+-" + ] queryset = self if excluded: queryset = queryset.filter(reduce(iand, excluded)) @@ -219,7 +249,7 @@ def annotate_scores(self): if result.publish_date: age = (now() - result.publish_date).total_seconds() if age > 0: - count = count / age**settings.SEARCH_AGE_SCALE_FACTOR + count = count / age ** settings.SEARCH_AGE_SCALE_FACTOR results[i].result_count = count return iter(results) @@ -295,10 +325,8 @@ def search(self, *args, **kwargs): if not settings.SEARCH_MODEL_CHOICES: # No choices defined - build a list of leaf models (those # without subclasses) that inherit from Displayable. - models = [m for m in apps.get_models() - if issubclass(m, self.model)] - parents = reduce(ior, [set(m._meta.get_parent_list()) - for m in models]) + models = [m for m in apps.get_models() if issubclass(m, self.model)] + parents = reduce(ior, [set(m._meta.get_parent_list()) for m in models]) models = [m for m in models if m not in parents] elif getattr(self.model._meta, "abstract", False): # When we're combining model subclasses for an abstract @@ -321,9 +349,11 @@ def search(self, *args, **kwargs): else: search_choices.add(model) if errors: - raise ImproperlyConfigured("Could not load the model(s) " - "%s defined in the 'SEARCH_MODEL_CHOICES' setting." - % ", ".join(errors)) + raise ImproperlyConfigured( + "Could not load the model(s) " + "%s defined in the 'SEARCH_MODEL_CHOICES' setting." + % ", ".join(errors) + ) for model in apps.get_models(): # Model is actually a subclasses of what we're @@ -356,8 +386,7 @@ def search(self, *args, **kwargs): queryset = model.objects.published(for_user=user) except AttributeError: queryset = model.objects.get_queryset() - all_results.extend( - queryset.search(*args, **kwargs).annotate_scores()) + all_results.extend(queryset.search(*args, **kwargs).annotate_scores()) return sorted(all_results, key=lambda r: r.result_count, reverse=True) @@ -385,8 +414,7 @@ def get_queryset(self): return super(DjangoCSM, self).get_queryset().filter(**lookup) -class DisplayableManager(CurrentSiteManager, PublishedManager, - SearchableManager): +class DisplayableManager(CurrentSiteManager, PublishedManager, SearchableManager): """ Manually combines ``CurrentSiteManager``, ``PublishedManager`` and ``SearchableManager`` for the ``Displayable`` model. @@ -399,17 +427,21 @@ def url_map(self, for_user=None, **kwargs): instances, including a fake homepage instance if none exists. Used in ``mezzanine.core.sitemaps``. """ + class Home: title = _("Home") + home = Home() setattr(home, "get_absolute_url", home_slug) items = {home.get_absolute_url(): home} for model in apps.get_models(): if issubclass(model, self.model): - if hasattr(model.objects, 'published'): - for item in (model.objects.published(for_user=for_user) - .filter(**kwargs) - .exclude(slug__startswith="http://") - .exclude(slug__startswith="https://")): + if hasattr(model.objects, "published"): + for item in ( + model.objects.published(for_user=for_user) + .filter(**kwargs) + .exclude(slug__startswith="http://") + .exclude(slug__startswith="https://") + ): items[item.get_absolute_url()] = item return items diff --git a/mezzanine/core/middleware.py b/mezzanine/core/middleware.py index a864e66b30..8bdd503bd9 100755 --- a/mezzanine/core/middleware.py +++ b/mezzanine/core/middleware.py @@ -6,8 +6,12 @@ from django.contrib.redirects.models import Redirect from django.core.exceptions import MiddlewareNotUsed from django.urls import reverse, resolve -from django.http import (HttpResponse, HttpResponseRedirect, - HttpResponsePermanentRedirect, HttpResponseGone) +from django.http import ( + HttpResponse, + HttpResponseRedirect, + HttpResponsePermanentRedirect, + HttpResponseGone, +) from django.middleware.csrf import CsrfViewMiddleware, get_token from django.template import Template, RequestContext from django.utils.cache import get_max_age @@ -17,12 +21,19 @@ from mezzanine.conf import settings from mezzanine.core.models import SitePermission -from mezzanine.core.management.commands.createdb import (DEFAULT_USERNAME, - DEFAULT_PASSWORD) -from mezzanine.utils.cache import (cache_key_prefix, nevercache_token, - cache_get, cache_set, cache_installed) +from mezzanine.core.management.commands.createdb import ( + DEFAULT_USERNAME, + DEFAULT_PASSWORD, +) +from mezzanine.utils.cache import ( + cache_key_prefix, + nevercache_token, + cache_get, + cache_set, + cache_installed, +) from mezzanine.utils.conf import middlewares_or_subclasses_installed -from mezzanine.utils.deprecation import (MiddlewareMixin, is_authenticated) +from mezzanine.utils.deprecation import MiddlewareMixin, is_authenticated from mezzanine.utils.sites import current_site_id from mezzanine.utils.urls import next_url @@ -32,6 +43,7 @@ class AdminLoginInterfaceSelectorMiddleware(MiddlewareMixin): Checks for a POST from the admin login view and if authentication is successful and the "site" interface is selected, redirect to the site. """ + def process_view(self, request, view_func, view_args, view_kwargs): login_type = request.POST.get("mezzanine_login_interface") if login_type and not is_authenticated(request.user): @@ -40,13 +52,21 @@ def process_view(self, request, view_func, view_args, view_kwargs): if login_type == "admin": next = next_url(request) or request.get_full_path() username = request.user.get_username() - if (username == DEFAULT_USERNAME and - request.user.check_password(DEFAULT_PASSWORD)): - error(request, mark_safe(_( - "Your account is using the default password, " - "please change it immediately.") - % reverse("user_change_password", - args=(request.user.id,)))) + if username == DEFAULT_USERNAME and request.user.check_password( + DEFAULT_PASSWORD + ): + error( + request, + mark_safe( + _( + "Your account is using the default password, " + "please change it immediately." + ) + % reverse( + "user_change_password", args=(request.user.id,) + ) + ), + ) else: next = "/" return HttpResponseRedirect(next) @@ -61,6 +81,7 @@ class SitePermissionMiddleware(MiddlewareMixin): used in place of ``user.is_staff`` to achieve per-site staff access. """ + def process_view(self, request, view_func, view_args, view_kwargs): has_site_permission = False if request.user.is_superuser: @@ -86,12 +107,14 @@ class TemplateForDeviceMiddleware(MiddlewareMixin): DEPRECATED: Device detection has been removed from Mezzanine. Inserts device-specific templates to the template list. """ + def __init__(self, *args, **kwargs): super(TemplateForDeviceMiddleware, self).__init__(*args, **kwargs) warnings.warn( "`TemplateForDeviceMiddleware` is deprecated. " "Please remove it from your middleware settings.", - FutureWarning, stacklevel=2 + FutureWarning, + stacklevel=2, ) @@ -99,12 +122,14 @@ class TemplateForHostMiddleware(MiddlewareMixin): """ Inserts host-specific templates to the template list. """ + def __init__(self, *args, **kwargs): super(TemplateForHostMiddleware, self).__init__(*args, **kwargs) warnings.warn( "`TemplateForHostMiddleware` is deprecated. Please upgrade " "to the template loader. See: https://goo.gl/SzHPR4", - FutureWarning, stacklevel=2 + FutureWarning, + stacklevel=2, ) @@ -151,7 +176,7 @@ def process_response(self, request, response): # enclosed by it, to avoid possible template code injection. token = nevercache_token() try: - token = token.encode('utf-8') + token = token.encode("utf-8") except AttributeError: pass parts = response.content.split(token) @@ -170,15 +195,11 @@ def process_response(self, request, response): context = RequestContext(request) for i, part in enumerate(parts): if i % 2: - part = ( - Template(part.decode("utf-8")) - .render(context) - .encode("utf-8") - ) + part = Template(part.decode("utf-8")).render(context).encode("utf-8") parts[i] = part response.content = b"".join(parts) response["Content-Length"] = len(response.content) - if hasattr(request, '_messages'): + if hasattr(request, "_messages"): # Required to clear out user messages. request._messages.update(response) # Response needs to be run-through the CSRF middleware again so @@ -205,8 +226,11 @@ class FetchFromCacheMiddleware(MiddlewareMixin): """ def process_request(self, request): - if (cache_installed() and request.method == "GET" and - not is_authenticated(request.user)): + if ( + cache_installed() + and request.method == "GET" + and not is_authenticated(request.user) + ): cache_key = cache_key_prefix(request) + request.get_full_path() response = cache_get(cache_key) # We need to force a csrf token here, as new sessions @@ -232,12 +256,14 @@ class SSLRedirectMiddleware(MiddlewareMixin): Also ensure URLs defined by ``SSL_FORCE_URL_PREFIXES`` are redirect to HTTPS, and redirect all other URLs to HTTP if on HTTPS. """ + def __init__(self, *args): warnings.warn( "SSLRedirectMiddleware is deprecated. See " "https://docs.djangoproject.com/en/stable/ref/middleware/" "#module-django.middleware.security for alternative solutions.", - DeprecationWarning) + DeprecationWarning, + ) super(SSLRedirectMiddleware, self).__init__(*args) def languages(self): diff --git a/mezzanine/core/models.py b/mezzanine/core/models.py index e77f2d4fe2..5c984d3486 100644 --- a/mezzanine/core/models.py +++ b/mezzanine/core/models.py @@ -31,6 +31,7 @@ def wrapped_manager(klass): class Mgr(MultilingualManager, klass): pass + return Mgr() else: return klass() @@ -49,8 +50,7 @@ class SiteRelated(models.Model): class Meta: abstract = True - site = models.ForeignKey("sites.Site", on_delete=models.CASCADE, - editable=False) + site = models.ForeignKey("sites.Site", on_delete=models.CASCADE, editable=False) def save(self, update_site=False, *args, **kwargs): """ @@ -70,9 +70,12 @@ class Slugged(SiteRelated): """ title = models.CharField(_("Title"), max_length=500) - slug = models.CharField(_("URL"), max_length=2000, blank=True, - help_text=_("Leave blank to have the URL auto-generated from " - "the title.")) + slug = models.CharField( + _("URL"), + max_length=2000, + blank=True, + help_text=_("Leave blank to have the URL auto-generated from " "the title."), + ) class Meta: abstract = True @@ -106,14 +109,17 @@ def get_slug(self): attr = "title" if settings.USE_MODELTRANSLATION: from modeltranslation.utils import build_localized_fieldname + attr = build_localized_fieldname(attr, settings.LANGUAGE_CODE) # Get self.title_xx where xx is the default language, if any. # Get self.title otherwise. return slugify(getattr(self, attr, None) or self.title) def admin_link(self): - return format_html("{}", self.get_absolute_url(), - ugettext("View on site")) + return format_html( + "{}", self.get_absolute_url(), ugettext("View on site") + ) + admin_link.short_description = "" @@ -122,15 +128,26 @@ class MetaData(models.Model): Abstract model that provides meta data for content. """ - _meta_title = models.CharField(_("Title"), null=True, blank=True, + _meta_title = models.CharField( + _("Title"), + null=True, + blank=True, max_length=500, - help_text=_("Optional title to be used in the HTML title tag. " - "If left blank, the main title field will be used.")) + help_text=_( + "Optional title to be used in the HTML title tag. " + "If left blank, the main title field will be used." + ), + ) description = models.TextField(_("Description"), blank=True) - gen_description = models.BooleanField(_("Generate description"), - help_text=_("If checked, the description will be automatically " - "generated from content. Uncheck if you want to manually " - "set a custom description."), default=True) + gen_description = models.BooleanField( + _("Generate description"), + help_text=_( + "If checked, the description will be automatically " + "generated from content. Uncheck if you want to manually " + "set a custom description." + ), + default=True, + ) keywords = KeywordsField(verbose_name=_("Keywords")) class Meta: @@ -161,20 +178,20 @@ def description_from_content(self): for field_type in (RichTextField, models.TextField): if not description: for field in self._meta.get_fields(): - if (isinstance(field, field_type) and - field.name != "description"): + if isinstance(field, field_type) and field.name != "description": description = getattr(self, field.name) if description: - from mezzanine.core.templatetags.mezzanine_tags \ - import richtext_filters + from mezzanine.core.templatetags.mezzanine_tags import ( + richtext_filters, + ) + description = richtext_filters(description) break # Fall back to the title if description couldn't be determined. if not description: description = str(self) # Strip everything after the first block or sentence. - ends = ("

    ", "
    ", "
    ", "
    ", "", - "\n", ". ", "! ", "? ") + ends = ("

    ", "
    ", "
    ", "
    ", "", "\n", ". ", "! ", "? ") for end in ends: pos = description.lower().find(end) if pos > -1: @@ -225,16 +242,27 @@ class Displayable(Slugged, MetaData, TimeStamped): blog posts, and Cartridge products. """ - status = models.IntegerField(_("Status"), - choices=CONTENT_STATUS_CHOICES, default=CONTENT_STATUS_PUBLISHED, - help_text=_("With Draft chosen, will only be shown for admin users " - "on the site.")) - publish_date = models.DateTimeField(_("Published from"), + status = models.IntegerField( + _("Status"), + choices=CONTENT_STATUS_CHOICES, + default=CONTENT_STATUS_PUBLISHED, + help_text=_( + "With Draft chosen, will only be shown for admin users " "on the site." + ), + ) + publish_date = models.DateTimeField( + _("Published from"), help_text=_("With Published chosen, won't be shown until this time"), - blank=True, null=True, db_index=True) - expiry_date = models.DateTimeField(_("Expires on"), + blank=True, + null=True, + db_index=True, + ) + expiry_date = models.DateTimeField( + _("Expires on"), help_text=_("With Published chosen, won't be shown after this time"), - blank=True, null=True) + blank=True, + null=True, + ) short_url = models.URLField(blank=True, null=True) in_sitemap = models.BooleanField(_("Show in sitemap"), default=True) @@ -262,6 +290,7 @@ def publish_date_since(self): Returns the time since ``publish_date``. """ return timesince(self.publish_date) + publish_date_since.short_description = _("Published from") def published(self): @@ -270,9 +299,11 @@ def published(self): the publish and expiry dates fall before and after the current date when specified. """ - return (self.status == CONTENT_STATUS_PUBLISHED and - (self.publish_date is None or self.publish_date <= now()) and - (self.expiry_date is None or self.expiry_date >= now())) + return ( + self.status == CONTENT_STATUS_PUBLISHED + and (self.publish_date is None or self.publish_date <= now()) + and (self.expiry_date is None or self.expiry_date >= now()) + ) def get_absolute_url(self): """ @@ -281,8 +312,9 @@ def get_absolute_url(self): contains a URL. """ name = self.__class__.__name__ - raise NotImplementedError("The model %s does not have " - "get_absolute_url defined" % name) + raise NotImplementedError( + "The model %s does not have " "get_absolute_url defined" % name + ) def get_absolute_url_with_host(self): """ @@ -324,11 +356,14 @@ def generate_short_url(self): service have been specified. """ from mezzanine.conf import settings + if settings.BITLY_ACCESS_TOKEN: - url = "https://api-ssl.bit.ly/v3/shorten?%s" % urlencode({ - "access_token": settings.BITLY_ACCESS_TOKEN, - "uri": self.get_absolute_url_with_host(), - }) + url = "https://api-ssl.bit.ly/v3/shorten?%s" % urlencode( + { + "access_token": settings.BITLY_ACCESS_TOKEN, + "uri": self.get_absolute_url_with_host(), + } + ) response = loads(urlopen(url).read().decode("utf-8")) if response["status_code"] == 200: return response["data"]["url"] @@ -391,8 +426,10 @@ class and if found, copies it to a custom attribute and deletes it def __new__(cls, name, bases, attrs): if "Meta" not in attrs: + class Meta: pass + attrs["Meta"] = Meta if hasattr(attrs["Meta"], "order_with_respect_to"): order_field = attrs["Meta"].order_with_respect_to @@ -497,8 +534,12 @@ class Ownable(models.Model): Abstract model that provides ownership of an object for a user. """ - user = models.ForeignKey(user_model_name, on_delete=models.CASCADE, - verbose_name=_("Author"), related_name="%(class)ss") + user = models.ForeignKey( + user_model_name, + on_delete=models.CASCADE, + verbose_name=_("Author"), + related_name="%(class)ss", + ) class Meta: abstract = True @@ -521,6 +562,7 @@ class ContentTyped(models.Model): - Include "admin/includes/content_typed_change_list.html" in the change_list.html template. """ + content_model = models.CharField(editable=False, max_length=50, null=True) class Meta: @@ -538,8 +580,11 @@ def get_content_model_name(cls): def get_content_models(cls): """ Return all subclasses of the concrete model. """ concrete_model = base_concrete_model(ContentTyped, cls) - return [m for m in apps.get_models() - if m is not concrete_model and issubclass(m, concrete_model)] + return [ + m + for m in apps.get_models() + if m is not concrete_model and issubclass(m, concrete_model) + ] def set_content_model(self): """ @@ -547,17 +592,16 @@ def set_content_model(self): the base class. """ if not self.content_model: - is_base_class = ( - base_concrete_model(ContentTyped, self) == self.__class__) + is_base_class = base_concrete_model(ContentTyped, self) == self.__class__ self.content_model = ( - None if is_base_class else self.get_content_model_name()) + None if is_base_class else self.get_content_model_name() + ) def get_content_model(self): """ Return content model, or if this is the base class return it. """ - return (getattr(self, self.content_model) if self.content_model - else self) + return getattr(self, self.content_model) if self.content_model else self class SitePermission(models.Model): @@ -567,10 +611,13 @@ class SitePermission(models.Model): access. """ - user = models.OneToOneField(user_model_name, on_delete=models.CASCADE, - verbose_name=_("Author"), related_name="%(class)ss") - sites = models.ManyToManyField("sites.Site", blank=True, - verbose_name=_("Sites")) + user = models.OneToOneField( + user_model_name, + on_delete=models.CASCADE, + verbose_name=_("Author"), + related_name="%(class)ss", + ) + sites = models.ManyToManyField("sites.Site", blank=True, verbose_name=_("Sites")) class Meta: verbose_name = _("Site permission") diff --git a/mezzanine/core/templatetags/mezzanine_tags.py b/mezzanine/core/templatetags/mezzanine_tags.py index cda19afeef..8181b534ca 100644 --- a/mezzanine/core/templatetags/mezzanine_tags.py +++ b/mezzanine/core/templatetags/mezzanine_tags.py @@ -3,6 +3,7 @@ from hashlib import md5 import os + try: from urllib.parse import quote, unquote except ImportError: @@ -42,6 +43,7 @@ if "compressor" in settings.INSTALLED_APPS: + @register.tag def compress(parser, token): """ @@ -50,8 +52,12 @@ def compress(parser, token): a dummy version when django-compressor isn't installed. """ from compressor.templatetags.compress import compress + return compress(parser, token) + + else: + @register.to_end_tag def compress(parsed, context, token): """ @@ -62,6 +68,7 @@ def compress(parsed, context, token): def initialize_nevercache(): if cache_installed(): + @register.tag def nevercache(parser, token): """ @@ -87,7 +94,9 @@ def nevercache(parser, token): start, end = tag_mapping[token_type] text.append("%s%s%s" % (start, token.contents, end)) parser.unclosed_block_tag(end_tag) + else: + @register.to_end_tag def nevercache(parsed, context, token): """ @@ -122,6 +131,7 @@ def sort_by(items, attr): """ General sort filter - sorts by either attribute or key. """ + def key_func(item): try: return getattr(item, attr) @@ -130,6 +140,7 @@ def key_func(item): return item[attr] except TypeError: getattr(item, attr) # Reraise AttributeError + return sorted(items, key=key_func) @@ -140,8 +151,11 @@ def is_installed(app_name): ``INSTALLED_APPS`` setting. """ from warnings import warn - warn("The is_installed filter is deprecated. Please use the tag " - "{% ifinstalled appname %}{% endifinstalled %}") + + warn( + "The is_installed filter is deprecated. Please use the tag " + "{% ifinstalled appname %}{% endifinstalled %}" + ) return app_name in settings.INSTALLED_APPS @@ -162,9 +176,11 @@ def ifinstalled(parser, token): try: tag, app = token.split_contents() except ValueError: - raise TemplateSyntaxError("ifinstalled should be in the form: " - "{% ifinstalled app_name %}" - "{% endifinstalled %}") + raise TemplateSyntaxError( + "ifinstalled should be in the form: " + "{% ifinstalled app_name %}" + "{% endifinstalled %}" + ) end_tag = "end" + tag unmatched_end_tag = 1 @@ -271,8 +287,17 @@ def search_form(context, search_model_names=None): @register.simple_tag -def thumbnail(image_url, width, height, upscale=True, quality=95, left=.5, - top=.5, padding=False, padding_color="#fff"): +def thumbnail( + image_url, + width, + height, + upscale=True, + quality=95, + left=0.5, + top=0.5, + padding=False, + padding_color="#fff", +): """ Given the URL to an image, resizes the image using the given width and height on the first time it is requested, and returns the URL @@ -298,7 +323,7 @@ def thumbnail(image_url, width, height, upscale=True, quality=95, left=.5, thumb_name = "%s-%sx%s" % (image_prefix, width, height) if not upscale: thumb_name += "-no-upscale" - if left != .5 or top != .5: + if left != 0.5 or top != 0.5: left = min(1, max(0, left)) top = min(1, max(0, top)) thumb_name = "%s-%sx%s" % (thumb_name, left, top) @@ -311,8 +336,9 @@ def thumbnail(image_url, width, height, upscale=True, quality=95, left=.5, # image, which is something we do in filebrowser when a new image # is written, allowing us to purge any previously generated # thumbnails that may match a new image name. - thumb_dir = os.path.join(settings.MEDIA_ROOT, image_dir, - settings.THUMBNAILS_DIR_NAME, image_name) + thumb_dir = os.path.join( + settings.MEDIA_ROOT, image_dir, settings.THUMBNAILS_DIR_NAME, image_name + ) if not os.path.exists(thumb_dir): try: os.makedirs(thumb_dir) @@ -320,9 +346,11 @@ def thumbnail(image_url, width, height, upscale=True, quality=95, left=.5, pass thumb_path = os.path.join(thumb_dir, thumb_name) - thumb_url = "%s/%s/%s" % (settings.THUMBNAILS_DIR_NAME, - quote(image_name.encode("utf-8")), - quote(thumb_name.encode("utf-8"))) + thumb_url = "%s/%s/%s" % ( + settings.THUMBNAILS_DIR_NAME, + quote(image_name.encode("utf-8")), + quote(thumb_name.encode("utf-8")), + ) image_url_path = os.path.dirname(image_url) if image_url_path: thumb_url = "%s/%s" % (image_url_path, thumb_url) @@ -334,6 +362,7 @@ def thumbnail(image_url, width, height, upscale=True, quality=95, left=.5, # but somehow the locale has changed and the filesystem does not # support utf-8. from mezzanine.core.exceptions import FileSystemEncodingChanged + raise FileSystemEncodingChanged() if thumb_exists: # Thumbnail exists, don't generate it. @@ -361,15 +390,16 @@ def thumbnail(image_url, width, height, upscale=True, quality=95, left=.5, orientation = None if orientation: methods = { - 2: (Image.FLIP_LEFT_RIGHT,), - 3: (Image.ROTATE_180,), - 4: (Image.FLIP_TOP_BOTTOM,), - 5: (Image.FLIP_LEFT_RIGHT, Image.ROTATE_90), - 6: (Image.ROTATE_270,), - 7: (Image.FLIP_LEFT_RIGHT, Image.ROTATE_270), - 8: (Image.ROTATE_90,)}.get(orientation, ()) + 2: (Image.FLIP_LEFT_RIGHT,), + 3: (Image.ROTATE_180,), + 4: (Image.FLIP_TOP_BOTTOM,), + 5: (Image.FLIP_LEFT_RIGHT, Image.ROTATE_90), + 6: (Image.ROTATE_270,), + 7: (Image.FLIP_LEFT_RIGHT, Image.ROTATE_270), + 8: (Image.ROTATE_90,), + }.get(orientation, ()) if methods: - image_info.pop('exif', None) + image_info.pop("exif", None) for method in methods: image = image.transpose(method) @@ -387,8 +417,7 @@ def thumbnail(image_url, width, height, upscale=True, quality=95, left=.5, to_width = from_width * to_height // from_height elif to_height == 0: to_height = from_height * to_width // from_width - if image.mode not in ("P", "L", "RGBA") \ - and filetype not in ("JPG", "JPEG"): + if image.mode not in ("P", "L", "RGBA") and filetype not in ("JPG", "JPEG"): try: image = image.convert("RGBA") except: @@ -449,17 +478,15 @@ def editable_loader(context): "has_site_permission": has_site_permission(user), "request": context["request"], } - if (settings.INLINE_EDITING_ENABLED and - template_vars["has_site_permission"]): + if settings.INLINE_EDITING_ENABLED and template_vars["has_site_permission"]: t = get_template("includes/editable_toolbar.html") template_vars["REDIRECT_FIELD_NAME"] = REDIRECT_FIELD_NAME - template_vars["editable_obj"] = context.get("editable_obj", - context.get("page", None)) - template_vars["accounts_logout_url"] = context.get( - "accounts_logout_url", None) + template_vars["editable_obj"] = context.get( + "editable_obj", context.get("page", None) + ) + template_vars["accounts_logout_url"] = context.get("accounts_logout_url", None) template_vars["toolbar"] = t.render(template_vars) - template_vars["richtext_media"] = RichTextField().formfield( - ).widget.media + template_vars["richtext_media"] = RichTextField().formfield().widget.media return template_vars @@ -474,17 +501,19 @@ def richtext_filters(content): content = filter_func(content) if not isinstance(content, SafeText): # raise TypeError( - # filter_name + " must mark it's return value as safe. See " - # "https://docs.djangoproject.com/en/stable/topics/security/" - # "#cross-site-scripting-xss-protection") + # filter_name + " must mark it's return value as safe. See " + # "https://docs.djangoproject.com/en/stable/topics/security/" + # "#cross-site-scripting-xss-protection") import warnings + warnings.warn( filter_name + " needs to ensure that any untrusted inputs are " "properly escaped and mark the html it returns as safe. In a " "future release this will cause an exception. See " "https://docs.djangoproject.com/en/stable/topics/security/" "cross-site-scripting-xss-protection", - FutureWarning) + FutureWarning, + ) content = mark_safe(content) return content @@ -498,6 +527,7 @@ def editable(parsed, context, token): ``True``, or the logged in user has change permissions for the model. """ + def parse_field(field): field = field.split(".") obj = context.get(field.pop(0), None) @@ -537,6 +567,7 @@ def try_url(url_name): tests are running. """ from warnings import warn + warn("try_url is deprecated, use the url tag with the 'as' arg instead.") try: url = reverse(url_name) @@ -564,8 +595,7 @@ def admin_app_list(request): item_title, item = item else: item_title = None - menu_order[item] = (group_index, group_title, - item_index, item_title) + menu_order[item] = (group_index, group_title, item_index, item_title) # Add all registered models, using group and title from menu order. for (model, model_admin) in admin.site._registry.items(): @@ -573,12 +603,14 @@ def admin_app_list(request): in_menu = not hasattr(model_admin, "in_menu") or model_admin.in_menu() if hasattr(model_admin, "in_menu"): import warnings + warnings.warn( - 'ModelAdmin.in_menu() has been replaced with ' - 'ModelAdmin.has_module_permission(request). See ' - 'https://docs.djangoproject.com/en/stable/ref/contrib/admin/' - '#django.contrib.admin.ModelAdmin.has_module_permission.', - DeprecationWarning) + "ModelAdmin.in_menu() has been replaced with " + "ModelAdmin.has_module_permission(request). See " + "https://docs.djangoproject.com/en/stable/ref/contrib/admin/" + "#django.contrib.admin.ModelAdmin.has_module_permission.", + DeprecationWarning, + ) in_menu = in_menu and model_admin.has_module_permission(request) if in_menu and request.user.has_module_perms(opts.app_label): admin_url_name = "" @@ -595,8 +627,9 @@ def admin_app_list(request): if admin_url_name: model_label = "%s.%s" % (opts.app_label, opts.object_name) try: - app_index, app_title, model_index, model_title = \ - menu_order[model_label] + app_index, app_title, model_index, model_title = menu_order[ + model_label + ] except KeyError: app_index = None try: @@ -619,14 +652,16 @@ def admin_app_list(request): "name": app_title, "models": [], } - app_dict[app_title]["models"].append({ - "index": model_index, - "perms": model_admin.get_model_perms(request), - "name": model_title, - "object_name": opts.object_name, - "admin_url": change_url, - "add_url": add_url - }) + app_dict[app_title]["models"].append( + { + "index": model_index, + "perms": model_admin.get_model_perms(request), + "name": model_title, + "object_name": opts.object_name, + "admin_url": change_url, + "add_url": add_url, + } + ) # Menu may also contain view or url pattern names given as (title, name). for (item_url, item) in menu_order.items(): @@ -641,12 +676,14 @@ def admin_app_list(request): "name": app_title, "models": [], } - app_dict[app_title]["models"].append({ - "index": item_index, - "perms": {"custom": True}, - "name": item_title, - "admin_url": item_url, - }) + app_dict[app_title]["models"].append( + { + "index": item_index, + "perms": {"custom": True}, + "name": item_title, + "admin_url": item_url, + } + ) app_list = list(app_dict.values()) sort = lambda x: (x["index"] if x["index"] is not None else 999, x["name"]) @@ -656,8 +693,7 @@ def admin_app_list(request): return app_list -@register.inclusion_tag("admin/includes/dropdown_menu.html", - takes_context=True) +@register.inclusion_tag("admin/includes/dropdown_menu.html", takes_context=True) def admin_dropdown_menu(context): """ Renders the app list for the admin dropdown menu navigation. @@ -686,8 +722,7 @@ def app_list(context): return context.flatten() -@register.inclusion_tag("admin/includes/recent_actions.html", - takes_context=True) +@register.inclusion_tag("admin/includes/recent_actions.html", takes_context=True) def recent_actions(context): """ Renders the recent actions list for the admin dashboard widget. @@ -731,14 +766,17 @@ def translate_url(context, language): url = reverse(view.func, args=view.args, kwargs=view.kwargs) except NoReverseMatch: try: - url_name = (view.url_name if not view.namespace - else '%s:%s' % (view.namespace, view.url_name)) + url_name = ( + view.url_name + if not view.namespace + else "%s:%s" % (view.namespace, view.url_name) + ) url = reverse(url_name, args=view.args, kwargs=view.kwargs) except NoReverseMatch: url_name = "admin:" + view.url_name url = reverse(url_name, args=view.args, kwargs=view.kwargs) translation.activate(current_language) - qs = context['request'].META.get("QUERY_STRING", "") + qs = context["request"].META.get("QUERY_STRING", "") if qs: url += "?" + qs return url diff --git a/mezzanine/core/tests.py b/mezzanine/core/tests.py index 36b67aa83b..eb51c7f345 100644 --- a/mezzanine/core/tests.py +++ b/mezzanine/core/tests.py @@ -34,30 +34,33 @@ from mezzanine.core.admin import BaseDynamicInlineAdmin from mezzanine.core.fields import RichTextField, MultiChoiceField from mezzanine.core.managers import DisplayableManager -from mezzanine.core.models import (CONTENT_STATUS_DRAFT, - CONTENT_STATUS_PUBLISHED) +from mezzanine.core.models import CONTENT_STATUS_DRAFT, CONTENT_STATUS_PUBLISHED from mezzanine.forms.admin import FieldAdmin from mezzanine.forms.models import Form from mezzanine.pages.models import Page, RichTextPage -from mezzanine.utils.deprecation import (get_middleware_setting, - get_middleware_setting_name) +from mezzanine.utils.deprecation import ( + get_middleware_setting, + get_middleware_setting_name, +) from mezzanine.utils.importing import import_dotted_path -from mezzanine.utils.tests import (TestCase, run_pyflakes_for_package, - run_pep8_for_package) +from mezzanine.utils.tests import ( + TestCase, + run_pyflakes_for_package, + run_pep8_for_package, +) from mezzanine.utils.html import TagCloser, escape class CoreTests(TestCase): - def test_tagcloser(self): """ Test tags are closed, and tags that shouldn't be closed aren't. """ - self.assertEqual(TagCloser("

    Unclosed paragraph").html, - "

    Unclosed paragraph

    ") + self.assertEqual( + TagCloser("

    Unclosed paragraph").html, "

    Unclosed paragraph

    " + ) - self.assertEqual(TagCloser("Line break
    ").html, - "Line break
    ") + self.assertEqual(TagCloser("Line break
    ").html, "Line break
    ") def test_escape(self): """ @@ -85,30 +88,28 @@ def test_utils(self): try: import_dotted_path("mezzanine.core") except ImportError: - self.fail("mezzanine.utils.imports.import_dotted_path" - "could not import \"mezzanine.core\"") + self.fail( + "mezzanine.utils.imports.import_dotted_path" + 'could not import "mezzanine.core"' + ) - @skipUnless("mezzanine.pages" in settings.INSTALLED_APPS, - "pages app required") + @skipUnless("mezzanine.pages" in settings.INSTALLED_APPS, "pages app required") def test_description(self): """ Test generated description is text version of the first line of content. """ description = "

    How now brown cow

    " - page = RichTextPage.objects.create(title="Draft", - content=description * 3) + page = RichTextPage.objects.create(title="Draft", content=description * 3) self.assertEqual(page.description, strip_tags(description)) - @skipUnless("mezzanine.pages" in settings.INSTALLED_APPS, - "pages app required") + @skipUnless("mezzanine.pages" in settings.INSTALLED_APPS, "pages app required") def test_draft(self): """ Test a draft object as only being viewable by a staff member. """ self.client.logout() - draft = RichTextPage.objects.create(title="Draft", - status=CONTENT_STATUS_DRAFT) + draft = RichTextPage.objects.create(title="Draft", status=CONTENT_STATUS_DRAFT) response = self.client.get(draft.get_absolute_url(), follow=True) self.assertEqual(response.status_code, 404) self.client.login(username=self._username, password=self._password) @@ -121,21 +122,22 @@ def test_searchable_manager_search_fields(self): """ manager = DisplayableManager() self.assertFalse(manager._search_fields) - manager = DisplayableManager(search_fields={'foo': 10}) + manager = DisplayableManager(search_fields={"foo": 10}) self.assertTrue(manager._search_fields) - @skipUnless("mezzanine.pages" in settings.INSTALLED_APPS, - "pages app required") + @skipUnless("mezzanine.pages" in settings.INSTALLED_APPS, "pages app required") def test_search(self): """ Objects with status "Draft" should not be within search results. """ RichTextPage.objects.all().delete() published = {"status": CONTENT_STATUS_PUBLISHED} - first = RichTextPage.objects.create(title="test page", - status=CONTENT_STATUS_DRAFT).id - second = RichTextPage.objects.create(title="test another test page", - **published).id + first = RichTextPage.objects.create( + title="test page", status=CONTENT_STATUS_DRAFT + ).id + second = RichTextPage.objects.create( + title="test another test page", **published + ).id # Draft shouldn't be a result. results = RichTextPage.objects.search("test") self.assertEqual(len(results), 1) @@ -162,9 +164,11 @@ def test_search(self): # Test ordering without age scaling. settings.SEARCH_AGE_SCALE_FACTOR = 0 RichTextPage.objects.filter(id=first).update( - publish_date=now() - timedelta(days=3)) + publish_date=now() - timedelta(days=3) + ) RichTextPage.objects.filter(id=second).update( - publish_date=datetime(2016, 1, 1, tzinfo=pytz.utc)) + publish_date=datetime(2016, 1, 1, tzinfo=pytz.utc) + ) results = RichTextPage.objects.search("test") self.assertEqual(len(results), 2) if results: @@ -213,8 +217,7 @@ def _test_site_pages(self, title, status, count): response = self.client.get(pages[0].get_absolute_url(), follow=True) self.assertEqual(response.status_code, code) - @skipUnless("mezzanine.pages" in settings.INSTALLED_APPS, - "pages app required") + @skipUnless("mezzanine.pages" in settings.INSTALLED_APPS, "pages app required") def test_multisite(self): from django.conf import settings @@ -272,48 +275,43 @@ def test_multisite(self): def _static_proxy(self, querystring): self.client.login(username=self._username, password=self._password) - proxy_url = '%s?%s' % (reverse('static_proxy'), querystring) + proxy_url = "%s?%s" % (reverse("static_proxy"), querystring) response = self.client.get(proxy_url) self.assertEqual(response.status_code, 200) - @override_settings(STATIC_URL='/static/') + @override_settings(STATIC_URL="/static/") def test_static_proxy(self): - querystring = urlencode([('u', static("test/image.jpg"))]) + querystring = urlencode([("u", static("test/image.jpg"))]) self._static_proxy(querystring) - @override_settings(STATIC_URL='http://testserver/static/') + @override_settings(STATIC_URL="http://testserver/static/") def test_static_proxy_with_host(self): - querystring = urlencode( - [('u', static("test/image.jpg"))]) + querystring = urlencode([("u", static("test/image.jpg"))]) self._static_proxy(querystring) - @override_settings(STATIC_URL='http://testserver:8000/static/') + @override_settings(STATIC_URL="http://testserver:8000/static/") def test_static_proxy_with_static_url_with_full_host(self): from django.templatetags.static import static - querystring = urlencode([('u', static("test/image.jpg"))]) + + querystring = urlencode([("u", static("test/image.jpg"))]) self._static_proxy(querystring) def _get_csrftoken(self, response): csrf = re.findall( - br'', - response.content + br'', + response.content, ) - self.assertEqual(len(csrf), 1, 'No csrfmiddlewaretoken found!') + self.assertEqual(len(csrf), 1, "No csrfmiddlewaretoken found!") return csrf[0] def _get_formurl(self, response): - action = re.findall( - br'
    ', - response.content - ) - self.assertEqual(len(action), 1, 'No form with action found!') - if action[0] == b'': - action = response.request['PATH_INFO'] + action = re.findall(br'', response.content) + self.assertEqual(len(action), 1, "No form with action found!") + if action[0] == b"": + action = response.request["PATH_INFO"] return action - @skipUnless('mezzanine.pages' in settings.INSTALLED_APPS, - 'pages app required') + @skipUnless("mezzanine.pages" in settings.INSTALLED_APPS, "pages app required") @override_settings(LANGUAGE_CODE="en") def test_password_reset(self): """ @@ -323,11 +321,10 @@ def test_password_reset(self): del mail.outbox[:] # Go to admin-login, search for reset-link - response = self.client.get('/admin/', follow=True) - self.assertContains(response, u'Forgot password?') + response = self.client.get("/admin/", follow=True) + self.assertContains(response, u"Forgot password?") url = re.findall( - b'Forgot password\\?', - response.content + b"Forgot password\\?", response.content ) self.assertEqual(len(url), 1) url = force_str(url[0]) @@ -338,26 +335,28 @@ def test_password_reset(self): csrf = self._get_csrftoken(response) url = self._get_formurl(response) - response = self.client.post(url, { - 'csrfmiddlewaretoken': csrf, - 'email': self._emailaddress - }) + response = self.client.post( + url, {"csrfmiddlewaretoken": csrf, "email": self._emailaddress} + ) self.assertEqual(response.status_code, 302) self.assertEqual(len(mail.outbox), 1) # Get reset-link, submit form url = re.findall( - r'http://example.com((?:/\w{2,3})?/reset/[^/]+/[^/]+/)', - mail.outbox[0].body + r"http://example.com((?:/\w{2,3})?/reset/[^/]+/[^/]+/)", mail.outbox[0].body )[0] response = self.client.get(url, follow=True) csrf = self._get_csrftoken(response) url = self._get_formurl(response) - response = self.client.post(url, { - 'csrfmiddlewaretoken': csrf, - 'new_password1': 'newdefault', - 'new_password2': 'newdefault' - }, follow=True) + response = self.client.post( + url, + { + "csrfmiddlewaretoken": csrf, + "new_password1": "newdefault", + "new_password2": "newdefault", + }, + follow=True, + ) self.assertEqual(response.status_code, 200) def test_richtext_widget(self): @@ -372,31 +371,32 @@ class RichTextModel(models.Model): form_class = modelform_factory( RichTextModel, - fields=('text_default', 'text_overridden'), - widgets={'text_overridden': Textarea}) + fields=("text_default", "text_overridden"), + widgets={"text_overridden": Textarea}, + ) form = form_class() richtext_widget = import_dotted_path(settings.RICHTEXT_WIDGET_CLASS) - self.assertIsInstance(form.fields['text_default'].widget, - richtext_widget) - self.assertIsInstance(form.fields['text_overridden'].widget, - Textarea) + self.assertIsInstance(form.fields["text_default"].widget, richtext_widget) + self.assertIsInstance(form.fields["text_overridden"].widget, Textarea) def test_admin_sites_dropdown(self): """ Ensures the site selection dropdown appears in the admin. """ self.client.login(username=self._username, password=self._password) - response = self.client.get('/admin/', follow=True) + response = self.client.get("/admin/", follow=True) set_site_url = reverse("set_site") # Set site URL shouldn't appear without multiple sites. self.assertNotContains(response, set_site_url) - site1 = Site.objects.create(domain="test-site-dropdown1.com", - name="test-site-dropdown1.com") - site2 = Site.objects.create(domain="test-site-dropdown2.com", - name="test-site-dropdown2.com") - response = self.client.get('/admin/', follow=True) + site1 = Site.objects.create( + domain="test-site-dropdown1.com", name="test-site-dropdown1.com" + ) + site2 = Site.objects.create( + domain="test-site-dropdown2.com", name="test-site-dropdown2.com" + ) + response = self.client.get("/admin/", follow=True) self.assertContains(response, set_site_url) self.assertContains(response, site1.name) self.assertContains(response, site2.name) @@ -408,74 +408,90 @@ def test_dynamic_inline_admins(self): Verifies that ``BaseDynamicInlineAdmin`` properly adds the ``_order`` field for admins of ``Orderable`` subclasses. """ - request = self._request_factory.get('/admin/') + request = self._request_factory.get("/admin/") request.user = self._user field_admin = FieldAdmin(Form, AdminSite()) fieldsets = field_admin.get_fieldsets(request) - self.assertEqual(fieldsets[0][1]['fields'][-1], '_order') + self.assertEqual(fieldsets[0][1]["fields"][-1], "_order") fields = field_admin.get_fields(request) - self.assertEqual(fields[-1], '_order') + self.assertEqual(fields[-1], "_order") def test_dynamic_inline_admins_fields_tuple(self): """ Checks if moving the ``_order`` field works with immutable sequences. """ + class MyModelInline(BaseDynamicInlineAdmin, InlineModelAdmin): # Any model would work since we're only instantiating the class and # not actually using it. model = RichTextPage - fields = ('a', '_order', 'b') + fields = ("a", "_order", "b") - request = self._request_factory.get('/admin/') + request = self._request_factory.get("/admin/") inline = MyModelInline(None, AdminSite()) - fields = inline.get_fieldsets(request)[0][1]['fields'] - self.assertSequenceEqual(fields, ('a', 'b', '_order')) + fields = inline.get_fieldsets(request)[0][1]["fields"] + self.assertSequenceEqual(fields, ("a", "b", "_order")) def test_dynamic_inline_admins_fields_without_order(self): """ Checks that ``_order`` field will be added if ``fields`` are listed without it. """ + class MyModelInline(BaseDynamicInlineAdmin, InlineModelAdmin): model = RichTextPage - fields = ('a', 'b') + fields = ("a", "b") - request = self._request_factory.get('/admin/') + request = self._request_factory.get("/admin/") inline = MyModelInline(None, AdminSite()) - fields = inline.get_fieldsets(request)[0][1]['fields'] - self.assertSequenceEqual(fields, ('a', 'b', '_order')) + fields = inline.get_fieldsets(request)[0][1]["fields"] + self.assertSequenceEqual(fields, ("a", "b", "_order")) def test_dynamic_inline_admins_fieldsets(self): """ Tests if ``_order`` is moved to the end of the last fieldsets fields. """ + class MyModelInline(BaseDynamicInlineAdmin, InlineModelAdmin): model = RichTextPage - fieldsets = (("Fieldset 1", {'fields': ('a',)}), - ("Fieldset 2", {'fields': ('_order', 'b')}), - ("Fieldset 3", {'fields': ('c')})) + fieldsets = ( + ("Fieldset 1", {"fields": ("a",)}), + ("Fieldset 2", {"fields": ("_order", "b")}), + ("Fieldset 3", {"fields": ("c")}), + ) - request = self._request_factory.get('/admin/') + request = self._request_factory.get("/admin/") inline = MyModelInline(None, AdminSite()) fieldsets = inline.get_fieldsets(request) - self.assertEqual(fieldsets[-1][1]["fields"][-1], '_order') - self.assertNotIn('_order', fieldsets[1][1]["fields"]) + self.assertEqual(fieldsets[-1][1]["fields"][-1], "_order") + self.assertNotIn("_order", fieldsets[1][1]["fields"]) def test_cache_installed(self): test_contexts = [ - (False, - ['mezzanine.core.middleware.FetchFromCacheMiddleware']), - (True, - ['mezzanine.core.middleware.UpdateCacheMiddleware', - 'mezzanine.core.tests.SubclassMiddleware']), - (True, - ['mezzanine.core.middleware.UpdateCacheMiddleware', - 'mezzanine.core.tests.FetchFromCacheMiddleware', - 'mezzanine.core.tests.function_middleware']), - (True, - ['mezzanine.core.middleware.UpdateCacheMiddleware', - 'mezzanine.core.middleware.FetchFromCacheMiddleware']), + (False, ["mezzanine.core.middleware.FetchFromCacheMiddleware"]), + ( + True, + [ + "mezzanine.core.middleware.UpdateCacheMiddleware", + "mezzanine.core.tests.SubclassMiddleware", + ], + ), + ( + True, + [ + "mezzanine.core.middleware.UpdateCacheMiddleware", + "mezzanine.core.tests.FetchFromCacheMiddleware", + "mezzanine.core.tests.function_middleware", + ], + ), + ( + True, + [ + "mezzanine.core.middleware.UpdateCacheMiddleware", + "mezzanine.core.middleware.FetchFromCacheMiddleware", + ], + ), ] with self.settings(TESTING=False): # Well, this is silly @@ -495,13 +511,12 @@ class SubclassMiddleware(FetchFromCacheMiddleware): def function_middleware(get_response): def middleware(request): return get_response(request) + return middleware -@skipUnless("mezzanine.pages" in settings.INSTALLED_APPS, - "pages app required") +@skipUnless("mezzanine.pages" in settings.INSTALLED_APPS, "pages app required") class SiteRelatedTestCase(TestCase): - def test_update_site(self): from django.conf import settings from mezzanine.utils.sites import current_site_id @@ -598,19 +613,22 @@ def tearDownClass(cls): cache_installed.cache_clear() initialize_nevercache() - @override_settings(**{ - "ROOT_URLCONF": CSRFTestViews, - "CACHES": { - 'default': { - 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', - } - }, - get_middleware_setting_name(): ( - 'mezzanine.core.middleware.UpdateCacheMiddleware',) + - get_middleware_setting() + - ('mezzanine.core.middleware.FetchFromCacheMiddleware', - ), - "TESTING": False}) + @override_settings( + **{ + "ROOT_URLCONF": CSRFTestViews, + "CACHES": { + "default": { + "BACKEND": "django.core.cache.backends.locmem.LocMemCache", + } + }, + get_middleware_setting_name(): ( + "mezzanine.core.middleware.UpdateCacheMiddleware", + ) + + get_middleware_setting() + + ("mezzanine.core.middleware.FetchFromCacheMiddleware",), + "TESTING": False, + } + ) def test_csrf_cookie_with_nevercache(self): """ Test that the CSRF cookie is properly set when using nevercache. @@ -635,8 +653,9 @@ def test_csrf_cookie_with_nevercache(self): class DisplayableTestCase(TestCase): def test_published(self): - page = Page.objects.create(publish_date=None, expiry_date=None, - status=CONTENT_STATUS_DRAFT) + page = Page.objects.create( + publish_date=None, expiry_date=None, status=CONTENT_STATUS_DRAFT + ) self.assertFalse(page.published()) page.status = CONTENT_STATUS_PUBLISHED @@ -654,7 +673,6 @@ def test_published(self): class ContentTypedTestCase(TestCase): - def test_set_content_model_base_concrete_class(self): page = Page.objects.create() page.set_content_model() @@ -665,7 +683,7 @@ def test_set_content_model_subclass(self): richtextpage = RichTextPage.objects.create() richtextpage.set_content_model() page = Page.objects.get(pk=richtextpage.pk) - self.assertEqual(page.content_model, 'richtextpage') + self.assertEqual(page.content_model, "richtextpage") self.assertEqual(page.get_content_model(), richtextpage) def test_set_content_model_again(self): @@ -680,10 +698,10 @@ def test_set_content_model_again(self): richtextpage = RichTextPage.objects.create() richtextpage.set_content_model() page = Page.objects.get(pk=richtextpage.pk) - self.assertEqual(page.content_model, 'richtextpage') + self.assertEqual(page.content_model, "richtextpage") self.assertEqual(page.get_content_model(), richtextpage) page.set_content_model() - self.assertEqual(page.content_model, 'richtextpage') + self.assertEqual(page.content_model, "richtextpage") self.assertEqual(page.get_content_model(), richtextpage) def test_contenttyped_admin_redirects(self): @@ -703,18 +721,19 @@ def test_contenttyped_admin_redirects(self): class FieldsTestCase(TestCase): def test_multichoicefield_validate_valid(self): - field = MultiChoiceField(choices=[('valid choice',)]) - field.validate(['valid choice'], None) + field = MultiChoiceField(choices=[("valid choice",)]) + field.validate(["valid choice"], None) def test_multichoicefield_validate_invalid(self): - field = MultiChoiceField(choices=[('valid choice',)]) + field = MultiChoiceField(choices=[("valid choice",)]) with self.assertRaises(ValidationError): - field.validate(['invalid choice'], None) + field.validate(["invalid choice"], None) class CommandsTestCase(TestCase): def test_collect_templates(self): if hasattr(self, "assertRaisesRegex"): with self.assertRaisesRegex( - CommandError, 'Apps are not in INSTALLED_APPS: .*'): - call_command('collecttemplates', 'nonexistent') + CommandError, "Apps are not in INSTALLED_APPS: .*" + ): + call_command("collecttemplates", "nonexistent") diff --git a/mezzanine/core/translation.py b/mezzanine/core/translation.py index 15bd17410f..c3e08580f6 100644 --- a/mezzanine/core/translation.py +++ b/mezzanine/core/translation.py @@ -2,12 +2,12 @@ class TranslatedSlugged(TranslationOptions): - fields = ('title',) + fields = ("title",) class TranslatedDisplayable(TranslatedSlugged): - fields = ('_meta_title', 'description') + fields = ("_meta_title", "description") class TranslatedRichText(TranslationOptions): - fields = ('content',) + fields = ("content",) diff --git a/mezzanine/core/urls.py b/mezzanine/core/urls.py index 60d153170b..b35861820c 100644 --- a/mezzanine/core/urls.py +++ b/mezzanine/core/urls.py @@ -9,18 +9,26 @@ if "django.contrib.admin" in settings.INSTALLED_APPS: urlpatterns += [ - path("password_reset/", + path( + "password_reset/", auth_views.PasswordResetView.as_view(), - name="password_reset"), - path("password_reset/done/", + name="password_reset", + ), + path( + "password_reset/done/", auth_views.PasswordResetDoneView.as_view(), - name="password_reset_done"), - path("reset/done/", + name="password_reset_done", + ), + path( + "reset/done/", auth_views.PasswordResetCompleteView.as_view(), - name="password_reset_complete"), - path("reset///", + name="password_reset_complete", + ), + path( + "reset///", auth_views.PasswordResetConfirmView.as_view(), - name="password_reset_confirm"), + name="password_reset_confirm", + ), ] urlpatterns += [ diff --git a/mezzanine/core/views.py b/mezzanine/core/views.py index c7e8c6d0b2..8d27eddab0 100644 --- a/mezzanine/core/views.py +++ b/mezzanine/core/views.py @@ -14,8 +14,7 @@ from django.contrib.staticfiles import finders from django.core.exceptions import PermissionDenied from django.urls import reverse -from django.http import (HttpResponse, HttpResponseServerError, - HttpResponseNotFound) +from django.http import HttpResponse, HttpResponseServerError, HttpResponseNotFound from django.shortcuts import redirect from django.template.loader import get_template from django.utils.translation import ugettext_lazy as _ @@ -78,8 +77,9 @@ def edit(request): """ model = apps.get_model(request.POST["app"], request.POST["model"]) obj = model.objects.get(id=request.POST["id"]) - form = get_edit_form(obj, request.POST["fields"], data=request.POST, - files=request.FILES) + form = get_edit_form( + obj, request.POST["fields"], data=request.POST, files=request.FILES + ) if not (is_editable(obj, request) and has_site_permission(request.user)): response = _("Permission denied") elif form.is_valid(): @@ -113,8 +113,7 @@ def search(request, template="search_results.html", extra_context=None): search_type = search_model._meta.verbose_name_plural.capitalize() results = search_model.objects.search(query, for_user=request.user) paginated = paginate(results, page, per_page, max_paging_links) - context = {"query": query, "results": paginated, - "search_type": search_type} + context = {"query": query, "results": paginated, "search_type": search_type} context.update(extra_context or {}) return TemplateResponse(request, template, context) @@ -172,6 +171,7 @@ def displayable_links_js(request): links = [] if "mezzanine.pages" in settings.INSTALLED_APPS: from mezzanine.pages.models import Page + is_page = lambda obj: isinstance(obj, Page) else: is_page = lambda obj: False @@ -186,7 +186,7 @@ def displayable_links_js(request): verbose_name = _("Page") if page else obj._meta.verbose_name title = "%s: %s" % (verbose_name, title) links.append((not page and real, {"title": str(title), "value": url})) - sorted_links = sorted(links, key=lambda link: (link[0], link[1]['value'])) + sorted_links = sorted(links, key=lambda link: (link[0], link[1]["value"])) return HttpResponse(dumps([link[1] for link in sorted_links])) diff --git a/mezzanine/forms/admin.py b/mezzanine/forms/admin.py index 731361ca98..62137b3f68 100644 --- a/mezzanine/forms/admin.py +++ b/mezzanine/forms/admin.py @@ -29,8 +29,21 @@ form_fieldsets = deepcopy(PageAdmin.fieldsets) form_fieldsets[0][1]["fields"][3:0] = ["content", "button_text", "response"] form_fieldsets = list(form_fieldsets) -form_fieldsets.insert(1, (_("Email"), {"fields": ("send_email", "email_from", - "email_copies", "email_subject", "email_message")})) +form_fieldsets.insert( + 1, + ( + _("Email"), + { + "fields": ( + "send_email", + "email_from", + "email_copies", + "email_subject", + "email_message", + ) + }, + ), +) inline_field_excludes = [] if not settings.FORMS_USE_HTML5: @@ -38,7 +51,6 @@ class FieldAdminInlineForm(DynamicInlineAdminForm): - def __init__(self, *args, **kwargs): """ Ensure the label and help_text fields are rendered as text inputs @@ -68,6 +80,7 @@ class FieldAdmin(TabularDynamicInlineAdmin): Admin class for the form field. Inherits from TabularDynamicInlineAdmin to add dynamic "Add another" link and drag/drop ordering. """ + model = Field form = FieldAdminInlineForm @@ -82,12 +95,15 @@ class Media: css = {"all": (static("mezzanine/css/admin/form.css"),)} inlines = (FieldAdmin,) - list_display = ("title", "status", "email_copies",) + list_display = ( + "title", + "status", + "email_copies", + ) list_display_links = ("title",) list_editable = ("status", "email_copies") list_filter = ("status",) - search_fields = ("title", "content", "response", "email_from", - "email_copies") + search_fields = ("title", "content", "response", "email_from", "email_copies") fieldsets = form_fieldsets def get_urls(self): @@ -96,12 +112,16 @@ def get_urls(self): """ urls = super(FormAdmin, self).get_urls() extra_urls = [ - url(r"^(?P\d+)/entries/$", + url( + r"^(?P\d+)/entries/$", self.admin_site.admin_view(self.entries_view), - name="form_entries"), - url(r"^file/(?P\d+)/$", + name="form_entries", + ), + url( + r"^file/(?P\d+)/$", self.admin_site.admin_view(self.file_view), - name="form_file"), + name="form_file", + ), ] return extra_urls + urls @@ -134,8 +154,9 @@ def entries_view(self, request, form_id): queue = BytesIO() delimiter = bytes(delimiter, encoding="utf-8") csv = writer(queue, delimiter=delimiter) - writerow = lambda row: csv.writerow([c.encode("utf-8") - if hasattr(c, "encode") else c for c in row]) + writerow = lambda row: csv.writerow( + [c.encode("utf-8") if hasattr(c, "encode") else c for c in row] + ) writerow(entries_form.columns()) for row in entries_form.rows(csv=True): writerow(row) @@ -149,14 +170,19 @@ def entries_view(self, request, form_id): count = entries.count() if count > 0: entries.delete() - message = ungettext("1 entry deleted", - "%(count)s entries deleted", count) + message = ungettext( + "1 entry deleted", "%(count)s entries deleted", count + ) info(request, message % {"count": count}) template = "admin/forms/entries.html" - context = {"title": _("View Entries"), "entries_form": entries_form, - "opts": self.model._meta, "original": form, - "can_delete_entries": can_delete_entries, - "submitted": submitted} + context = { + "title": _("View Entries"), + "entries_form": entries_form, + "opts": self.model._meta, + "original": form, + "can_delete_entries": can_delete_entries, + "submitted": submitted, + } return render(request, template, context) def file_view(self, request, field_entry_id): @@ -167,9 +193,9 @@ def file_view(self, request, field_entry_id): path = join(fs.location, field_entry.value) response = HttpResponse(content_type=guess_type(path)[0]) with open(path, "r+b") as f: - response["Content-Disposition"] = ("attachment; filename=%s" - % f.name) + response["Content-Disposition"] = "attachment; filename=%s" % f.name response.write(f.read()) return response + admin.site.register(Form, FormAdmin) diff --git a/mezzanine/forms/defaults.py b/mezzanine/forms/defaults.py index cf0c6e3b82..f84e600656 100644 --- a/mezzanine/forms/defaults.py +++ b/mezzanine/forms/defaults.py @@ -23,8 +23,9 @@ register_setting( name="FORMS_CSV_DELIMITER", - description=_("Char to use as a field delimiter when exporting form " - "responses as CSV."), + description=_( + "Char to use as a field delimiter when exporting form " "responses as CSV." + ), editable=False, default=",", ) @@ -38,21 +39,25 @@ register_setting( name="FORMS_EXTRA_FIELDS", - description=_("Extra field types for the forms app. Should contain a " + description=_( + "Extra field types for the forms app. Should contain a " "sequence of three-item sequences, each containing the ID, dotted " "import path for the field class, and field name, for each custom " "field type. The ID is simply a numeric constant for the field, " "but cannot be a value already used, so choose a high number such " - "as 100 or greater to avoid conflicts."), + "as 100 or greater to avoid conflicts." + ), editable=False, default=(), ) register_setting( name="FORMS_EXTRA_WIDGETS", - description=_("Extra field widgets for the forms app. Should contain a " + description=_( + "Extra field widgets for the forms app. Should contain a " "sequence of two-item sequences, each containing an existing ID " - "for a form field, and a dotted import path for the widget class."), + "for a form field, and a dotted import path for the widget class." + ), editable=False, default=(), ) diff --git a/mezzanine/forms/fields.py b/mezzanine/forms/fields.py index 6789d54f91..1089692ae7 100644 --- a/mezzanine/forms/fields.py +++ b/mezzanine/forms/fields.py @@ -84,14 +84,16 @@ # HTML5 Widgets html5_field = lambda name, base: type(str(""), (base,), {"input_type": name}) if getattr(settings, "FORMS_USE_HTML5", False): - WIDGETS.update({ - DATE: html5_field("date", forms.DateInput), - DATE_TIME: html5_field("datetime", forms.DateTimeInput), - DOB: html5_field("date", forms.DateInput), - EMAIL: html5_field("email", forms.TextInput), - NUMBER: html5_field("number", forms.TextInput), - URL: html5_field("url", forms.TextInput), - }) + WIDGETS.update( + { + DATE: html5_field("date", forms.DateInput), + DATE_TIME: html5_field("datetime", forms.DateTimeInput), + DOB: html5_field("date", forms.DateInput), + EMAIL: html5_field("email", forms.TextInput), + NUMBER: html5_field("number", forms.TextInput), + URL: html5_field("url", forms.TextInput), + } + ) # Allow extra fields types to be defined via the FORMS_EXTRA_FIELDS # setting, which should contain a sequence of three-item sequences, diff --git a/mezzanine/forms/forms.py b/mezzanine/forms/forms.py index 6952099374..9fafb2b986 100644 --- a/mezzanine/forms/forms.py +++ b/mezzanine/forms/forms.py @@ -78,38 +78,35 @@ # The filter function for each filter type FILTER_FUNCS = { - FILTER_CHOICE_CONTAINS: - lambda val, field: val.lower() in field.lower(), - FILTER_CHOICE_DOESNT_CONTAIN: - lambda val, field: val.lower() not in field.lower(), - FILTER_CHOICE_EQUALS: - lambda val, field: val.lower() == field.lower(), - FILTER_CHOICE_DOESNT_EQUAL: - lambda val, field: val.lower() != field.lower(), - FILTER_CHOICE_BETWEEN: - lambda val_from, val_to, field: ( - (not val_from or val_from <= field) and - (not val_to or val_to >= field) - ), - FILTER_CHOICE_CONTAINS_ANY: - lambda val, field: set(val) & set(split_choices(field)), - FILTER_CHOICE_CONTAINS_ALL: - lambda val, field: set(val) == set(split_choices(field)), - FILTER_CHOICE_DOESNT_CONTAIN_ANY: - lambda val, field: not set(val) & set(split_choices(field)), - FILTER_CHOICE_DOESNT_CONTAIN_ALL: - lambda val, field: set(val) != set(split_choices(field)), + FILTER_CHOICE_CONTAINS: lambda val, field: val.lower() in field.lower(), + FILTER_CHOICE_DOESNT_CONTAIN: lambda val, field: val.lower() not in field.lower(), + FILTER_CHOICE_EQUALS: lambda val, field: val.lower() == field.lower(), + FILTER_CHOICE_DOESNT_EQUAL: lambda val, field: val.lower() != field.lower(), + FILTER_CHOICE_BETWEEN: lambda val_from, val_to, field: ( + (not val_from or val_from <= field) and (not val_to or val_to >= field) + ), + FILTER_CHOICE_CONTAINS_ANY: lambda val, field: set(val) & set(split_choices(field)), + FILTER_CHOICE_CONTAINS_ALL: lambda val, field: set(val) + == set(split_choices(field)), + FILTER_CHOICE_DOESNT_CONTAIN_ANY: lambda val, field: not set(val) + & set(split_choices(field)), + FILTER_CHOICE_DOESNT_CONTAIN_ALL: lambda val, field: set(val) + != set(split_choices(field)), } # Export form fields for each filter type grouping -text_filter_field = forms.ChoiceField(label=" ", required=False, - choices=TEXT_FILTER_CHOICES) -choice_filter_field = forms.ChoiceField(label=" ", required=False, - choices=CHOICE_FILTER_CHOICES) -multiple_filter_field = forms.ChoiceField(label=" ", required=False, - choices=MULTIPLE_FILTER_CHOICES) -date_filter_field = forms.ChoiceField(label=" ", required=False, - choices=DATE_FILTER_CHOICES) +text_filter_field = forms.ChoiceField( + label=" ", required=False, choices=TEXT_FILTER_CHOICES +) +choice_filter_field = forms.ChoiceField( + label=" ", required=False, choices=CHOICE_FILTER_CHOICES +) +multiple_filter_field = forms.ChoiceField( + label=" ", required=False, choices=MULTIPLE_FILTER_CHOICES +) +date_filter_field = forms.ChoiceField( + label=" ", required=False, choices=DATE_FILTER_CHOICES +) class FormForForm(forms.ModelForm): @@ -142,15 +139,19 @@ def __init__(self, form, context, *args, **kwargs): field_key = "field_%s" % field.id field_class = fields.CLASSES[field.field_type] field_widget = fields.WIDGETS.get(field.field_type) - field_args = {"label": field.label, "required": field.required, - "help_text": field.help_text} + field_args = { + "label": field.label, + "required": field.required, + "help_text": field.help_text, + } arg_names = field_class.__init__.__code__.co_varnames if "max_length" in arg_names: field_args["max_length"] = settings.FORMS_FIELD_MAX_LENGTH if "choices" in arg_names: choices = list(field.get_choices()) - if (field.field_type == fields.SELECT and - field.default not in [c[0] for c in choices]): + if field.field_type == fields.SELECT and field.default not in [ + c[0] for c in choices + ]: choices.insert(0, ("", field.placeholder_text)) field_args["choices"] = choices if field_widget is not None: @@ -188,10 +189,12 @@ def __init__(self, form, context, *args, **kwargs): self.fields[field_key].widget.years = years # Add identifying type attr to the field for styling. - setattr(self.fields[field_key], "type", - field_class.__name__.lower()) - if (field.required and settings.FORMS_USE_HTML5 and - field.field_type != fields.CHECKBOX_MULTIPLE): + setattr(self.fields[field_key], "type", field_class.__name__.lower()) + if ( + field.required + and settings.FORMS_USE_HTML5 + and field.field_type != fields.CHECKBOX_MULTIPLE + ): self.fields[field_key].widget.attrs["required"] = "" if field.placeholder_text and not field.default: text = field.placeholder_text @@ -255,41 +258,48 @@ def __init__(self, form, request, *args, **kwargs): self.form = form self.request = request self.form_fields = form.fields.all() - self.entry_time_name = str(FormEntry._meta.get_field( - "entry_time").verbose_name) + self.entry_time_name = str(FormEntry._meta.get_field("entry_time").verbose_name) super(EntriesForm, self).__init__(*args, **kwargs) for field in self.form_fields: field_key = "field_%s" % field.id # Checkbox for including in export. self.fields["%s_export" % field_key] = forms.BooleanField( - label=field.label, initial=True, required=False) + label=field.label, initial=True, required=False + ) if field.is_a(*fields.CHOICES): # A fixed set of choices to filter by. if field.is_a(fields.CHECKBOX): choices = ((True, _("Checked")), (False, _("Not checked"))) else: choices = field.get_choices() - contains_field = forms.MultipleChoiceField(label=" ", - choices=choices, widget=forms.CheckboxSelectMultiple(), - required=False) + contains_field = forms.MultipleChoiceField( + label=" ", + choices=choices, + widget=forms.CheckboxSelectMultiple(), + required=False, + ) self.fields["%s_filter" % field_key] = choice_filter_field self.fields["%s_contains" % field_key] = contains_field elif field.is_a(*fields.MULTIPLE): # A fixed set of choices to filter by, with multiple # possible values in the entry field. - contains_field = forms.MultipleChoiceField(label=" ", + contains_field = forms.MultipleChoiceField( + label=" ", choices=field.get_choices(), widget=forms.CheckboxSelectMultiple(), - required=False) + required=False, + ) self.fields["%s_filter" % field_key] = multiple_filter_field self.fields["%s_contains" % field_key] = contains_field elif field.is_a(*fields.DATES): # A date range to filter by. self.fields["%s_filter" % field_key] = date_filter_field self.fields["%s_from" % field_key] = forms.DateField( - label=" ", widget=SelectDateWidget(), required=False) + label=" ", widget=SelectDateWidget(), required=False + ) self.fields["%s_to" % field_key] = forms.DateField( - label=_("and"), widget=SelectDateWidget(), required=False) + label=_("and"), widget=SelectDateWidget(), required=False + ) else: # Text box for search term to filter by. contains_field = forms.CharField(label=" ", required=False) @@ -297,14 +307,18 @@ def __init__(self, form, request, *args, **kwargs): self.fields["%s_contains" % field_key] = contains_field # Add ``FormEntry.entry_time`` as a field. field_key = "field_0" - self.fields["%s_export" % field_key] = forms.BooleanField(initial=True, + self.fields["%s_export" % field_key] = forms.BooleanField( + initial=True, label=FormEntry._meta.get_field("entry_time").verbose_name, - required=False) + required=False, + ) self.fields["%s_filter" % field_key] = date_filter_field self.fields["%s_from" % field_key] = forms.DateField( - label=" ", widget=SelectDateWidget(), required=False) + label=" ", widget=SelectDateWidget(), required=False + ) self.fields["%s_to" % field_key] = forms.DateField( - label=_("and"), widget=SelectDateWidget(), required=False) + label=_("and"), widget=SelectDateWidget(), required=False + ) def __iter__(self): """ @@ -312,16 +326,22 @@ def __iter__(self): """ for field_id in [f.id for f in self.form_fields] + [0]: prefix = "field_%s_" % field_id - fields = [f for f in super(EntriesForm, self).__iter__() - if f.name.startswith(prefix)] + fields = [ + f + for f in super(EntriesForm, self).__iter__() + if f.name.startswith(prefix) + ] yield fields[0], fields[1], fields[2:] def columns(self): """ Returns the list of selected column names. """ - fields = [f.label for f in self.form_fields - if self.cleaned_data["field_%s_export" % f.id]] + fields = [ + f.label + for f in self.form_fields + if self.cleaned_data["field_%s_export" % f.id] + ] if self.cleaned_data["field_0_export"]: fields.append(self.entry_time_name) return fields @@ -352,15 +372,18 @@ def rows(self, csv=False): # Get the field entries for the given form and filter by entry_time # if specified. - field_entries = FieldEntry.objects.filter( - entry__form=self.form).order_by( - "-entry__id").select_related("entry") + field_entries = ( + FieldEntry.objects.filter(entry__form=self.form) + .order_by("-entry__id") + .select_related("entry") + ) if self.cleaned_data["field_0_filter"] == FILTER_CHOICE_BETWEEN: time_from = self.cleaned_data["field_0_from"] time_to = self.cleaned_data["field_0_to"] if time_from and time_to: field_entries = field_entries.filter( - entry__entry_time__range=(time_from, time_to)) + entry__entry_time__range=(time_from, time_to) + ) # Loop through each field value ordered by entry, building up each # entry as a row. Use the ``valid_row`` flag for marking a row as @@ -411,7 +434,7 @@ def rows(self, csv=False): field_value = self.request.build_absolute_uri(url) if not csv: parts = (field_value, split(field_entry.value)[1]) - field_value = mark_safe("%s" % parts) + field_value = mark_safe('%s' % parts) # Only use values for fields that were selected. try: current_row[field_indexes[field_id]] = field_value diff --git a/mezzanine/forms/models.py b/mezzanine/forms/models.py index 6e34c42124..bbd830129a 100644 --- a/mezzanine/forms/models.py +++ b/mezzanine/forms/models.py @@ -18,21 +18,40 @@ class Form(Page, RichText): button_text = models.CharField(_("Button text"), max_length=50, blank=True) response = RichTextField(_("Response")) - send_email = models.BooleanField(_("Send email to user"), default=True, - help_text=_("To send an email to the email address supplied in " - "the form upon submission, check this box.")) - email_from = models.EmailField(_("From address"), max_length=254, - help_text=_("The address the email will be sent from"), blank=True) - email_copies = models.CharField(_("Send email to others"), blank=True, - help_text=_("Provide a comma separated list of email addresses " - "to be notified upon form submission. Leave blank to " - "disable notifications."), - max_length=200) + send_email = models.BooleanField( + _("Send email to user"), + default=True, + help_text=_( + "To send an email to the email address supplied in " + "the form upon submission, check this box." + ), + ) + email_from = models.EmailField( + _("From address"), + max_length=254, + help_text=_("The address the email will be sent from"), + blank=True, + ) + email_copies = models.CharField( + _("Send email to others"), + blank=True, + help_text=_( + "Provide a comma separated list of email addresses " + "to be notified upon form submission. Leave blank to " + "disable notifications." + ), + max_length=200, + ) email_subject = models.CharField(_("Subject"), max_length=200, blank=True) - email_message = models.TextField(_("Message"), blank=True, - help_text=_("Emails sent based on the above options will contain " - "each of the form fields entered. You can also enter " - "a message here that will be included in the email.")) + email_message = models.TextField( + _("Message"), + blank=True, + help_text=_( + "Emails sent based on the above options will contain " + "each of the form fields entered. You can also enter " + "a message here that will be included in the email." + ), + ) class Meta: verbose_name = _("Form") @@ -43,6 +62,7 @@ class FieldManager(models.Manager): """ Only show visible fields when displaying actual form.. """ + def visible(self): return self.filter(visible=True) @@ -57,13 +77,21 @@ class AbstractBaseField(Orderable): field_type = models.IntegerField(_("Type"), choices=fields.NAMES) required = models.BooleanField(_("Required"), default=True) visible = models.BooleanField(_("Visible"), default=True) - choices = models.CharField(_("Choices"), max_length=1000, blank=True, - help_text=_("Comma separated options where applicable. If an option " - "itself contains commas, surround the option with `backticks`.")) - default = models.CharField(_("Default value"), blank=True, - max_length=settings.FORMS_FIELD_MAX_LENGTH) - placeholder_text = models.CharField(_("Placeholder Text"), blank=True, - max_length=100) + choices = models.CharField( + _("Choices"), + max_length=1000, + blank=True, + help_text=_( + "Comma separated options where applicable. If an option " + "itself contains commas, surround the option with `backticks`." + ), + ) + default = models.CharField( + _("Default value"), blank=True, max_length=settings.FORMS_FIELD_MAX_LENGTH + ) + placeholder_text = models.CharField( + _("Placeholder Text"), blank=True, max_length=100 + ) help_text = models.TextField(_("Help text"), blank=True) objects = wrapped_manager(FieldManager) @@ -108,8 +136,7 @@ def is_a(self, *args): class Field(AbstractBaseField): - form = models.ForeignKey("Form", on_delete=models.CASCADE, - related_name="fields") + form = models.ForeignKey("Form", on_delete=models.CASCADE, related_name="fields") class Meta(AbstractBaseField.Meta): order_with_respect_to = "form" @@ -120,8 +147,7 @@ class FormEntry(models.Model): An entry submitted via a user-built form. """ - form = models.ForeignKey("Form", on_delete=models.CASCADE, - related_name="entries") + form = models.ForeignKey("Form", on_delete=models.CASCADE, related_name="entries") entry_time = models.DateTimeField(_("Date/time")) class Meta: @@ -134,11 +160,11 @@ class FieldEntry(models.Model): A single field value for a form entry submitted via a user-built form. """ - entry = models.ForeignKey("FormEntry", on_delete=models.CASCADE, - related_name="fields") + entry = models.ForeignKey( + "FormEntry", on_delete=models.CASCADE, related_name="fields" + ) field_id = models.IntegerField() - value = models.CharField(max_length=settings.FORMS_FIELD_MAX_LENGTH, - null=True) + value = models.CharField(max_length=settings.FORMS_FIELD_MAX_LENGTH, null=True) class Meta: verbose_name = _("Form field entry") diff --git a/mezzanine/forms/page_processors.py b/mezzanine/forms/page_processors.py index 0db42773ad..915a5f4ee7 100644 --- a/mezzanine/forms/page_processors.py +++ b/mezzanine/forms/page_processors.py @@ -25,8 +25,9 @@ def form_processor(request, page): """ Display a built form and handle submission. """ - form = FormForForm(page.form, RequestContext(request), - request.POST or None, request.FILES or None) + form = FormForForm( + page.form, RequestContext(request), request.POST or None, request.FILES or None + ) if form.is_valid(): url = page.get_absolute_url() + "?sent=1" if is_spam(request, form, url): @@ -39,8 +40,10 @@ def form_processor(request, page): subject = page.form.email_subject if not subject: subject = "%s - %s" % (page.form.title, entry.entry_time) - fields = [(v.label, format_value(form.cleaned_data[k])) - for (k, v) in form.fields.items()] + fields = [ + (v.label, format_value(form.cleaned_data[k])) + for (k, v) in form.fields.items() + ] context = { "fields": fields, "message": page.form.email_message, @@ -49,17 +52,24 @@ def form_processor(request, page): email_from = page.form.email_from or settings.DEFAULT_FROM_EMAIL email_to = form.email_to() if email_to and page.form.send_email: - send_mail_template(subject, "email/form_response", email_from, - email_to, context) + send_mail_template( + subject, "email/form_response", email_from, email_to, context + ) headers = None if email_to: # Add the email entered as a Reply-To header - headers = {'Reply-To': email_to} + headers = {"Reply-To": email_to} email_copies = split_addresses(page.form.email_copies) if email_copies: - send_mail_template(subject, "email/form_response_copies", - email_from, email_copies, context, - attachments=attachments, headers=headers) + send_mail_template( + subject, + "email/form_response_copies", + email_from, + email_copies, + context, + attachments=attachments, + headers=headers, + ) form_valid.send(sender=request, form=form, entry=entry) return redirect(url) form_invalid.send(sender=request, form=form) diff --git a/mezzanine/forms/tests.py b/mezzanine/forms/tests.py index 661bf02022..a55b5466e5 100644 --- a/mezzanine/forms/tests.py +++ b/mezzanine/forms/tests.py @@ -11,18 +11,20 @@ class TestsForm(TestCase): - def test_forms(self): """ Simple 200 status check against rendering and posting to forms with both optional and required fields. """ for required in (True, False): - form = Form.objects.create(title="Form", - status=CONTENT_STATUS_PUBLISHED) + form = Form.objects.create(title="Form", status=CONTENT_STATUS_PUBLISHED) for (i, (field, _)) in enumerate(fields.NAMES): - form.fields.create(label="Field %s" % i, field_type=field, - required=required, visible=True) + form.fields.create( + label="Field %s" % i, + field_type=field, + required=required, + visible=True, + ) response = self.client.get(form.get_absolute_url()) self.assertEqual(response.status_code, 200) visible_fields = form.fields.visible() @@ -30,8 +32,10 @@ def test_forms(self): response = self.client.post(form.get_absolute_url(), data=data) self.assertEqual(response.status_code, 200) - @skipUnless(settings.USE_MODELTRANSLATION and len(settings.LANGUAGES) > 1, - "modeltranslation configured for several languages required") + @skipUnless( + settings.USE_MODELTRANSLATION and len(settings.LANGUAGES) > 1, + "modeltranslation configured for several languages required", + ) def test_submit_button_text(self): """ Test that Form.button_text has its value displayed properly without @@ -39,8 +43,7 @@ def test_submit_button_text(self): """ from collections import OrderedDict from django.urls import reverse - from django.utils.translation import (get_language, activate, - ugettext as _) + from django.utils.translation import get_language, activate, ugettext as _ from modeltranslation.utils import auto_populate default_language = get_language() @@ -55,10 +58,12 @@ def test_submit_button_text(self): break return with auto_populate(True): - form = Form.objects.create(title="Form button_text", - status=CONTENT_STATUS_PUBLISHED) - form.fields.create(label="Field test", field_type=fields.TEXT, - required=True, visible=True) + form = Form.objects.create( + title="Form button_text", status=CONTENT_STATUS_PUBLISHED + ) + form.fields.create( + label="Field test", field_type=fields.TEXT, required=True, visible=True + ) submit_text = _("Submit") form.button_text = submit_text form.save() @@ -68,28 +73,30 @@ def test_submit_button_text(self): # Default language contains the default translation for Submit self.assertContains(response, _("Submit")) # Language used for form creation contains its own translation - self.client.post(reverse('set_language'), data={'language': c}) + self.client.post(reverse("set_language"), data={"language": c}) response = self.client.get(form.get_absolute_url()) - self.client.post(reverse('set_language'), data={'language': - default_language}) + self.client.post(reverse("set_language"), data={"language": default_language}) self.assertContains(response, submit_text) def test_custom_email_type(self): - class CustomEmailField(forms.EmailField): pass fields.CLASSES[16] = CustomEmailField - fields.NAMES += ((16, 'Custom email field'),) + fields.NAMES += ((16, "Custom email field"),) form_page = Form.objects.create(title="Email form tests") form_page.fields.create(label="Email field test", field_type=16) - test_email = 'test@example.com' - request = self._request_factory.post('/', {'field_1': test_email}) + test_email = "test@example.com" + request = self._request_factory.post("/", {"field_1": test_email}) - form = FormForForm(form_page, RequestContext(request), - request.POST or None, request.FILES or None) + form = FormForForm( + form_page, + RequestContext(request), + request.POST or None, + request.FILES or None, + ) self.assertTrue(form.is_valid()) self.assertEqual(form.email_to(), test_email) diff --git a/mezzanine/forms/translation.py b/mezzanine/forms/translation.py index 75214291f4..ab5b5c20c6 100644 --- a/mezzanine/forms/translation.py +++ b/mezzanine/forms/translation.py @@ -4,11 +4,23 @@ class TranslatedForm(TranslatedRichText): - fields = ('button_text', 'response', 'email_subject', 'email_message',) + fields = ( + "button_text", + "response", + "email_subject", + "email_message", + ) class TranslatedField(TranslationOptions): - fields = ('label', 'choices', 'default', 'placeholder_text', 'help_text',) + fields = ( + "label", + "choices", + "default", + "placeholder_text", + "help_text", + ) + translator.register(Form, TranslatedForm) translator.register(Field, TranslatedField) diff --git a/mezzanine/galleries/admin.py b/mezzanine/galleries/admin.py index 74920c8569..c60e62d7e3 100644 --- a/mezzanine/galleries/admin.py +++ b/mezzanine/galleries/admin.py @@ -11,7 +11,6 @@ class GalleryImageInline(TabularDynamicInlineAdmin): class GalleryAdmin(PageAdmin): - class Media: css = {"all": (static("mezzanine/css/admin/gallery.css"),)} diff --git a/mezzanine/galleries/models.py b/mezzanine/galleries/models.py index 3424eeec97..26e55c3a78 100644 --- a/mezzanine/galleries/models.py +++ b/mezzanine/galleries/models.py @@ -39,10 +39,15 @@ class BaseGallery(models.Model): class Meta: abstract = True - zip_import = models.FileField(verbose_name=_("Zip import"), blank=True, + zip_import = models.FileField( + verbose_name=_("Zip import"), + blank=True, upload_to=upload_to("galleries.Gallery.zip_import", "galleries"), - help_text=_("Upload a zip file containing images, and " - "they'll be imported into this gallery.")) + help_text=_( + "Upload a zip file containing images, and " + "they'll be imported into this gallery." + ), + ) def save(self, delete_zip_import=True, *args, **kwargs): """ @@ -56,6 +61,7 @@ def save(self, delete_zip_import=True, *args, **kwargs): data = zip_file.read(name) try: from PIL import Image + image = Image.open(BytesIO(data)) image.load() image = Image.open(BytesIO(data)) @@ -69,7 +75,7 @@ def save(self, delete_zip_import=True, *args, **kwargs): # In python3, name is a string. Convert it to bytes. if not isinstance(name, bytes): try: - name = name.encode('cp437') + name = name.encode("cp437") except UnicodeEncodeError: # File name includes characters that aren't in cp437, # which isn't supported by most zip tooling. They will @@ -78,7 +84,7 @@ def save(self, delete_zip_import=True, *args, **kwargs): # Decode byte-name. if isinstance(name, bytes): - encoding = charsetdetect(name)['encoding'] + encoding = charsetdetect(name)["encoding"] tempname = name.decode(encoding) # A gallery with a slug of "/" tries to extract files @@ -89,17 +95,21 @@ def save(self, delete_zip_import=True, *args, **kwargs): saved_path = default_storage.save(path, ContentFile(data)) except UnicodeEncodeError: from warnings import warn - warn("A file was saved that contains unicode " - "characters in its path, but somehow the current " - "locale does not support utf-8. You may need to set " - "'LC_ALL' to a correct value, eg: 'en_US.UTF-8'.") + + warn( + "A file was saved that contains unicode " + "characters in its path, but somehow the current " + "locale does not support utf-8. You may need to set " + "'LC_ALL' to a correct value, eg: 'en_US.UTF-8'." + ) # The native() call is needed here around str because # os.path.join() in Python 2.x (in posixpath.py) # mixes byte-strings with unicode strings without # explicit conversion, which raises a TypeError as it # would on Python 3. - path = os.path.join(GALLERIES_UPLOAD_DIR, slug, - str(name, errors="ignore")) + path = os.path.join( + GALLERIES_UPLOAD_DIR, slug, str(name, errors="ignore") + ) saved_path = default_storage.save(path, ContentFile(data)) self.images.create(file=saved_path) if delete_zip_import: @@ -120,12 +130,16 @@ class Meta: @python_2_unicode_compatible class GalleryImage(Orderable): - gallery = models.ForeignKey("Gallery", on_delete=models.CASCADE, - related_name="images") - file = FileField(_("File"), max_length=200, format="Image", - upload_to=upload_to("galleries.GalleryImage.file", "galleries")) - description = models.CharField(_("Description"), max_length=1000, - blank=True) + gallery = models.ForeignKey( + "Gallery", on_delete=models.CASCADE, related_name="images" + ) + file = FileField( + _("File"), + max_length=200, + format="Image", + upload_to=upload_to("galleries.GalleryImage.file", "galleries"), + ) + description = models.CharField(_("Description"), max_length=1000, blank=True) class Meta: verbose_name = _("Image") @@ -146,7 +160,11 @@ def save(self, *args, **kwargs): name = "".join([c if c not in punctuation else " " for c in name]) # str.title() doesn't deal with unicode very well. # http://bugs.python.org/issue6412 - name = "".join([s.upper() if i == 0 or name[i - 1] == " " else s - for i, s in enumerate(name)]) + name = "".join( + [ + s.upper() if i == 0 or name[i - 1] == " " else s + for i, s in enumerate(name) + ] + ) self.description = name super(GalleryImage, self).save(*args, **kwargs) diff --git a/mezzanine/galleries/tests.py b/mezzanine/galleries/tests.py index 5bc0aac43d..5f627e2e53 100644 --- a/mezzanine/galleries/tests.py +++ b/mezzanine/galleries/tests.py @@ -9,7 +9,6 @@ class GalleriesTests(TestCase): - def test_gallery_import(self): """ Test that a gallery creates images when given a zip file to @@ -23,8 +22,7 @@ def test_gallery_import(self): self.assertTrue(images) self.assertTrue(all([image.description for image in images])) # Clean up. - rmtree(os.path.join(settings.MEDIA_ROOT, - GALLERIES_UPLOAD_DIR, title)) + rmtree(os.path.join(settings.MEDIA_ROOT, GALLERIES_UPLOAD_DIR, title)) def test_thumbnail_generation(self): """ @@ -37,8 +35,11 @@ def test_thumbnail_generation(self): image_name = "image.jpg" size = (24, 24) copy_test_to_media("mezzanine.core", image_name) - thumb_name = os.path.join(settings.THUMBNAILS_DIR_NAME, image_name, - image_name.replace(".", "-%sx%s." % size)) + thumb_name = os.path.join( + settings.THUMBNAILS_DIR_NAME, + image_name, + image_name.replace(".", "-%sx%s." % size), + ) thumb_path = os.path.join(settings.MEDIA_ROOT, thumb_name) thumb_image = thumbnail(image_name, *size) self.assertEqual(os.path.normpath(thumb_image.lstrip("/")), thumb_name) diff --git a/mezzanine/galleries/translation.py b/mezzanine/galleries/translation.py index 5026979136..d6d764f3b2 100644 --- a/mezzanine/galleries/translation.py +++ b/mezzanine/galleries/translation.py @@ -8,7 +8,8 @@ class TranslatedGallery(TranslatedRichText): class TranslatedGalleryImage(TranslationOptions): - fields = ('description',) + fields = ("description",) + translator.register(Gallery, TranslatedGallery) translator.register(GalleryImage, TranslatedGalleryImage) diff --git a/mezzanine/generic/__init__.py b/mezzanine/generic/__init__.py index 2cfdbab1b7..3fd827eb0f 100644 --- a/mezzanine/generic/__init__.py +++ b/mezzanine/generic/__init__.py @@ -8,9 +8,11 @@ def get_model(): from mezzanine.generic.models import ThreadedComment + return ThreadedComment def get_form(): from mezzanine.generic.forms import ThreadedCommentForm + return ThreadedCommentForm diff --git a/mezzanine/generic/admin.py b/mezzanine/generic/admin.py index ce8a56284f..dca5e9b6ca 100644 --- a/mezzanine/generic/admin.py +++ b/mezzanine/generic/admin.py @@ -6,7 +6,7 @@ from mezzanine.generic.models import ThreadedComment -__all__ = ('ThreadedCommentAdmin',) +__all__ = ("ThreadedCommentAdmin",) class ThreadedCommentAdmin(CommentsAdmin): @@ -14,8 +14,14 @@ class ThreadedCommentAdmin(CommentsAdmin): Admin class for comments. """ - list_display = ("avatar_link", "intro", "submit_date", "is_public", - "is_removed", "admin_link") + list_display = ( + "avatar_link", + "intro", + "submit_date", + "is_public", + "is_removed", + "admin_link", + ) list_display_links = ("intro", "submit_date") list_filter = [f for f in CommentsAdmin.list_filter if f != "site"] fieldsets = ( diff --git a/mezzanine/generic/defaults.py b/mezzanine/generic/defaults.py index abdd1a59c0..87e162c3ed 100644 --- a/mezzanine/generic/defaults.py +++ b/mezzanine/generic/defaults.py @@ -29,8 +29,7 @@ register_setting( name="COMMENTS_DISQUS_SHORTNAME", label=_("Disqus shortname"), - description=_("Shortname for the http://disqus.com comments " - "service."), + description=_("Shortname for the http://disqus.com comments " "service."), editable=True, default="", ) @@ -54,16 +53,17 @@ register_setting( name="COMMENTS_DEFAULT_APPROVED", label=_("Auto-approve comments"), - description=_("If ``True``, built-in comments are approved by " - "default."), + description=_("If ``True``, built-in comments are approved by " "default."), editable=True, default=True, ) register_setting( name="COMMENT_FILTER", - description=_("Dotted path to the function to call on a comment's " - "value before it is rendered to the template."), + description=_( + "Dotted path to the function to call on a comment's " + "value before it is rendered to the template." + ), editable=False, default=None, ) @@ -71,9 +71,11 @@ register_setting( name="COMMENTS_NOTIFICATION_EMAILS", label=_("Comment notification email addresses"), - description=_("A comma separated list of email addresses that " - "will receive an email notification each time a " - "new comment is posted on the site."), + description=_( + "A comma separated list of email addresses that " + "will receive an email notification each time a " + "new comment is posted on the site." + ), editable=True, default="", ) @@ -81,8 +83,7 @@ register_setting( name="COMMENTS_NUM_LATEST", label=_("Admin comments"), - description=_("Number of latest comments shown in the admin " - "dashboard."), + description=_("Number of latest comments shown in the admin " "dashboard."), editable=True, default=5, ) @@ -90,9 +91,11 @@ register_setting( name="COMMENTS_UNAPPROVED_VISIBLE", label=_("Show unapproved comments"), - description=_("If ``True``, comments that have ``is_public`` " + description=_( + "If ``True``, comments that have ``is_public`` " "unchecked will still be displayed, but replaced with a " - "``waiting to be approved`` message."), + "``waiting to be approved`` message." + ), editable=True, default=True, ) @@ -100,9 +103,11 @@ register_setting( name="COMMENTS_REMOVED_VISIBLE", label=_("Show removed comments"), - description=_("If ``True``, comments that have ``removed`` " - "checked will still be displayed, but replaced " - "with a ``removed`` message."), + description=_( + "If ``True``, comments that have ``removed`` " + "checked will still be displayed, but replaced " + "with a ``removed`` message." + ), editable=True, default=True, ) @@ -125,8 +130,10 @@ register_setting( name="RATINGS_ACCOUNT_REQUIRED", label=_("Accounts required for rating"), - description=_("If ``True``, users must log in to rate content " - "such as blog posts and comments."), + description=_( + "If ``True``, users must log in to rate content " + "such as blog posts and comments." + ), editable=True, default=False, ) @@ -135,6 +142,9 @@ name="RATINGS_RANGE", description=_("A sequence of integers that are valid ratings."), editable=False, - default=list(range(getattr(settings, "RATINGS_MIN", 1), - getattr(settings, "RATINGS_MAX", 5) + 1)), + default=list( + range( + getattr(settings, "RATINGS_MIN", 1), getattr(settings, "RATINGS_MAX", 5) + 1 + ) + ), ) diff --git a/mezzanine/generic/fields.py b/mezzanine/generic/fields.py index c864559f52..e7d9f1d38d 100644 --- a/mezzanine/generic/fields.py +++ b/mezzanine/generic/fields.py @@ -47,11 +47,13 @@ def __init__(self, *args, **kwargs): else: # otherwise, warn the user to stick to the new (as of 4.0) # ``default_related_model`` attribute - raise ImproperlyConfigured("BaseGenericRelation changed the " + raise ImproperlyConfigured( + "BaseGenericRelation changed the " "way it handled a default ``related_model`` in mezzanine " "4.0. Please override ``default_related_model`` instead " "and do not tamper with django's ``related_model`` " - "property anymore.") + "property anymore." + ) def contribute_to_class(self, cls, name): """ @@ -63,8 +65,12 @@ def contribute_to_class(self, cls, name): for field in cls._meta.many_to_many: if isinstance(field, self.__class__): e = "Multiple %s fields are not supported (%s.%s, %s.%s)" % ( - self.__class__.__name__, cls.__name__, cls.__name__, - name, field.name) + self.__class__.__name__, + cls.__name__, + cls.__name__, + name, + field.name, + ) raise ImproperlyConfigured(e) self.related_field_name = name super(BaseGenericRelation, self).contribute_to_class(cls, name) @@ -144,8 +150,7 @@ def related_items_changed(self, instance, related_manager): count = related_manager.count_queryset() except AttributeError: count = related_manager.count() - count_field_name = list(self.fields.keys())[0] % \ - self.related_field_name + count_field_name = list(self.fields.keys())[0] % self.related_field_name setattr(instance, count_field_name, count) instance.save() @@ -158,8 +163,7 @@ class KeywordsField(BaseGenericRelation): """ default_related_model = "generic.AssignedKeyword" - fields = {"%s_string": CharField(editable=False, blank=True, - max_length=500)} + fields = {"%s_string": CharField(editable=False, blank=True, max_length=500)} def __init__(self, *args, **kwargs): """ @@ -176,6 +180,7 @@ def formfield(self, **kwargs): isn't a form field mapped to ``GenericRelation`` model fields. """ from mezzanine.generic.forms import KeywordsWidget + kwargs["widget"] = KeywordsWidget return super(KeywordsField, self).formfield(**kwargs) @@ -188,6 +193,7 @@ def save_form_data(self, instance, data): instance is being removed. """ from mezzanine.generic.models import Keyword + related_manager = getattr(instance, self.name) # Get a list of Keyword IDs being removed. old_ids = [str(a.keyword_id) for a in related_manager.all()] @@ -209,8 +215,7 @@ def contribute_to_class(self, cls, name): ``KEYWORDS_FIELD_string`` field in ``search_fields``. """ super(KeywordsField, self).contribute_to_class(cls, name) - string_field_name = list(self.fields.keys())[0] % \ - self.related_field_name + string_field_name = list(self.fields.keys())[0] % self.related_field_name if hasattr(cls, "search_fields") and name in cls.search_fields: try: weight = cls.search_fields[name] @@ -231,8 +236,7 @@ def related_items_changed(self, instance, related_manager): """ assigned = related_manager.select_related("keyword") keywords = " ".join([str(a.keyword) for a in assigned]) - string_field_name = list(self.fields.keys())[0] % \ - self.related_field_name + string_field_name = list(self.fields.keys())[0] % self.related_field_name if getattr(instance, string_field_name) != keywords: setattr(instance, string_field_name, keywords) instance.save() @@ -246,9 +250,11 @@ class RatingField(BaseGenericRelation): """ default_related_model = "generic.Rating" - fields = {"%s_count": IntegerField(default=0, editable=False), - "%s_sum": IntegerField(default=0, editable=False), - "%s_average": FloatField(default=0, editable=False)} + fields = { + "%s_count": IntegerField(default=0, editable=False), + "%s_sum": IntegerField(default=0, editable=False), + "%s_average": FloatField(default=0, editable=False), + } def related_items_changed(self, instance, related_manager): """ diff --git a/mezzanine/generic/forms.py b/mezzanine/generic/forms.py index ab9322b9d6..9bfd71c6bd 100644 --- a/mezzanine/generic/forms.py +++ b/mezzanine/generic/forms.py @@ -34,7 +34,7 @@ class KeywordsWidget(forms.MultiWidget): class Media: js = ( - 'admin/js/jquery.init.js', + "admin/js/jquery.init.js", static("mezzanine/js/admin/keywords_field.js"), ) @@ -42,8 +42,7 @@ def __init__(self, attrs=None): """ Setup the text and hidden form field widgets. """ - widgets = (forms.HiddenInput, - forms.TextInput(attrs={"class": "vTextField"})) + widgets = (forms.HiddenInput, forms.TextInput(attrs={"class": "vTextField"})) super(KeywordsWidget, self).__init__(widgets, attrs) self._ids = [] @@ -79,7 +78,7 @@ def render(self, *args, **kwargs): links = "" for keyword in Keyword.objects.all().order_by("title"): prefix = "+" if str(keyword.id) not in self._ids else "-" - links += ("%s%s" % (prefix, str(keyword))) + links += "%s%s" % (prefix, str(keyword)) rendered += mark_safe("

    %s

    " % links) return rendered @@ -93,12 +92,9 @@ def value_from_datadict(self, data, files, name): class ThreadedCommentForm(CommentForm, Html5Mixin): - name = forms.CharField(label=_("Name"), help_text=_("required"), - max_length=50) - email = forms.EmailField(label=_("Email"), - help_text=_("required (not published)")) - url = forms.URLField(label=_("Website"), help_text=_("optional"), - required=False) + name = forms.CharField(label=_("Name"), help_text=_("required"), max_length=50) + email = forms.EmailField(label=_("Email"), help_text=_("required (not published)")) + url = forms.URLField(label=_("Website"), help_text=_("optional"), required=False) # These are used to get/set prepopulated fields via cookies. cookie_fields = ("name", "email", "url") @@ -161,13 +157,16 @@ def save(self, request): "replied_to_id": comment.replied_to_id, } for duplicate in self.get_comment_model().objects.filter(**lookup): - if (duplicate.submit_date.date() == comment.submit_date.date() and - duplicate.comment == comment.comment): + if ( + duplicate.submit_date.date() == comment.submit_date.date() + and duplicate.comment == comment.comment + ): return duplicate comment.save() - comment_was_posted.send(sender=comment.__class__, comment=comment, - request=request) + comment_was_posted.send( + sender=comment.__class__, comment=comment, request=request + ) notify_emails = split_addresses(settings.COMMENTS_NOTIFICATION_EMAILS) if notify_emails: subject = ugettext("New comment for: ") + str(obj) @@ -177,9 +176,13 @@ def save(self, request): "request": request, "obj": obj, } - send_mail_template(subject, "email/comment_notification", - settings.DEFAULT_FROM_EMAIL, notify_emails, - context) + send_mail_template( + subject, + "email/comment_notification", + settings.DEFAULT_FROM_EMAIL, + notify_emails, + context, + ) return comment @@ -188,9 +191,12 @@ class RatingForm(CommentSecurityForm): Form for a rating. Subclasses ``CommentSecurityForm`` to make use of its easy setup for generic relations. """ - value = forms.ChoiceField(label="", widget=forms.RadioSelect, - choices=list(zip( - *(settings.RATINGS_RANGE,) * 2))) + + value = forms.ChoiceField( + label="", + widget=forms.RadioSelect, + choices=list(zip(*(settings.RATINGS_RANGE,) * 2)), + ) def __init__(self, request, *args, **kwargs): self.request = request @@ -198,7 +204,7 @@ def __init__(self, request, *args, **kwargs): if request and is_authenticated(request.user): current = self.rating_manager.filter(user=request.user).first() if current: - self.initial['value'] = current.value + self.initial["value"] = current.value @property def rating_manager(self): @@ -230,8 +236,9 @@ def save(self): manager = self.rating_manager if is_authenticated(user): - rating_instance, created = manager.get_or_create(user=user, - defaults={'value': rating_value}) + rating_instance, created = manager.get_or_create( + user=user, defaults={"value": rating_value} + ) if not created: if rating_instance.value == int(rating_value): # User submitted the same rating as previously, diff --git a/mezzanine/generic/managers.py b/mezzanine/generic/managers.py index 555cb26abd..a069e1e936 100644 --- a/mezzanine/generic/managers.py +++ b/mezzanine/generic/managers.py @@ -34,7 +34,6 @@ def count_queryset(self): class KeywordManager(CurrentSiteManager): - def get_by_natural_key(self, value): """ Provides natural key method. diff --git a/mezzanine/generic/models.py b/mezzanine/generic/models.py index 1469e37b2e..9b87159bc8 100644 --- a/mezzanine/generic/models.py +++ b/mezzanine/generic/models.py @@ -26,8 +26,13 @@ class ThreadedComment(Comment): """ by_author = models.BooleanField(_("By the blog author"), default=False) - replied_to = models.ForeignKey("self", on_delete=models.CASCADE, null=True, - editable=False, related_name="comments") + replied_to = models.ForeignKey( + "self", + on_delete=models.CASCADE, + null=True, + editable=False, + related_name="comments", + ) rating = RatingField(verbose_name=_("Rating")) objects = CommentManager() @@ -60,20 +65,27 @@ def save(self, *args, **kwargs): def intro(self): return truncatewords_html(self.comment, 20) + intro.short_description = _("Comment") def avatar_link(self): from mezzanine.core.templatetags.mezzanine_tags import gravatar_url + return format_html( "{}", - self.user_email, gravatar_url(self.email), self.user_name + self.user_email, + gravatar_url(self.email), + self.user_name, ) + avatar_link.short_description = _("User") def admin_link(self): - return format_html("{}", self.get_absolute_url(), - ugettext("View on site")) + return format_html( + "{}", self.get_absolute_url(), ugettext("View on site") + ) + admin_link.short_description = "" # Exists for backward compatibility when the gravatar_url template @@ -102,10 +114,15 @@ class AssignedKeyword(Orderable): A ``Keyword`` assigned to a model instance. """ - keyword = models.ForeignKey("Keyword", on_delete=models.CASCADE, - verbose_name=_("Keyword"), related_name="assignments") - content_type = models.ForeignKey("contenttypes.ContentType", - on_delete=models.CASCADE) + keyword = models.ForeignKey( + "Keyword", + on_delete=models.CASCADE, + verbose_name=_("Keyword"), + related_name="assignments", + ) + content_type = models.ForeignKey( + "contenttypes.ContentType", on_delete=models.CASCADE + ) object_pk = models.IntegerField() content_object = GenericForeignKey("content_type", "object_pk") @@ -122,14 +139,19 @@ class Rating(models.Model): """ value = models.IntegerField(_("Value")) - rating_date = models.DateTimeField(_("Rating date"), - auto_now_add=True, null=True) - content_type = models.ForeignKey("contenttypes.ContentType", - on_delete=models.CASCADE) + rating_date = models.DateTimeField(_("Rating date"), auto_now_add=True, null=True) + content_type = models.ForeignKey( + "contenttypes.ContentType", on_delete=models.CASCADE + ) object_pk = models.IntegerField() content_object = GenericForeignKey("content_type", "object_pk") - user = models.ForeignKey(get_user_model_name(), on_delete=models.CASCADE, - verbose_name=_("Rater"), null=True, related_name="%(class)ss") + user = models.ForeignKey( + get_user_model_name(), + on_delete=models.CASCADE, + verbose_name=_("Rater"), + null=True, + related_name="%(class)ss", + ) class Meta: verbose_name = _("Rating") @@ -141,6 +163,7 @@ def save(self, *args, **kwargs): """ valid = map(str, settings.RATINGS_RANGE) if str(self.value) not in valid: - raise ValueError("Invalid rating. %s is not in %s" % (self.value, - ", ".join(valid))) + raise ValueError( + "Invalid rating. %s is not in %s" % (self.value, ", ".join(valid)) + ) super(Rating, self).save(*args, **kwargs) diff --git a/mezzanine/generic/templatetags/comment_tags.py b/mezzanine/generic/templatetags/comment_tags.py index 0b904b62cc..224ff0c0ec 100644 --- a/mezzanine/generic/templatetags/comment_tags.py +++ b/mezzanine/generic/templatetags/comment_tags.py @@ -21,13 +21,16 @@ def comments_for(context, obj): form_class = import_dotted_path(settings.COMMENT_FORM_CLASS) form = form_class(context["request"], obj) context_form = context.get("posted_comment_form", form) - context.update({ - 'posted_comment_form': - context_form if context_form.target_object == obj else form, - 'unposted_comment_form': form, - 'comment_url': reverse("comment"), - 'object_for_comments': obj, - }) + context.update( + { + "posted_comment_form": context_form + if context_form.target_object == obj + else form, + "unposted_comment_form": form, + "comment_url": reverse("comment"), + "object_for_comments": obj, + } + ) return context.flatten() @@ -53,16 +56,17 @@ def comment_thread(context, parent): replied_to = int(context["request"].POST["replied_to"]) except KeyError: replied_to = 0 - context.update({ - "comments_for_thread": context["all_comments"].get(parent_id, []), - "no_comments": parent_id is None and not context["all_comments"], - "replied_to": replied_to, - }) + context.update( + { + "comments_for_thread": context["all_comments"].get(parent_id, []), + "no_comments": parent_id is None and not context["all_comments"], + "replied_to": replied_to, + } + ) return context.flatten() -@register.inclusion_tag("admin/includes/recent_comments.html", - takes_context=True) +@register.inclusion_tag("admin/includes/recent_comments.html", takes_context=True) def recent_comments(context): """ Dashboard widget for displaying recent comments. @@ -83,8 +87,10 @@ def comment_filter(comment_text): """ filter_func = settings.COMMENT_FILTER if not filter_func: + def filter_func(s): return linebreaksbr(urlize(s, autoescape=True), autoescape=True) + elif not callable(filter_func): filter_func = import_dotted_path(filter_func) return filter_func(comment_text) diff --git a/mezzanine/generic/templatetags/disqus_tags.py b/mezzanine/generic/templatetags/disqus_tags.py index 289be3e74e..2da9a230a8 100644 --- a/mezzanine/generic/templatetags/disqus_tags.py +++ b/mezzanine/generic/templatetags/disqus_tags.py @@ -41,19 +41,23 @@ def _get_disqus_sso(user, public_key, secret_key): # Based on snippet provided on http://docs.disqus.com/developers/sso/ # create a JSON packet of our data attributes - data = json.dumps({ - 'id': '%s' % user.id, - 'username': user.username, - 'email': user.email, - }) + data = json.dumps( + { + "id": "%s" % user.id, + "username": user.username, + "email": user.email, + } + ) # encode the data to base64 message = base64.b64encode(data.encode("utf8")) # generate a timestamp for signing the message timestamp = int(time.time()) # generate our hmac signature - sig = hmac.HMAC(secret_key.encode("utf8"), - ('%s %s' % (message, timestamp)).encode("utf8"), - hashlib.sha1).hexdigest() + sig = hmac.HMAC( + secret_key.encode("utf8"), + ("%s %s" % (message, timestamp)).encode("utf8"), + hashlib.sha1, + ).hexdigest() # Messages are of the form - return '%s %s %s' % (message, sig, timestamp) + return "%s %s %s" % (message, sig, timestamp) diff --git a/mezzanine/generic/templatetags/keyword_tags.py b/mezzanine/generic/templatetags/keyword_tags.py index c1a2d0eef6..97a1467c51 100644 --- a/mezzanine/generic/templatetags/keyword_tags.py +++ b/mezzanine/generic/templatetags/keyword_tags.py @@ -46,9 +46,9 @@ def keywords_for(*args): return [] counts = [keyword.item_count for keyword in keywords] min_count, max_count = min(counts), max(counts) - factor = (settings.TAG_CLOUD_SIZES - 1.) + factor = settings.TAG_CLOUD_SIZES - 1.0 if min_count != max_count: - factor /= (max_count - min_count) + factor /= max_count - min_count for kywd in keywords: kywd.weight = int(round((kywd.item_count - min_count) * factor)) + 1 return keywords diff --git a/mezzanine/generic/templatetags/rating_tags.py b/mezzanine/generic/templatetags/rating_tags.py index 13b8ca3553..c66f9cbac3 100644 --- a/mezzanine/generic/templatetags/rating_tags.py +++ b/mezzanine/generic/templatetags/rating_tags.py @@ -15,7 +15,7 @@ def rating_for(context, obj): context["rating_form"] = RatingForm(context["request"], obj) ratings = context["request"].COOKIES.get("mezzanine-rating", "") rating_string = "%s.%s" % (obj._meta, obj.pk) - context["rated"] = (rating_string in ratings) + context["rated"] = rating_string in ratings rating_name = obj.get_ratingfield_name() for f in ("average", "count", "sum"): context["rating_" + f] = getattr(obj, "%s_%s" % (rating_name, f)) diff --git a/mezzanine/generic/tests.py b/mezzanine/generic/tests.py index 5c65515957..5c766613b1 100644 --- a/mezzanine/generic/tests.py +++ b/mezzanine/generic/tests.py @@ -19,15 +19,14 @@ class GenericTests(TestCase): - - @skipUnless("mezzanine.blog" in settings.INSTALLED_APPS, - "blog app required") + @skipUnless("mezzanine.blog" in settings.INSTALLED_APPS, "blog app required") def test_rating(self): """ Test that ratings can be posted and avarage/count are calculated. """ - blog_post = BlogPost.objects.create(title="Ratings", user=self._user, - status=CONTENT_STATUS_PUBLISHED) + blog_post = BlogPost.objects.create( + title="Ratings", user=self._user, status=CONTENT_STATUS_PUBLISHED + ) if settings.RATINGS_ACCOUNT_REQUIRED: self.client.login(username=self._username, password=self._password) data = RatingForm(None, blog_post).initial @@ -43,28 +42,28 @@ def test_rating(self): average = _sum / count if settings.RATINGS_ACCOUNT_REQUIRED: self.assertEqual(blog_post.rating_count, 1) - self.assertEqual(blog_post.rating_sum, - settings.RATINGS_RANGE[-1]) - self.assertEqual(blog_post.rating_average, - settings.RATINGS_RANGE[-1] / 1) + self.assertEqual(blog_post.rating_sum, settings.RATINGS_RANGE[-1]) + self.assertEqual(blog_post.rating_average, settings.RATINGS_RANGE[-1] / 1) else: self.assertEqual(blog_post.rating_count, count) self.assertEqual(blog_post.rating_sum, _sum) self.assertEqual(blog_post.rating_average, average) - @skipUnless("mezzanine.blog" in settings.INSTALLED_APPS, - "blog app required") + @skipUnless("mezzanine.blog" in settings.INSTALLED_APPS, "blog app required") def test_comment_ratings(self): """ Test that a generic relation defined on one of Mezzanine's generic models (in this case ratings of comments) correctly sets its extra fields. """ - blog_post = BlogPost.objects.create(title="Post with comments", - user=self._user) + blog_post = BlogPost.objects.create(title="Post with comments", user=self._user) content_type = ContentType.objects.get_for_model(blog_post) - kwargs = {"content_type": content_type, "object_pk": blog_post.id, - "site_id": settings.SITE_ID, "comment": "First!!!11"} + kwargs = { + "content_type": content_type, + "object_pk": blog_post.id, + "site_id": settings.SITE_ID, + "comment": "First!!!11", + } comment = ThreadedComment.objects.create(**kwargs) comment.rating.create(value=settings.RATINGS_RANGE[0]) comment.rating.create(value=settings.RATINGS_RANGE[-1]) @@ -74,10 +73,10 @@ def test_comment_ratings(self): self.assertEqual( comment.rating_average, - (settings.RATINGS_RANGE[0] + settings.RATINGS_RANGE[-1]) / 2) + (settings.RATINGS_RANGE[0] + settings.RATINGS_RANGE[-1]) / 2, + ) - @skipUnless("mezzanine.blog" in settings.INSTALLED_APPS, - "blog app required") + @skipUnless("mezzanine.blog" in settings.INSTALLED_APPS, "blog app required") def test_comment_queries(self): """ Test that rendering comments executes the same number of @@ -85,8 +84,11 @@ def test_comment_queries(self): """ blog_post = BlogPost.objects.create(title="Post", user=self._user) content_type = ContentType.objects.get_for_model(blog_post) - kwargs = {"content_type": content_type, "object_pk": blog_post.id, - "site_id": settings.SITE_ID} + kwargs = { + "content_type": content_type, + "object_pk": blog_post.id, + "site_id": settings.SITE_ID, + } template = "{% load comment_tags %}{% comment_thread blog_post %}" context = { "blog_post": blog_post, @@ -101,8 +103,7 @@ def test_comment_queries(self): after = self.queries_used_for_template(template, **context) self.assertEqual(before, after) - @skipUnless("mezzanine.pages" in settings.INSTALLED_APPS, - "pages app required") + @skipUnless("mezzanine.pages" in settings.INSTALLED_APPS, "pages app required") def test_keywords(self): """ Test that the keywords_string field is correctly populated. @@ -129,8 +130,9 @@ def test_delete_unused(self): """ assigned_keyword = Keyword.objects.create(title="assigned") Keyword.objects.create(title="unassigned") - AssignedKeyword.objects.create(keyword_id=assigned_keyword.id, - content_object=RichTextPage(pk=1)) + AssignedKeyword.objects.create( + keyword_id=assigned_keyword.id, content_object=RichTextPage(pk=1) + ) Keyword.objects.delete_unused(keyword_ids=[assigned_keyword.id]) self.assertEqual(Keyword.objects.count(), 2) Keyword.objects.delete_unused() @@ -142,7 +144,7 @@ def test_comment_form_returns_400_when_missing_data(self): Assert 400 status code response when expected data is missing from the comment form. This simulates typical malicious bot behavior. """ - request = self._request_factory.post(reverse('comment')) + request = self._request_factory.post(reverse("comment")) if settings.COMMENTS_ACCOUNT_REQUIRED: request.user = self._user request.session = {} @@ -151,27 +153,29 @@ def test_comment_form_returns_400_when_missing_data(self): def test_multiple_comment_forms(self): - template = Template(""" + template = Template( + """ {% load comment_tags %} {% comments_for post1 %} {% comments_for post2 %} - """) + """ + ) - request = self._request_factory.get(reverse('comment')) + request = self._request_factory.get(reverse("comment")) request.user = self._user context = { - 'post1': BlogPost.objects.create(title="Post #1", user=self._user), - 'post2': BlogPost.objects.create(title="Post #2", user=self._user), - 'request': request, + "post1": BlogPost.objects.create(title="Post #1", user=self._user), + "post2": BlogPost.objects.create(title="Post #2", user=self._user), + "request": request, } result = template.render(Context(context)) self.assertInHTML( '' % context['post2'].pk, - result + 'type="hidden" value="%d" />' % context["post2"].pk, + result, ) def test_keywords_widget(self): @@ -197,8 +201,9 @@ def test_keywords_widget(self): self.assertIn("brown", values_from_string[1]) for keyword_id in keyword_id_list: - AssignedKeyword.objects.create(keyword_id=keyword_id, - content_object=RichTextPage(pk=1)) + AssignedKeyword.objects.create( + keyword_id=keyword_id, content_object=RichTextPage(pk=1) + ) assigned_keywords = AssignedKeyword.objects.all() values_from_relation = keyword_widget.decompress(assigned_keywords) diff --git a/mezzanine/generic/views.py b/mezzanine/generic/views.py index f8268a7eff..fa2ec95c1e 100644 --- a/mezzanine/generic/views.py +++ b/mezzanine/generic/views.py @@ -37,8 +37,9 @@ def admin_keywords_submit(request): if keyword_id not in keyword_ids: keyword_ids.append(keyword_id) titles.append(title) - return HttpResponse("%s|%s" % (",".join(keyword_ids), ", ".join(titles)), - content_type='text/plain') + return HttpResponse( + "%s|%s" % (",".join(keyword_ids), ", ".join(titles)), content_type="text/plain" + ) def initial_validation(request, prefix): @@ -65,8 +66,13 @@ def initial_validation(request, prefix): if not is_authenticated(request.user): if request.method == "POST": request.session[posted_session_key] = request.POST - error(request, _("You must be logged in. Please log in or " - "sign up to complete this action.")) + error( + request, + _( + "You must be logged in. Please log in or " + "sign up to complete this action." + ), + ) redirect_url = "%s?next=%s" % (settings.LOGIN_URL, reverse(prefix)) elif posted_session_key in request.session: post_data = request.session.pop(posted_session_key) diff --git a/mezzanine/mobile/__init__.py b/mezzanine/mobile/__init__.py index 99341d15c7..9e69b41970 100644 --- a/mezzanine/mobile/__init__.py +++ b/mezzanine/mobile/__init__.py @@ -2,5 +2,7 @@ warnings.warn( "mezzanine.mobile has been deprecated. Please remove it from your " - "INSTALLED_APPS.", FutureWarning, stacklevel=2 + "INSTALLED_APPS.", + FutureWarning, + stacklevel=2, ) diff --git a/mezzanine/pages/__init__.py b/mezzanine/pages/__init__.py index afe488f802..25779d62b8 100644 --- a/mezzanine/pages/__init__.py +++ b/mezzanine/pages/__init__.py @@ -5,4 +5,4 @@ from mezzanine import __version__ # noqa -default_app_config = 'mezzanine.pages.apps.PagesConfig' +default_app_config = "mezzanine.pages.apps.PagesConfig" diff --git a/mezzanine/pages/admin.py b/mezzanine/pages/admin.py index 8e6c572b95..83159759d6 100644 --- a/mezzanine/pages/admin.py +++ b/mezzanine/pages/admin.py @@ -174,9 +174,7 @@ def formfield_for_dbfield(self, db_field, request, **kwargs): if db_field.name == "slug": kwargs["required"] = True kwargs["help_text"] = None - return super(LinkAdmin, self).formfield_for_dbfield( - db_field, request, **kwargs - ) + return super(LinkAdmin, self).formfield_for_dbfield(db_field, request, **kwargs) def save_form(self, request, form, change): """ diff --git a/mezzanine/pages/apps.py b/mezzanine/pages/apps.py index 15ebe6f560..1a14c99bd0 100644 --- a/mezzanine/pages/apps.py +++ b/mezzanine/pages/apps.py @@ -3,7 +3,7 @@ class PagesConfig(AppConfig): - name = 'mezzanine.pages' + name = "mezzanine.pages" def ready(self): from . import checks # noqa diff --git a/mezzanine/pages/checks.py b/mezzanine/pages/checks.py index 1e5b946ccb..6ca54e8061 100644 --- a/mezzanine/pages/checks.py +++ b/mezzanine/pages/checks.py @@ -8,20 +8,24 @@ def check_context_processor(app_configs, **kwargs): issues = [] - name = 'mezzanine.pages.context_processors.page' + name = "mezzanine.pages.context_processors.page" if settings.TEMPLATES: - loaded = any(name in config.get('OPTIONS', {}).get( - 'context_processors', {}) for config in settings.TEMPLATES) + loaded = any( + name in config.get("OPTIONS", {}).get("context_processors", {}) + for config in settings.TEMPLATES + ) else: loaded = name in settings.TEMPLATE_CONTEXT_PROCESSORS if not loaded: - issues.append(Warning( - "You haven't included 'mezzanine.pages.context_processors.page' " - "as a context processor in any of your template configurations. " - "Your templates might not work as expected.", - id="mezzanine.pages.W01" - )) + issues.append( + Warning( + "You haven't included 'mezzanine.pages.context_processors.page' " + "as a context processor in any of your template configurations. " + "Your templates might not work as expected.", + id="mezzanine.pages.W01", + ) + ) return issues diff --git a/mezzanine/pages/defaults.py b/mezzanine/pages/defaults.py index cf4ef0567f..0dd49b4b33 100644 --- a/mezzanine/pages/defaults.py +++ b/mezzanine/pages/defaults.py @@ -16,23 +16,27 @@ register_setting( name="ADD_PAGE_ORDER", - description=_("A sequence of ``Page`` subclasses in the format " + description=_( + "A sequence of ``Page`` subclasses in the format " "``app_label.model_name``, that controls the ordering of items " "in the select drop-down for adding new pages within the admin " - "page tree interface."), + "page tree interface." + ), editable=False, default=("pages.RichTextPage",), ) register_setting( name="PAGE_MENU_TEMPLATES", - description=_("A sequence of templates used by the ``page_menu`` " + description=_( + "A sequence of templates used by the ``page_menu`` " "template tag. Each item in the sequence is a three item sequence, " "containing a unique ID for the template, a label for the template, " "and the template path. These templates are then available for " "selection when editing which menus a page should appear in. Note " "that if a menu template is used that doesn't appear in this " - "setting, all pages will appear in it."), + "setting, all pages will appear in it." + ), editable=False, default=( (1, _("Top navigation bar"), "pages/menus/dropdown.html"), @@ -43,22 +47,26 @@ register_setting( name="PAGE_MENU_TEMPLATES_DEFAULT", - description=_("A sequence of IDs from the ``PAGE_MENU_TEMPLATES`` " + description=_( + "A sequence of IDs from the ``PAGE_MENU_TEMPLATES`` " "setting that defines the default menu templates selected when " "creating new pages. By default all menu templates are selected. " "Set this setting to an empty sequence to have no templates " - "selected by default."), + "selected by default." + ), editable=False, default=None, ) register_setting( name="PAGES_PUBLISHED_INCLUDE_LOGIN_REQUIRED", - description=_("If ``True``, pages with ``login_required`` checked will " + description=_( + "If ``True``, pages with ``login_required`` checked will " "still be listed in menus and search results, for unauthenticated " "users. Regardless of this setting, when an unauthenticated user " "accesses a page with ``login_required`` checked, they'll be " - "redirected to the login page."), + "redirected to the login page." + ), editable=False, default=False, ) diff --git a/mezzanine/pages/fields.py b/mezzanine/pages/fields.py index 84132aa14c..ad82b0dc04 100644 --- a/mezzanine/pages/fields.py +++ b/mezzanine/pages/fields.py @@ -11,8 +11,8 @@ def __init__(self, *args, **kwargs): defaults = {"max_length": 100} defaults.update(kwargs) super(MenusField, self).__init__(*args, **defaults) - self._overridden_default = ("default" in kwargs) - self._overridden_choices = ("choices" in kwargs) + self._overridden_default = "default" in kwargs + self._overridden_choices = "choices" in kwargs def has_default(self): """ diff --git a/mezzanine/pages/managers.py b/mezzanine/pages/managers.py index 4be3f77c32..ae371793b5 100644 --- a/mezzanine/pages/managers.py +++ b/mezzanine/pages/managers.py @@ -5,7 +5,6 @@ class PageManager(DisplayableManager): - def published(self, for_user=None, include_login_required=False): """ Override ``DisplayableManager.published`` to exclude @@ -21,8 +20,11 @@ def published(self, for_user=None, include_login_required=False): """ published = super(PageManager, self).published(for_user=for_user) unauthenticated = for_user and not is_authenticated(for_user) - if (unauthenticated and not include_login_required and - not settings.PAGES_PUBLISHED_INCLUDE_LOGIN_REQUIRED): + if ( + unauthenticated + and not include_login_required + and not settings.PAGES_PUBLISHED_INCLUDE_LOGIN_REQUIRED + ): published = published.exclude(login_required=True) return published diff --git a/mezzanine/pages/middleware.py b/mezzanine/pages/middleware.py index 426bcc7f42..26993e3bc4 100644 --- a/mezzanine/pages/middleware.py +++ b/mezzanine/pages/middleware.py @@ -7,7 +7,7 @@ from mezzanine.pages.models import Page from mezzanine.pages.views import page as page_view from mezzanine.utils.conf import middlewares_or_subclasses_installed -from mezzanine.utils.deprecation import (MiddlewareMixin, is_authenticated) +from mezzanine.utils.deprecation import MiddlewareMixin, is_authenticated from mezzanine.utils.urls import path_to_slug @@ -61,8 +61,9 @@ def process_view(self, request, view_func, view_args, view_kwargs): # Load the closest matching page by slug, and assign it to the # request object. If none found, skip all further processing. slug = path_to_slug(request.path_info) - pages = Page.objects.with_ascendants_for_slug(slug, - for_user=request.user, include_login_required=True) + pages = Page.objects.with_ascendants_for_slug( + slug, for_user=request.user, include_login_required=True + ) if pages: page = pages[0] setattr(request, "page", page) @@ -93,8 +94,7 @@ def process_view(self, request, view_func, view_args, view_kwargs): # Run page processors. extra_context = {} if request.resolver_match: - extra_context = request.resolver_match.kwargs.get("extra_context", - {}) + extra_context = request.resolver_match.kwargs.get("extra_context", {}) model_processors = page_processors.processors[page.content_model] slug_processors = page_processors.processors["slug:%s" % page.slug] for (processor, exact_page) in slug_processors + model_processors: @@ -110,9 +110,11 @@ def process_view(self, request, view_func, view_args, view_kwargs): extra_context[k] = v except (TypeError, ValueError): name = "%s.%s" % (processor.__module__, processor.__name__) - error = ("The page processor %s returned %s but must " - "return HttpResponse or dict." % - (name, type(processor_response))) + error = ( + "The page processor %s returned %s but must " + "return HttpResponse or dict." + % (name, type(processor_response)) + ) raise ValueError(error) return page_view(request, slug, extra_context=extra_context) diff --git a/mezzanine/pages/models.py b/mezzanine/pages/models.py index 9f0628b54e..9cd347b80f 100644 --- a/mezzanine/pages/models.py +++ b/mezzanine/pages/models.py @@ -8,8 +8,7 @@ from django.utils.translation import ugettext_lazy as _, ugettext from mezzanine.conf import settings -from mezzanine.core.models import ( - ContentTyped, Displayable, Orderable, RichText) +from mezzanine.core.models import ContentTyped, Displayable, Orderable, RichText from mezzanine.pages.fields import MenusField from mezzanine.pages.managers import PageManager from mezzanine.utils.urls import path_to_slug @@ -36,12 +35,16 @@ class Page(BasePage, ContentTyped): need to subclass. """ - parent = models.ForeignKey("Page", on_delete=models.CASCADE, - blank=True, null=True, related_name="children") + parent = models.ForeignKey( + "Page", on_delete=models.CASCADE, blank=True, null=True, related_name="children" + ) in_menus = MenusField(_("Show in menus"), blank=True, null=True) titles = models.CharField(editable=False, max_length=1000, null=True) - login_required = models.BooleanField(_("Login required"), default=False, - help_text=_("If checked, only logged in users can view this page")) + login_required = models.BooleanField( + _("Login required"), + default=False, + help_text=_("If checked, only logged in users can view this page"), + ) class Meta: verbose_name = _("Page") @@ -61,7 +64,7 @@ def get_absolute_url(self): slug = self.slug if self.content_model == "link": # Ensure the URL is absolute. - slug = urljoin('/', slug) + slug = urljoin("/", slug) return slug if slug == "/": return reverse("home") @@ -112,8 +115,7 @@ def get_ascendants(self, for_user=None): if self.slug: kwargs = {"for_user": for_user} with override_current_site_id(self.site_id): - pages = Page.objects.with_ascendants_for_slug(self.slug, - **kwargs) + pages = Page.objects.with_ascendants_for_slug(self.slug, **kwargs) self._ascendants = pages[0]._ascendants else: self._ascendants = [] @@ -144,7 +146,7 @@ def set_slug(self, new_slug): slug_prefix = "%s/" % self.slug for page in Page.objects.filter(slug__startswith=slug_prefix): if not page.overridden(): - page.slug = new_slug + page.slug[len(self.slug):] + page.slug = new_slug + page.slug[len(self.slug) :] page.save() self.slug = new_slug self.save() @@ -162,20 +164,21 @@ def set_parent(self, new_parent): parent = new_parent while parent is not None: if parent.pk == self.pk: - raise AttributeError("You can't set a page or its child as" - " a parent.") + raise AttributeError( + "You can't set a page or its child as" " a parent." + ) parent = parent.parent self.parent = new_parent self.save() - if self_slug and not (self.content_model == "link" and - self.slug.startswith("http")): + if self_slug and not ( + self.content_model == "link" and self.slug.startswith("http") + ): if not old_parent_slug: self.set_slug("/".join((new_parent_slug, self.slug))) elif self.slug.startswith(old_parent_slug): - new_slug = self.slug.replace(old_parent_slug, - new_parent_slug, 1) + new_slug = self.slug.replace(old_parent_slug, new_parent_slug, 1) self.set_slug(new_slug.strip("/")) def overridden(self): @@ -184,6 +187,7 @@ def overridden(self): urlpattern and is therefore considered to be overridden. """ from mezzanine.pages.views import page + page_url = reverse("page", kwargs={"slug": self.slug}) resolved_view = resolve(page_url)[0] return resolved_view != page @@ -242,6 +246,7 @@ def set_helpers(self, context): def is_c_or_a(page_id): parent_id = context.get("_parent_page_ids", {}).get(page_id) return self.id == page_id or (parent_id and is_c_or_a(parent_id)) + self.is_current_or_ascendant = lambda: bool(is_c_or_a(current_page_id)) self.is_current_parent = self.id == current_parent_id # Am I a primary page? diff --git a/mezzanine/pages/page_processors.py b/mezzanine/pages/page_processors.py index 30f6613820..c14e0e0964 100644 --- a/mezzanine/pages/page_processors.py +++ b/mezzanine/pages/page_processors.py @@ -34,10 +34,11 @@ def processor_for(content_model_or_slug, exact_page=False): elif issubclass(content_model_or_slug, Page): content_model = content_model_or_slug else: - raise TypeError("%s is not a valid argument for page_processor, " - "which should be a model subclass of Page in class " - "or string form (app.model), or a valid slug" % - content_model_or_slug) + raise TypeError( + "%s is not a valid argument for page_processor, " + "which should be a model subclass of Page in class " + "or string form (app.model), or a valid slug" % content_model_or_slug + ) def decorator(func): parts = (func, exact_page) @@ -47,6 +48,7 @@ def decorator(func): else: processors["slug:%s" % slug].insert(0, parts) return func + return decorator diff --git a/mezzanine/pages/templatetags/pages_tags.py b/mezzanine/pages/templatetags/pages_tags.py index 9692d6a6c6..493d7fd8db 100644 --- a/mezzanine/pages/templatetags/pages_tags.py +++ b/mezzanine/pages/templatetags/pages_tags.py @@ -50,16 +50,17 @@ def page_menu(context, token): slug = "" num_children = lambda id: lambda: len(context["menu_pages"][id]) has_children = lambda id: lambda: num_children(id)() > 0 - rel = [m.__name__.lower() - for m in Page.get_content_models() - if not m._meta.proxy] + rel = [ + m.__name__.lower() for m in Page.get_content_models() if not m._meta.proxy + ] published = Page.objects.published(for_user=user).select_related(*rel) # Store the current page being viewed in the context. Used # for comparisons in page.set_menu_helpers. if "page" not in context: try: context.dicts[0]["_current_page"] = published.exclude( - content_model="link").get(slug=slug) + content_model="link" + ).get(slug=slug) except Page.DoesNotExist: context.dicts[0]["_current_page"] = None elif slug: @@ -141,9 +142,13 @@ def models_for_pages(*args): ``Page`` model. """ from warnings import warn - warn("template tag models_for_pages is deprectaed, use " - "PageAdmin.get_content_models instead") + + warn( + "template tag models_for_pages is deprectaed, use " + "PageAdmin.get_content_models instead" + ) from mezzanine.pages.admin import PageAdmin + return PageAdmin.get_content_models() @@ -183,14 +188,17 @@ def set_page_permissions(context, token): opts = model._meta except AttributeError: if model is None: - error = _("Could not load the model for the following page, " - "was it removed?") + error = _( + "Could not load the model for the following page, " "was it removed?" + ) obj = page else: # A missing inner Meta class usually means the Page model # hasn't been directly subclassed. - error = _("An error occured with the following class. Does " - "it subclass Page directly?") + error = _( + "An error occured with the following class. Does " + "it subclass Page directly?" + ) obj = model.__class__.__name__ raise ImproperlyConfigured(error + " '%s'" % obj) perm_name = opts.app_label + ".%s_" + opts.object_name.lower() diff --git a/mezzanine/pages/tests.py b/mezzanine/pages/tests.py index 79b5c7aa0b..f61f53fbc2 100644 --- a/mezzanine/pages/tests.py +++ b/mezzanine/pages/tests.py @@ -30,19 +30,20 @@ class PagesTests(TestCase): - def setUp(self): """ Make sure we have a thread-local request with a site_id attribute set. """ super(PagesTests, self).setUp() from mezzanine.core.request import _thread_local - request = self._request_factory.get('/') + + request = self._request_factory.get("/") request.site_id = settings.SITE_ID _thread_local.request = request def tearDown(self): from mezzanine.core.request import _thread_local + try: del _thread_local.request except AttributeError: @@ -106,8 +107,7 @@ def test_page_ascendants(self): def test_set_parent(self): old_parent, _ = RichTextPage.objects.get_or_create(title="Old parent") new_parent, _ = RichTextPage.objects.get_or_create(title="New parent") - child, _ = RichTextPage.objects.get_or_create( - title="Child", slug="kid") + child, _ = RichTextPage.objects.get_or_create(title="Child", slug="kid") self.assertTrue(child.parent is None) self.assertTrue(child.slug == "kid") @@ -155,10 +155,10 @@ def test_set_parent(self): p1.set_parent(p2c) def test_set_slug(self): - parent, _ = RichTextPage.objects.get_or_create( - title="Parent", slug="parent") + parent, _ = RichTextPage.objects.get_or_create(title="Parent", slug="parent") child, _ = RichTextPage.objects.get_or_create( - title="Child", slug="parent/child", parent_id=parent.id) + title="Child", slug="parent/child", parent_id=parent.id + ) parent.set_slug("new-parent-slug") self.assertTrue(parent.slug == "new-parent-slug") @@ -170,10 +170,12 @@ def test_set_slug(self): def test_login_required(self): public, _ = RichTextPage.objects.get_or_create( - title="Public", slug="public", login_required=False) + title="Public", slug="public", login_required=False + ) private, _ = RichTextPage.objects.get_or_create( - title="Private", slug="private", login_required=True) - accounts_installed = ("mezzanine.accounts" in settings.INSTALLED_APPS) + title="Private", slug="private", login_required=True + ) + accounts_installed = "mezzanine.accounts" in settings.INSTALLED_APPS args = {"for_user": AnonymousUser()} self.assertTrue(public in RichTextPage.objects.published(**args)) @@ -212,8 +214,7 @@ def test_login_required(self): target_status_code = 200 else: target_status_code = 404 - self.assertRedirects(response, login, - target_status_code=target_status_code) + self.assertRedirects(response, login, target_status_code=target_status_code) response = self.client.get(public_url, follow=True) self.assertEqual(response.status_code, 200) @@ -247,24 +248,29 @@ def test_login_required(self): def test_set_model_permissions(self): from mezzanine.core.request import _thread_local - template = ('{% load pages_tags %}' - '{% set_model_permissions model %}{{ model.perms }}') + + template = ( + "{% load pages_tags %}" "{% set_model_permissions model %}{{ model.perms }}" + ) request = _thread_local.request request.user = AnonymousUser() - rendered = Template(template).render(Context({'model': RichTextPage, - 'request': request})) + rendered = Template(template).render( + Context({"model": RichTextPage, "request": request}) + ) self.assertIsNotNone(rendered) def test_set_page_permissions(self): from mezzanine.core.request import _thread_local - template = ('{% load pages_tags %}' - '{% set_page_permissions page %}{{ page.perms }}') + + template = ( + "{% load pages_tags %}" "{% set_page_permissions page %}{{ page.perms }}" + ) request = _thread_local.request request.user = AnonymousUser() - home_page, _ = RichTextPage.objects.get_or_create(slug="/", - title="home") - rendered = Template(template).render(Context({'page': home_page, - 'request': request})) + home_page, _ = RichTextPage.objects.get_or_create(slug="/", title="home") + rendered = Template(template).render( + Context({"page": home_page, "request": request}) + ) self.assertIsNotNone(rendered) def test_page_menu_key_error(self): @@ -272,20 +278,20 @@ def test_page_menu_key_error(self): Test that rendering a page menu without a template name or context["menu_template_name"] raises a TemplateSystemError. """ - template = ('{% load pages_tags %}' - '{% page_menu %}') + template = "{% load pages_tags %}" "{% page_menu %}" with self.assertRaises(TemplateSyntaxError): Template(template).render(Context({})) def test_page_menu_slug_home(self): from mezzanine.core.request import _thread_local + home, _ = RichTextPage.objects.get_or_create(slug="/", title="home") - template = ('{% load pages_tags %}' - '{% page_menu "pages/menus/tree.html" %}') + template = "{% load pages_tags %}" '{% page_menu "pages/menus/tree.html" %}' request = _thread_local.request request.user = AnonymousUser() - rendered = Template(template).render(Context({'page': home, - 'request': request})) + rendered = Template(template).render( + Context({"page": home, "request": request}) + ) self.assertIsNotNone(rendered) def test_page_menu_queries(self): @@ -294,12 +300,12 @@ def test_page_menu_queries(self): queries regardless of the number of pages or levels of children. """ - template = ('{% load pages_tags %}' - '{% page_menu "pages/menus/tree.html" %}') + template = "{% load pages_tags %}" '{% page_menu "pages/menus/tree.html" %}' before = self.queries_used_for_template(template) self.assertTrue(before > 0) - self.create_recursive_objects(RichTextPage, "parent", title="Page", - status=CONTENT_STATUS_PUBLISHED) + self.create_recursive_objects( + RichTextPage, "parent", title="Page", status=CONTENT_STATUS_PUBLISHED + ) after = self.queries_used_for_template(template) self.assertEqual(before, after) @@ -313,9 +319,13 @@ def test_page_menu_flags(self): template = "{% load pages_tags %}" for i, label, path in settings.PAGE_MENU_TEMPLATES: menus.append(i) - pages.append(RichTextPage.objects.create(in_menus=list(menus), - title="Page for %s" % str(label), - status=CONTENT_STATUS_PUBLISHED)) + pages.append( + RichTextPage.objects.create( + in_menus=list(menus), + title="Page for %s" % str(label), + status=CONTENT_STATUS_PUBLISHED, + ) + ) template += "{%% page_menu '%s' %%}" % path rendered = Template(template).render(Context({})) for page in pages: @@ -327,8 +337,7 @@ def test_page_menu_default(self): field is used, also checking that it doesn't get forced to text, but that sequences are made immutable. """ - with override_settings( - PAGE_MENU_TEMPLATES=((8, "a", "a"), (9, "b", "b"))): + with override_settings(PAGE_MENU_TEMPLATES=((8, "a", "a"), (9, "b", "b"))): with override_settings(PAGE_MENU_TEMPLATES_DEFAULT=None): page_in_all_menus = Page.objects.create() self.assertEqual(page_in_all_menus.in_menus, (8, 9)) @@ -345,9 +354,11 @@ def test_menusfield_default(self): def my_default_func(): return my_default - choices = ((1, 'First Menu', 'template1'), - (2, 'Second Menu', 'template2'), - (3, 'Third Menu', 'template3')) + choices = ( + (1, "First Menu", "template1"), + (2, "Second Menu", "template2"), + (3, "Third Menu", "template3"), + ) with override_settings(PAGE_MENU_TEMPLATES=choices): with override_settings(PAGE_MENU_TEMPLATES_DEFAULT=(1, 2, 3)): # test default @@ -380,7 +391,7 @@ def test_unicode_slug_parm_to_processor_for(self): """ from mezzanine.pages.page_processors import processor_for - @processor_for(u'test unicode string') + @processor_for(u"test unicode string") def test_page_processor(request, page): return {} @@ -395,22 +406,24 @@ def test_exact_page_processor_for(self): from mezzanine.pages.page_processors import processor_for from mezzanine.pages.views import page as page_view - @processor_for('foo/bar', exact_page=True) + @processor_for("foo/bar", exact_page=True) def test_page_processor(request, page): return HttpResponse("bar") foo, _ = RichTextPage.objects.get_or_create(title="foo") bar, _ = RichTextPage.objects.get_or_create(title="bar", parent=foo) - request = self._request_factory.get('/foo/bar/') + request = self._request_factory.get("/foo/bar/") request.user = self._user response = PageMiddleware().process_view(request, page_view, [], {}) self.assertTrue(isinstance(response, HttpResponse)) self.assertContains(response, "bar") - @skipUnless(settings.USE_MODELTRANSLATION and len(settings.LANGUAGES) > 1, - "modeltranslation configured for several languages required") + @skipUnless( + settings.USE_MODELTRANSLATION and len(settings.LANGUAGES) > 1, + "modeltranslation configured for several languages required", + ) def test_page_slug_has_correct_lang(self): """ Test that slug generation is done for the default language and @@ -449,23 +462,24 @@ def test_clean_slug(self): Test that PageAdminForm strips leading and trailing slashes from slugs or returns `/`. """ + class TestPageAdminForm(PageAdminForm): class Meta: fields = ["slug"] model = Page - data = {'slug': '/'} + data = {"slug": "/"} submitted_form = TestPageAdminForm(data=data) self.assertTrue(submitted_form.is_valid()) - self.assertEqual(submitted_form.cleaned_data['slug'], "/") + self.assertEqual(submitted_form.cleaned_data["slug"], "/") - data = {'slug': '/hello/world/'} + data = {"slug": "/hello/world/"} submitted_form = TestPageAdminForm(data=data) self.assertTrue(submitted_form.is_valid()) - self.assertEqual(submitted_form.cleaned_data['slug'], 'hello/world') + self.assertEqual(submitted_form.cleaned_data["slug"], "hello/world") def test_ascendants_different_site(self): - site2 = Site.objects.create(domain='site2.example.com', name='Site 2') + site2 = Site.objects.create(domain="site2.example.com", name="Site 2") parent = Page.objects.create(title="Parent", site=site2) child = parent.children.create(title="Child", site=site2) @@ -479,21 +493,22 @@ def test_ascendants_different_site(self): self.assertListEqual(grandchild.get_ascendants(), [child, parent]) def test_check_context_processor(self): - context_processor = 'mezzanine.pages.context_processors.page' - templates = [{'OPTIONS': {'context_processors': context_processor}}] - expected_warning = [Warning( - "You haven't included 'mezzanine.pages.context_processors.page' " - "as a context processor in any of your template configurations. " - "Your templates might not work as expected.", - id="mezzanine.pages.W01" - )] - app_config = apps.get_app_config('pages') + context_processor = "mezzanine.pages.context_processors.page" + templates = [{"OPTIONS": {"context_processors": context_processor}}] + expected_warning = [ + Warning( + "You haven't included 'mezzanine.pages.context_processors.page' " + "as a context processor in any of your template configurations. " + "Your templates might not work as expected.", + id="mezzanine.pages.W01", + ) + ] + app_config = apps.get_app_config("pages") with override_settings(TEMPLATES=None): with override_settings(TEMPLATE_CONTEXT_PROCESSORS=tuple()): issues = check_context_processor(app_config) self.assertEqual(issues, expected_warning) - with override_settings( - TEMPLATE_CONTEXT_PROCESSORS=(context_processor, )): + with override_settings(TEMPLATE_CONTEXT_PROCESSORS=(context_processor,)): issues = check_context_processor(app_config) self.assertEqual(issues, []) with override_settings(TEMPLATES=templates): diff --git a/mezzanine/pages/translation.py b/mezzanine/pages/translation.py index e8b565e396..6ecd514e8a 100644 --- a/mezzanine/pages/translation.py +++ b/mezzanine/pages/translation.py @@ -1,11 +1,10 @@ from modeltranslation.translator import translator, TranslationOptions -from mezzanine.core.translation import (TranslatedDisplayable, - TranslatedRichText) +from mezzanine.core.translation import TranslatedDisplayable, TranslatedRichText from mezzanine.pages.models import Page, RichTextPage, Link class TranslatedPage(TranslatedDisplayable): - fields = ('titles',) + fields = ("titles",) class TranslatedRichTextPage(TranslatedRichText): @@ -15,6 +14,7 @@ class TranslatedRichTextPage(TranslatedRichText): class TranslatedLink(TranslationOptions): fields = () + translator.register(Page, TranslatedPage) translator.register(RichTextPage, TranslatedRichTextPage) translator.register(Link, TranslatedLink) diff --git a/mezzanine/pages/urls.py b/mezzanine/pages/urls.py index 1882d7af1c..3a2ff39698 100644 --- a/mezzanine/pages/urls.py +++ b/mezzanine/pages/urls.py @@ -9,6 +9,9 @@ # Page patterns. urlpatterns = [ - re_path("(?P.*)%s$" % ("/" if settings.APPEND_SLASH else ""), - views.page, name="page"), + re_path( + "(?P.*)%s$" % ("/" if settings.APPEND_SLASH else ""), + views.page, + name="page", + ), ] diff --git a/mezzanine/pages/views.py b/mezzanine/pages/views.py index 2074b142a1..8bc8ac320e 100644 --- a/mezzanine/pages/views.py +++ b/mezzanine/pages/views.py @@ -18,16 +18,17 @@ def admin_page_ordering(request): def get_id(s): s = s.split("_")[-1] return int(s) if s.isdigit() else None - page = get_object_or_404(Page, id=get_id(request.POST['id'])) + + page = get_object_or_404(Page, id=get_id(request.POST["id"])) old_parent_id = page.parent_id - new_parent_id = get_id(request.POST['parent_id']) + new_parent_id = get_id(request.POST["parent_id"]) new_parent = Page.objects.get(id=new_parent_id) if new_parent_id else None try: page.get_content_model().can_move(request, new_parent) except PageMoveException as e: messages.error(request, e) - return HttpResponse('error') + return HttpResponse("error") # Perform the page move if new_parent_id != page.parent_id: @@ -35,10 +36,10 @@ def get_id(s): # previous siblings. page.set_parent(new_parent) pages = Page.objects.filter(parent_id=old_parent_id) - for i, page in enumerate(pages.order_by('_order')): + for i, page in enumerate(pages.order_by("_order")): Page.objects.filter(id=page.id).update(_order=i) # Set the new order for the moved page and its current siblings. - for i, page_id in enumerate(request.POST.getlist('siblings[]')): + for i, page_id in enumerate(request.POST.getlist("siblings[]")): Page.objects.filter(id=get_id(page_id)).update(_order=i) return HttpResponse("ok") @@ -64,11 +65,14 @@ def page(request, slug, template=u"pages/page.html", extra_context=None): """ from mezzanine.pages.middleware import PageMiddleware + if not PageMiddleware.installed(): - raise ImproperlyConfigured("mezzanine.pages.middleware.PageMiddleware " - "(or a subclass of it) is missing from " + - "settings.MIDDLEWARE_CLASSES or " + - "settings.MIDDLEWARE") + raise ImproperlyConfigured( + "mezzanine.pages.middleware.PageMiddleware " + "(or a subclass of it) is missing from " + + "settings.MIDDLEWARE_CLASSES or " + + "settings.MIDDLEWARE" + ) if not hasattr(request, "page") or request.page.slug != slug: raise Http404 @@ -82,14 +86,16 @@ def page(request, slug, template=u"pages/page.html", extra_context=None): if method_template: templates.insert(0, method_template) if request.page.content_model is not None: - templates.append(u"pages/%s/%s.html" % (template_name, - request.page.content_model)) + templates.append( + u"pages/%s/%s.html" % (template_name, request.page.content_model) + ) for parent in request.page.get_ascendants(for_user=request.user): parent_template_name = str(parent.slug) # Check for a template matching the page's content model. if request.page.content_model is not None: - templates.append(u"pages/%s/%s.html" % (parent_template_name, - request.page.content_model)) + templates.append( + u"pages/%s/%s.html" % (parent_template_name, request.page.content_model) + ) # Check for a template matching the page's content model. if request.page.content_model is not None: templates.append(u"pages/%s.html" % request.page.content_model) diff --git a/mezzanine/project_template/fabfile.py b/mezzanine/project_template/fabfile.py index d6dda4085d..feed631128 100644 --- a/mezzanine/project_template/fabfile.py +++ b/mezzanine/project_template/fabfile.py @@ -13,8 +13,17 @@ from mezzanine.utils.conf import real_project_name -from fabric.api import abort, env, cd, prefix, sudo as _sudo, run as _run, \ - hide, task, local +from fabric.api import ( + abort, + env, + cd, + prefix, + sudo as _sudo, + run as _run, + hide, + task, + local, +) from fabric.context_managers import settings as fab_settings from fabric.contrib.console import confirm from fabric.contrib.files import exists, upload_template @@ -65,14 +74,15 @@ env.deploy_tool = conf.get("DEPLOY_TOOL", "rsync") env.reqs_path = conf.get("REQUIREMENTS_PATH", None) env.locale = conf.get("LOCALE", "en_US.UTF-8") -env.num_workers = conf.get("NUM_WORKERS", - "multiprocessing.cpu_count() * 2 + 1") +env.num_workers = conf.get("NUM_WORKERS", "multiprocessing.cpu_count() * 2 + 1") env.secret_key = conf.get("SECRET_KEY", "") env.nevercache_key = conf.get("NEVERCACHE_KEY", "") -if not env.secret_key and \ - os.environ.get("DJANGO_SETTINGS_MODULE", "") != "docs_settings": +if ( + not env.secret_key + and os.environ.get("DJANGO_SETTINGS_MODULE", "") != "docs_settings" +): print("Aborting, no SECRET_KEY setting defined.") exit() @@ -124,6 +134,7 @@ # Context for virtualenv and project # ###################################### + @contextmanager def virtualenv(): """ @@ -177,6 +188,7 @@ def update_changed_requirements(): # Utils and wrappers for various commands # ########################################### + def _print(output): print() print(output) @@ -184,9 +196,7 @@ def _print(output): def print_command(command): - _print(blue("$ ", bold=True) + - yellow(command, bold=True) + - red(" ->", bold=True)) + _print(blue("$ ", bold=True) + yellow(command, bold=True) + red(" ->", bold=True)) @task @@ -217,6 +227,7 @@ def logged(*args, **kawrgs): header = "-" * len(func.__name__) _print(green("\n".join([header, func.__name__, header]), bold=True)) return func(*args, **kawrgs) + return logged @@ -271,11 +282,21 @@ def rsync_upload(): """ Uploads the project with rsync excluding some files and folders. """ - excludes = ["*.pyc", "*.pyo", "*.db", ".DS_Store", ".coverage", - "local_settings.py", "/static", "/.git", "/.hg"] + excludes = [ + "*.pyc", + "*.pyo", + "*.db", + ".DS_Store", + ".coverage", + "local_settings.py", + "/static", + "/.git", + "/.hg", + ] local_dir = "'%s%s'" % (os.getcwd(), os.sep) - return rsync_project(remote_dir=env.proj_path, local_dir=local_dir, - exclude=excludes) + return rsync_project( + remote_dir=env.proj_path, local_dir=local_dir, exclude=excludes + ) def vcs_upload(): @@ -283,8 +304,7 @@ def vcs_upload(): Uploads the project with the selected VCS tool. """ if env.deploy_tool == "git": - remote_path = "ssh://%s@%s%s" % (env.user, env.host_string, - env.repo_path) + remote_path = "ssh://%s@%s%s" % (env.user, env.host_string, env.repo_path) if not exists(env.repo_path): run("mkdir -p %s" % env.repo_path) with cd(env.repo_path): @@ -294,8 +314,7 @@ def vcs_upload(): run("GIT_WORK_TREE=%s git checkout -f master" % env.proj_path) run("GIT_WORK_TREE=%s git reset --hard" % env.proj_path) elif env.deploy_tool == "hg": - remote_path = "ssh://%s@%s/%s" % (env.user, env.host_string, - env.repo_path) + remote_path = "ssh://%s@%s/%s" % (env.user, env.host_string, env.repo_path) with cd(env.repo_path): if not exists("%s/.hg" % env.repo_path): run("hg init") @@ -380,10 +399,12 @@ def python(code, show=True): """ Runs Python code in the project's virtual environment, with Django loaded. """ - setup = "import os;" \ - "os.environ[\'DJANGO_SETTINGS_MODULE\']=\'%s.settings\';" \ - "import django;" \ - "django.setup();" % env.proj_app + setup = ( + "import os;" + "os.environ['DJANGO_SETTINGS_MODULE']='%s.settings';" + "import django;" + "django.setup();" % env.proj_app + ) full_code = 'python -c "%s%s"' % (setup, code.replace("`", "\\\`")) with project(): if show: @@ -396,8 +417,9 @@ def static(): """ Returns the live STATIC_ROOT directory. """ - return python("from django.conf import settings;" - "print(settings.STATIC_ROOT)", show=False).split("\n")[-1] + return python( + "from django.conf import settings;" "print(settings.STATIC_ROOT)", show=False + ).split("\n")[-1] @task @@ -412,6 +434,7 @@ def manage(command): # Security best practices # ########################### + @task @log_call @hosts(["root@%s" % host for host in env.hosts]) @@ -427,14 +450,20 @@ def secure(new_user=env.user): run("usermod -G sudo %s" % new_user) run("sed -i 's:RootLogin yes:RootLogin no:' /etc/ssh/sshd_config") run("service ssh restart") - print(green("Security steps completed. Log in to the server as '%s' from " - "now on." % new_user, bold=True)) + print( + green( + "Security steps completed. Log in to the server as '%s' from " + "now on." % new_user, + bold=True, + ) + ) ######################### # Install and configure # ######################### + @task @log_call def install(): @@ -443,9 +472,11 @@ def install(): """ # Install system requirements sudo("apt-get update -y -q") - apt("nginx libjpeg-dev python-dev python-setuptools git-core " - "postgresql libpq-dev memcached supervisor python-pip") - apt('gcc rsync') + apt( + "nginx libjpeg-dev python-dev python-setuptools git-core " + "postgresql libpq-dev memcached supervisor python-pip" + ) + apt("gcc rsync") run("mkdir -p /home/%s/logs" % env.user) # Install Python requirements @@ -453,12 +484,18 @@ def install(): # Set up virtualenv run("mkdir -p %s" % env.venv_home) - run("echo 'export WORKON_HOME=%s' >> /home/%s/.bashrc" % (env.venv_home, - env.user)) - run("echo 'source /usr/local/bin/virtualenvwrapper.sh' >> " - "/home/%s/.bashrc" % env.user) - print(green("Successfully set up git, mercurial, pip, virtualenv, " - "supervisor, memcached.", bold=True)) + run("echo 'export WORKON_HOME=%s' >> /home/%s/.bashrc" % (env.venv_home, env.user)) + run( + "echo 'source /usr/local/bin/virtualenvwrapper.sh' >> " + "/home/%s/.bashrc" % env.user + ) + print( + green( + "Successfully set up git, mercurial, pip, virtualenv, " + "supervisor, memcached.", + bold=True, + ) + ) @task @@ -485,8 +522,10 @@ def create(): run("mkdir -p %s" % env.venv_home) with cd(env.venv_home): if exists(env.proj_name): - if confirm("Virtualenv already exists in host server: %s" - "\nWould you like to replace it?" % env.proj_name): + if confirm( + "Virtualenv already exists in host server: %s" + "\nWould you like to replace it?" % env.proj_name + ): run("rm -rf %s" % env.proj_name) else: abort() @@ -500,14 +539,16 @@ def create(): # Create DB and DB user pw = db_pass() - user_sql_args = (env.proj_name, pw.replace("'", "\'")) + user_sql_args = (env.proj_name, pw.replace("'", "'")) user_sql = "CREATE USER %s WITH ENCRYPTED PASSWORD '%s';" % user_sql_args psql(user_sql, show=False) shadowed = "*" * len(pw) print_command(user_sql.replace("'%s'" % pw, "'%s'" % shadowed)) - psql("CREATE DATABASE %s WITH OWNER %s ENCODING = 'UTF8' " - "LC_CTYPE = '%s' LC_COLLATE = '%s' TEMPLATE template0;" % - (env.proj_name, env.proj_name, env.locale, env.locale)) + psql( + "CREATE DATABASE %s WITH OWNER %s ENCODING = 'UTF8' " + "LC_CTYPE = '%s' LC_COLLATE = '%s' TEMPLATE template0;" + % (env.proj_name, env.proj_name, env.locale, env.locale) + ) # Set up SSL certificate if not env.ssl_disabled: @@ -519,12 +560,14 @@ def create(): key_file = env.proj_name + ".key" if not exists(crt_file) and not exists(key_file): try: - crt_local, = glob(join("deploy", "*.crt")) - key_local, = glob(join("deploy", "*.key")) + (crt_local,) = glob(join("deploy", "*.crt")) + (key_local,) = glob(join("deploy", "*.key")) except ValueError: parts = (crt_file, key_file, env.domains[0]) - sudo("openssl req -new -x509 -nodes -out %s -keyout %s " - "-subj '/CN=%s' -days 3650" % parts) + sudo( + "openssl req -new -x509 -nodes -out %s -keyout %s " + "-subj '/CN=%s' -days 3650" % parts + ) else: upload_template(crt_local, crt_file, use_sudo=True) upload_template(key_local, key_file, use_sudo=True) @@ -534,25 +577,30 @@ def create(): with project(): if env.reqs_path: pip("-r %s/%s" % (env.proj_path, env.reqs_path)) - pip("gunicorn setproctitle psycopg2 " - "django-compressor python-memcached") - # Bootstrap the DB + pip("gunicorn setproctitle psycopg2 " "django-compressor python-memcached") + # Bootstrap the DB manage("createdb --noinput --nodata") - python("from django.conf import settings;" - "from django.contrib.sites.models import Site;" - "Site.objects.filter(id=settings.SITE_ID).update(domain='%s');" - % env.domains[0]) + python( + "from django.conf import settings;" + "from django.contrib.sites.models import Site;" + "Site.objects.filter(id=settings.SITE_ID).update(domain='%s');" + % env.domains[0] + ) for domain in env.domains: - python("from django.contrib.sites.models import Site;" - "Site.objects.get_or_create(domain='%s');" % domain) + python( + "from django.contrib.sites.models import Site;" + "Site.objects.get_or_create(domain='%s');" % domain + ) if env.admin_pass: pw = env.admin_pass - user_py = ("from django.contrib.auth import get_user_model;" - "User = get_user_model();" - "u, _ = User.objects.get_or_create(username='admin');" - "u.is_staff = u.is_superuser = True;" - "u.set_password('%s');" - "u.save();" % pw) + user_py = ( + "from django.contrib.auth import get_user_model;" + "User = get_user_model();" + "u, _ = User.objects.get_or_create(username='admin');" + "u.is_staff = u.is_superuser = True;" + "u.set_password('%s');" + "u.save();" % pw + ) python(user_py, show=False) shadowed = "*" * len(pw) print_command(user_py.replace("'%s'" % pw, "'%s'" % shadowed)) @@ -585,6 +633,7 @@ def remove(): # Deployment # ############## + @task @log_call def restart(): @@ -610,8 +659,10 @@ def deploy(): processes for the project. """ if not exists(env.proj_path): - if confirm("Project does not exist in host server: %s" - "\nWould you like to create it?" % env.proj_name): + if confirm( + "Project does not exist in host server: %s" + "\nWould you like to create it?" % env.proj_name + ): create() else: abort() @@ -622,14 +673,13 @@ def deploy(): if env.deploy_tool in env.vcs_tools: with cd(env.repo_path): if env.deploy_tool == "git": - run("git rev-parse HEAD > %s/last.commit" % env.proj_path) + run("git rev-parse HEAD > %s/last.commit" % env.proj_path) elif env.deploy_tool == "hg": - run("hg id -i > last.commit") + run("hg id -i > last.commit") with project(): static_dir = static() if exists(static_dir): - run("tar -cf static.tar --exclude='*.thumbnails' %s" % - static_dir) + run("tar -cf static.tar --exclude='*.thumbnails' %s" % static_dir) else: with cd(join(env.proj_path, "..")): excludes = ["*.pyc", "*.pio", "*.thumbnails"] @@ -665,10 +715,12 @@ def rollback(): if env.deploy_tool in env.vcs_tools: with cd(env.repo_path): if env.deploy_tool == "git": - run("GIT_WORK_TREE={0} git checkout -f " - "`cat {0}/last.commit`".format(env.proj_path)) + run( + "GIT_WORK_TREE={0} git checkout -f " + "`cat {0}/last.commit`".format(env.proj_path) + ) elif env.deploy_tool == "hg": - run("hg update -C `cat last.commit`") + run("hg update -C `cat last.commit`") with project(): with cd(join(static(), "..")): run("tar -xf %s/static.tar" % env.proj_path) diff --git a/mezzanine/project_template/project_name/settings.py b/mezzanine/project_template/project_name/settings.py index e79c68a607..4da7d71410 100644 --- a/mezzanine/project_template/project_name/settings.py +++ b/mezzanine/project_template/project_name/settings.py @@ -1,4 +1,3 @@ - from __future__ import absolute_import, unicode_literals import os @@ -92,7 +91,7 @@ # Hosts/domain names that are valid for this site; required if DEBUG is False # See https://docs.djangoproject.com/en/dev/ref/settings/#allowed-hosts -ALLOWED_HOSTS = ['localhost', '127.0.0.1'] +ALLOWED_HOSTS = ["localhost", "127.0.0.1"] # Local time zone for this installation. Choices can be found here: # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name @@ -101,7 +100,7 @@ # timezone as the operating system. # If running in a Windows environment this must be set to the same as your # system time zone. -TIME_ZONE = 'UTC' +TIME_ZONE = "UTC" # If you set this to True, Django will use timezone-aware datetimes. USE_TZ = True @@ -111,9 +110,7 @@ LANGUAGE_CODE = "en" # Supported languages -LANGUAGES = ( - ('en', _('English')), -) +LANGUAGES = (("en", _("English")),) # A boolean that turns on/off debug mode. When set to ``True``, stack traces # are displayed for error pages. Should always be set to ``False`` in @@ -197,9 +194,7 @@ TEMPLATES = [ { "BACKEND": "django.template.backends.django.DjangoTemplates", - "DIRS": [ - os.path.join(PROJECT_ROOT, "templates") - ], + "DIRS": [os.path.join(PROJECT_ROOT, "templates")], "OPTIONS": { "context_processors": [ "django.contrib.auth.context_processors.auth", @@ -220,7 +215,7 @@ "mezzanine.template.loaders.host_themes.Loader", "django.template.loaders.filesystem.Loader", "django.template.loaders.app_directories.Loader", - ] + ], }, }, ] @@ -234,24 +229,24 @@ ################ INSTALLED_APPS = [ - 'django.contrib.admin', - 'django.contrib.auth', - 'django.contrib.contenttypes', - 'django.contrib.redirects', - 'django.contrib.sessions', - 'django.contrib.sites', - 'django.contrib.sitemaps', - 'django.contrib.messages', - 'django.contrib.staticfiles', - 'mezzanine.boot', - 'mezzanine.conf', - 'mezzanine.core', - 'mezzanine.generic', - 'mezzanine.pages', - 'mezzanine.blog', - 'mezzanine.forms', - 'mezzanine.galleries', - 'mezzanine.twitter', + "django.contrib.admin", + "django.contrib.auth", + "django.contrib.contenttypes", + "django.contrib.redirects", + "django.contrib.sessions", + "django.contrib.sites", + "django.contrib.sitemaps", + "django.contrib.messages", + "django.contrib.staticfiles", + "mezzanine.boot", + "mezzanine.conf", + "mezzanine.core", + "mezzanine.generic", + "mezzanine.pages", + "mezzanine.blog", + "mezzanine.forms", + "mezzanine.galleries", + "mezzanine.twitter", # 'mezzanine.accounts', ] @@ -259,23 +254,21 @@ # these middleware classes will be applied in the order given, and in the # response phase the middleware will be applied in reverse order. MIDDLEWARE = ( - 'mezzanine.core.middleware.UpdateCacheMiddleware', - - 'django.contrib.sessions.middleware.SessionMiddleware', + "mezzanine.core.middleware.UpdateCacheMiddleware", + "django.contrib.sessions.middleware.SessionMiddleware", # Uncomment if using internationalisation or localisation # 'django.middleware.locale.LocaleMiddleware', - 'django.middleware.common.CommonMiddleware', - 'django.middleware.csrf.CsrfViewMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', - 'django.middleware.clickjacking.XFrameOptionsMiddleware', - - 'mezzanine.core.request.CurrentRequestMiddleware', - 'mezzanine.core.middleware.RedirectFallbackMiddleware', - 'mezzanine.core.middleware.AdminLoginInterfaceSelectorMiddleware', - 'mezzanine.core.middleware.SitePermissionMiddleware', - 'mezzanine.pages.middleware.PageMiddleware', - 'mezzanine.core.middleware.FetchFromCacheMiddleware', + "django.middleware.common.CommonMiddleware", + "django.middleware.csrf.CsrfViewMiddleware", + "django.contrib.auth.middleware.AuthenticationMiddleware", + "django.contrib.messages.middleware.MessageMiddleware", + "django.middleware.clickjacking.XFrameOptionsMiddleware", + "mezzanine.core.request.CurrentRequestMiddleware", + "mezzanine.core.middleware.RedirectFallbackMiddleware", + "mezzanine.core.middleware.AdminLoginInterfaceSelectorMiddleware", + "mezzanine.core.middleware.SitePermissionMiddleware", + "mezzanine.pages.middleware.PageMiddleware", + "mezzanine.core.middleware.FetchFromCacheMiddleware", ) if DJANGO_VERSION < (1, 10): @@ -317,6 +310,7 @@ if os.path.exists(f): import sys import imp + module_name = "%s.local_settings" % PROJECT_APP module = imp.new_module(module_name) module.__file__ = f diff --git a/mezzanine/project_template/project_name/urls.py b/mezzanine/project_template/project_name/urls.py index 19aa4c0849..3e07ca2da1 100644 --- a/mezzanine/project_template/project_name/urls.py +++ b/mezzanine/project_template/project_name/urls.py @@ -23,22 +23,19 @@ if settings.USE_MODELTRANSLATION: urlpatterns += [ - re_path('^i18n/$', set_language, name='set_language'), + re_path("^i18n/$", set_language, name="set_language"), ] urlpatterns += [ # We don't want to presume how your homepage works, so here are a # few patterns you can use to set it up. - # HOMEPAGE AS STATIC TEMPLATE # --------------------------- # This pattern simply loads the index.html template. It isn't # commented out like the others, so it's the default. You only need # one homepage pattern, so if you use a different one, comment this # one out. - path("", TemplateView.as_view(template_name="index.html"), name="home"), - # HOMEPAGE AS AN EDITABLE PAGE IN THE PAGE TREE # --------------------------------------------- # This pattern gives us a normal ``Page`` object, so that your @@ -52,9 +49,7 @@ # "/.html" - so for this case, the template "pages/index.html" # should be used if you want to customize the homepage's template. # NOTE: Don't forget to import the view function too! - # url(r"^$", mezzanine.pages.views.page, {"slug": "/"}, name="home"), - # HOMEPAGE FOR A BLOG-ONLY SITE # ----------------------------- # This pattern points the homepage to the blog post listing page, @@ -63,22 +58,18 @@ # ``settings.py`` module, and delete the blog page object from the # page tree in the admin if it was installed. # NOTE: Don't forget to import the view function too! - # url(r"^$", blog_views.blog_post_list, name="home"), - # MEZZANINE'S URLS # ---------------- # ADD YOUR OWN URLPATTERNS *ABOVE* THE LINE BELOW. # ``mezzanine.urls`` INCLUDES A *CATCH ALL* PATTERN # FOR PAGES, SO URLPATTERNS ADDED BELOW ``mezzanine.urls`` # WILL NEVER BE MATCHED! - # If you'd like more granular control over the patterns in # ``mezzanine.urls``, go right ahead and take the parts you want # from it, and use them directly below instead of using # ``mezzanine.urls``. path("", include("mezzanine.urls")), - # MOUNTING MEZZANINE UNDER A PREFIX # --------------------------------- # You can also mount all of Mezzanine's urlpatterns under a @@ -92,9 +83,7 @@ # of this file as well. # Note that for any of the various homepage patterns above, you'll # need to use the ``SITE_PREFIX`` setting as well. - # ("^%s/" % settings.SITE_PREFIX, include("mezzanine.urls")) - ] # Adds ``STATIC_URL`` to the context of error pages, so that error diff --git a/mezzanine/project_template/project_name/wsgi.py b/mezzanine/project_template/project_name/wsgi.py index b7b3af1d86..3158d5c6f9 100644 --- a/mezzanine/project_template/project_name/wsgi.py +++ b/mezzanine/project_template/project_name/wsgi.py @@ -12,7 +12,8 @@ from django.core.wsgi import get_wsgi_application from mezzanine.utils.conf import real_project_name -os.environ.setdefault("DJANGO_SETTINGS_MODULE", - "%s.settings" % real_project_name("{{ project_name }}")) +os.environ.setdefault( + "DJANGO_SETTINGS_MODULE", "%s.settings" % real_project_name("{{ project_name }}") +) application = get_wsgi_application() diff --git a/mezzanine/template/__init__.py b/mezzanine/template/__init__.py index 089bbf7ff7..e1e2a0ef27 100644 --- a/mezzanine/template/__init__.py +++ b/mezzanine/template/__init__.py @@ -27,7 +27,8 @@ def as_tag(self, tag_func): "The `as_tag` template tag builder is deprecated in favour of " "Django's built-in `simple_tag`, which supports variable " "assignment in Django 1.9 and above.", - DeprecationWarning, stacklevel=2 + DeprecationWarning, + stacklevel=2, ) @wraps(tag_func) @@ -42,6 +43,7 @@ def resolve(arg): return template.Variable(arg).resolve(context) except template.VariableDoesNotExist: return arg + args, kwargs = [], {} for arg in parts[1:-2]: if "=" in arg: @@ -52,7 +54,9 @@ def resolve(arg): args.append(resolve(arg)) context[parts[-1]] = tag_func(*args, **kwargs) return "" + return AsTagNode() + return self.tag(tag_wrapper) def render_tag(self, tag_func): @@ -61,12 +65,15 @@ def render_tag(self, tag_func): for the template tag node. The render function takes two arguments - the template context and the tag token. """ + @wraps(tag_func) def tag_wrapper(parser, token): class RenderTagNode(template.Node): def render(self, context): return tag_func(context, token) + return RenderTagNode() + return self.tag(tag_wrapper) def to_end_tag(self, tag_func): @@ -78,11 +85,10 @@ def to_end_tag(self, tag_func): parsed content between the start and end tags, the template context and the tag token. """ + @wraps(tag_func) def tag_wrapper(parser, token): - class ToEndTagNode(template.Node): - def __init__(self): end_name = "end%s" % tag_func.__name__ self.nodelist = parser.parse((end_name,)) @@ -90,7 +96,7 @@ def __init__(self): def render(self, context): args = (self.nodelist.render(context), context, token) - return tag_func(*args[:tag_func.__code__.co_argcount]) + return tag_func(*args[: tag_func.__code__.co_argcount]) return ToEndTagNode() diff --git a/mezzanine/template/loader_tags.py b/mezzanine/template/loader_tags.py index 661fa81843..4243ac6e18 100644 --- a/mezzanine/template/loader_tags.py +++ b/mezzanine/template/loader_tags.py @@ -58,11 +58,14 @@ def find_template(self, name, context, peeking=False): if context_name not in context: context[context_name] = {} if name not in context[context_name]: - all_dirs = ( - list(chain.from_iterable( - [template_engine.get('DIRS', []) - for template_engine in settings.TEMPLATES])) + - list(app_directories.get_app_template_dirs('templates'))) + all_dirs = list( + chain.from_iterable( + [ + template_engine.get("DIRS", []) + for template_engine in settings.TEMPLATES + ] + ) + ) + list(app_directories.get_app_template_dirs("templates")) # os.path.abspath is needed under uWSGI, and also ensures we # have consistent path separators across different OSes. context[context_name][name] = list(map(os.path.abspath, all_dirs)) @@ -89,7 +92,7 @@ def find_template(self, name, context, peeking=False): # get_parent, and not when we're peeking during the # second call. if not peeking: - remove_path = os.path.abspath(path[:-len(name) - 1]) + remove_path = os.path.abspath(path[: -len(name) - 1]) context[context_name][name].remove(remove_path) return Template(source) raise TemplateDoesNotExist(name) @@ -109,8 +112,10 @@ def get_parent(self, context): return parent template = self.find_template(parent, context) for node in template.nodelist: - if (isinstance(node, ExtendsNode) and - node.parent_name.resolve(context) == parent): + if ( + isinstance(node, ExtendsNode) + and node.parent_name.resolve(context) == parent + ): return self.find_template(parent, context, peeking=True) return template @@ -127,7 +132,8 @@ def overextends(parser, token): "The `overextends` template tag is deprecated in favour of " "Django's built-in `extends` tag, which supports recursive " "extension in Django 1.9 and above.", - DeprecationWarning, stacklevel=2 + DeprecationWarning, + stacklevel=2, ) bits = token.split_contents() @@ -136,6 +142,7 @@ def overextends(parser, token): parent_name = parser.compile_filter(bits[1]) nodelist = parser.parse() if nodelist.get_nodes_by_type(ExtendsNode): - raise TemplateSyntaxError("'%s' cannot appear more than once " - "in the same template" % bits[0]) + raise TemplateSyntaxError( + "'%s' cannot appear more than once " "in the same template" % bits[0] + ) return OverExtendsNode(nodelist, parent_name, None) diff --git a/mezzanine/template/loaders/host_themes.py b/mezzanine/template/loaders/host_themes.py index 00bce2d62c..02a0e047e9 100644 --- a/mezzanine/template/loaders/host_themes.py +++ b/mezzanine/template/loaders/host_themes.py @@ -9,6 +9,7 @@ class Loader(filesystem.Loader): """ Template loader that implements host detection. """ + def get_dirs(self): theme_dir = host_theme_path() if theme_dir: diff --git a/mezzanine/twitter/__init__.py b/mezzanine/twitter/__init__.py index 805fa508e8..3d6f118640 100644 --- a/mezzanine/twitter/__init__.py +++ b/mezzanine/twitter/__init__.py @@ -26,11 +26,14 @@ def get_auth_settings(): only if they're all defined. """ from mezzanine.conf import settings + try: - auth_settings = (settings.TWITTER_CONSUMER_KEY, - settings.TWITTER_CONSUMER_SECRET, - settings.TWITTER_ACCESS_TOKEN_KEY, - settings.TWITTER_ACCESS_TOKEN_SECRET) + auth_settings = ( + settings.TWITTER_CONSUMER_KEY, + settings.TWITTER_CONSUMER_SECRET, + settings.TWITTER_ACCESS_TOKEN_KEY, + settings.TWITTER_ACCESS_TOKEN_SECRET, + ) except AttributeError: return None else: diff --git a/mezzanine/twitter/admin.py b/mezzanine/twitter/admin.py index e2edc2091c..d06873bb7b 100644 --- a/mezzanine/twitter/admin.py +++ b/mezzanine/twitter/admin.py @@ -1,4 +1,3 @@ - from __future__ import unicode_literals from django.utils.safestring import mark_safe @@ -37,15 +36,19 @@ def formfield_for_dbfield(self, db_field, request, **kwargs): formsets attribute of the admin class fell apart quite horrifically. """ - formfield = super(TweetableAdminMixin, - self).formfield_for_dbfield(db_field, request, **kwargs) + formfield = super(TweetableAdminMixin, self).formfield_for_dbfield( + db_field, request, **kwargs + ) if Api and db_field.name == "status" and get_auth_settings(): + def wrapper(render): def wrapped(*args, **kwargs): rendered = render(*args, **kwargs) label = _("Send to Twitter") return mark_safe(rendered + FORMFIELD_HTML % label) + return wrapped + formfield.widget.render = wrapper(formfield.widget.render) return formfield diff --git a/mezzanine/twitter/defaults.py b/mezzanine/twitter/defaults.py index f8939f2610..26f6da741a 100644 --- a/mezzanine/twitter/defaults.py +++ b/mezzanine/twitter/defaults.py @@ -19,8 +19,10 @@ register_setting( name="TWITTER_DEFAULT_QUERY_TYPE", label=_("Default Twitter Query Type"), - description=_("Type of query that will be used to retrieve tweets for " - "the default Twitter feed."), + description=_( + "Type of query that will be used to retrieve tweets for " + "the default Twitter feed." + ), editable=True, default=QUERY_TYPE_SEARCH, choices=QUERY_TYPE_CHOICES, @@ -29,11 +31,13 @@ register_setting( name="TWITTER_DEFAULT_QUERY", label=_("Default Twitter Query"), - description=_("Twitter query to use for the default query type. " + description=_( + "Twitter query to use for the default query type. " "\n\n*Note:* Once you change this from the default, you'll need to " "configure each of the oAuth consumer/access key/secret settings. " "Please refer to http://dev.twitter.com for more information " - "on creating an application and acquiring these settings."), + "on creating an application and acquiring these settings." + ), editable=True, default="from:stephen_mcd mezzanine", ) @@ -50,26 +54,26 @@ name="TWITTER_CONSUMER_KEY", label=_("Twitter OAuth consumer key"), editable=True, - default='', + default="", ) register_setting( name="TWITTER_CONSUMER_SECRET", label=_("Twitter OAuth consumer secret"), editable=True, - default='', + default="", ) register_setting( name="TWITTER_ACCESS_TOKEN_KEY", label=_("Twitter OAuth access token"), editable=True, - default='', + default="", ) register_setting( name="TWITTER_ACCESS_TOKEN_SECRET", label=_("Twitter OAuth access token secret"), editable=True, - default='', + default="", ) diff --git a/mezzanine/twitter/managers.py b/mezzanine/twitter/managers.py index 978319221d..972e486ac7 100644 --- a/mezzanine/twitter/managers.py +++ b/mezzanine/twitter/managers.py @@ -15,6 +15,7 @@ def get_for(self, query_type, value): return the tweets for the query. """ from mezzanine.twitter.models import Query + lookup = {"type": query_type, "value": value} query, created = Query.objects.get_or_create(**lookup) if created: diff --git a/mezzanine/twitter/models.py b/mezzanine/twitter/models.py index a860a3683c..f7046dbb7f 100644 --- a/mezzanine/twitter/models.py +++ b/mezzanine/twitter/models.py @@ -11,16 +11,20 @@ import requests from mezzanine.conf import settings -from mezzanine.twitter import QUERY_TYPE_CHOICES, QUERY_TYPE_USER, \ - QUERY_TYPE_LIST, QUERY_TYPE_SEARCH +from mezzanine.twitter import ( + QUERY_TYPE_CHOICES, + QUERY_TYPE_USER, + QUERY_TYPE_LIST, + QUERY_TYPE_SEARCH, +) from mezzanine.twitter import get_auth_settings from mezzanine.twitter.managers import TweetManager re_usernames = re.compile(r"(^|\W)@([0-9a-zA-Z+_]+)", re.IGNORECASE) re_hashtags = re.compile(r"#([0-9a-zA-Z+_]+)", re.IGNORECASE) -replace_hashtags = "#\\1" -replace_usernames = "\\1@\\2" +replace_hashtags = '#\\1' +replace_usernames = '\\1@\\2' class TwitterQueryException(Exception): @@ -29,8 +33,7 @@ class TwitterQueryException(Exception): class Query(models.Model): - type = models.CharField(_("Type"), choices=QUERY_TYPE_CHOICES, - max_length=10) + type = models.CharField(_("Type"), choices=QUERY_TYPE_CHOICES, max_length=10) value = models.CharField(_("Value"), max_length=140) interested = models.BooleanField("Interested", default=True) @@ -51,13 +54,17 @@ def run(self): except KeyError: value = self.value urls = { - QUERY_TYPE_USER: ("https://api.twitter.com/1.1/statuses/" - "user_timeline.json?screen_name=%s" - "&include_rts=true" % value.lstrip("@")), - QUERY_TYPE_LIST: ("https://api.twitter.com/1.1/lists/statuses.json" - "?list_id=%s&include_rts=true" % value), + QUERY_TYPE_USER: ( + "https://api.twitter.com/1.1/statuses/" + "user_timeline.json?screen_name=%s" + "&include_rts=true" % value.lstrip("@") + ), + QUERY_TYPE_LIST: ( + "https://api.twitter.com/1.1/lists/statuses.json" + "?list_id=%s&include_rts=true" % value + ), QUERY_TYPE_SEARCH: "https://api.twitter.com/1.1/search/tweets.json" - "?q=%s" % value, + "?q=%s" % value, } try: url = urls[self.type] @@ -66,6 +73,7 @@ def run(self): auth_settings = get_auth_settings() if not auth_settings: from mezzanine.conf import registry + if self.value == registry["TWITTER_DEFAULT_QUERY"]["default"]: # These are some read-only keys and secrets we use # for the default query (eg nothing has been configured) @@ -93,16 +101,15 @@ def run(self): if not created: continue if "retweeted_status" in tweet_json: - user = tweet_json['user'] + user = tweet_json["user"] tweet.retweeter_user_name = user["screen_name"] tweet.retweeter_full_name = user["name"] tweet.retweeter_profile_image_url = user["profile_image_url"] tweet_json = tweet_json["retweeted_status"] if self.type == QUERY_TYPE_SEARCH: - tweet.user_name = tweet_json['user']['screen_name'] - tweet.full_name = tweet_json['user']['name'] - tweet.profile_image_url = \ - tweet_json['user']["profile_image_url"] + tweet.user_name = tweet_json["user"]["screen_name"] + tweet.full_name = tweet_json["user"]["name"] + tweet.profile_image_url = tweet_json["user"]["profile_image_url"] date_format = "%a %b %d %H:%M:%S +0000 %Y" else: user = tweet_json["user"] @@ -113,9 +120,9 @@ def run(self): tweet.text = urlize(tweet_json["text"]) tweet.text = re_usernames.sub(replace_usernames, tweet.text) tweet.text = re_hashtags.sub(replace_hashtags, tweet.text) - if getattr(settings, 'TWITTER_STRIP_HIGH_MULTIBYTE', False): + if getattr(settings, "TWITTER_STRIP_HIGH_MULTIBYTE", False): chars = [ch for ch in tweet.text if ord(ch) < 0x800] - tweet.text = ''.join(chars) + tweet.text = "".join(chars) d = datetime.strptime(tweet_json["created_at"], date_format) tweet.created_at = make_aware(d, utc) try: @@ -136,13 +143,15 @@ class Tweet(models.Model): user_name = models.CharField(_("User name"), max_length=100, null=True) full_name = models.CharField(_("Full name"), max_length=100, null=True) retweeter_profile_image_url = models.URLField( - _("Profile image URL (Retweeted by)"), null=True) + _("Profile image URL (Retweeted by)"), null=True + ) retweeter_user_name = models.CharField( - _("User name (Retweeted by)"), max_length=100, null=True) + _("User name (Retweeted by)"), max_length=100, null=True + ) retweeter_full_name = models.CharField( - _("Full name (Retweeted by)"), max_length=100, null=True) - query = models.ForeignKey("Query", on_delete=models.CASCADE, - related_name="tweets") + _("Full name (Retweeted by)"), max_length=100, null=True + ) + query = models.ForeignKey("Query", on_delete=models.CASCADE, related_name="tweets") objects = TweetManager() diff --git a/mezzanine/twitter/templatetags/twitter_tags.py b/mezzanine/twitter/templatetags/twitter_tags.py index 185cd5fab1..65c4dcb14f 100644 --- a/mezzanine/twitter/templatetags/twitter_tags.py +++ b/mezzanine/twitter/templatetags/twitter_tags.py @@ -4,8 +4,7 @@ from collections import defaultdict from mezzanine.conf import settings -from mezzanine.twitter import (QUERY_TYPE_USER, QUERY_TYPE_LIST, - QUERY_TYPE_SEARCH) +from mezzanine.twitter import QUERY_TYPE_USER, QUERY_TYPE_LIST, QUERY_TYPE_SEARCH from mezzanine.twitter.models import Tweet, TwitterQueryException from mezzanine import template @@ -32,7 +31,7 @@ def tweets_for(query_type, args, per_user=None): tweets = sum(_tweets.values(), []) tweets.sort(key=lambda t: t.created_at, reverse=True) if len(args) > 1 and str(args[-1]).isdigit(): - tweets = tweets[:int(args[-1])] + tweets = tweets[: int(args[-1])] return tweets @@ -66,8 +65,7 @@ def tweets_default(*args): Tweets for the default settings. """ query_type = settings.TWITTER_DEFAULT_QUERY_TYPE - args = (settings.TWITTER_DEFAULT_QUERY, - settings.TWITTER_DEFAULT_NUM_TWEETS) + args = (settings.TWITTER_DEFAULT_QUERY, settings.TWITTER_DEFAULT_NUM_TWEETS) per_user = None if query_type == QUERY_TYPE_LIST: per_user = 1 diff --git a/mezzanine/urls.py b/mezzanine/urls.py index 902acef7b1..f74f451416 100644 --- a/mezzanine/urls.py +++ b/mezzanine/urls.py @@ -15,10 +15,9 @@ urlpatterns = [] # JavaScript localization feature -js_info_dict = {'domain': 'django'} +js_info_dict = {"domain": "django"} urlpatterns += [ - re_path(r'^jsi18n/(?P\S+?)/$', JavaScriptCatalog.as_view(), - js_info_dict), + re_path(r"^jsi18n/(?P\S+?)/$", JavaScriptCatalog.as_view(), js_info_dict), ] if settings.DEBUG and "debug_toolbar" in settings.INSTALLED_APPS: @@ -28,7 +27,7 @@ pass else: urlpatterns += [ - path('__debug__/', include(debug_toolbar.urls)), + path("__debug__/", include(debug_toolbar.urls)), ] # Django's sitemap app. @@ -41,9 +40,12 @@ # Return a robots.txt that disallows all spiders when DEBUG is True. if getattr(settings, "DEBUG", False): urlpatterns += [ - re_path("robots.txt", - lambda r: HttpResponse("User-agent: *\nDisallow: /", - content_type="text/plain")), + re_path( + "robots.txt", + lambda r: HttpResponse( + "User-agent: *\nDisallow: /", content_type="text/plain" + ), + ), ] # Miscellanous Mezzanine patterns. @@ -79,10 +81,9 @@ # so give pages their own prefix and inject them before the # blog urlpatterns. if blog_installed and not BLOG_SLUG.rstrip("/"): - PAGES_SLUG = str(getattr(settings, "PAGES_SLUG", "pages").strip("/") + - "/") + PAGES_SLUG = str(getattr(settings, "PAGES_SLUG", "pages").strip("/") + "/") blog_patterns_start = urlpatterns.index(blog_patterns[0]) - urlpatterns[blog_patterns_start:len(blog_patterns)] = [ + urlpatterns[blog_patterns_start : len(blog_patterns)] = [ re_path(r"^%s" % PAGES_SLUG, include("mezzanine.pages.urls")), ] else: diff --git a/mezzanine/utils/cache.py b/mezzanine/utils/cache.py index 0fe50d81ba..cb23939847 100644 --- a/mezzanine/utils/cache.py +++ b/mezzanine/utils/cache.py @@ -63,11 +63,17 @@ def cache_installed(): """ has_key = bool(getattr(settings, "NEVERCACHE_KEY", "")) - return (has_key and settings.CACHES and not settings.TESTING and - middlewares_or_subclasses_installed([ + return ( + has_key + and settings.CACHES + and not settings.TESTING + and middlewares_or_subclasses_installed( + [ "mezzanine.core.middleware.UpdateCacheMiddleware", "mezzanine.core.middleware.FetchFromCacheMiddleware", - ])) + ] + ) + ) def cache_key_prefix(request): diff --git a/mezzanine/utils/conf.py b/mezzanine/utils/conf.py index 9c2e3ac3cb..0d48934c35 100644 --- a/mezzanine/utils/conf.py +++ b/mezzanine/utils/conf.py @@ -19,13 +19,13 @@ class SitesAllowedHosts(object): ``Site`` model and uses any domains added to it, the first time the setting is accessed. """ + def __iter__(self): if getattr(self, "_hosts", None) is None: from django.contrib.sites.models import Site + try: - self._hosts = [ - s.domain.split(":")[0] for s in Site.objects.all() - ] + self._hosts = [s.domain.split(":")[0] for s in Site.objects.all()] except OperationalError: return iter([]) return iter(self._hosts) @@ -55,14 +55,18 @@ def set_dynamic_settings(s): remove = lambda n, k: s[n].remove(k) if k in s[n] else None # Django 1.10 middleware compatibility - MIDDLEWARE_SETTING_NAME = 'MIDDLEWARE' if 'MIDDLEWARE' in s \ - and s['MIDDLEWARE'] is not None \ - else 'MIDDLEWARE_CLASSES' + MIDDLEWARE_SETTING_NAME = ( + "MIDDLEWARE" + if "MIDDLEWARE" in s and s["MIDDLEWARE"] is not None + else "MIDDLEWARE_CLASSES" + ) if not s.get("ALLOWED_HOSTS", []): - warn("You haven't defined the ALLOWED_HOSTS settings, which " - "Django requires. Will fall back to the domains " - "configured as sites.") + warn( + "You haven't defined the ALLOWED_HOSTS settings, which " + "Django requires. Will fall back to the domains " + "configured as sites." + ) s["ALLOWED_HOSTS"] = SitesAllowedHosts() if s.get("TIME_ZONE", None) is None: @@ -81,9 +85,14 @@ def set_dynamic_settings(s): # Change tuple settings to lists for easier manipulation. s.setdefault("AUTHENTICATION_BACKENDS", defaults.AUTHENTICATION_BACKENDS) s.setdefault("STATICFILES_FINDERS", defaults.STATICFILES_FINDERS) - tuple_list_settings = ["AUTHENTICATION_BACKENDS", "INSTALLED_APPS", - MIDDLEWARE_SETTING_NAME, "STATICFILES_FINDERS", - "LANGUAGES", "TEMPLATE_CONTEXT_PROCESSORS"] + tuple_list_settings = [ + "AUTHENTICATION_BACKENDS", + "INSTALLED_APPS", + MIDDLEWARE_SETTING_NAME, + "STATICFILES_FINDERS", + "LANGUAGES", + "TEMPLATE_CONTEXT_PROCESSORS", + ] for setting in tuple_list_settings[:]: if not isinstance(s.get(setting, []), list): s[setting] = list(s[setting]) @@ -108,8 +117,10 @@ def set_dynamic_settings(s): # admin won't try to import it s["USE_MODELTRANSLATION"] = False remove("INSTALLED_APPS", "modeltranslation") - warn("USE_MODETRANSLATION setting is set to True but django-" - "modeltranslation is not installed. Disabling it.") + warn( + "USE_MODETRANSLATION setting is set to True but django-" + "modeltranslation is not installed. Disabling it." + ) else: # Force i18n so we are assured that modeltranslation is active s["USE_I18N"] = True @@ -145,14 +156,19 @@ def set_dynamic_settings(s): # since jQuery is configured via a setting. if "compressor" in s["INSTALLED_APPS"]: append("STATICFILES_FINDERS", "compressor.finders.CompressorFinder") - s.setdefault("COMPRESS_OFFLINE_CONTEXT", { - "MEDIA_URL": s.get("MEDIA_URL", ""), - "STATIC_URL": s.get("STATIC_URL", ""), - }) + s.setdefault( + "COMPRESS_OFFLINE_CONTEXT", + { + "MEDIA_URL": s.get("MEDIA_URL", ""), + "STATIC_URL": s.get("STATIC_URL", ""), + }, + ) def mezzanine_settings(): from mezzanine.conf import settings + return settings + s["COMPRESS_OFFLINE_CONTEXT"]["settings"] = mezzanine_settings # Ensure the Mezzanine auth backend is enabled if @@ -196,26 +212,36 @@ def mezzanine_settings(): # Remove caching middleware if no backend defined. if not (s.get("CACHE_BACKEND") or s.get("CACHES")): - s[MIDDLEWARE_SETTING_NAME] = [mw for mw in s[MIDDLEWARE_SETTING_NAME] - if not - (mw.endswith("UpdateCacheMiddleware") or - mw.endswith("FetchFromCacheMiddleware"))] + s[MIDDLEWARE_SETTING_NAME] = [ + mw + for mw in s[MIDDLEWARE_SETTING_NAME] + if not ( + mw.endswith("UpdateCacheMiddleware") + or mw.endswith("FetchFromCacheMiddleware") + ) + ] # If only LANGUAGE_CODE has been defined, ensure the other required # settings for translations are configured. - if (s.get("LANGUAGE_CODE") and len(s.get("LANGUAGES", [])) == 1 and - s["LANGUAGE_CODE"] != s["LANGUAGES"][0][0]): + if ( + s.get("LANGUAGE_CODE") + and len(s.get("LANGUAGES", [])) == 1 + and s["LANGUAGE_CODE"] != s["LANGUAGES"][0][0] + ): s["USE_I18N"] = True s["LANGUAGES"] = [(s["LANGUAGE_CODE"], "")] # Ensure required middleware is installed, otherwise admin # becomes inaccessible. - if s["USE_I18N"] and not [mw for mw in s[MIDDLEWARE_SETTING_NAME] if - mw.endswith("LocaleMiddleware")]: + if s["USE_I18N"] and not [ + mw for mw in s[MIDDLEWARE_SETTING_NAME] if mw.endswith("LocaleMiddleware") + ]: session = s[MIDDLEWARE_SETTING_NAME].index( - "django.contrib.sessions.middleware.SessionMiddleware") - s[MIDDLEWARE_SETTING_NAME].insert(session + 1, - "django.middleware.locale.LocaleMiddleware") + "django.contrib.sessions.middleware.SessionMiddleware" + ) + s[MIDDLEWARE_SETTING_NAME].insert( + session + 1, "django.middleware.locale.LocaleMiddleware" + ) # Revert tuple settings back to tuples. for setting in tuple_list_settings: @@ -261,8 +287,8 @@ def flatten(seqs): middleware_items = map(import_string, middleware_setting) middleware_classes = filter( - lambda m: isinstance(m, six.class_types), - middleware_items) + lambda m: isinstance(m, six.class_types), middleware_items + ) middleware_ancestors = set(flatten(map(getmro, middleware_classes))) needed_middlewares = set(map(import_string, needed_middlewares)) diff --git a/mezzanine/utils/deprecation.py b/mezzanine/utils/deprecation.py index 7102109bbd..a152db0171 100644 --- a/mezzanine/utils/deprecation.py +++ b/mezzanine/utils/deprecation.py @@ -12,6 +12,7 @@ try: from django.utils.deprecation import MiddlewareMixin except ImportError: + class MiddlewareMixin(object): pass @@ -62,9 +63,12 @@ def get_related_model(field): def mark_safe(s): from django.utils.safestring import mark_safe as django_safe + if callable(s): + @wraps(s) def wrapper(*args, **kwargs): return django_safe(s(*args, **kwargs)) + return wrapper return django_safe(s) diff --git a/mezzanine/utils/docs.py b/mezzanine/utils/docs.py index 3b2c6aabca..50842ef76e 100644 --- a/mezzanine/utils/docs.py +++ b/mezzanine/utils/docs.py @@ -50,26 +50,35 @@ def build_settings_docs(docs_path, prefix=None): setting_default = setting["default"] if isinstance(setting_default, str): if gethostname() in setting_default or ( - setting_default.startswith("/") and - os.path.exists(setting_default)): + setting_default.startswith("/") and os.path.exists(setting_default) + ): setting_default = dynamic if setting_default != dynamic: setting_default = repr(deep_force_unicode(setting_default)) lines.extend(["", settings_label]) lines.extend(["", settings_name, "-" * len(settings_name)]) - lines.extend(["", - urlize(setting["description"] or "").replace( - "", " <").replace( - "", ">`_")]) + lines.extend( + [ + "", + urlize(setting["description"] or "") + .replace('', " <") + .replace("", ">`_"), + ] + ) if setting["choices"]: - choices = ", ".join(["%s: ``%s``" % (str(v), force_text(k)) - for k, v in setting["choices"]]) + choices = ", ".join( + ["%s: ``%s``" % (str(v), force_text(k)) for k, v in setting["choices"]] + ) lines.extend(["", "Choices: %s" % choices, ""]) lines.extend(["", "Default: ``%s``" % setting_default]) with open(os.path.join(docs_path, "settings.rst"), "w") as f: - f.write("\n".join(lines).replace("u'", "'").replace("yo'", - "you'").replace("'", "'")) + f.write( + "\n".join(lines) + .replace("u'", "'") + .replace("yo'", "you'") + .replace("'", "'") + ) def build_deploy_docs(docs_path): @@ -104,11 +113,29 @@ def build_changelog(docs_path, package_name="mezzanine"): changelog_file = os.path.join(project_path, changelog_filename) versions = OrderedDict() repo = None - ignore = ("AUTHORS", "formatting", "typo", "pep8", "pep 8", - "whitespace", "README", "trans", "print debug", - "debugging", "tabs", "style", "sites", "ignore", - "tweak", "cleanup", "minor", "for changeset", - ".com``", "oops", "syntax") + ignore = ( + "AUTHORS", + "formatting", + "typo", + "pep8", + "pep 8", + "whitespace", + "README", + "trans", + "print debug", + "debugging", + "tabs", + "style", + "sites", + "ignore", + "tweak", + "cleanup", + "minor", + "for changeset", + ".com``", + "oops", + "syntax", + ) hotfixes = { "40cbc47b8d8a": "1.0.9", "a25749986abc": "1.0.10", @@ -148,8 +175,12 @@ def build_changelog(docs_path, package_name="mezzanine"): words = description.split() # Format var names in commit. for i, word in enumerate(words): - if (set("._") & set(word[:-1]) and set(letters) & set(word) and - "`" not in word and not word[0].isdigit()): + if ( + set("._") & set(word[:-1]) + and set(letters) & set(word) + and "`" not in word + and not word[0].isdigit() + ): last = "" if word[-1] in ",.": last, word = word[-1], word[:-1] @@ -164,7 +195,7 @@ def build_changelog(docs_path, package_name="mezzanine"): break versions[locals()[version_var]] = { "changes": [], - "date": _changeset_date(cs).strftime("%b %d, %Y") + "date": _changeset_date(cs).strftime("%b %d, %Y"), } new_version = len(files) == 1 @@ -193,8 +224,14 @@ def build_changelog(docs_path, package_name="mezzanine"): changelog_update = changelog_filename in files ignored = [w for w in ignore if w.lower() in description.lower()] too_few_words = len(description.split()) <= 3 - if (merge or new_version or branch_closed or changelog_update or - ignored or too_few_words): + if ( + merge + or new_version + or branch_closed + or changelog_update + or ignored + or too_few_words + ): continue # Ensure we have a current version and if so, add this changeset's # description to it. @@ -239,17 +276,20 @@ def build_modelgraph(docs_path, package_name="mezzanine"): to_path = os.path.join(docs_path, "img", "graph.png") build_path = os.path.join(docs_path, "build", "_images") resized_path = os.path.join(os.path.dirname(to_path), "graph-small.png") - settings = import_dotted_path(package_name + - ".project_template.project_name.settings") - apps = [a.rsplit(".")[1] for a in settings.INSTALLED_APPS - if a.startswith("mezzanine.") or a.startswith(package_name + ".")] + settings = import_dotted_path( + package_name + ".project_template.project_name.settings" + ) + apps = [ + a.rsplit(".")[1] + for a in settings.INSTALLED_APPS + if a.startswith("mezzanine.") or a.startswith(package_name + ".") + ] try: from django_extensions.management.commands import graph_models except ImportError: warn("Couldn't build model_graph, django_extensions not installed") else: - options = {"inheritance": True, "outputfile": "graph.png", - "layout": "dot"} + options = {"inheritance": True, "outputfile": "graph.png", "layout": "dot"} try: graph_models.Command().execute(*apps, **options) except Exception as e: @@ -268,6 +308,7 @@ def build_modelgraph(docs_path, package_name="mezzanine"): warn("Couldn't build model_graph, copy to build failed on: %s" % e) try: from PIL import Image + image = Image.open(to_path) image.width = 800 image.height = image.size[1] * 800 // image.size[0] @@ -288,8 +329,9 @@ def build_requirements(docs_path, package_name="mezzanine"): """ mezz_string = "Mezzanine==" project_path = os.path.join(docs_path, "..") - requirements_file = os.path.join(project_path, package_name, - "project_template", "requirements.txt") + requirements_file = os.path.join( + project_path, package_name, "project_template", "requirements.txt" + ) with open(requirements_file, "r") as f: requirements = f.readlines() with open(requirements_file, "w") as f: diff --git a/mezzanine/utils/email.py b/mezzanine/utils/email.py index b03a1e8632..872c5fc64e 100644 --- a/mezzanine/utils/email.py +++ b/mezzanine/utils/email.py @@ -26,9 +26,17 @@ def subject_template(template, context): return " ".join(subject.splitlines()).strip() -def send_mail_template(subject, template, addr_from, addr_to, context=None, - attachments=None, fail_silently=None, addr_bcc=None, - headers=None): +def send_mail_template( + subject, + template, + addr_from, + addr_to, + context=None, + attachments=None, + fail_silently=None, + addr_bcc=None, + headers=None, +): """ Send email rendering text and html versions for the specified template name using the context dictionary passed in. @@ -47,16 +55,18 @@ def send_mail_template(subject, template, addr_from, addr_to, context=None, # doesn't work: if not hasattr(addr_to, "__iter__"): if isinstance(addr_to, str) or isinstance(addr_to, bytes): addr_to = [addr_to] - if addr_bcc is not None and (isinstance(addr_bcc, str) or - isinstance(addr_bcc, bytes)): + if addr_bcc is not None and ( + isinstance(addr_bcc, str) or isinstance(addr_bcc, bytes) + ): addr_bcc = [addr_bcc] # Loads a template passing in vars as context. - render = lambda type: loader.get_template("%s.%s" % - (template, type)).render(context) + render = lambda type: loader.get_template("%s.%s" % (template, type)).render( + context + ) # Create and send email. - msg = EmailMultiAlternatives(subject, render("txt"), - addr_from, addr_to, addr_bcc, - headers=headers) + msg = EmailMultiAlternatives( + subject, render("txt"), addr_from, addr_to, addr_bcc, headers=headers + ) msg.attach_alternative(render("html"), "text/html") for attachment in attachments: msg.attach(*attachment) @@ -72,10 +82,17 @@ def send_verification_mail(request, user, verification_type): the verification link, as well as the names of the email templates to use. """ - verify_url = reverse(verification_type, kwargs={ - "uidb36": int_to_base36(user.id), - "token": default_token_generator.make_token(user), - }) + "?next=" + (next_url(request) or "/") + verify_url = ( + reverse( + verification_type, + kwargs={ + "uidb36": int_to_base36(user.id), + "token": default_token_generator.make_token(user), + }, + ) + + "?next=" + + (next_url(request) or "/") + ) context = { "request": request, "user": user, @@ -83,9 +100,13 @@ def send_verification_mail(request, user, verification_type): } subject_template_name = "email/%s_subject.txt" % verification_type subject = subject_template(subject_template_name, context) - send_mail_template(subject, "email/%s" % verification_type, - settings.DEFAULT_FROM_EMAIL, user.email, - context=context) + send_mail_template( + subject, + "email/%s" % verification_type, + settings.DEFAULT_FROM_EMAIL, + user.email, + context=context, + ) def send_approve_mail(request, user): @@ -103,9 +124,13 @@ def send_approve_mail(request, user): "change_url": admin_url(user.__class__, "change", user.id), } subject = subject_template("email/account_approve_subject.txt", context) - send_mail_template(subject, "email/account_approve", - settings.DEFAULT_FROM_EMAIL, approval_emails, - context=context) + send_mail_template( + subject, + "email/account_approve", + settings.DEFAULT_FROM_EMAIL, + approval_emails, + context=context, + ) def send_approved_mail(request, user): @@ -116,6 +141,10 @@ def send_approved_mail(request, user): """ context = {"request": request, "user": user} subject = subject_template("email/account_approved_subject.txt", context) - send_mail_template(subject, "email/account_approved", - settings.DEFAULT_FROM_EMAIL, user.email, - context=context) + send_mail_template( + subject, + "email/account_approved", + settings.DEFAULT_FROM_EMAIL, + user.email, + context=context, + ) diff --git a/mezzanine/utils/html.py b/mezzanine/utils/html.py index 0f2d1014f0..1e98922123 100644 --- a/mezzanine/utils/html.py +++ b/mezzanine/utils/html.py @@ -1,11 +1,15 @@ try: from html.parser import HTMLParser from html.entities import name2codepoint + try: from html.parser import HTMLParseError except ImportError: # Python 3.5+ + class HTMLParseError(Exception): pass + + except ImportError: # Python 2 from HTMLParser import HTMLParser, HTMLParseError from htmlentitydefs import name2codepoint @@ -15,8 +19,8 @@ class HTMLParseError(Exception): from mezzanine.utils.deprecation import mark_safe -SELF_CLOSING_TAGS = ['br', 'img'] -NON_SELF_CLOSING_TAGS = ['script', 'iframe'] +SELF_CLOSING_TAGS = ["br", "img"] +NON_SELF_CLOSING_TAGS = ["script", "iframe"] ABSOLUTE_URL_TAGS = {"img": "src", "a": "href", "iframe": "src"} # Tags and attributes added to richtext filtering whitelist when the @@ -26,8 +30,17 @@ class HTMLParseError(Exception): # events (onclick etc) to this list. To enable those, filtering can # be turned off in the settings admin. LOW_FILTER_TAGS = ("iframe", "embed", "video", "param", "source", "object") -LOW_FILTER_ATTRS = ("allowfullscreen", "autostart", "loop", "hidden", - "playcount", "volume", "controls", "data", "classid") +LOW_FILTER_ATTRS = ( + "allowfullscreen", + "autostart", + "loop", + "hidden", + "playcount", + "volume", + "controls", + "data", + "classid", +) def absolute_urls(html): @@ -57,6 +70,7 @@ def decode_entities(html): Remove HTML entities from a string. Adapted from http://effbot.org/zone/re-sub.htm#unescape-html """ + def decode(m): html = m.group(0) if html[:2] == "&#": @@ -73,6 +87,7 @@ def decode(m): except KeyError: pass return html + return re.sub(r"&#?\w+;", decode, html.replace("&", "&")) @@ -86,6 +101,7 @@ def escape(html): from bleach import clean, ALLOWED_PROTOCOLS from mezzanine.conf import settings from mezzanine.core import defaults + if settings.RICHTEXT_FILTER_LEVEL == defaults.RICHTEXT_FILTER_LEVEL_NONE: return html tags = settings.RICHTEXT_ALLOWED_TAGS @@ -96,9 +112,15 @@ def escape(html): attrs += LOW_FILTER_ATTRS if isinstance(attrs, tuple): attrs = list(attrs) - return clean(html, tags=tags, attributes=attrs, strip=True, - strip_comments=False, styles=styles, - protocols=ALLOWED_PROTOCOLS + ["tel"]) + return clean( + html, + tags=tags, + attributes=attrs, + strip=True, + strip_comments=False, + styles=styles, + protocols=ALLOWED_PROTOCOLS + ["tel"], + ) @mark_safe diff --git a/mezzanine/utils/models.py b/mezzanine/utils/models.py index cf0fda9260..ad2eb33c50 100644 --- a/mezzanine/utils/models.py +++ b/mezzanine/utils/models.py @@ -14,7 +14,7 @@ def get_user_model(): "Mezzanine's get_user_model() is deprecated and will be removed in a " "future version. Replace all uses of this function with Django's " "django.contrib.auth.get_user_model().", - DeprecationWarning + DeprecationWarning, ) return django_get_user_model() @@ -65,14 +65,11 @@ class Sub(Super): and ``_order`` which are only relevant in the context of the ``Page`` model and not the model of the custom content type. """ - if hasattr(model, 'objects'): + if hasattr(model, "objects"): # "model" is a model class - return (model if model._meta.abstract else - _base_concrete_model(abstract, model)) + return model if model._meta.abstract else _base_concrete_model(abstract, model) # "model" is a model instance - return ( - _base_concrete_model(abstract, model.__class__) or - model.__class__) + return _base_concrete_model(abstract, model.__class__) or model.__class__ def upload_to(field_path, default): @@ -82,6 +79,7 @@ def upload_to(field_path, default): ``UPLOAD_TO_HANDLERS`` setting. """ from mezzanine.conf import settings + for k, v in settings.UPLOAD_TO_HANDLERS.items(): if k.lower() == field_path.lower(): return import_dotted_path(v) @@ -104,9 +102,11 @@ def admin_thumb(self): return "" from mezzanine.conf import settings from mezzanine.core.templatetags.mezzanine_tags import thumbnail - x, y = settings.ADMIN_THUMB_SIZE.split('x') + + x, y = settings.ADMIN_THUMB_SIZE.split("x") thumb_url = thumbnail(thumb, x, y) return format_html("", settings.MEDIA_URL, thumb_url) + admin_thumb.short_description = "" @@ -133,10 +133,12 @@ def __new__(cls, name, bases, attrs): if not issubclass(mixin_for, Model): raise TypeError except (TypeError, KeyError, AttributeError): - raise ImproperlyConfigured("The ModelMixin class '%s' requires " - "an inner Meta class with the " - "``mixin_for`` attribute defined, " - "with a value that is a valid model.") + raise ImproperlyConfigured( + "The ModelMixin class '%s' requires " + "an inner Meta class with the " + "``mixin_for`` attribute defined, " + "with a value that is a valid model." + ) # Copy fields and methods onto the model being mixed into, and # return it as the definition for the mixin class itself. for k, v in attrs.items(): diff --git a/mezzanine/utils/sites.py b/mezzanine/utils/sites.py index e6c96a3dba..bf8d59bd73 100644 --- a/mezzanine/utils/sites.py +++ b/mezzanine/utils/sites.py @@ -10,8 +10,7 @@ from mezzanine.utils.conf import middlewares_or_subclasses_installed -SITE_PERMISSION_MIDDLEWARE = \ - "mezzanine.core.middleware.SitePermissionMiddleware" +SITE_PERMISSION_MIDDLEWARE = "mezzanine.core.middleware.SitePermissionMiddleware" def current_site_id(): @@ -38,6 +37,7 @@ def current_site_id(): return override_current_site_id.thread_local.site_id from mezzanine.utils.cache import cache_installed, cache_get, cache_set + request = current_request() site_id = getattr(request, "site_id", None) if request and not site_id: diff --git a/mezzanine/utils/tests.py b/mezzanine/utils/tests.py index 80afd27819..8a2d853205 100644 --- a/mezzanine/utils/tests.py +++ b/mezzanine/utils/tests.py @@ -14,35 +14,26 @@ # Ignore these warnings in pyflakes - if added to, please comment why. IGNORE_ERRORS = ( - # Used to version subpackages. ".__version__' imported but unused", - # No caching fallback. "redefinition of function 'nevercache'", - # Dummy fallback in templates for django-compressor. "redefinition of function 'compress'", - # Fabic config fallback. "redefinition of unused 'conf'", - # Fixing these would make the code ugiler IMO. "continuation line", "closing bracket does not match", - # Jython compatiblity. "redefinition of unused 'Image", - # Django custom user compatibility. "'get_user_model' imported but unused", - # lambdas are OK. "do not assign a lambda", - # checks modules need to be imported to register check functions, they will # be run by Django. - "'.checks' imported but unused" + "'.checks' imported but unused", ) @@ -132,8 +123,11 @@ def _run_checker_for_package(checker, package_name, extra_ignore=None): package_path = path_for_import(package_name) for (root, dirs, files) in os.walk(str(package_path)): for f in files: - if (f == "local_settings.py" or not f.endswith(".py") or - root.split(os.sep)[-1] in ["migrations"]): + if ( + f == "local_settings.py" + or not f.endswith(".py") + or root.split(os.sep)[-1] in ["migrations"] + ): # Ignore continue for warning in checker(os.path.join(root, f)): @@ -179,6 +173,7 @@ class Checker(pep8.Checker): """ Subclass pep8's Checker to hook into error reporting. """ + def __init__(self, *args, **kwargs): super(Checker, self).__init__(*args, **kwargs) self.report_error = self._report_error @@ -200,8 +195,7 @@ def check_all(self, *args, **kwargs): style_guide = pep8.StyleGuide(config_file="setup.cfg") def pep8_checker(path): - for line_number, text in Checker(path, - options=style_guide.options).check_all(): + for line_number, text in Checker(path, options=style_guide.options).check_all(): yield "%s:%s: %s" % (path, line_number, text) args = (pep8_checker, package_name, extra_ignore) diff --git a/mezzanine/utils/timezone.py b/mezzanine/utils/timezone.py index 16529a1f97..5049890f7e 100644 --- a/mezzanine/utils/timezone.py +++ b/mezzanine/utils/timezone.py @@ -21,7 +21,7 @@ def get_best_local_timezone(): local_offset = datetime.timedelta(seconds=-local_offset) for zone_name in pytz.all_timezones: timezone = pytz.timezone(zone_name) - if not hasattr(timezone, '_tzinfos'): + if not hasattr(timezone, "_tzinfos"): continue for utcoffset, daylight, tzname in timezone._tzinfos: if utcoffset == local_offset and tzname == localtz: diff --git a/mezzanine/utils/urls.py b/mezzanine/utils/urls.py index 1d8086df57..ba688d14f1 100644 --- a/mezzanine/utils/urls.py +++ b/mezzanine/utils/urls.py @@ -34,7 +34,7 @@ def home_slug(): prefix = get_script_prefix() slug = reverse("home") if slug.startswith(prefix): - slug = '/' + slug[len(prefix):] + slug = "/" + slug[len(prefix) :] try: return resolve(slug).kwargs["slug"] except KeyError: @@ -103,6 +103,7 @@ def login_redirect(request): ignorable_nexts = ("",) if "mezzanine.accounts" in settings.INSTALLED_APPS: from mezzanine.accounts import urls + ignorable_nexts += (urls.SIGNUP_URL, urls.LOGIN_URL, urls.LOGOUT_URL) next = next_url(request) or "" if next in ignorable_nexts: @@ -125,6 +126,7 @@ def path_to_slug(path): a slug that would match a ``Page`` instance's slug. """ from mezzanine.urls import PAGES_SLUG + lang_code = translation.get_language_from_path(path) for prefix in (lang_code, settings.SITE_PREFIX, PAGES_SLUG): if prefix: diff --git a/mezzanine/utils/views.py b/mezzanine/utils/views.py index ac03e56512..af06889632 100644 --- a/mezzanine/utils/views.py +++ b/mezzanine/utils/views.py @@ -34,9 +34,11 @@ def is_editable(obj, request): else: codename = get_permission_codename("change", obj._meta) perm = "%s.%s" % (obj._meta.app_label, codename) - return (is_authenticated(request.user) and - has_site_permission(request.user) and - request.user.has_perm(perm)) + return ( + is_authenticated(request.user) + and has_site_permission(request.user) + and request.user.has_perm(perm) + ) def ip_for_request(request): @@ -95,23 +97,23 @@ def is_spam_akismet(request, form, url): if data_field and not data.get(data_field): cleaned_data = form.cleaned_data.get(name) try: - data[data_field] = cleaned_data.encode('utf-8') + data[data_field] = cleaned_data.encode("utf-8") except UnicodeEncodeError: data[data_field] = cleaned_data if not data.get("comment_content"): return False - api_url = ("http://%s.rest.akismet.com/1.1/comment-check" % - settings.AKISMET_API_KEY) + api_url = "http://%s.rest.akismet.com/1.1/comment-check" % settings.AKISMET_API_KEY versions = (django.get_version(), mezzanine.__version__) headers = {"User-Agent": "Django/%s | Mezzanine/%s" % versions} try: - response = urlopen(Request(api_url, urlencode(data).encode('utf-8'), - headers)).read() + response = urlopen( + Request(api_url, urlencode(data).encode("utf-8"), headers) + ).read() except Exception: return False # Python 3 returns response as a bytestring, Python 2 as a regular str - return response in (b'true', 'true') + return response in (b"true", "true") def is_spam(request, form, url): @@ -144,15 +146,16 @@ def paginate(objects, page_num, per_page, max_paging_links): objects = paginator.page(paginator.num_pages) page_range = objects.paginator.page_range if len(page_range) > max_paging_links: - start = min(objects.paginator.num_pages - max_paging_links, - max(0, objects.number - (max_paging_links // 2) - 1)) - page_range = list(page_range)[start:start + max_paging_links] + start = min( + objects.paginator.num_pages - max_paging_links, + max(0, objects.number - (max_paging_links // 2) - 1), + ) + page_range = list(page_range)[start : start + max_paging_links] objects.visible_page_range = page_range return objects -def render(request, templates, dictionary=None, context_instance=None, - **kwargs): +def render(request, templates, dictionary=None, context_instance=None, **kwargs): """ Mimics ``django.shortcuts.render`` but uses a TemplateResponse for ``mezzanine.core.middleware.TemplateForDeviceMiddleware`` @@ -162,7 +165,7 @@ def render(request, templates, dictionary=None, context_instance=None, "mezzanine.utils.views.render is deprecated and will be removed " "in a future version. Please update your project to use Django's " "TemplateResponse, which now provides equivalent functionality.", - DeprecationWarning + DeprecationWarning, ) dictionary = dictionary or {} @@ -180,14 +183,14 @@ def set_cookie(response, name, value, expiry_seconds=None, secure=False): """ if expiry_seconds is None: expiry_seconds = 90 * 24 * 60 * 60 # Default to 90 days. - expires = datetime.strftime(datetime.utcnow() + - timedelta(seconds=expiry_seconds), - "%a, %d-%b-%Y %H:%M:%S GMT") + expires = datetime.strftime( + datetime.utcnow() + timedelta(seconds=expiry_seconds), + "%a, %d-%b-%Y %H:%M:%S GMT", + ) # Django doesn't seem to support unicode cookie keys correctly on # Python 2. Work around by encoding it. See # https://code.djangoproject.com/ticket/19802 try: response.set_cookie(name, value, expires=expires, secure=secure) except (KeyError, TypeError): - response.set_cookie(name.encode('utf-8'), value, expires=expires, - secure=secure) + response.set_cookie(name.encode("utf-8"), value, expires=expires, secure=secure) diff --git a/setup.cfg b/setup.cfg index 423d10b7f0..48016a8aab 100644 --- a/setup.cfg +++ b/setup.cfg @@ -2,9 +2,16 @@ universal = 1 [flake8] -exclude = build,.git,migrations -ignore = E123,E126,E127,E128,E402,W503,E731,W601 -max-line-length = 79 - -[pep8] -max-line-length = 79 +# Configured to match black +ignore = + E203 + W503 +max-line-length = 88 +exclude = + migrations + .tox + .git + .eggs + *.egg-info + build + dist diff --git a/setup.py b/setup.py index 853d63e51d..f033076b63 100755 --- a/setup.py +++ b/setup.py @@ -6,8 +6,10 @@ from mezzanine import __version__ as version -exclude = ["mezzanine/project_template/dev.db", - "mezzanine/project_template/project_name/local_settings.py"] +exclude = [ + "mezzanine/project_template/dev.db", + "mezzanine/project_template/project_name/local_settings.py", +] if sys.argv == ["setup.py", "test"]: exclude = [] exclude = dict([(e, None) for e in exclude]) @@ -42,8 +44,8 @@ author="Stephen McDonald", author_email="stephen.mc@gmail.com", description="An open source content management platform built using " - "the Django framework.", - long_description=open("README.rst", 'rb').read().decode('utf-8'), + "the Django framework.", + long_description=open("README.rst", "rb").read().decode("utf-8"), license="BSD", url="http://mezzanine.jupo.org/", zip_safe=False, @@ -89,7 +91,8 @@ "Topic :: Internet :: WWW/HTTP :: WSGI", "Topic :: Software Development :: Libraries :: Application Frameworks", "Topic :: Software Development :: Libraries :: Python Modules", - ]) + ], + ) finally: for e in exclude: if exclude[e] is not None: From 1ae2b1b593eedaf7a0001c49e5272a30566a5921 Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Tue, 8 Sep 2020 19:11:41 -0600 Subject: [PATCH 013/101] chore: convert to setup.cfg and pytest --- MANIFEST.in | 4 +- mezzanine/bin/runtests.py | 76 ----------- mezzanine/utils/tests.py | 116 ---------------- setup.cfg | 125 ++++++++++++++++- setup.py | 107 +-------------- tests/__init__.py | 0 tests/conftest.py | 63 +++++++++ .../tests.py => tests/test_accounts.py | 0 mezzanine/blog/tests.py => tests/test_blog.py | 0 mezzanine/conf/tests.py => tests/test_conf.py | 0 mezzanine/core/tests.py => tests/test_core.py | 126 ++++++++---------- .../forms/tests.py => tests/test_forms.py | 0 .../tests.py => tests/test_galleries.py | 0 .../generic/tests.py => tests/test_generic.py | 0 .../pages/tests.py => tests/test_pages.py | 0 tox.ini | 11 -- 16 files changed, 247 insertions(+), 381 deletions(-) delete mode 100755 mezzanine/bin/runtests.py create mode 100644 tests/__init__.py create mode 100644 tests/conftest.py rename mezzanine/accounts/tests.py => tests/test_accounts.py (100%) rename mezzanine/blog/tests.py => tests/test_blog.py (100%) rename mezzanine/conf/tests.py => tests/test_conf.py (100%) rename mezzanine/core/tests.py => tests/test_core.py (88%) rename mezzanine/forms/tests.py => tests/test_forms.py (100%) rename mezzanine/galleries/tests.py => tests/test_galleries.py (100%) rename mezzanine/generic/tests.py => tests/test_generic.py (100%) rename mezzanine/pages/tests.py => tests/test_pages.py (100%) delete mode 100644 tox.ini diff --git a/MANIFEST.in b/MANIFEST.in index 1b30c0c8e1..f718bbc398 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,7 +1,9 @@ -include CHANGELOG LICENSE README.rst +include AUTHORS CHANGELOG LICENSE *.rst recursive-include docs * recursive-exclude docs/build * recursive-include mezzanine * recursive-exclude */project_template/static * global-exclude __pycache__ global-exclude *.py[co] +prune .tx +prune tests diff --git a/mezzanine/bin/runtests.py b/mezzanine/bin/runtests.py deleted file mode 100755 index ac008ae8f1..0000000000 --- a/mezzanine/bin/runtests.py +++ /dev/null @@ -1,76 +0,0 @@ -#!/usr/bin/env python -import atexit -import os -import shutil -import sys - -import django -from django.core.management import call_command - - -def main(package="mezzanine", args=()): - """ - This is the main test function called via ``python setup.py test``. - It's responsible for hacking the ``project_template`` dir into - an actual project to test against. - """ - - from mezzanine.utils.importing import path_for_import - - package_path = path_for_import(package) - project_path = os.path.join(package_path, "project_template") - - os.environ["DJANGO_SETTINGS_MODULE"] = "project_name.test_settings" - - project_app_path = os.path.join(project_path, "project_name") - - local_settings_path = os.path.join(project_app_path, "local_settings.py") - test_settings_path = os.path.join(project_app_path, "test_settings.py") - - sys.path.insert(0, package_path) - sys.path.insert(0, project_path) - - if not os.path.exists(test_settings_path): - shutil.copy(local_settings_path + ".template", test_settings_path) - with open(test_settings_path, "r") as f: - local_settings = f.read() - with open(test_settings_path, "w") as f: - test_settings = """ - -from . import settings - -globals().update(i for i in settings.__dict__.items() if i[0].isupper()) - -# Require the mezzanine.accounts app. We use settings.INSTALLED_APPS here so -# the syntax test doesn't complain about an undefined name. -if "mezzanine.accounts" not in settings.INSTALLED_APPS: - INSTALLED_APPS = list(settings.INSTALLED_APPS) + ["mezzanine.accounts"] - -# Use the MD5 password hasher by default for quicker test runs. -PASSWORD_HASHERS = ('django.contrib.auth.hashers.MD5PasswordHasher',) - -""" - f.write(test_settings + local_settings) - - def cleanup_test_settings(): - import os # Outer scope sometimes unavailable in atexit functions. - - for fn in [test_settings_path, test_settings_path + "c"]: - try: - os.remove(fn) - except OSError: - pass - - atexit.register(cleanup_test_settings) - - django.setup() - - from django.core.management.commands import test - - if django.VERSION < (1, 10): - sys.exit(test.Command().execute(*args, verbosity=1)) - sys.exit(call_command(test.Command(), *args, verbosity=1)) - - -if __name__ == "__main__": - main(args=sys.argv[1:]) diff --git a/mezzanine/utils/tests.py b/mezzanine/utils/tests.py index 8a2d853205..7bbf1d4ddc 100644 --- a/mezzanine/utils/tests.py +++ b/mezzanine/utils/tests.py @@ -1,4 +1,3 @@ -from _ast import PyCF_ONLY_AST import os from shutil import copyfile, copytree @@ -12,31 +11,6 @@ from mezzanine.utils.importing import path_for_import -# Ignore these warnings in pyflakes - if added to, please comment why. -IGNORE_ERRORS = ( - # Used to version subpackages. - ".__version__' imported but unused", - # No caching fallback. - "redefinition of function 'nevercache'", - # Dummy fallback in templates for django-compressor. - "redefinition of function 'compress'", - # Fabic config fallback. - "redefinition of unused 'conf'", - # Fixing these would make the code ugiler IMO. - "continuation line", - "closing bracket does not match", - # Jython compatiblity. - "redefinition of unused 'Image", - # Django custom user compatibility. - "'get_user_model' imported but unused", - # lambdas are OK. - "do not assign a lambda", - # checks modules need to be imported to register check functions, they will - # be run by Django. - "'.checks' imported but unused", -) - - class TestCase(BaseTestCase): """ This is the base test case providing common features for all tests @@ -110,93 +84,3 @@ def copy_test_to_media(module, name): copy(test_path, to_path) except OSError: pass - - -def _run_checker_for_package(checker, package_name, extra_ignore=None): - """ - Runs the checker function across every Python module in the - given package. - """ - ignore_strings = IGNORE_ERRORS - if extra_ignore: - ignore_strings += extra_ignore - package_path = path_for_import(package_name) - for (root, dirs, files) in os.walk(str(package_path)): - for f in files: - if ( - f == "local_settings.py" - or not f.endswith(".py") - or root.split(os.sep)[-1] in ["migrations"] - ): - # Ignore - continue - for warning in checker(os.path.join(root, f)): - for ignore in ignore_strings: - if ignore in warning: - break - else: - yield warning.replace(package_path, package_name, 1) - - -def run_pyflakes_for_package(package_name, extra_ignore=None): - """ - If pyflakes is installed, run it across the given package name - returning any warnings found. - """ - from pyflakes.checker import Checker - - def pyflakes_checker(path): - with open(path, "U") as source_file: - source = source_file.read() - try: - tree = compile(source, path, "exec", PyCF_ONLY_AST) - except (SyntaxError, IndentationError) as value: - info = (path, value.lineno, value.args[0]) - yield "Invalid syntax in %s:%d: %s" % info - else: - result = Checker(tree, path) - for warning in result.messages: - yield str(warning) - - args = (pyflakes_checker, package_name, extra_ignore) - return _run_checker_for_package(*args) - - -def run_pep8_for_package(package_name, extra_ignore=None): - """ - If pep8 is installed, run it across the given package name - returning any warnings or errors found. - """ - import pep8 - - class Checker(pep8.Checker): - """ - Subclass pep8's Checker to hook into error reporting. - """ - - def __init__(self, *args, **kwargs): - super(Checker, self).__init__(*args, **kwargs) - self.report_error = self._report_error - - def _report_error(self, line_number, offset, text, check): - """ - Store pairs of line numbers and errors. - """ - self.errors.append((line_number, text.split(" ", 1)[1])) - - def check_all(self, *args, **kwargs): - """ - Assign the errors attribute and return it after running. - """ - self.errors = [] - super(Checker, self).check_all(*args, **kwargs) - return self.errors - - style_guide = pep8.StyleGuide(config_file="setup.cfg") - - def pep8_checker(path): - for line_number, text in Checker(path, options=style_guide.options).check_all(): - yield "%s:%s: %s" % (path, line_number, text) - - args = (pep8_checker, package_name, extra_ignore) - return _run_checker_for_package(*args) diff --git a/setup.cfg b/setup.cfg index 48016a8aab..1460f8e971 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,11 +1,127 @@ -[wheel] +[metadata] +name = Mezzanine +version = attr: mezzanine.__version__ +description = An open source content management platform built using the Django framework. +long_description = file: README.rst +long_description_content_type = text/x-rst +author = Stephen McDonald +author_email = stephen.mc@gmail.com +url = http://mezzanine.jupo.org/ +license = BSD +license_file = LICENSE +classifiers = + Development Status :: 5 - Production/Stable + Environment :: Web Environment + Framework :: Django + Intended Audience :: Developers + License :: OSI Approved :: BSD License + Operating System :: OS Independent + Programming Language :: Python + Programming Language :: Python :: 3 + Programming Language :: Python :: 3.6 + Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 + Topic :: Internet :: WWW/HTTP + Topic :: Internet :: WWW/HTTP :: Dynamic Content + Topic :: Internet :: WWW/HTTP :: WSGI + Topic :: Software Development :: Libraries :: Application Frameworks + Topic :: Software Development :: Libraries :: Python Modules + +[options] +python_requires = >=3.6, <3.9 +packages = find: +include_package_data = True +install_requires = + django-contrib-comments >= 1.9, <1.10 + django >= 2.2, < 3.0 + filebrowser_safe==1.0.0a1 + grappelli_safe==1.0.0a1 + tzlocal >= 2, <3 + bleach >= 2, <4 + beautifulsoup4 >= 4.5.3 + future >= 0.9 + requests >= 2.1.0, <3 + requests-oauthlib >= 1.3, <2 + pillow >= 7, <8 + chardet + +[options.extras_require] +testing = + tox >= 3, <4 + +[entry_points.console_scripts] +mezzanine-project = mezzanine.bin.mezzanine_project:create_project + +# Building + +[bdist_wheel] universal = 1 +# Testing + +[tox:tox] +envlist = + py{36,37,38}-dj{22} + flake8 + black + package + +[testenv] +# Run test suite +allowlist_externals = + find +deps = + pytest-django >=3, <4 + dj22: Django>=2.2, <3 + djmaster: https://github.com/django/django/archive/master.tar.gz#egg=Django +setenv = + PYTHONPATH={toxinidir} +commands = + find {toxinidir} -type f -name "*.pyc" -delete + pytest --basetemp="{envtmpdir}" {posargs} + +[testenv:package] +# Check package integrity and compatibility with PyPI +allowlist_externals = + rm +deps = + twine + check-manifest +skip_install = true +commands = + python setup.py -q sdist + twine check dist/* + rm -rf dist + check-manifest --ignore-bad-ideas '*.mo' {toxinidir} + +[testenv:black] +# Lint with black +skip_install = true +deps = + black==20.8b1 +commands = black . --check --exclude "(\.tox|\.git|build|dist|migrations)" + +[testenv:format] +# This env is not run by default. It's provided here for you +# to easily autoformat code by running `tox -e format` +skip_install = true +deps = + black==20.8b1 +commands = black . --exclude "(\.tox|\.git|build|dist|migrations)" + +[testenv:flake8] +# Lint with flake8 +skip_install = true +deps = + flake8 >= 3, <4 +commands = flake8 . + [flake8] # Configured to match black ignore = E203 W503 + E731 max-line-length = 88 exclude = migrations @@ -15,3 +131,10 @@ exclude = *.egg-info build dist + +[gh-actions] +# Connect GitHub Action matrices with tox envs +python = + 3.6: py36 + 3.7: py37 + 3.8: py38, flake8, black, package diff --git a/setup.py b/setup.py index f033076b63..606849326a 100755 --- a/setup.py +++ b/setup.py @@ -1,106 +1,3 @@ -#!/usr/bin/env python -import os -import sys -from shutil import rmtree -from setuptools import setup, find_packages -from mezzanine import __version__ as version +from setuptools import setup - -exclude = [ - "mezzanine/project_template/dev.db", - "mezzanine/project_template/project_name/local_settings.py", -] -if sys.argv == ["setup.py", "test"]: - exclude = [] -exclude = dict([(e, None) for e in exclude]) - -for e in exclude: - if e.endswith(".py"): - try: - os.remove("%sc" % e) - except: - pass - try: - with open(e, "r") as f: - exclude[e] = (f.read(), os.stat(e)) - os.remove(e) - except: - pass - -if sys.argv[:2] == ["setup.py", "bdist_wheel"]: - # Remove previous build dir when creating a wheel build, - # since if files have been removed from the project, - # they'll still be cached in the build dir and end up - # as part of the build, which is really neat! - try: - rmtree("build") - except: - pass - -try: - setup( - name="Mezzanine", - version=version, - author="Stephen McDonald", - author_email="stephen.mc@gmail.com", - description="An open source content management platform built using " - "the Django framework.", - long_description=open("README.rst", "rb").read().decode("utf-8"), - license="BSD", - url="http://mezzanine.jupo.org/", - zip_safe=False, - include_package_data=True, - packages=find_packages(), - install_requires=[ - "django-contrib-comments", - "django >= 2.2, < 3.0", - "filebrowser_safe >= 0.5.0", - "grappelli_safe >= 0.5.0", - "tzlocal >= 1.0", - "bleach >= 2.0", - "beautifulsoup4 >= 4.5.3", - "requests >= 2.1.0", - "requests-oauthlib >= 0.4", - "future >= 0.9.0", - "pillow", - "chardet", - ], - entry_points=""" - [console_scripts] - mezzanine-project=mezzanine.bin.mezzanine_project:create_project - """, - test_suite="mezzanine.bin.runtests.main", - tests_require=["pyflakes>=0.6.1", "pep8>=1.4.1"], - classifiers=[ - "Development Status :: 5 - Production/Stable", - "Environment :: Web Environment", - "Framework :: Django", - "Intended Audience :: Developers", - "License :: OSI Approved :: BSD License", - "Operating System :: OS Independent", - "Programming Language :: Python", - "Programming Language :: Python :: 2.7", - "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.4", - "Programming Language :: Python :: 3.5", - "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", - "Topic :: Internet :: WWW/HTTP", - "Topic :: Internet :: WWW/HTTP :: Dynamic Content", - "Topic :: Internet :: WWW/HTTP :: WSGI", - "Topic :: Software Development :: Libraries :: Application Frameworks", - "Topic :: Software Development :: Libraries :: Python Modules", - ], - ) -finally: - for e in exclude: - if exclude[e] is not None: - data, stat = exclude[e] - try: - with open(e, "w") as f: - f.write(data) - os.chown(e, stat.st_uid, stat.st_gid) - os.chmod(e, stat.st_mode) - except: - pass +setup() diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/conftest.py b/tests/conftest.py new file mode 100644 index 0000000000..106485c7f0 --- /dev/null +++ b/tests/conftest.py @@ -0,0 +1,63 @@ +import os +import shutil +import sys + +import django +import pytest + +from pathlib import Path + +# Path to the temp mezzanine project folder (will be a sibling of this file) +PROJECT_PATH = Path(__file__).parent / "project_name" + +TEST_SETTINGS = """ +from . import settings + +globals().update(i for i in settings.__dict__.items() if i[0].isupper()) + +# Add our own tests folder to installed apps (required to test models) +INSTALLED_APPS = list(INSTALLED_APPS) +INSTALLED_APPS.append("tests") + +if "mezzanine.accounts" not in INSTALLED_APPS: + INSTALLED_APPS.append("mezzanine.accounts") + +# Use the MD5 password hasher by default for quicker test runs. +PASSWORD_HASHERS = ('django.contrib.auth.hashers.MD5PasswordHasher',) +""" + + +def pytest_report_header(config): + """ + Have pytest report the path to the project folder + """ + return f"mezzanine proj (tmp): {PROJECT_PATH}" + + +def pytest_configure(): + """ + Hack the `project_template` dir into an actual project to test against. + """ + from mezzanine.utils.importing import path_for_import + + template_path = ( + Path(path_for_import("mezzanine")) / "project_template" / "project_name" + ) + shutil.copytree(str(template_path), str(PROJECT_PATH)) + local_settings = (PROJECT_PATH / "local_settings.py.template").read_text() + (PROJECT_PATH / "test_settings.py").write_text(TEST_SETTINGS + local_settings) + + # Setup the environment for Django + sys.path.insert(0, str(PROJECT_PATH.parent)) + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "project_name.test_settings") + django.setup() + + +def pytest_unconfigure(): + """ + Remove the folder folder we copied in `pytest_configure`. + """ + try: + shutil.rmtree(str(PROJECT_PATH)) + except OSError: + pass diff --git a/mezzanine/accounts/tests.py b/tests/test_accounts.py similarity index 100% rename from mezzanine/accounts/tests.py rename to tests/test_accounts.py diff --git a/mezzanine/blog/tests.py b/tests/test_blog.py similarity index 100% rename from mezzanine/blog/tests.py rename to tests/test_blog.py diff --git a/mezzanine/conf/tests.py b/tests/test_conf.py similarity index 100% rename from mezzanine/conf/tests.py rename to tests/test_conf.py diff --git a/mezzanine/core/tests.py b/tests/test_core.py similarity index 88% rename from mezzanine/core/tests.py rename to tests/test_core.py index eb51c7f345..52267e53fe 100644 --- a/mezzanine/core/tests.py +++ b/tests/test_core.py @@ -43,11 +43,7 @@ get_middleware_setting_name, ) from mezzanine.utils.importing import import_dotted_path -from mezzanine.utils.tests import ( - TestCase, - run_pyflakes_for_package, - run_pep8_for_package, -) +from mezzanine.utils.tests import TestCase from mezzanine.utils.html import TagCloser, escape @@ -68,16 +64,6 @@ def test_escape(self): """ self.assertEqual(escape("
    "), "
    ") - def test_syntax(self): - """ - Run pyflakes/pep8 across the code base to check for potential errors. - """ - warnings = [] - warnings.extend(run_pyflakes_for_package("mezzanine")) - warnings.extend(run_pep8_for_package("mezzanine")) - if warnings: - self.fail("Syntax warnings!\n\n%s" % "\n".join(warnings)) - def test_utils(self): """ Miscellanous tests for the ``mezzanine.utils`` package. @@ -232,37 +218,37 @@ def test_multisite(self): # create pages under site1, which should be only accessible # when SITE_ID is site1 - settings.SITE_ID = site1.pk - site1_page = self._create_page("Site1", CONTENT_STATUS_PUBLISHED) - self._test_site_pages("Site1", CONTENT_STATUS_PUBLISHED, count=1) + with override_current_site_id(site1.pk): + site1_page = self._create_page("Site1", CONTENT_STATUS_PUBLISHED) + self._test_site_pages("Site1", CONTENT_STATUS_PUBLISHED, count=1) # create pages under site2, which should only be accessible # when SITE_ID is site2 - settings.SITE_ID = site2.pk - self._create_page("Site2", CONTENT_STATUS_PUBLISHED) - self._test_site_pages("Site2", CONTENT_STATUS_PUBLISHED, count=1) + with override_current_site_id(site2.pk): + self._create_page("Site2", CONTENT_STATUS_PUBLISHED) + self._test_site_pages("Site2", CONTENT_STATUS_PUBLISHED, count=1) - # original page should 404 - response = self.client.get(site1_page.get_absolute_url(), follow=True) - self.assertEqual(response.status_code, 404) + # original page should 404 + response = self.client.get(site1_page.get_absolute_url(), follow=True) + self.assertEqual(response.status_code, 404) # change back to site1, and only the site1 pages should be retrieved - settings.SITE_ID = site1.pk - self._test_site_pages("Site1", CONTENT_STATUS_PUBLISHED, count=1) + with override_current_site_id(site1.pk): + self._test_site_pages("Site1", CONTENT_STATUS_PUBLISHED, count=1) - # insert a new record, see the count change - self._create_page("Site1 Draft", CONTENT_STATUS_DRAFT) - self._test_site_pages("Site1 Draft", CONTENT_STATUS_DRAFT, count=2) - self._test_site_pages("Site1 Draft", CONTENT_STATUS_PUBLISHED, count=2) + # insert a new record, see the count change + self._create_page("Site1 Draft", CONTENT_STATUS_DRAFT) + self._test_site_pages("Site1 Draft", CONTENT_STATUS_DRAFT, count=2) + self._test_site_pages("Site1 Draft", CONTENT_STATUS_PUBLISHED, count=2) # change back to site2, and only the site2 pages should be retrieved - settings.SITE_ID = site2.pk - self._test_site_pages("Site2", CONTENT_STATUS_PUBLISHED, count=1) + with override_current_site_id(site2.pk): + self._test_site_pages("Site2", CONTENT_STATUS_PUBLISHED, count=1) - # insert a new record, see the count change - self._create_page("Site2 Draft", CONTENT_STATUS_DRAFT) - self._test_site_pages("Site2 Draft", CONTENT_STATUS_DRAFT, count=2) - self._test_site_pages("Site2 Draft", CONTENT_STATUS_PUBLISHED, count=2) + # insert a new record, see the count change + self._create_page("Site2 Draft", CONTENT_STATUS_DRAFT) + self._test_site_pages("Site2 Draft", CONTENT_STATUS_DRAFT, count=2) + self._test_site_pages("Site2 Draft", CONTENT_STATUS_PUBLISHED, count=2) # tear down if old_site_id: @@ -474,15 +460,15 @@ def test_cache_installed(self): True, [ "mezzanine.core.middleware.UpdateCacheMiddleware", - "mezzanine.core.tests.SubclassMiddleware", + "tests.test_core.SubclassMiddleware", ], ), ( True, [ "mezzanine.core.middleware.UpdateCacheMiddleware", - "mezzanine.core.tests.FetchFromCacheMiddleware", - "mezzanine.core.tests.function_middleware", + "tests.test_core.FetchFromCacheMiddleware", + "tests.test_core.function_middleware", ], ), ( @@ -519,7 +505,6 @@ def middleware(request): class SiteRelatedTestCase(TestCase): def test_update_site(self): from django.conf import settings - from mezzanine.utils.sites import current_site_id # setup try: @@ -531,48 +516,47 @@ def test_update_site(self): site2 = Site.objects.create(domain="site2.com") # default behaviour, page gets assigned current site - settings.SITE_ID = site2.pk - self.assertEqual(settings.SITE_ID, current_site_id()) - page = RichTextPage() - page.save() - self.assertEqual(page.site_id, site2.pk) + with override_current_site_id(site2.pk): + page = RichTextPage() + page.save() + self.assertEqual(page.site_id, site2.pk) - # Subsequent saves do not update site to current site - page.site = site1 - page.save() - self.assertEqual(page.site_id, site1.pk) + # Subsequent saves do not update site to current site + page.site = site1 + page.save() + self.assertEqual(page.site_id, site1.pk) # resave w/ update_site=True, page gets assigned current site - settings.SITE_ID = site1.pk - page.site = site2 - page.save(update_site=True) - self.assertEqual(page.site_id, site1.pk) + with override_current_site_id(site1.pk): + page.site = site2 + page.save(update_site=True) + self.assertEqual(page.site_id, site1.pk) # resave w/ update_site=False, page does not update site - settings.SITE_ID = site2.pk - page.save(update_site=False) - self.assertEqual(page.site_id, site1.pk) + with override_current_site_id(site2.pk): + page.save(update_site=False) + self.assertEqual(page.site_id, site1.pk) # When update_site=True, new page gets assigned current site - settings.SITE_ID = site2.pk - page = RichTextPage() - page.site = site1 - page.save(update_site=True) - self.assertEqual(page.site_id, site2.pk) + with override_current_site_id(site2.pk): + page = RichTextPage() + page.site = site1 + page.save(update_site=True) + self.assertEqual(page.site_id, site2.pk) # When update_site=False, new page keeps current site - settings.SITE_ID = site2.pk - page = RichTextPage() - page.site = site1 - page.save(update_site=False) - self.assertEqual(page.site_id, site1.pk) + with override_current_site_id(site2.pk): + page = RichTextPage() + page.site = site1 + page.save(update_site=False) + self.assertEqual(page.site_id, site1.pk) # When site explicitly assigned, new page keeps assigned site - settings.SITE_ID = site2.pk - page = RichTextPage() - page.site = site1 - page.save() - self.assertEqual(page.site_id, site1.pk) + with override_current_site_id(site2.pk): + page = RichTextPage() + page.site = site1 + page.save() + self.assertEqual(page.site_id, site1.pk) # tear down if old_site_id: diff --git a/mezzanine/forms/tests.py b/tests/test_forms.py similarity index 100% rename from mezzanine/forms/tests.py rename to tests/test_forms.py diff --git a/mezzanine/galleries/tests.py b/tests/test_galleries.py similarity index 100% rename from mezzanine/galleries/tests.py rename to tests/test_galleries.py diff --git a/mezzanine/generic/tests.py b/tests/test_generic.py similarity index 100% rename from mezzanine/generic/tests.py rename to tests/test_generic.py diff --git a/mezzanine/pages/tests.py b/tests/test_pages.py similarity index 100% rename from mezzanine/pages/tests.py rename to tests/test_pages.py diff --git a/tox.ini b/tox.ini deleted file mode 100644 index 01aa1f4978..0000000000 --- a/tox.ini +++ /dev/null @@ -1,11 +0,0 @@ -[tox] -envlist = - py{35,37}-dj{22,master} - -[testenv] -commands = python setup.py test - -deps = - dj22: Django>=2.2,<2.3 - djmaster: git+https://github.com/django/django.git@master#egg=Django - dj{22,master}: git+https://github.com/fermorltd/filebrowser-safe.git@2.2-compat#egg=filebrowser_safe From 433cee9144b9cbfacafcc43303c0e03cb7063f21 Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Tue, 8 Sep 2020 19:21:13 -0600 Subject: [PATCH 014/101] style: fix flake8 errors --- docs/docs_settings.py | 10 ++++++---- mezzanine/blog/management/commands/import_posterous.py | 2 +- mezzanine/blog/management/commands/import_rss.py | 8 ++++---- mezzanine/conf/__init__.py | 2 +- mezzanine/conf/forms.py | 4 ++-- mezzanine/core/admin.py | 2 +- mezzanine/core/management/commands/runserver.py | 2 +- mezzanine/core/templatetags/mezzanine_tags.py | 6 +++--- mezzanine/galleries/models.py | 2 +- mezzanine/pages/page_processors.py | 2 +- mezzanine/project_template/fabfile.py | 2 +- mezzanine/twitter/management/commands/poll_twitter.py | 2 +- mezzanine/utils/docs.py | 2 +- tests/conftest.py | 1 - tests/test_core.py | 4 ++-- tests/test_forms.py | 2 +- tests/test_pages.py | 2 +- 17 files changed, 28 insertions(+), 27 deletions(-) diff --git a/docs/docs_settings.py b/docs/docs_settings.py index 8d28f5b51b..6fe77b752a 100644 --- a/docs/docs_settings.py +++ b/docs/docs_settings.py @@ -1,16 +1,18 @@ +# flake8: noqa + """ This is the local_settings file for Mezzanine's docs. """ -from mezzanine.project_template.project_name.settings import * # noqa +from random import choice + +from mezzanine.project_template.project_name.settings import * DEBUG = False ROOT_URLCONF = "mezzanine.project_template.project_name.urls" -# Generate a SECRET_KEY for this build -from random import choice - characters = "abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)" +# Generate a SECRET_KEY for this build SECRET_KEY = "".join([choice(characters) for i in range(50)]) if "mezzanine.accounts" not in INSTALLED_APPS: diff --git a/mezzanine/blog/management/commands/import_posterous.py b/mezzanine/blog/management/commands/import_posterous.py index 70a37db5e2..57f84717ed 100644 --- a/mezzanine/blog/management/commands/import_posterous.py +++ b/mezzanine/blog/management/commands/import_posterous.py @@ -49,7 +49,7 @@ def request(self, path, data=None): try: response = json.loads(r.text) return response - except: + except: # noqa raise CommandError(r.text) def handle_import(self, options): diff --git a/mezzanine/blog/management/commands/import_rss.py b/mezzanine/blog/management/commands/import_rss.py index 5e8f2a48a4..e86e22e274 100644 --- a/mezzanine/blog/management/commands/import_rss.py +++ b/mezzanine/blog/management/commands/import_rss.py @@ -54,11 +54,11 @@ def handle_import(self, options): from BeautifulSoup import BeautifulSoup except ImportError: raise CommandError("BeautifulSoup package is required") - for l in BeautifulSoup(urlopen(page_url).read()).findAll("link"): - if "application/rss" in l.get( + for link in BeautifulSoup(urlopen(page_url).read()).findAll("link"): + if "application/rss" in link.get( "type", "" - ) or "application/atom" in l.get("type", ""): - rss_url = urljoin(page_url, l["href"]) + ) or "application/atom" in link.get("type", ""): + rss_url = urljoin(page_url, link["href"]) break else: raise CommandError("Could not parse RSS link from the page") diff --git a/mezzanine/conf/__init__.py b/mezzanine/conf/__init__.py index 2ad9c060d9..6cbf42bba9 100644 --- a/mezzanine/conf/__init__.py +++ b/mezzanine/conf/__init__.py @@ -288,7 +288,7 @@ def __delattr__(self, item): else: try: import_module("%s.defaults" % app) - except: + except: # noqa if module_has_submodule(module, "defaults"): raise diff --git a/mezzanine/conf/forms.py b/mezzanine/conf/forms.py index fd47e5af0d..7b2ed82f84 100644 --- a/mezzanine/conf/forms.py +++ b/mezzanine/conf/forms.py @@ -38,7 +38,7 @@ def __init__(self, *args, **kwargs): for code in OrderedDict(settings.LANGUAGES): try: activate(code) - except: + except: # noqa pass else: self._init_field( @@ -126,7 +126,7 @@ def save(self): if registry[name]["translatable"]: try: activate(code) - except: + except: # noqa pass finally: setting_obj.value = value diff --git a/mezzanine/core/admin.py b/mezzanine/core/admin.py index 85895834ce..3cab13463c 100644 --- a/mezzanine/core/admin.py +++ b/mezzanine/core/admin.py @@ -146,7 +146,7 @@ def save_model(self, request, obj, form, change): if code != lang: # Already done try: activate(code) - except: + except: # noqa pass else: obj.save() diff --git a/mezzanine/core/management/commands/runserver.py b/mezzanine/core/management/commands/runserver.py index c0082682a6..e7c6eb29cf 100644 --- a/mezzanine/core/management/commands/runserver.py +++ b/mezzanine/core/management/commands/runserver.py @@ -165,7 +165,7 @@ def inner_run(self, *args, **kwargs): # shouldn't be able to crash the development server. try: self.stdout.write(banner()) - except: + except: # noqa pass super(Command, self).inner_run(*args, **kwargs) diff --git a/mezzanine/core/templatetags/mezzanine_tags.py b/mezzanine/core/templatetags/mezzanine_tags.py index 8181b534ca..696fef1ecf 100644 --- a/mezzanine/core/templatetags/mezzanine_tags.py +++ b/mezzanine/core/templatetags/mezzanine_tags.py @@ -374,7 +374,7 @@ def thumbnail( f = default_storage.open(image_url) try: image = Image.open(f) - except: + except: # noqa # Invalid image format. return image_url @@ -386,7 +386,7 @@ def thumbnail( # - http://caniuse.com/#feat=css-image-orientation try: orientation = image._getexif().get(0x0112) - except: + except: # noqa orientation = None if orientation: methods = { @@ -420,7 +420,7 @@ def thumbnail( if image.mode not in ("P", "L", "RGBA") and filetype not in ("JPG", "JPEG"): try: image = image.convert("RGBA") - except: + except: # noqa return image_url # Required for progressive jpgs. ImageFile.MAXBLOCK = 2 * (max(image.size) ** 2) diff --git a/mezzanine/galleries/models.py b/mezzanine/galleries/models.py index 26e55c3a78..f7f0e62042 100644 --- a/mezzanine/galleries/models.py +++ b/mezzanine/galleries/models.py @@ -68,7 +68,7 @@ def save(self, delete_zip_import=True, *args, **kwargs): image.verify() except ImportError: pass - except: + except: # noqa continue name = os.path.split(name)[1] diff --git a/mezzanine/pages/page_processors.py b/mezzanine/pages/page_processors.py index c14e0e0964..f261551790 100644 --- a/mezzanine/pages/page_processors.py +++ b/mezzanine/pages/page_processors.py @@ -72,6 +72,6 @@ def autodiscover(): else: try: import_module("%s.page_processors" % app) - except: + except: # noqa if module_has_submodule(module, "page_processors"): raise diff --git a/mezzanine/project_template/fabfile.py b/mezzanine/project_template/fabfile.py index feed631128..0cdb578051 100644 --- a/mezzanine/project_template/fabfile.py +++ b/mezzanine/project_template/fabfile.py @@ -405,7 +405,7 @@ def python(code, show=True): "import django;" "django.setup();" % env.proj_app ) - full_code = 'python -c "%s%s"' % (setup, code.replace("`", "\\\`")) + full_code = 'python -c "%s%s"' % (setup, code.replace("`", "\\\`")) # noqa with project(): if show: print_command(code) diff --git a/mezzanine/twitter/management/commands/poll_twitter.py b/mezzanine/twitter/management/commands/poll_twitter.py index 2649b14054..575baa199a 100644 --- a/mezzanine/twitter/management/commands/poll_twitter.py +++ b/mezzanine/twitter/management/commands/poll_twitter.py @@ -25,5 +25,5 @@ def handle(self, **options): print("Twitter query error [%s]: %s" % (query, e)) try: db.close_connection() - except: + except: # noqa pass diff --git a/mezzanine/utils/docs.py b/mezzanine/utils/docs.py index 50842ef76e..81b7cdd556 100644 --- a/mezzanine/utils/docs.py +++ b/mezzanine/utils/docs.py @@ -213,7 +213,7 @@ def build_changelog(docs_path, package_name="mezzanine"): try: tag(ui, repo, version_tag, rev=cs.hex()) print("Tagging version %s" % version_tag) - except: + except: # noqa pass # Ignore changesets that are merges, bumped the version, closed diff --git a/tests/conftest.py b/tests/conftest.py index 106485c7f0..f99d90c7dc 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -3,7 +3,6 @@ import sys import django -import pytest from pathlib import Path diff --git a/tests/test_core.py b/tests/test_core.py index 52267e53fe..2ec7c2332a 100644 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -210,7 +210,7 @@ def test_multisite(self): # setup try: old_site_id = settings.SITE_ID - except: + except: # noqa old_site_id = None site1 = Site.objects.create(domain="site1.com") @@ -509,7 +509,7 @@ def test_update_site(self): # setup try: old_site_id = settings.SITE_ID - except: + except: # noqa old_site_id = None site1 = Site.objects.create(domain="site1.com") diff --git a/tests/test_forms.py b/tests/test_forms.py index a55b5466e5..7a6506aa61 100644 --- a/tests/test_forms.py +++ b/tests/test_forms.py @@ -52,7 +52,7 @@ def test_submit_button_text(self): for c in code_list: try: activate(c) - except: + except: # noqa pass else: break diff --git a/tests/test_pages.py b/tests/test_pages.py index f61f53fbc2..6389f58392 100644 --- a/tests/test_pages.py +++ b/tests/test_pages.py @@ -442,7 +442,7 @@ def test_page_slug_has_correct_lang(self): for code in code_list: try: activate(code) - except: + except: # noqa pass else: break From 3ea064fba306ad18478e6a7eaa117423965c2241 Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Tue, 8 Sep 2020 19:27:32 -0600 Subject: [PATCH 015/101] chore: declare console_scripts correctly --- setup.cfg | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 1460f8e971..95f200b764 100644 --- a/setup.cfg +++ b/setup.cfg @@ -49,8 +49,9 @@ install_requires = testing = tox >= 3, <4 -[entry_points.console_scripts] -mezzanine-project = mezzanine.bin.mezzanine_project:create_project +[options.entry_points] +console_scripts = + mezzanine-project = mezzanine.bin.mezzanine_project:create_project # Building From bfcc199de8ca13fe4cf866e9ae74cbd125316fe7 Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Tue, 8 Sep 2020 19:31:19 -0600 Subject: [PATCH 016/101] ci: configure semantic-release --- .github/workflows/main.yml | 44 ++++++++++++++++++++++++++++++++++++++ .releaserc | 19 ++++++++++++++++ .travis.yml | 24 --------------------- MANIFEST.in | 1 + mezzanine/__init__.py | 2 +- 5 files changed, 65 insertions(+), 25 deletions(-) create mode 100644 .github/workflows/main.yml create mode 100644 .releaserc delete mode 100644 .travis.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000000..f3a736957b --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,44 @@ +name: Test and release + +# Fires on all incoming commits +on: [push] + +jobs: + + # Test + test: + runs-on: ubuntu-latest + strategy: + matrix: + python: [3.6, 3.7, 3.8] + + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.python }} + - name: Install dependencies + run: pip install tox tox-gh-actions + - name: Run tests + run: tox --parallel + env: + TOX_PARALLEL_NO_SPINNER: 1 + + # Create a new semantic release + release: + needs: test + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v1 + with: + python-version: 3.8 + - uses: cycjimmy/semantic-release-action@v2 + with: + semantic_version: 17 + extra_plugins: | + @semantic-release/exec@5 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + TWINE_USERNAME: __token__ + TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }} diff --git a/.releaserc b/.releaserc new file mode 100644 index 0000000000..96a7bfc7fa --- /dev/null +++ b/.releaserc @@ -0,0 +1,19 @@ +{ + "branches": [ + "+([0-9])?(.{+([0-9]),x}).x", + "stable", + {"name": "alpha", "prerelease": true}, + {"name": "beta", "prerelease": true}, + {"name": "rc", "prerelease": true} + ], + "plugins": [ + "@semantic-release/commit-analyzer", + "@semantic-release/release-notes-generator", + "@semantic-release/github", + ["@semantic-release/exec", { + "verifyConditionsCmd": "python -m pip install -U pip setuptools wheel twine", + "prepareCmd": "sed -i 's/0.0.dev0/${nextRelease.version}/' mezzanine/__init__.py", + "publishCmd": "python setup.py sdist bdist_wheel && twine upload dist/*" + }] + ] +} diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d30204e36b..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,24 +0,0 @@ -language: python -env: - - DJANGO="22" - - DJANGO="master" -python: - - "3.5" - - "3.6" - - "3.7" - - "3.8" -install: - - pip install --upgrade pip setuptools tox -script: - - tox -e py$(python -c 'import sys;print("".join(map(str, sys.version_info[:2])))')-dj${DJANGO} -matrix: - fast_finish: true - include: - - python: "3.5" - env: DJANGO="22" - allow_failures: - - env: DJANGO="master" -notifications: - irc: "irc.freenode.org#mezzanine" - on_success: change - on_failure: change diff --git a/MANIFEST.in b/MANIFEST.in index f718bbc398..6a7741e520 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -7,3 +7,4 @@ global-exclude __pycache__ global-exclude *.py[co] prune .tx prune tests +exclude .releaserc diff --git a/mezzanine/__init__.py b/mezzanine/__init__.py index ed48cdab09..51539633fb 100644 --- a/mezzanine/__init__.py +++ b/mezzanine/__init__.py @@ -1 +1 @@ -__version__ = "4.3.1" +__version__ = "0.0.dev0" # Do not edit, managed by semantic-release From dbefbbdc1c37eb2d8826c61fe0bbd50ae6fd12ab Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Wed, 9 Sep 2020 11:59:32 -0600 Subject: [PATCH 017/101] chore: don't distribute tests in wheels --- setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 95f200b764..6c9b2c5494 100644 --- a/setup.cfg +++ b/setup.cfg @@ -29,8 +29,8 @@ classifiers = [options] python_requires = >=3.6, <3.9 -packages = find: -include_package_data = True +packages = mezzanine +include_package_data = true install_requires = django-contrib-comments >= 1.9, <1.10 django >= 2.2, < 3.0 From 590c323df1882c90186640bd6c66d522e925ae99 Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Wed, 9 Sep 2020 12:55:10 -0600 Subject: [PATCH 018/101] chore: use re_path only when strictly necessary --- mezzanine/blog/urls.py | 36 +++++++++---------- mezzanine/pages/urls.py | 6 ++-- .../project_template/project_name/urls.py | 4 +-- mezzanine/urls.py | 6 ++-- 4 files changed, 24 insertions(+), 28 deletions(-) diff --git a/mezzanine/blog/urls.py b/mezzanine/blog/urls.py index ed491264f9..b57ef5fac0 100644 --- a/mezzanine/blog/urls.py +++ b/mezzanine/blog/urls.py @@ -1,4 +1,4 @@ -from django.urls import re_path +from django.urls import path, re_path from mezzanine.blog import views from mezzanine.conf import settings @@ -9,36 +9,34 @@ # Blog patterns. urlpatterns = [ - re_path( - r"^feeds/(?P.*)%s$" % _slash, + path( + "feeds/" + _slash, views.blog_post_feed, name="blog_post_feed", ), - re_path( - r"^tag/(?P.*)/feeds/(?P.*)%s$" % _slash, + path( + "tag//feeds/" + _slash, views.blog_post_feed, name="blog_post_feed_tag", ), - re_path( - r"^tag/(?P.*)%s$" % _slash, views.blog_post_list, name="blog_post_list_tag" - ), - re_path( - r"^category/(?P.*)/feeds/(?P.*)%s$" % _slash, + path("tag/" + _slash, views.blog_post_list, name="blog_post_list_tag"), + path( + "category//feeds/" + _slash, views.blog_post_feed, name="blog_post_feed_category", ), - re_path( - r"^category/(?P.*)%s$" % _slash, + path( + "category/" + _slash, views.blog_post_list, name="blog_post_list_category", ), - re_path( - r"^author/(?P.*)/feeds/(?P.*)%s$" % _slash, + path( + "author//feeds/" + _slash, views.blog_post_feed, name="blog_post_feed_author", ), - re_path( - r"^author/(?P.*)%s$" % _slash, + path( + "author/" + _slash, views.blog_post_list, name="blog_post_list_author", ), @@ -68,8 +66,6 @@ views.blog_post_detail, name="blog_post_detail_year", ), - re_path( - r"^(?P.*)%s$" % _slash, views.blog_post_detail, name="blog_post_detail" - ), - re_path(r"^$", views.blog_post_list, name="blog_post_list"), + path("" + _slash, views.blog_post_detail, name="blog_post_detail"), + path("", views.blog_post_list, name="blog_post_list"), ] diff --git a/mezzanine/pages/urls.py b/mezzanine/pages/urls.py index 3a2ff39698..6f2e97a7ff 100644 --- a/mezzanine/pages/urls.py +++ b/mezzanine/pages/urls.py @@ -1,4 +1,4 @@ -from django.urls import re_path +from django.urls import path from django.conf import settings from mezzanine.pages import page_processors, views @@ -9,8 +9,8 @@ # Page patterns. urlpatterns = [ - re_path( - "(?P.*)%s$" % ("/" if settings.APPEND_SLASH else ""), + path( + "" + ("/" if settings.APPEND_SLASH else ""), views.page, name="page", ), diff --git a/mezzanine/project_template/project_name/urls.py b/mezzanine/project_template/project_name/urls.py index 3e07ca2da1..b2cd20298b 100644 --- a/mezzanine/project_template/project_name/urls.py +++ b/mezzanine/project_template/project_name/urls.py @@ -1,6 +1,6 @@ from django.conf.urls.i18n import i18n_patterns from django.contrib import admin -from django.urls import path, include, re_path +from django.urls import path, include from django.views.i18n import set_language from django.views.generic import TemplateView @@ -23,7 +23,7 @@ if settings.USE_MODELTRANSLATION: urlpatterns += [ - re_path("^i18n/$", set_language, name="set_language"), + path("i18n", set_language, name="set_language"), ] urlpatterns += [ diff --git a/mezzanine/urls.py b/mezzanine/urls.py index f74f451416..8578b93df5 100644 --- a/mezzanine/urls.py +++ b/mezzanine/urls.py @@ -40,7 +40,7 @@ # Return a robots.txt that disallows all spiders when DEBUG is True. if getattr(settings, "DEBUG", False): urlpatterns += [ - re_path( + path( "robots.txt", lambda r: HttpResponse( "User-agent: *\nDisallow: /", content_type="text/plain" @@ -70,7 +70,7 @@ if BLOG_SLUG: BLOG_SLUG += "/" blog_patterns = [ - re_path(r"^%s" % BLOG_SLUG, include("mezzanine.blog.urls")), + path(BLOG_SLUG, include("mezzanine.blog.urls")), ] urlpatterns += blog_patterns @@ -84,7 +84,7 @@ PAGES_SLUG = str(getattr(settings, "PAGES_SLUG", "pages").strip("/") + "/") blog_patterns_start = urlpatterns.index(blog_patterns[0]) urlpatterns[blog_patterns_start : len(blog_patterns)] = [ - re_path(r"^%s" % PAGES_SLUG, include("mezzanine.pages.urls")), + path(PAGES_SLUG, include("mezzanine.pages.urls")), ] else: urlpatterns += [ From 1a818fa511bdc07eb438b842e2ad2ab4fd38b840 Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Wed, 9 Sep 2020 13:28:44 -0600 Subject: [PATCH 019/101] tests: use temp dirs to support parallel testing --- setup.cfg | 7 +++---- tests/conftest.py | 26 +++++++++++++------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/setup.cfg b/setup.cfg index 6c9b2c5494..2dc9d21985 100644 --- a/setup.cfg +++ b/setup.cfg @@ -62,23 +62,22 @@ universal = 1 [tox:tox] envlist = - py{36,37,38}-dj{22} + py{36,37,38}-dj{22,30,31} flake8 black package [testenv] # Run test suite -allowlist_externals = - find deps = pytest-django >=3, <4 dj22: Django>=2.2, <3 + dj30: Django>=3.0, <3.1 + dj31: Django>=3.1, <3.2 djmaster: https://github.com/django/django/archive/master.tar.gz#egg=Django setenv = PYTHONPATH={toxinidir} commands = - find {toxinidir} -type f -name "*.pyc" -delete pytest --basetemp="{envtmpdir}" {posargs} [testenv:package] diff --git a/tests/conftest.py b/tests/conftest.py index f99d90c7dc..47b6a4b8e8 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,13 +1,14 @@ import os import shutil import sys +import tempfile import django from pathlib import Path -# Path to the temp mezzanine project folder (will be a sibling of this file) -PROJECT_PATH = Path(__file__).parent / "project_name" +# Path to the temp mezzanine project folder +TMP_PATH = Path(tempfile.mkdtemp()) / "project_template" TEST_SETTINGS = """ from . import settings @@ -28,9 +29,9 @@ def pytest_report_header(config): """ - Have pytest report the path to the project folder + Have pytest report the path of the project folder """ - return f"mezzanine proj (tmp): {PROJECT_PATH}" + return f"mezzanine proj (tmp): {TMP_PATH}" def pytest_configure(): @@ -39,24 +40,23 @@ def pytest_configure(): """ from mezzanine.utils.importing import path_for_import - template_path = ( - Path(path_for_import("mezzanine")) / "project_template" / "project_name" - ) - shutil.copytree(str(template_path), str(PROJECT_PATH)) - local_settings = (PROJECT_PATH / "local_settings.py.template").read_text() - (PROJECT_PATH / "test_settings.py").write_text(TEST_SETTINGS + local_settings) + template_path = Path(path_for_import("mezzanine")) / "project_template" + shutil.copytree(str(template_path), str(TMP_PATH)) + proj_path = TMP_PATH / "project_name" + local_settings = (proj_path / "local_settings.py.template").read_text() + (proj_path / "test_settings.py").write_text(TEST_SETTINGS + local_settings) # Setup the environment for Django - sys.path.insert(0, str(PROJECT_PATH.parent)) + sys.path.insert(0, str(TMP_PATH)) os.environ.setdefault("DJANGO_SETTINGS_MODULE", "project_name.test_settings") django.setup() def pytest_unconfigure(): """ - Remove the folder folder we copied in `pytest_configure`. + Remove the temporary folder """ try: - shutil.rmtree(str(PROJECT_PATH)) + shutil.rmtree(str(TMP_PATH)) except OSError: pass From d4db5e6fe73bc19264a5bc68db22148d72dc2791 Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Wed, 9 Sep 2020 13:46:47 -0600 Subject: [PATCH 020/101] feat: remove `future` dependency And __future__ imports too --- docs/conf.py | 2 -- mezzanine/accounts/urls.py | 2 -- mezzanine/bin/__init__.py | 1 - mezzanine/boot/lazy_admin.py | 2 -- mezzanine/conf/__init__.py | 5 ----- mezzanine/conf/context_processors.py | 2 -- mezzanine/core/admin.py | 2 -- mezzanine/core/templatetags/mezzanine_tags.py | 3 --- mezzanine/forms/models.py | 2 -- mezzanine/pages/templatetags/pages_tags.py | 3 --- mezzanine/project_template/fabfile.py | 3 --- mezzanine/project_template/project_name/settings.py | 1 - mezzanine/template/__init__.py | 2 -- mezzanine/twitter/__init__.py | 2 -- mezzanine/twitter/admin.py | 2 -- mezzanine/twitter/defaults.py | 2 -- mezzanine/twitter/management/commands/poll_twitter.py | 2 -- mezzanine/twitter/managers.py | 2 -- mezzanine/twitter/templatetags/twitter_tags.py | 3 --- mezzanine/utils/views.py | 2 -- setup.cfg | 1 - tests/test_generic.py | 5 +---- 22 files changed, 1 insertion(+), 50 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index fbe6778d1f..86a1824228 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -11,8 +11,6 @@ # All configuration values have a default; values that are commented out # serve to show the default. -from __future__ import unicode_literals - from datetime import datetime import sys import os diff --git a/mezzanine/accounts/urls.py b/mezzanine/accounts/urls.py index 118b36cdbb..adbc359fca 100644 --- a/mezzanine/accounts/urls.py +++ b/mezzanine/accounts/urls.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.conf.urls import url from mezzanine.accounts import views diff --git a/mezzanine/bin/__init__.py b/mezzanine/bin/__init__.py index d298ea2a57..ee4aaafee6 100644 --- a/mezzanine/bin/__init__.py +++ b/mezzanine/bin/__init__.py @@ -1,4 +1,3 @@ """ Provides scripts for building and working with Mezzanine. """ -from __future__ import unicode_literals diff --git a/mezzanine/boot/lazy_admin.py b/mezzanine/boot/lazy_admin.py index e768e748fc..c7e1b6dbb3 100644 --- a/mezzanine/boot/lazy_admin.py +++ b/mezzanine/boot/lazy_admin.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.conf import settings from django.conf.urls import include, url from django.contrib.auth import get_user_model diff --git a/mezzanine/conf/__init__.py b/mezzanine/conf/__init__.py index 6cbf42bba9..8ee8b1d499 100644 --- a/mezzanine/conf/__init__.py +++ b/mezzanine/conf/__init__.py @@ -4,9 +4,7 @@ or Django itself. Settings can also be made editable via the admin. """ -from __future__ import unicode_literals from weakref import WeakKeyDictionary -from future.builtins import bytes, str from functools import partial from importlib import import_module @@ -63,9 +61,6 @@ def register_setting( if label is None: label = name.replace("_", " ").title() - # Python 2/3 compatibility. isinstance() is overridden by future - # on Python 2 to behave as Python 3 in conjunction with either - # Python 2's native types or the future.builtins types. if isinstance(default, bool): # Prevent bools treated as ints setting_type = bool diff --git a/mezzanine/conf/context_processors.py b/mezzanine/conf/context_processors.py index 12c9071bb9..f112266f93 100644 --- a/mezzanine/conf/context_processors.py +++ b/mezzanine/conf/context_processors.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from warnings import warn from django.utils.encoding import python_2_unicode_compatible diff --git a/mezzanine/core/admin.py b/mezzanine/core/admin.py index 3cab13463c..61537a100f 100644 --- a/mezzanine/core/admin.py +++ b/mezzanine/core/admin.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from copy import deepcopy from django.contrib import admin diff --git a/mezzanine/core/templatetags/mezzanine_tags.py b/mezzanine/core/templatetags/mezzanine_tags.py index 696fef1ecf..4dbe5b1189 100644 --- a/mezzanine/core/templatetags/mezzanine_tags.py +++ b/mezzanine/core/templatetags/mezzanine_tags.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import, division, unicode_literals -from future.builtins import int, open, str - from hashlib import md5 import os diff --git a/mezzanine/forms/models.py b/mezzanine/forms/models.py index bbd830129a..f7b4e9d6ef 100644 --- a/mezzanine/forms/models.py +++ b/mezzanine/forms/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db import models from django.utils.encoding import python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _ diff --git a/mezzanine/pages/templatetags/pages_tags.py b/mezzanine/pages/templatetags/pages_tags.py index 493d7fd8db..c6e99985e1 100644 --- a/mezzanine/pages/templatetags/pages_tags.py +++ b/mezzanine/pages/templatetags/pages_tags.py @@ -1,6 +1,3 @@ -from __future__ import unicode_literals -from future.builtins import str - from collections import defaultdict from django.core.exceptions import ImproperlyConfigured diff --git a/mezzanine/project_template/fabfile.py b/mezzanine/project_template/fabfile.py index 0cdb578051..03c5065cd5 100644 --- a/mezzanine/project_template/fabfile.py +++ b/mezzanine/project_template/fabfile.py @@ -1,6 +1,3 @@ -from __future__ import print_function, unicode_literals -from future.builtins import open - import os import re import sys diff --git a/mezzanine/project_template/project_name/settings.py b/mezzanine/project_template/project_name/settings.py index 4da7d71410..f673a172c9 100644 --- a/mezzanine/project_template/project_name/settings.py +++ b/mezzanine/project_template/project_name/settings.py @@ -1,4 +1,3 @@ -from __future__ import absolute_import, unicode_literals import os from django import VERSION as DJANGO_VERSION diff --git a/mezzanine/template/__init__.py b/mezzanine/template/__init__.py index e1e2a0ef27..84428116da 100644 --- a/mezzanine/template/__init__.py +++ b/mezzanine/template/__init__.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from functools import wraps import warnings diff --git a/mezzanine/twitter/__init__.py b/mezzanine/twitter/__init__.py index 3d6f118640..ea2e50f934 100644 --- a/mezzanine/twitter/__init__.py +++ b/mezzanine/twitter/__init__.py @@ -1,8 +1,6 @@ """ Provides models and utilities for displaying different types of Twitter feeds. """ -from __future__ import unicode_literals - from django.utils.translation import ugettext_lazy as _ from mezzanine import __version__ # noqa diff --git a/mezzanine/twitter/admin.py b/mezzanine/twitter/admin.py index d06873bb7b..0e4552134a 100644 --- a/mezzanine/twitter/admin.py +++ b/mezzanine/twitter/admin.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.utils.safestring import mark_safe from django.utils.translation import ugettext_lazy as _ from django.template.defaultfilters import truncatechars diff --git a/mezzanine/twitter/defaults.py b/mezzanine/twitter/defaults.py index 26f6da741a..a94bdfd54c 100644 --- a/mezzanine/twitter/defaults.py +++ b/mezzanine/twitter/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 from mezzanine.twitter import QUERY_TYPE_CHOICES, QUERY_TYPE_SEARCH diff --git a/mezzanine/twitter/management/commands/poll_twitter.py b/mezzanine/twitter/management/commands/poll_twitter.py index 575baa199a..4536593aaf 100644 --- a/mezzanine/twitter/management/commands/poll_twitter.py +++ b/mezzanine/twitter/management/commands/poll_twitter.py @@ -1,5 +1,3 @@ -from __future__ import print_function, unicode_literals - from django.core.management.base import BaseCommand from django import db diff --git a/mezzanine/twitter/managers.py b/mezzanine/twitter/managers.py index 972e486ac7..83b9ae0f78 100644 --- a/mezzanine/twitter/managers.py +++ b/mezzanine/twitter/managers.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.db.models import Manager diff --git a/mezzanine/twitter/templatetags/twitter_tags.py b/mezzanine/twitter/templatetags/twitter_tags.py index 65c4dcb14f..4a9333479d 100644 --- a/mezzanine/twitter/templatetags/twitter_tags.py +++ b/mezzanine/twitter/templatetags/twitter_tags.py @@ -1,6 +1,3 @@ -from __future__ import unicode_literals -from future.builtins import int, str - from collections import defaultdict from mezzanine.conf import settings diff --git a/mezzanine/utils/views.py b/mezzanine/utils/views.py index af06889632..00fa7e0d7a 100644 --- a/mezzanine/utils/views.py +++ b/mezzanine/utils/views.py @@ -1,7 +1,5 @@ import warnings -from future.builtins import int - from datetime import datetime, timedelta from urllib.parse import urlencode diff --git a/setup.cfg b/setup.cfg index 2dc9d21985..a699822bc5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -39,7 +39,6 @@ install_requires = tzlocal >= 2, <3 bleach >= 2, <4 beautifulsoup4 >= 4.5.3 - future >= 0.9 requests >= 2.1.0, <3 requests-oauthlib >= 1.3, <2 pillow >= 7, <8 diff --git a/tests/test_generic.py b/tests/test_generic.py index 5c766613b1..40cd517c9d 100644 --- a/tests/test_generic.py +++ b/tests/test_generic.py @@ -1,6 +1,5 @@ from django.template import Context from django.template import Template -from future.utils import native_str from unittest import skipUnless @@ -33,9 +32,7 @@ def test_rating(self): for value in settings.RATINGS_RANGE: data["value"] = value response = self.client.post(reverse("rating"), data=data) - # Django doesn't seem to support unicode cookie keys correctly on - # Python 2. See https://code.djangoproject.com/ticket/19802 - response.delete_cookie(native_str("mezzanine-rating")) + response.delete_cookie("mezzanine-rating") blog_post = BlogPost.objects.get(id=blog_post.id) count = len(settings.RATINGS_RANGE) _sum = sum(settings.RATINGS_RANGE) From 49a26305fb88a14f8ba5f5f73c41e3fdb434ff33 Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Wed, 9 Sep 2020 15:05:46 -0600 Subject: [PATCH 021/101] refactor: remove all usages of six --- mezzanine/bin/management/commands/mezzanine_project.py | 5 ++--- mezzanine/generic/forms.py | 3 +-- mezzanine/utils/conf.py | 5 +---- mezzanine/utils/static.py | 3 +-- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/mezzanine/bin/management/commands/mezzanine_project.py b/mezzanine/bin/management/commands/mezzanine_project.py index cd2f998bfc..f472ca5823 100644 --- a/mezzanine/bin/management/commands/mezzanine_project.py +++ b/mezzanine/bin/management/commands/mezzanine_project.py @@ -6,7 +6,6 @@ from django.core.management import CommandError from django.core.management.commands.startproject import Command as BaseCommand -from django.utils import six from django.utils.crypto import get_random_string import mezzanine @@ -56,7 +55,7 @@ def handle(self, *args, **options): # overwriting the ones already copied from Mezzanine. alt = options.pop("alt", "") if alt: - options["template"] = six.text_type( + options["template"] = str( os.path.join( os.path.dirname(os.path.abspath(import_module(alt).__file__)), "project_template", @@ -98,5 +97,5 @@ def handle_template(self, template, subdir): TemplateCommand. """ if template is None: - return six.text_type(os.path.join(mezzanine.__path__[0], subdir)) + return str(os.path.join(mezzanine.__path__[0], subdir)) return super(Command, self).handle_template(template, subdir) diff --git a/mezzanine/generic/forms.py b/mezzanine/generic/forms.py index 9bfd71c6bd..695e81c8de 100644 --- a/mezzanine/generic/forms.py +++ b/mezzanine/generic/forms.py @@ -1,7 +1,6 @@ from django import forms from django_comments.forms import CommentSecurityForm, CommentForm from django_comments.signals import comment_was_posted -from django.utils import six from django.utils.safestring import mark_safe from django.utils.translation import ugettext, ugettext_lazy as _ @@ -59,7 +58,7 @@ def decompress(self, value): if hasattr(value, "select_related"): keywords = [a.keyword for a in value.select_related("keyword")] - elif value and isinstance(value, six.string_types): + elif value and isinstance(value, str): keyword_pks = value.split(",") keywords = Keyword.objects.all().filter(id__in=keyword_pks) diff --git a/mezzanine/utils/conf.py b/mezzanine/utils/conf.py index 0d48934c35..57108273e0 100644 --- a/mezzanine/utils/conf.py +++ b/mezzanine/utils/conf.py @@ -3,7 +3,6 @@ from inspect import getmro from warnings import warn -import six from django.db import OperationalError from django.conf import global_settings as defaults from django.utils.module_loading import import_string @@ -286,9 +285,7 @@ def flatten(seqs): return (item for seq in seqs for item in seq) middleware_items = map(import_string, middleware_setting) - middleware_classes = filter( - lambda m: isinstance(m, six.class_types), middleware_items - ) + middleware_classes = filter(lambda m: isinstance(m, type), middleware_items) middleware_ancestors = set(flatten(map(getmro, middleware_classes))) needed_middlewares = set(map(import_string, needed_middlewares)) diff --git a/mezzanine/utils/static.py b/mezzanine/utils/static.py index c774bd8fcf..0d6532f03e 100644 --- a/mezzanine/utils/static.py +++ b/mezzanine/utils/static.py @@ -4,13 +4,12 @@ from django.contrib.admin.templatetags.admin_static import static from django.conf import settings from django.utils.functional import lazy -from django.utils import six # The 'static' template tag returns cache-busting file names, which prevents # CDN's or browsers from serving old assets. # See https://github.com/stephenmcd/mezzanine/pull/1411 for original # proposal. -static_lazy = lazy(static, six.text_type) +static_lazy = lazy(static, str) # The above however is incompatible with Django's ManifestStaticFilesStorage # (see https://github.com/stephenmcd/mezzanine/issues/1772), so in that From b6f9063e1e4278b6a570bfc975d7ce1479c1237d Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Wed, 9 Sep 2020 15:07:45 -0600 Subject: [PATCH 022/101] tests: fix pytest discovery In parallel mode, Pytest was discovering some files generated by the "package" env --- setup.cfg | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/setup.cfg b/setup.cfg index a699822bc5..90fc9b3f59 100644 --- a/setup.cfg +++ b/setup.cfg @@ -77,20 +77,17 @@ deps = setenv = PYTHONPATH={toxinidir} commands = - pytest --basetemp="{envtmpdir}" {posargs} + pytest --basetemp="{envtmpdir}" --ignore Mezzanine-0.0.dev0 {posargs} [testenv:package] # Check package integrity and compatibility with PyPI -allowlist_externals = - rm deps = twine check-manifest skip_install = true commands = - python setup.py -q sdist - twine check dist/* - rm -rf dist + python setup.py -q sdist --dist-dir="{envtmpdir}/dist" + twine check "{envtmpdir}/dist/*" check-manifest --ignore-bad-ideas '*.mo' {toxinidir} [testenv:black] From 82e71553b3aecb04403a271036832a5e855e6881 Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Wed, 9 Sep 2020 15:43:42 -0600 Subject: [PATCH 023/101] tests: test against django master --- setup.cfg | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index 90fc9b3f59..ab31cdfd39 100644 --- a/setup.cfg +++ b/setup.cfg @@ -61,7 +61,7 @@ universal = 1 [tox:tox] envlist = - py{36,37,38}-dj{22,30,31} + py{36,37,38}-dj{22,30,31,master} flake8 black package @@ -74,11 +74,17 @@ deps = dj30: Django>=3.0, <3.1 dj31: Django>=3.1, <3.2 djmaster: https://github.com/django/django/archive/master.tar.gz#egg=Django -setenv = - PYTHONPATH={toxinidir} commands = pytest --basetemp="{envtmpdir}" --ignore Mezzanine-0.0.dev0 {posargs} +[testenv:py{36,37,38}-djmaster] +# Same as above, but ignoring the output while testing against Django master +ignore_outcome = true +deps = + {[testenv]deps} +commands = + {[testenv]commands} + [testenv:package] # Check package integrity and compatibility with PyPI deps = From a4bd82856c0986e9c299d8eb3df11fe2f5946580 Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Wed, 9 Sep 2020 17:24:45 -0600 Subject: [PATCH 024/101] feat: remove code deprecated in Django 3 --- mezzanine/conf/context_processors.py | 3 --- mezzanine/core/middleware.py | 3 ++- mezzanine/core/templates/admin/base_site.html | 2 +- mezzanine/core/templates/admin/index.html | 2 +- mezzanine/core/templates/admin/login.html | 2 +- mezzanine/core/templates/base.html | 2 +- mezzanine/core/templates/includes/editable_loader.html | 2 +- mezzanine/core/templates/includes/editable_toolbar.html | 2 +- mezzanine/forms/models.py | 2 -- mezzanine/forms/templates/admin/forms/entries.html | 2 +- mezzanine/galleries/models.py | 2 -- mezzanine/galleries/templates/pages/gallery.html | 2 +- mezzanine/generic/models.py | 2 -- mezzanine/pages/models.py | 2 -- mezzanine/pages/templates/admin/pages/page/change_list.html | 2 +- mezzanine/pages/templates/pages/menus/admin.html | 2 +- mezzanine/utils/cache.py | 2 +- mezzanine/utils/static.py | 2 +- 18 files changed, 14 insertions(+), 24 deletions(-) diff --git a/mezzanine/conf/context_processors.py b/mezzanine/conf/context_processors.py index f112266f93..95221dd2a6 100644 --- a/mezzanine/conf/context_processors.py +++ b/mezzanine/conf/context_processors.py @@ -1,13 +1,10 @@ from warnings import warn -from django.utils.encoding import python_2_unicode_compatible - # Deprecated settings and their defaults. DEPRECATED = {} -@python_2_unicode_compatible class TemplateSettings(dict): """ Dict wrapper for template settings. This exists to enforce diff --git a/mezzanine/core/middleware.py b/mezzanine/core/middleware.py index 8bdd503bd9..573e6d62f8 100755 --- a/mezzanine/core/middleware.py +++ b/mezzanine/core/middleware.py @@ -1,5 +1,7 @@ import warnings +from functools import lru_cache + from django.contrib import admin from django.contrib.auth import logout from django.contrib.messages import error @@ -15,7 +17,6 @@ from django.middleware.csrf import CsrfViewMiddleware, get_token from django.template import Template, RequestContext from django.utils.cache import get_max_age -from django.utils.lru_cache import lru_cache from django.utils.safestring import mark_safe from django.utils.translation import ugettext as _ diff --git a/mezzanine/core/templates/admin/base_site.html b/mezzanine/core/templates/admin/base_site.html index 00bb3cc036..8a59711ed1 100644 --- a/mezzanine/core/templates/admin/base_site.html +++ b/mezzanine/core/templates/admin/base_site.html @@ -1,5 +1,5 @@ {% extends "admin/base.html" %} -{% load mezzanine_tags i18n staticfiles static %} +{% load mezzanine_tags i18n static static %} {% block title %}{{ title }} | Mezzanine{% endblock %} diff --git a/mezzanine/core/templates/admin/index.html b/mezzanine/core/templates/admin/index.html index 22d2ca47a2..84e1c01119 100644 --- a/mezzanine/core/templates/admin/index.html +++ b/mezzanine/core/templates/admin/index.html @@ -1,6 +1,6 @@ {% extends "admin/base_site.html" %} -{% load i18n mezzanine_tags staticfiles %} +{% load i18n mezzanine_tags static %} {% block extrahead %} {{ block.super }} diff --git a/mezzanine/core/templates/admin/login.html b/mezzanine/core/templates/admin/login.html index e362f8aebd..fb51c20f81 100644 --- a/mezzanine/core/templates/admin/login.html +++ b/mezzanine/core/templates/admin/login.html @@ -1,5 +1,5 @@ {% extends "admin/base_site.html" %} -{% load i18n staticfiles %} +{% load i18n static %} {% block extrahead %} diff --git a/mezzanine/core/templates/base.html b/mezzanine/core/templates/base.html index f7d78da064..571766210c 100644 --- a/mezzanine/core/templates/base.html +++ b/mezzanine/core/templates/base.html @@ -1,6 +1,6 @@ -{% load pages_tags mezzanine_tags i18n staticfiles %} +{% load pages_tags mezzanine_tags i18n static %} diff --git a/mezzanine/core/templates/includes/editable_loader.html b/mezzanine/core/templates/includes/editable_loader.html index df79ffe771..1d5db0ab84 100644 --- a/mezzanine/core/templates/includes/editable_loader.html +++ b/mezzanine/core/templates/includes/editable_loader.html @@ -1,4 +1,4 @@ -{% load i18n staticfiles %} +{% load i18n static %} {% if has_site_permission %} diff --git a/mezzanine/core/templates/includes/editable_toolbar.html b/mezzanine/core/templates/includes/editable_toolbar.html index 3c1ab90716..e4f03da6d9 100644 --- a/mezzanine/core/templates/includes/editable_toolbar.html +++ b/mezzanine/core/templates/includes/editable_toolbar.html @@ -1,4 +1,4 @@ -{% load i18n staticfiles %} +{% load i18n static %}
    {% url "admin:index" as admin_index_url %} diff --git a/mezzanine/forms/models.py b/mezzanine/forms/models.py index f7b4e9d6ef..508e25fb43 100644 --- a/mezzanine/forms/models.py +++ b/mezzanine/forms/models.py @@ -1,5 +1,4 @@ from django.db import models -from django.utils.encoding import python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _ from mezzanine.conf import settings @@ -65,7 +64,6 @@ def visible(self): return self.filter(visible=True) -@python_2_unicode_compatible class AbstractBaseField(Orderable): """ A field for a user-built form. diff --git a/mezzanine/forms/templates/admin/forms/entries.html b/mezzanine/forms/templates/admin/forms/entries.html index 2926a8b4eb..b4bb47250f 100644 --- a/mezzanine/forms/templates/admin/forms/entries.html +++ b/mezzanine/forms/templates/admin/forms/entries.html @@ -1,6 +1,6 @@ {% extends "admin/base_site.html" %} -{% load i18n staticfiles %} +{% load i18n static %} {% block extrahead %} {{ block.super }} diff --git a/mezzanine/galleries/models.py b/mezzanine/galleries/models.py index f7f0e62042..0779d3c21f 100644 --- a/mezzanine/galleries/models.py +++ b/mezzanine/galleries/models.py @@ -7,7 +7,6 @@ from django.core.files.base import ContentFile from django.core.files.storage import default_storage from django.db import models -from django.utils.encoding import python_2_unicode_compatible from django.utils.encoding import force_text from django.utils.translation import ugettext_lazy as _ @@ -127,7 +126,6 @@ class Meta: verbose_name_plural = _("Galleries") -@python_2_unicode_compatible class GalleryImage(Orderable): gallery = models.ForeignKey( diff --git a/mezzanine/galleries/templates/pages/gallery.html b/mezzanine/galleries/templates/pages/gallery.html index 90c78cd230..42aa56a443 100644 --- a/mezzanine/galleries/templates/pages/gallery.html +++ b/mezzanine/galleries/templates/pages/gallery.html @@ -1,6 +1,6 @@ {% extends "pages/page.html" %} -{% load mezzanine_tags staticfiles %} +{% load mezzanine_tags static %} {% block extra_css %} diff --git a/mezzanine/generic/models.py b/mezzanine/generic/models.py index 9b87159bc8..45847eefed 100644 --- a/mezzanine/generic/models.py +++ b/mezzanine/generic/models.py @@ -2,7 +2,6 @@ from django.db import models from django.template.defaultfilters import truncatewords_html from django.utils.translation import ugettext, ugettext_lazy as _ -from django.utils.encoding import python_2_unicode_compatible from django.utils.html import format_html from django_comments.models import Comment @@ -108,7 +107,6 @@ class Meta: verbose_name_plural = _("Keywords") -@python_2_unicode_compatible class AssignedKeyword(Orderable): """ A ``Keyword`` assigned to a model instance. diff --git a/mezzanine/pages/models.py b/mezzanine/pages/models.py index 9cd347b80f..2a2e3bb88d 100644 --- a/mezzanine/pages/models.py +++ b/mezzanine/pages/models.py @@ -4,7 +4,6 @@ from django.urls import resolve, reverse from django.db import models -from django.utils.encoding import python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _, ugettext from mezzanine.conf import settings @@ -28,7 +27,6 @@ class Meta: abstract = True -@python_2_unicode_compatible class Page(BasePage, ContentTyped): """ A page in the page tree. This is the base class that custom content types diff --git a/mezzanine/pages/templates/admin/pages/page/change_list.html b/mezzanine/pages/templates/admin/pages/page/change_list.html index 46cfd36047..7c8dbc37cd 100644 --- a/mezzanine/pages/templates/admin/pages/page/change_list.html +++ b/mezzanine/pages/templates/admin/pages/page/change_list.html @@ -1,5 +1,5 @@ {% extends "admin/change_list.html" %} -{% load pages_tags staticfiles %} +{% load pages_tags static %} {% block extrahead %} {{ block.super }} diff --git a/mezzanine/pages/templates/pages/menus/admin.html b/mezzanine/pages/templates/pages/menus/admin.html index 540c563469..84c3b5ef5c 100644 --- a/mezzanine/pages/templates/pages/menus/admin.html +++ b/mezzanine/pages/templates/pages/menus/admin.html @@ -1,4 +1,4 @@ -{% load pages_tags i18n staticfiles %} +{% load pages_tags i18n static %}
      {% for page in page_branch %} diff --git a/mezzanine/utils/cache.py b/mezzanine/utils/cache.py index cb23939847..5c18757048 100644 --- a/mezzanine/utils/cache.py +++ b/mezzanine/utils/cache.py @@ -1,8 +1,8 @@ +from functools import lru_cache from hashlib import md5 from time import time from django.core.cache import cache -from django.utils.lru_cache import lru_cache from django.utils.cache import _i18n_cache_key_suffix from mezzanine.conf import settings diff --git a/mezzanine/utils/static.py b/mezzanine/utils/static.py index 0d6532f03e..fa98b58410 100644 --- a/mezzanine/utils/static.py +++ b/mezzanine/utils/static.py @@ -1,7 +1,7 @@ """ Utils for working with static files. """ -from django.contrib.admin.templatetags.admin_static import static +from django.templatetags.static import static from django.conf import settings from django.utils.functional import lazy From 398446a2bcdf0fec2b98342878927cefbb9a2976 Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Wed, 9 Sep 2020 18:13:31 -0600 Subject: [PATCH 025/101] chore: add black config to its own file So all envs and IDEs can pick it up automatically --- pyproject.toml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 pyproject.toml diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000000..044dfcbc22 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,16 @@ +[tool.black] +exclude = ''' +( + /( + \.eggs + | \.git + | \.tox + | \.venv + | build + | dist + | migrations + )/ +) +''' + +force_exclude = "migrations/" From 2abd23c3a53f90933e32d81101a67cb18157a55e Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Wed, 9 Sep 2020 18:14:14 -0600 Subject: [PATCH 026/101] ci: streamline tox env dependencies Also makes it easier to install locally --- setup.cfg | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/setup.cfg b/setup.cfg index ab31cdfd39..143b37c8ff 100644 --- a/setup.cfg +++ b/setup.cfg @@ -46,7 +46,10 @@ install_requires = [options.extras_require] testing = - tox >= 3, <4 + pytest-django >= 3, <4 +codestyle = + flake8 >= 3, <4 + black==20.8b1 [options.entry_points] console_scripts = @@ -69,7 +72,7 @@ envlist = [testenv] # Run test suite deps = - pytest-django >=3, <4 + .[testing] dj22: Django>=2.2, <3 dj30: Django>=3.0, <3.1 dj31: Django>=3.1, <3.2 @@ -96,26 +99,23 @@ commands = twine check "{envtmpdir}/dist/*" check-manifest --ignore-bad-ideas '*.mo' {toxinidir} -[testenv:black] -# Lint with black -skip_install = true -deps = - black==20.8b1 -commands = black . --check --exclude "(\.tox|\.git|build|dist|migrations)" - [testenv:format] # This env is not run by default. It's provided here for you # to easily autoformat code by running `tox -e format` skip_install = true -deps = - black==20.8b1 -commands = black . --exclude "(\.tox|\.git|build|dist|migrations)" +deps = .[codestyle] +commands = black . + +[testenv:black] +# Lint with black +skip_install = true +deps = .[codestyle] +commands = black . --check [testenv:flake8] # Lint with flake8 skip_install = true -deps = - flake8 >= 3, <4 +deps = .[codestyle] commands = flake8 . [flake8] From 4db716c4868de464d0113db6fa38c355cbf333fe Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Wed, 9 Sep 2020 18:16:16 -0600 Subject: [PATCH 027/101] feat: remove requirements.txt from template folder It just gets outdated very easily and people should freeze reqs manually anyway --- mezzanine/project_template/requirements.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 mezzanine/project_template/requirements.txt diff --git a/mezzanine/project_template/requirements.txt b/mezzanine/project_template/requirements.txt deleted file mode 100644 index b259593866..0000000000 --- a/mezzanine/project_template/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -Mezzanine==5.0.0 \ No newline at end of file From 42a2effd858880f2f7357c80cb33231e7a226b3c Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Wed, 9 Sep 2020 18:54:55 -0600 Subject: [PATCH 028/101] chore: ignore pytest cache --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index fb1be164ab..5d18dbb51f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ .DS_Store .coverage .idea/ +.pytest_cache local_settings.py .eggs/ .tox/ From 47cd479afc00220f602777111d48b3ecd10c9ca8 Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Wed, 9 Sep 2020 18:57:44 -0600 Subject: [PATCH 029/101] docs: update readme and contributing guide --- CONTRIBUTING.rst | 52 +++++++++++++++++++++++++++++++++--------------- README.rst | 9 +++++++-- 2 files changed, 43 insertions(+), 18 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 64a66c5b47..caea7d17c9 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -1,27 +1,47 @@ -Please note the following instructions for opening an issue: +Thank you for your interest in contributing to this project! * If you're confident you've identified a bug, or have already written a patch, feel free to open an issue or pull request. Otherwise, please discuss on the `mezzanine-users `_ mailing list first. -* Contributed code must be written in the existing style. For Python - (and to a decent extent, JavaScript as well), this is as simple as - following the `Django coding style `_ and (most importantly) - `PEP 8 `_. Front-end CSS should adhere to the - `Bootstrap CSS guidelines `_. +* For large features or bug fixes it's always a good idea to open an issue before you start developing your solution. This way the right approach and ideas can be discussed upfront instead of after spending time and energy developing it. * Contributions must be made available on a separately named branch, based on the latest version of the master branch. -* Run the tests before committing your changes. If your changes - cause the tests to break, they won't be accepted. +* If you are adding new functionality, you must include basic tests + and documentation. +* Please add your name to the end of the AUTHORS file as part of your pull + request. - Tests can be run using:: +Testing +------- - ./setup.py test +After cloning the repository and working on your contribution, install the extra testing requirements and run ``pytest``. - Or specified tests using:: +.. code-block:: bash - ./mezzanine/bin/runtests.py mezzanine.core.tests.CoreTests + pip install -e ".[testing]" + pytest -* If you are adding new functionality, you must include basic tests - and documentation. -* Please add your name to the end of the AUTHORS file as part of your pull - request. +Since the test suite is quite big you may want to run only a specific test case: + +.. code-block:: bash + + # Test the "galleries" app only + pytest tests/test_galleries.py + +Code Style +---------- + +Python code style is enforced with ``flake8`` and ``black``. You can install and run both as follows: + +.. code-block:: bash + + pip install -e ".[codestyle]" + black . --check # Omit the flag to have black autofix errors + flake8 . + +If your editor is configured to integrate with ``black`` and ``flake8`` it should pick up the project's configuration automatically. + +Continous Integration +--------------------- + +When you are ready to contribute your changes `create and submit a pull request `_ against the ``master`` branch. This will run all tests in all supported Python and Django versions and alert you if any of them fail. diff --git a/README.rst b/README.rst index d6cbc7ad83..44690cd092 100644 --- a/README.rst +++ b/README.rst @@ -1,5 +1,10 @@ -.. image:: https://secure.travis-ci.org/stephenmcd/mezzanine.png?branch=master - :target: http://travis-ci.org/stephenmcd/mezzanine +.. image:: https://img.shields.io/pypi/v/mezzanine.svg + :target: https://pypi.org/project/mezzanine/ +.. image:: https://img.shields.io/pypi/pyversions/mezzanine.svg +.. image:: https://github.com/stephenmcd/mezzanine/workflows/Test%20and%20release/badge.svg + :target: https://github.com/stephenmcd/mezzanine/actions?query=workflow%3A%22Test+and+release%22 +.. image:: https://img.shields.io/badge/code%20style-black-000000.svg + :target: https://github.com/psf/black Created by `Stephen McDonald `_ From 37712f1a1023ac0ee7e2114ac4262cedfd7f4556 Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Wed, 9 Sep 2020 18:59:07 -0600 Subject: [PATCH 030/101] feat: enable support for django >= 2.2, < 3.2 --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 143b37c8ff..596b6c7077 100644 --- a/setup.cfg +++ b/setup.cfg @@ -33,7 +33,7 @@ packages = mezzanine include_package_data = true install_requires = django-contrib-comments >= 1.9, <1.10 - django >= 2.2, < 3.0 + django >= 2.2, < 3.2 filebrowser_safe==1.0.0a1 grappelli_safe==1.0.0a1 tzlocal >= 2, <3 From 29ec79bd3366109cb810efde9f642ee19e8e00c0 Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Sat, 24 Oct 2020 13:11:06 -0600 Subject: [PATCH 031/101] Revert "feat: enable support for django >= 2.2, < 3.2" This reverts commit 37712f1a1023ac0ee7e2114ac4262cedfd7f4556. --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 596b6c7077..143b37c8ff 100644 --- a/setup.cfg +++ b/setup.cfg @@ -33,7 +33,7 @@ packages = mezzanine include_package_data = true install_requires = django-contrib-comments >= 1.9, <1.10 - django >= 2.2, < 3.2 + django >= 2.2, < 3.0 filebrowser_safe==1.0.0a1 grappelli_safe==1.0.0a1 tzlocal >= 2, <3 From 721847e84bf2af8bb31e2877bace827e8ae6655d Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Wed, 26 May 2021 19:12:30 -0600 Subject: [PATCH 032/101] ci: test against Python 3.9 and Django 3.2 --- .github/workflows/main.yml | 15 ++++++++---- .gitignore | 1 + .releaserc | 2 +- mezzanine/__init__.py | 2 +- setup.cfg | 48 +++++++++++++++++++++----------------- 5 files changed, 41 insertions(+), 27 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f3a736957b..4e5f0dceaf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,7 +1,9 @@ name: Test and release # Fires on all incoming commits -on: [push] +on: + pull_request: + push: jobs: @@ -10,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python: [3.6, 3.7, 3.8] + python: [3.6, 3.7, 3.8, 3.9] steps: - uses: actions/checkout@v2 @@ -18,11 +20,16 @@ jobs: with: python-version: ${{ matrix.python }} - name: Install dependencies - run: pip install tox tox-gh-actions + run: pip install tox tox-gh-actions -U pip - name: Run tests - run: tox --parallel + run: | + tox --skip-missing-interpreters=false --parallel env: TOX_PARALLEL_NO_SPINNER: 1 + - name: Publish Test Report + uses: mikepenz/action-junit-report@v2 + with: + report_paths: '**/junit/TEST-*.xml' # Create a new semantic release release: diff --git a/.gitignore b/.gitignore index 5d18dbb51f..d64ddeba00 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ .coverage .idea/ .pytest_cache +junit/ local_settings.py .eggs/ .tox/ diff --git a/.releaserc b/.releaserc index 96a7bfc7fa..796b01e276 100644 --- a/.releaserc +++ b/.releaserc @@ -12,7 +12,7 @@ "@semantic-release/github", ["@semantic-release/exec", { "verifyConditionsCmd": "python -m pip install -U pip setuptools wheel twine", - "prepareCmd": "sed -i 's/0.0.dev0/${nextRelease.version}/' mezzanine/__init__.py", + "prepareCmd": "sed -i 's/9999dev0/${nextRelease.version}/' mezzanine/__init__.py", "publishCmd": "python setup.py sdist bdist_wheel && twine upload dist/*" }] ] diff --git a/mezzanine/__init__.py b/mezzanine/__init__.py index 51539633fb..ccc11f1dbd 100644 --- a/mezzanine/__init__.py +++ b/mezzanine/__init__.py @@ -1 +1 @@ -__version__ = "0.0.dev0" # Do not edit, managed by semantic-release +__version__ = "9999dev0" # Do not edit, managed by semantic-release diff --git a/setup.cfg b/setup.cfg index 143b37c8ff..500fb1fc6d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -21,6 +21,7 @@ classifiers = Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 Topic :: Internet :: WWW/HTTP Topic :: Internet :: WWW/HTTP :: Dynamic Content Topic :: Internet :: WWW/HTTP :: WSGI @@ -28,25 +29,25 @@ classifiers = Topic :: Software Development :: Libraries :: Python Modules [options] -python_requires = >=3.6, <3.9 +python_requires = >=3.6 packages = mezzanine include_package_data = true install_requires = - django-contrib-comments >= 1.9, <1.10 - django >= 2.2, < 3.0 - filebrowser_safe==1.0.0a1 - grappelli_safe==1.0.0a1 - tzlocal >= 2, <3 - bleach >= 2, <4 + django-contrib-comments >= 1.9 + django >= 2.2 + filebrowser-safe >= 0.5 + grappelli-safe >= 0.5 + tzlocal >= 2 + bleach >= 2 beautifulsoup4 >= 4.5.3 - requests >= 2.1.0, <3 - requests-oauthlib >= 1.3, <2 - pillow >= 7, <8 + requests >= 2.1.0 + requests-oauthlib >= 1.3 + pillow >= 7 chardet [options.extras_require] testing = - pytest-django >= 3, <4 + pytest-django >= 4, <5 codestyle = flake8 >= 3, <4 black==20.8b1 @@ -63,30 +64,34 @@ universal = 1 # Testing [tox:tox] +skip_missing_interpreters = true envlist = - py{36,37,38}-dj{22,30,31,master} + py{36,37,38,39}-dj{22,30,31,32} + py{38,39}-dj{main} flake8 black package [testenv] # Run test suite +usedevelop = true deps = .[testing] + https://github.com/stephenmcd/filebrowser-safe/archive/master.tar.gz#egg=filebrowser_safe + https://github.com/stephenmcd/grappelli-safe/archive/master.tar.gz#egg=grappelli_safe dj22: Django>=2.2, <3 dj30: Django>=3.0, <3.1 dj31: Django>=3.1, <3.2 - djmaster: https://github.com/django/django/archive/master.tar.gz#egg=Django + dj32: Django>=3.2, <3.3 + djmain: https://github.com/django/django/archive/main.tar.gz#egg=Django commands = - pytest --basetemp="{envtmpdir}" --ignore Mezzanine-0.0.dev0 {posargs} + pytest --basetemp="{envtmpdir}" --junitxml="junit/TEST-{envname}.xml" {posargs} -[testenv:py{36,37,38}-djmaster] -# Same as above, but ignoring the output while testing against Django master +[testenv:py{38,39}-djmain] +# Same as above, but ignoring the output while testing against Django main ignore_outcome = true -deps = - {[testenv]deps} -commands = - {[testenv]commands} +deps = {[testenv]deps} +commands = {[testenv]commands} [testenv:package] # Check package integrity and compatibility with PyPI @@ -139,4 +144,5 @@ exclude = python = 3.6: py36 3.7: py37 - 3.8: py38, flake8, black, package + 3.8: py38 + 3.8: py39, flake8, black, package From 1111b3003b46489b5680173de12a6fbf62133314 Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Thu, 27 May 2021 08:11:20 -0600 Subject: [PATCH 033/101] ci: fix gh-actions python versions --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 500fb1fc6d..c65db9770d 100644 --- a/setup.cfg +++ b/setup.cfg @@ -145,4 +145,4 @@ python = 3.6: py36 3.7: py37 3.8: py38 - 3.8: py39, flake8, black, package + 3.9: py39, flake8, black, package From bcc979a0720b47c2ae1c65ea0c1ef391a9e4f962 Mon Sep 17 00:00:00 2001 From: Pete Dermott <7780261+petedermott@users.noreply.github.com> Date: Thu, 27 May 2021 15:32:13 +0100 Subject: [PATCH 034/101] fix: Replace _get_val_from_obj with value_from_object (#1980) Co-authored-by: Peter Dermott --- mezzanine/core/fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mezzanine/core/fields.py b/mezzanine/core/fields.py index 9f560230df..2701a9fc54 100644 --- a/mezzanine/core/fields.py +++ b/mezzanine/core/fields.py @@ -94,7 +94,7 @@ def validate(self, value, instance): raise ValidationError(error) def value_to_string(self, obj): - value = self._get_val_from_obj(obj) + value = self.value_to_string(obj) return ",".join(value) From 90f23dded47a29644174ff07b8f2aafc79768377 Mon Sep 17 00:00:00 2001 From: Dominique Bischof Date: Thu, 27 May 2021 10:40:48 -0400 Subject: [PATCH 035/101] fix: remove `context` argument from `from_db_value` method (removed in Django 3) (#1978) Fixes #1971 --- mezzanine/core/fields.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mezzanine/core/fields.py b/mezzanine/core/fields.py index 2701a9fc54..fc3e48c8b0 100644 --- a/mezzanine/core/fields.py +++ b/mezzanine/core/fields.py @@ -79,7 +79,7 @@ def get_db_prep_value(self, value, connection, **kwargs): value = ",".join([str(i) for i in value]) return value - def from_db_value(self, value, expression, connection, context): + def from_db_value(self, value, expression, connection): return self.to_python(value) def to_python(self, value): From 30bba1fb8da44ca5b146b4d7f92d385e824dda35 Mon Sep 17 00:00:00 2001 From: Dejan Noveski Date: Thu, 27 May 2021 16:41:55 +0200 Subject: [PATCH 036/101] fix: restore translation tabs (#1982) When translation fields are present in admin, jquery.ui library is loaded prior to django's jquery.init.js, which binds jQuery.ui to django.jQuery rather than window.jQuery. That propagates down and tabbing fails. Fixes #1967 --- mezzanine/core/admin.py | 1 + 1 file changed, 1 insertion(+) diff --git a/mezzanine/core/admin.py b/mezzanine/core/admin.py index 61537a100f..931a7584c2 100644 --- a/mezzanine/core/admin.py +++ b/mezzanine/core/admin.py @@ -38,6 +38,7 @@ class BaseTranslationModelAdmin(TranslationAdmin): class Media: js = ( + 'admin/js/jquery.init.js', static("mezzanine/js/%s" % settings.JQUERY_UI_FILENAME), static("mezzanine/js/admin/tabbed_translation_fields.js"), ) From 5259e1fa06b3cadcb2d642611e0be7089d141b1e Mon Sep 17 00:00:00 2001 From: django-doctor <72647856+django-doctor@users.noreply.github.com> Date: Thu, 27 May 2021 15:42:46 +0100 Subject: [PATCH 037/101] perf: improve efficiency of ORM call (#1975) --- mezzanine/core/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mezzanine/core/admin.py b/mezzanine/core/admin.py index 931a7584c2..68c6a69a37 100644 --- a/mezzanine/core/admin.py +++ b/mezzanine/core/admin.py @@ -426,7 +426,7 @@ def save_model(self, request, obj, form, change): super(SitePermissionUserAdmin, self).save_model(request, obj, form, change) user = self.model.objects.get(id=obj.id) has_perms = len(user.get_all_permissions()) > 0 - has_sites = SitePermission.objects.filter(user=user).count() > 0 + has_sites = SitePermission.objects.filter(user=user).exists() if ( user.is_active and user.is_staff From e15adba8b3351168d0ae94801c6d2d464ccab872 Mon Sep 17 00:00:00 2001 From: Moez Bouhlel Date: Thu, 27 May 2021 15:45:12 +0100 Subject: [PATCH 038/101] fix: fix `_clone` method for ModelTranslation support (#1976) ModelTransalation' queryset class `TransalationQuerySet` defines a [`_clone()`](https://github.com/deschler/django-modeltranslation/blob/445ee84821cc8127deee83656a8d3c7ca6f72b54/modeltranslation/manager.py#L188) function that supports passing some kwargs, and some functions already depends on this behaviour (e.g: [`rewrite()`](https://github.com/deschler/django-modeltranslation/blob/445ee84821cc8127deee83656a8d3c7ca6f72b54/modeltranslation/manager.py#L202), [`populate()`](https://github.com/deschler/django-modeltranslation/blob/445ee84821cc8127deee83656a8d3c7ca6f72b54/modeltranslation/manager.py#L206). This commit restore the support of passing kwargs. --- mezzanine/core/managers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mezzanine/core/managers.py b/mezzanine/core/managers.py index aca16fa51e..45cfcd412d 100644 --- a/mezzanine/core/managers.py +++ b/mezzanine/core/managers.py @@ -198,11 +198,11 @@ def search(self, query, search_fields=None): queryset = queryset.filter(reduce(ior, optional)) return queryset.distinct() - def _clone(self): + def _clone(self, *args, **kwargs): """ Ensure attributes are copied to subsequent queries. """ - clone = super(SearchableQuerySet, self)._clone() + clone = super(SearchableQuerySet, self)._clone(*args, **kwargs) clone._search_terms = self._search_terms clone._search_fields = self._search_fields clone._search_ordered = self._search_ordered From 79920b4dfd8cdd4b251042cb3c6d7c9333daa76f Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Thu, 27 May 2021 08:56:59 -0600 Subject: [PATCH 039/101] chore: black --- mezzanine/core/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mezzanine/core/admin.py b/mezzanine/core/admin.py index 68c6a69a37..4cd64e4b06 100644 --- a/mezzanine/core/admin.py +++ b/mezzanine/core/admin.py @@ -38,7 +38,7 @@ class BaseTranslationModelAdmin(TranslationAdmin): class Media: js = ( - 'admin/js/jquery.init.js', + "admin/js/jquery.init.js", static("mezzanine/js/%s" % settings.JQUERY_UI_FILENAME), static("mezzanine/js/admin/tabbed_translation_fields.js"), ) From 60a3dfcf60e884ad8f7762fcabcc8482d100ad03 Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Mon, 31 May 2021 17:22:31 -0600 Subject: [PATCH 040/101] chore: move tox config to its own file --- .github/workflows/main.yml | 17 +++++++- MANIFEST.in | 3 +- setup.cfg | 86 -------------------------------------- tox.ini | 75 +++++++++++++++++++++++++++++++++ 4 files changed, 92 insertions(+), 89 deletions(-) create mode 100644 tox.ini diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4e5f0dceaf..aaa5944c08 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,15 +31,28 @@ jobs: with: report_paths: '**/junit/TEST-*.xml' + # Lint + lint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-python@v1 + with: + python-version: 3.9 + - name: Install dependencies + run: pip install tox -U pip + - name: Lint + run: tox -e package -e flake8 -e black + # Create a new semantic release release: - needs: test + needs: [test, lint] runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v1 with: - python-version: 3.8 + python-version: 3.9 - uses: cycjimmy/semantic-release-action@v2 with: semantic_version: 17 diff --git a/MANIFEST.in b/MANIFEST.in index 6a7741e520..8a73a77df4 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -3,8 +3,9 @@ recursive-include docs * recursive-exclude docs/build * recursive-include mezzanine * recursive-exclude */project_template/static * + global-exclude __pycache__ global-exclude *.py[co] prune .tx prune tests -exclude .releaserc +exclude .releaserc tox.ini diff --git a/setup.cfg b/setup.cfg index c65db9770d..fc0ec0f8d9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -60,89 +60,3 @@ console_scripts = [bdist_wheel] universal = 1 - -# Testing - -[tox:tox] -skip_missing_interpreters = true -envlist = - py{36,37,38,39}-dj{22,30,31,32} - py{38,39}-dj{main} - flake8 - black - package - -[testenv] -# Run test suite -usedevelop = true -deps = - .[testing] - https://github.com/stephenmcd/filebrowser-safe/archive/master.tar.gz#egg=filebrowser_safe - https://github.com/stephenmcd/grappelli-safe/archive/master.tar.gz#egg=grappelli_safe - dj22: Django>=2.2, <3 - dj30: Django>=3.0, <3.1 - dj31: Django>=3.1, <3.2 - dj32: Django>=3.2, <3.3 - djmain: https://github.com/django/django/archive/main.tar.gz#egg=Django -commands = - pytest --basetemp="{envtmpdir}" --junitxml="junit/TEST-{envname}.xml" {posargs} - -[testenv:py{38,39}-djmain] -# Same as above, but ignoring the output while testing against Django main -ignore_outcome = true -deps = {[testenv]deps} -commands = {[testenv]commands} - -[testenv:package] -# Check package integrity and compatibility with PyPI -deps = - twine - check-manifest -skip_install = true -commands = - python setup.py -q sdist --dist-dir="{envtmpdir}/dist" - twine check "{envtmpdir}/dist/*" - check-manifest --ignore-bad-ideas '*.mo' {toxinidir} - -[testenv:format] -# This env is not run by default. It's provided here for you -# to easily autoformat code by running `tox -e format` -skip_install = true -deps = .[codestyle] -commands = black . - -[testenv:black] -# Lint with black -skip_install = true -deps = .[codestyle] -commands = black . --check - -[testenv:flake8] -# Lint with flake8 -skip_install = true -deps = .[codestyle] -commands = flake8 . - -[flake8] -# Configured to match black -ignore = - E203 - W503 - E731 -max-line-length = 88 -exclude = - migrations - .tox - .git - .eggs - *.egg-info - build - dist - -[gh-actions] -# Connect GitHub Action matrices with tox envs -python = - 3.6: py36 - 3.7: py37 - 3.8: py38 - 3.9: py39, flake8, black, package diff --git a/tox.ini b/tox.ini new file mode 100644 index 0000000000..7bca795de5 --- /dev/null +++ b/tox.ini @@ -0,0 +1,75 @@ +[tox] +skip_missing_interpreters = true +envlist = + py{36,37,38,39}-dj{22,30,31,32} + flake8 + black + package + +[testenv] +# Run test suite +usedevelop = true +deps = + .[testing] + https://github.com/stephenmcd/filebrowser-safe/archive/master.tar.gz#egg=filebrowser_safe + https://github.com/stephenmcd/grappelli-safe/archive/master.tar.gz#egg=grappelli_safe + dj22: Django>=2.2, <3 + dj30: Django>=3.0, <3.1 + dj31: Django>=3.1, <3.2 + dj32: Django>=3.2, <3.3 +commands = + pytest --basetemp="{envtmpdir}" --junitxml="junit/TEST-{envname}.xml" {posargs} + +[testenv:package] +# Check package integrity and compatibility with PyPI +deps = + twine + check-manifest +skip_install = true +commands = + python setup.py -q sdist --dist-dir="{envtmpdir}/dist" + twine check "{envtmpdir}/dist/*" + check-manifest --ignore-bad-ideas '*.mo' {toxinidir} + +[testenv:format] +# This env is not run by default. It's provided here for you +# to easily autoformat code by running `tox -e format` +skip_install = true +deps = .[codestyle] +commands = black . + +[testenv:black] +# Lint with black +skip_install = true +deps = .[codestyle] +commands = black . --check + +[testenv:flake8] +# Lint with flake8 +skip_install = true +deps = .[codestyle] +commands = flake8 . + +[flake8] +# Configured to match black +ignore = + E203 + W503 + E731 +max-line-length = 88 +exclude = + migrations + .tox + .git + .eggs + *.egg-info + build + dist + +[gh-actions] +# Connect GitHub Action matrices with tox envs +python = + 3.6: py36 + 3.7: py37 + 3.8: py38 + 3.9: py39 From bb4cb57c513c29077b3d8def4640c3a1662f2aa3 Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Mon, 31 May 2021 17:41:08 -0600 Subject: [PATCH 041/101] style: run isort --- .github/workflows/main.yml | 2 +- .isort.cfg | 2 ++ docs/conf.py | 6 ++--- mezzanine/accounts/admin.py | 5 ++-- mezzanine/accounts/defaults.py | 4 +-- mezzanine/accounts/forms.py | 10 +++---- mezzanine/accounts/models.py | 2 +- .../accounts/templatetags/accounts_tags.py | 7 +++-- mezzanine/accounts/urls.py | 1 - mezzanine/accounts/views.py | 16 +++++------ .../management/commands/mezzanine_project.py | 2 +- mezzanine/blog/admin.py | 4 +-- mezzanine/blog/defaults.py | 1 - mezzanine/blog/feeds.py | 7 +++-- mezzanine/blog/forms.py | 1 - mezzanine/blog/management/base.py | 5 ++-- .../management/commands/import_blogger.py | 2 +- .../management/commands/import_posterous.py | 2 +- .../blog/management/commands/import_rss.py | 3 +-- .../blog/management/commands/import_tumblr.py | 2 -- .../management/commands/import_wordpress.py | 4 +-- mezzanine/blog/migrations/0001_initial.py | 5 ++-- .../migrations/0002_auto_20150527_1555.py | 2 +- mezzanine/blog/templatetags/blog_tags.py | 4 +-- mezzanine/blog/translation.py | 5 ++-- mezzanine/blog/urls.py | 1 - mezzanine/blog/views.py | 4 +-- mezzanine/boot/lazy_admin.py | 8 ++---- mezzanine/conf/__init__.py | 3 +-- mezzanine/conf/admin.py | 6 ++--- mezzanine/conf/context_processors.py | 1 - mezzanine/conf/forms.py | 8 +++--- mezzanine/conf/migrations/0001_initial.py | 2 +- mezzanine/conf/translation.py | 3 ++- mezzanine/core/__init__.py | 1 - mezzanine/core/admin.py | 11 ++++---- mezzanine/core/auth_backends.py | 1 - mezzanine/core/defaults.py | 1 - mezzanine/core/fields.py | 2 +- mezzanine/core/forms.py | 3 +-- mezzanine/core/management/__init__.py | 2 +- .../core/management/commands/createdb.py | 7 ++--- .../core/management/commands/runserver.py | 2 +- mezzanine/core/managers.py | 10 +++---- mezzanine/core/middleware.py | 19 +++++++------ mezzanine/core/migrations/0001_initial.py | 2 +- .../migrations/0002_auto_20150414_2140.py | 2 +- mezzanine/core/models.py | 12 ++++----- mezzanine/core/request.py | 1 - mezzanine/core/sitemaps.py | 1 - mezzanine/core/templatetags/mezzanine_tags.py | 11 ++++---- mezzanine/core/urls.py | 3 +-- mezzanine/core/views.py | 16 +++++------ mezzanine/forms/admin.py | 10 +++---- mezzanine/forms/defaults.py | 1 - mezzanine/forms/fields.py | 5 +--- mezzanine/forms/forms.py | 10 +++---- mezzanine/forms/migrations/0001_initial.py | 3 ++- .../migrations/0002_auto_20141227_0224.py | 3 ++- mezzanine/forms/migrations/0003_emailfield.py | 3 ++- .../migrations/0004_auto_20150517_0510.py | 2 +- mezzanine/forms/page_processors.py | 2 +- mezzanine/forms/translation.py | 5 ++-- mezzanine/galleries/admin.py | 2 +- .../galleries/migrations/0001_initial.py | 3 ++- .../migrations/0002_auto_20141227_0224.py | 3 ++- mezzanine/galleries/models.py | 5 ++-- mezzanine/galleries/translation.py | 5 ++-- mezzanine/generic/admin.py | 3 +-- mezzanine/generic/defaults.py | 1 - mezzanine/generic/fields.py | 6 ++--- mezzanine/generic/forms.py | 9 ++++--- mezzanine/generic/migrations/0001_initial.py | 2 +- .../migrations/0002_auto_20141227_0224.py | 3 ++- mezzanine/generic/models.py | 8 +++--- .../generic/templatetags/comment_tags.py | 3 +-- mezzanine/generic/templatetags/disqus_tags.py | 1 - .../generic/templatetags/keyword_tags.py | 3 +-- mezzanine/generic/templatetags/rating_tags.py | 1 - mezzanine/generic/urls.py | 1 - mezzanine/generic/views.py | 6 ++--- mezzanine/pages/__init__.py | 1 - mezzanine/pages/admin.py | 3 +-- mezzanine/pages/defaults.py | 1 - mezzanine/pages/managers.py | 2 +- mezzanine/pages/middleware.py | 2 +- mezzanine/pages/migrations/0001_initial.py | 3 ++- .../migrations/0002_auto_20141227_0224.py | 5 ++-- .../migrations/0003_auto_20150527_1555.py | 2 +- mezzanine/pages/models.py | 17 +++++++----- mezzanine/pages/page_processors.py | 1 - mezzanine/pages/templatetags/pages_tags.py | 3 +-- mezzanine/pages/translation.py | 5 ++-- mezzanine/pages/urls.py | 3 +-- mezzanine/pages/views.py | 4 +-- mezzanine/project_template/fabfile.py | 20 +++++--------- .../project_template/project_name/settings.py | 3 +-- .../project_template/project_name/urls.py | 4 +-- .../project_template/project_name/wsgi.py | 1 + mezzanine/template/__init__.py | 4 +-- mezzanine/template/loader_tags.py | 3 +-- mezzanine/twitter/__init__.py | 1 - mezzanine/twitter/admin.py | 2 +- mezzanine/twitter/defaults.py | 2 +- .../management/commands/poll_twitter.py | 2 +- mezzanine/twitter/migrations/0001_initial.py | 2 +- mezzanine/twitter/models.py | 10 +++---- .../twitter/templatetags/twitter_tags.py | 5 ++-- mezzanine/urls.py | 5 ++-- mezzanine/utils/admin.py | 2 +- mezzanine/utils/cache.py | 2 +- mezzanine/utils/conf.py | 2 +- mezzanine/utils/deprecation.py | 1 - mezzanine/utils/docs.py | 6 ++--- mezzanine/utils/email.py | 4 +-- mezzanine/utils/html.py | 10 ++++--- mezzanine/utils/models.py | 2 +- mezzanine/utils/sites.py | 3 +-- mezzanine/utils/static.py | 2 +- mezzanine/utils/timezone.py | 5 ++-- mezzanine/utils/urls.py | 5 ++-- mezzanine/utils/views.py | 6 ++--- setup.cfg | 1 + tests/conftest.py | 3 +-- tests/test_accounts.py | 3 +-- tests/test_blog.py | 7 +++-- tests/test_conf.py | 5 ++-- tests/test_core.py | 25 ++++++++--------- tests/test_forms.py | 7 +++-- tests/test_galleries.py | 2 +- tests/test_generic.py | 7 ++--- tests/test_pages.py | 15 ++++++----- tox.ini | 27 +++++++++---------- 133 files changed, 285 insertions(+), 339 deletions(-) create mode 100644 .isort.cfg diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index aaa5944c08..3cb703cd17 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,7 +42,7 @@ jobs: - name: Install dependencies run: pip install tox -U pip - name: Lint - run: tox -e package -e flake8 -e black + run: tox -e package -e lint # Create a new semantic release release: diff --git a/.isort.cfg b/.isort.cfg new file mode 100644 index 0000000000..f238bf7ea1 --- /dev/null +++ b/.isort.cfg @@ -0,0 +1,2 @@ +[settings] +profile = black diff --git a/docs/conf.py b/docs/conf.py index 86a1824228..6cd8b0885f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -11,11 +11,11 @@ # All configuration values have a default; values that are commented out # serve to show the default. -from datetime import datetime -import sys import os -import mezzanine +import sys +from datetime import datetime +import mezzanine if "DJANGO_SETTINGS_MODULE" not in os.environ: docs_path = os.getcwd() diff --git a/mezzanine/accounts/admin.py b/mezzanine/accounts/admin.py index 18b4813cd9..54591bb4e0 100644 --- a/mezzanine/accounts/admin.py +++ b/mezzanine/accounts/admin.py @@ -1,12 +1,11 @@ from django.contrib import admin from django.contrib.auth import get_user_model -from mezzanine.accounts import get_profile_model, ProfileNotConfigured -from mezzanine.core.admin import SitePermissionUserAdmin +from mezzanine.accounts import ProfileNotConfigured, get_profile_model from mezzanine.conf import settings +from mezzanine.core.admin import SitePermissionUserAdmin from mezzanine.utils.email import send_approved_mail, send_verification_mail - User = get_user_model() user_list_display = SitePermissionUserAdmin.list_display diff --git a/mezzanine/accounts/defaults.py b/mezzanine/accounts/defaults.py index 19448219c4..06624d361f 100644 --- a/mezzanine/accounts/defaults.py +++ b/mezzanine/accounts/defaults.py @@ -9,13 +9,11 @@ that are only read during startup shouldn't be editable, since changing them would require an application reload. """ +from django.conf import settings from django.utils.translation import ugettext_lazy as _ from mezzanine.conf import register_setting - -from django.conf import settings - profile_model_default = getattr(settings, "AUTH_PROFILE_MODULE", None) if profile_model_default: from warnings import warn diff --git a/mezzanine/accounts/forms.py b/mezzanine/accounts/forms.py index 08e10f707c..d0edb61f93 100644 --- a/mezzanine/accounts/forms.py +++ b/mezzanine/accounts/forms.py @@ -1,22 +1,22 @@ +from django import forms from django.contrib.auth import authenticate, get_user_model from django.contrib.auth.tokens import default_token_generator from django.db.models import Q from django.db.models.manager import Manager -from django import forms from django.utils.http import int_to_base36 -from django.utils.translation import ugettext, ugettext_lazy as _ +from django.utils.translation import ugettext +from django.utils.translation import ugettext_lazy as _ from mezzanine.accounts import ( + ProfileNotConfigured, + get_profile_for_user, get_profile_model, get_profile_user_fieldname, - get_profile_for_user, - ProfileNotConfigured, ) from mezzanine.conf import settings from mezzanine.core.forms import Html5Mixin from mezzanine.utils.urls import slugify, unique_slug - User = get_user_model() _exclude_fields = tuple(getattr(settings, "ACCOUNTS_PROFILE_FORM_EXCLUDE_FIELDS", ())) diff --git a/mezzanine/accounts/models.py b/mezzanine/accounts/models.py index 87a9250b6e..a3c315b697 100644 --- a/mezzanine/accounts/models.py +++ b/mezzanine/accounts/models.py @@ -1,9 +1,9 @@ from django.db import DatabaseError, connection from django.db.models.signals import post_save + from mezzanine.accounts import get_profile_for_user from mezzanine.conf import settings - __all__ = () diff --git a/mezzanine/accounts/templatetags/accounts_tags.py b/mezzanine/accounts/templatetags/accounts_tags.py index b806e02fd8..2bcccb5eb5 100644 --- a/mezzanine/accounts/templatetags/accounts_tags.py +++ b/mezzanine/accounts/templatetags/accounts_tags.py @@ -3,15 +3,14 @@ from django.contrib.auth import get_user_model from mezzanine import template -from mezzanine.conf import settings from mezzanine.accounts import ( + ProfileNotConfigured, + get_profile_for_user, get_profile_form, get_profile_user_fieldname, - get_profile_for_user, - ProfileNotConfigured, ) from mezzanine.accounts.forms import LoginForm - +from mezzanine.conf import settings register = template.Library() diff --git a/mezzanine/accounts/urls.py b/mezzanine/accounts/urls.py index adbc359fca..d04f20267f 100644 --- a/mezzanine/accounts/urls.py +++ b/mezzanine/accounts/urls.py @@ -3,7 +3,6 @@ from mezzanine.accounts import views from mezzanine.conf import settings - ACCOUNT_URL = getattr(settings, "ACCOUNT_URL", "/accounts/") SIGNUP_URL = getattr(settings, "SIGNUP_URL", "/%s/signup/" % ACCOUNT_URL.strip("/")) SIGNUP_VERIFY_URL = getattr( diff --git a/mezzanine/accounts/views.py b/mezzanine/accounts/views.py index 83be66937f..6fcf399b68 100644 --- a/mezzanine/accounts/views.py +++ b/mezzanine/accounts/views.py @@ -1,23 +1,19 @@ -from django.contrib.auth import ( - login as auth_login, - authenticate, - logout as auth_logout, - get_user_model, -) +from django.contrib.auth import authenticate, get_user_model +from django.contrib.auth import login as auth_login +from django.contrib.auth import logout as auth_logout from django.contrib.auth.decorators import login_required -from django.contrib.messages import info, error -from django.urls import NoReverseMatch, get_script_prefix +from django.contrib.messages import error, info from django.shortcuts import get_object_or_404, redirect from django.template.response import TemplateResponse +from django.urls import NoReverseMatch, get_script_prefix from django.utils.translation import ugettext_lazy as _ from mezzanine.accounts import get_profile_form from mezzanine.accounts.forms import LoginForm, PasswordResetForm from mezzanine.conf import settings -from mezzanine.utils.email import send_verification_mail, send_approve_mail +from mezzanine.utils.email import send_approve_mail, send_verification_mail from mezzanine.utils.urls import login_redirect, next_url - User = get_user_model() diff --git a/mezzanine/bin/management/commands/mezzanine_project.py b/mezzanine/bin/management/commands/mezzanine_project.py index f472ca5823..a1d33fa9b7 100644 --- a/mezzanine/bin/management/commands/mezzanine_project.py +++ b/mezzanine/bin/management/commands/mezzanine_project.py @@ -1,6 +1,6 @@ +import os from distutils.dir_util import copy_tree from importlib import import_module -import os from shutil import move, rmtree from tempfile import mkdtemp diff --git a/mezzanine/blog/admin.py b/mezzanine/blog/admin.py index 8069c5dffe..dc5b773fff 100644 --- a/mezzanine/blog/admin.py +++ b/mezzanine/blog/admin.py @@ -3,12 +3,12 @@ from django.contrib import admin from django.utils.translation import ugettext_lazy as _ -from mezzanine.blog.models import BlogPost, BlogCategory +from mezzanine.blog.models import BlogCategory, BlogPost from mezzanine.conf import settings from mezzanine.core.admin import ( + BaseTranslationModelAdmin, DisplayableAdmin, OwnableAdmin, - BaseTranslationModelAdmin, ) from mezzanine.twitter.admin import TweetableAdminMixin diff --git a/mezzanine/blog/defaults.py b/mezzanine/blog/defaults.py index 437b4dfca8..aa0216925c 100644 --- a/mezzanine/blog/defaults.py +++ b/mezzanine/blog/defaults.py @@ -14,7 +14,6 @@ from mezzanine.conf import register_setting - register_setting( name="BLOG_USE_FEATURED_IMAGE", description=_("Enable featured images in blog posts"), diff --git a/mezzanine/blog/feeds.py b/mezzanine/blog/feeds.py index b93b408694..0673418016 100644 --- a/mezzanine/blog/feeds.py +++ b/mezzanine/blog/feeds.py @@ -1,20 +1,19 @@ from django.contrib.auth import get_user_model from django.contrib.sites.models import Site from django.contrib.syndication.views import Feed, add_domain -from django.urls import reverse from django.shortcuts import get_object_or_404 +from django.urls import reverse from django.utils.feedgenerator import Atom1Feed from django.utils.html import strip_tags -from mezzanine.blog.models import BlogPost, BlogCategory +from mezzanine.blog.models import BlogCategory, BlogPost from mezzanine.conf import settings -from mezzanine.core.templatetags.mezzanine_tags import richtext_filters from mezzanine.core.request import current_request +from mezzanine.core.templatetags.mezzanine_tags import richtext_filters from mezzanine.generic.models import Keyword from mezzanine.utils.html import absolute_urls from mezzanine.utils.sites import current_site_id - User = get_user_model() try: diff --git a/mezzanine/blog/forms.py b/mezzanine/blog/forms.py index fc22b8537c..a0233dd231 100644 --- a/mezzanine/blog/forms.py +++ b/mezzanine/blog/forms.py @@ -3,7 +3,6 @@ from mezzanine.blog.models import BlogPost from mezzanine.core.models import CONTENT_STATUS_DRAFT - # These fields need to be in the form, hidden, with default values, # since it posts to the blog post admin, which includes these fields # and will use empty values instead of the model defaults, without diff --git a/mezzanine/blog/management/base.py b/mezzanine/blog/management/base.py index 20b580f1f5..d8ed4ec4aa 100644 --- a/mezzanine/blog/management/base.py +++ b/mezzanine/blog/management/base.py @@ -7,10 +7,9 @@ from django.utils.encoding import force_text from django.utils.html import strip_tags -from mezzanine.blog.models import BlogPost, BlogCategory +from mezzanine.blog.models import BlogCategory, BlogPost from mezzanine.conf import settings -from mezzanine.core.models import CONTENT_STATUS_DRAFT -from mezzanine.core.models import CONTENT_STATUS_PUBLISHED +from mezzanine.core.models import CONTENT_STATUS_DRAFT, CONTENT_STATUS_PUBLISHED from mezzanine.generic.models import Keyword, ThreadedComment from mezzanine.pages.models import RichTextPage from mezzanine.utils.html import decode_entities diff --git a/mezzanine/blog/management/commands/import_blogger.py b/mezzanine/blog/management/commands/import_blogger.py index ed62cb8362..fb0b6b5611 100644 --- a/mezzanine/blog/management/commands/import_blogger.py +++ b/mezzanine/blog/management/commands/import_blogger.py @@ -1,6 +1,6 @@ +import re from datetime import datetime, timedelta from time import timezone -import re from django.core.management.base import CommandError diff --git a/mezzanine/blog/management/commands/import_posterous.py b/mezzanine/blog/management/commands/import_posterous.py index 57f84717ed..13763b23e6 100644 --- a/mezzanine/blog/management/commands/import_posterous.py +++ b/mezzanine/blog/management/commands/import_posterous.py @@ -1,6 +1,6 @@ -from datetime import datetime import json import time +from datetime import datetime from django.core.management.base import CommandError diff --git a/mezzanine/blog/management/commands/import_rss.py b/mezzanine/blog/management/commands/import_rss.py index e86e22e274..049862d141 100644 --- a/mezzanine/blog/management/commands/import_rss.py +++ b/mezzanine/blog/management/commands/import_rss.py @@ -1,8 +1,7 @@ from datetime import timedelta from time import timezone - -from urllib.request import urlopen from urllib.parse import urljoin +from urllib.request import urlopen 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 e8dca93374..fcb7449b91 100644 --- a/mezzanine/blog/management/commands/import_tumblr.py +++ b/mezzanine/blog/management/commands/import_tumblr.py @@ -1,7 +1,6 @@ from datetime import datetime from json import loads from time import sleep - from urllib.request import urlopen from django.core.management.base import CommandError @@ -9,7 +8,6 @@ from mezzanine.blog.management.base import BaseImporterCommand - MAX_POSTS_PER_CALL = 20 # Max number of posts Tumblr API will return per call. MAX_RETRIES_PER_CALL = 3 # Max times to retry API call after failing. SLEEP_PER_RETRY = 3 # Seconds to pause for between retries. diff --git a/mezzanine/blog/management/commands/import_wordpress.py b/mezzanine/blog/management/commands/import_wordpress.py index 80193c5670..4eac9daaaf 100644 --- a/mezzanine/blog/management/commands/import_wordpress.py +++ b/mezzanine/blog/management/commands/import_wordpress.py @@ -1,9 +1,9 @@ +import re from collections import defaultdict from datetime import datetime, timedelta -import re from time import mktime, timezone -from xml.dom.minidom import parse from xml.dom import Node +from xml.dom.minidom import parse from django.core.management.base import CommandError from django.utils.html import linebreaks diff --git a/mezzanine/blog/migrations/0001_initial.py b/mezzanine/blog/migrations/0001_initial.py index b9d3c9ddc4..fab369f202 100644 --- a/mezzanine/blog/migrations/0001_initial.py +++ b/mezzanine/blog/migrations/0001_initial.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- -from django.db import models, migrations +from django.conf import settings +from django.db import migrations, models + import mezzanine.core.fields import mezzanine.utils.models -from django.conf import settings class Migration(migrations.Migration): diff --git a/mezzanine/blog/migrations/0002_auto_20150527_1555.py b/mezzanine/blog/migrations/0002_auto_20150527_1555.py index 7db9cdd480..45eed9c527 100644 --- a/mezzanine/blog/migrations/0002_auto_20150527_1555.py +++ b/mezzanine/blog/migrations/0002_auto_20150527_1555.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mezzanine/blog/templatetags/blog_tags.py b/mezzanine/blog/templatetags/blog_tags.py index 5e193dbc28..da1fcb0fd6 100644 --- a/mezzanine/blog/templatetags/blog_tags.py +++ b/mezzanine/blog/templatetags/blog_tags.py @@ -4,10 +4,10 @@ from django.db.models import Count, Q from django.utils import timezone +from mezzanine import template from mezzanine.blog.forms import BlogPostForm -from mezzanine.blog.models import BlogPost, BlogCategory +from mezzanine.blog.models import BlogCategory, BlogPost from mezzanine.generic.models import Keyword -from mezzanine import template User = get_user_model() diff --git a/mezzanine/blog/translation.py b/mezzanine/blog/translation.py index 1a9382a798..16f3ad64f3 100644 --- a/mezzanine/blog/translation.py +++ b/mezzanine/blog/translation.py @@ -1,10 +1,11 @@ from modeltranslation.translator import translator + +from mezzanine.blog.models import BlogCategory, BlogPost from mezzanine.core.translation import ( - TranslatedSlugged, TranslatedDisplayable, TranslatedRichText, + TranslatedSlugged, ) -from mezzanine.blog.models import BlogCategory, BlogPost class TranslatedBlogPost(TranslatedDisplayable, TranslatedRichText): diff --git a/mezzanine/blog/urls.py b/mezzanine/blog/urls.py index b57ef5fac0..bf7d0fb969 100644 --- a/mezzanine/blog/urls.py +++ b/mezzanine/blog/urls.py @@ -3,7 +3,6 @@ from mezzanine.blog import views from mezzanine.conf import settings - # Trailing slahes for urlpatterns based on setup. _slash = "/" if settings.APPEND_SLASH else "" diff --git a/mezzanine/blog/views.py b/mezzanine/blog/views.py index f73de04e58..b2ebbf0467 100644 --- a/mezzanine/blog/views.py +++ b/mezzanine/blog/views.py @@ -6,8 +6,8 @@ from django.template.response import TemplateResponse from django.utils.translation import ugettext_lazy as _ -from mezzanine.blog.models import BlogPost, BlogCategory -from mezzanine.blog.feeds import PostsRSS, PostsAtom +from mezzanine.blog.feeds import PostsAtom, PostsRSS +from mezzanine.blog.models import BlogCategory, BlogPost from mezzanine.conf import settings from mezzanine.generic.models import Keyword from mezzanine.utils.views import paginate diff --git a/mezzanine/boot/lazy_admin.py b/mezzanine/boot/lazy_admin.py index c7e1b6dbb3..ff16fc7d8e 100644 --- a/mezzanine/boot/lazy_admin.py +++ b/mezzanine/boot/lazy_admin.py @@ -1,12 +1,8 @@ from django.conf import settings from django.conf.urls import include, url +from django.contrib.admin.sites import AdminSite, AlreadyRegistered, NotRegistered +from django.contrib.admin.sites import site as default_site from django.contrib.auth import get_user_model -from django.contrib.admin.sites import ( - AdminSite, - site as default_site, - NotRegistered, - AlreadyRegistered, -) from django.shortcuts import redirect from mezzanine.utils.importing import import_dotted_path diff --git a/mezzanine/conf/__init__.py b/mezzanine/conf/__init__.py index 8ee8b1d499..3268b562be 100644 --- a/mezzanine/conf/__init__.py +++ b/mezzanine/conf/__init__.py @@ -4,11 +4,10 @@ or Django itself. Settings can also be made editable via the admin. """ -from weakref import WeakKeyDictionary - from functools import partial from importlib import import_module from warnings import warn +from weakref import WeakKeyDictionary from django.conf import settings as django_settings from django.utils.functional import Promise diff --git a/mezzanine/conf/admin.py b/mezzanine/conf/admin.py index 86741b0191..22d1ddc0d0 100644 --- a/mezzanine/conf/admin.py +++ b/mezzanine/conf/admin.py @@ -3,13 +3,13 @@ from django.contrib import admin from django.contrib.messages import info from django.http import HttpResponseRedirect -from django.utils.translation import ugettext_lazy as _ from django.utils.encoding import force_text +from django.utils.translation import ugettext_lazy as _ -from mezzanine.core.admin import BaseTranslationModelAdmin from mezzanine.conf import settings -from mezzanine.conf.models import Setting from mezzanine.conf.forms import SettingsForm +from mezzanine.conf.models import Setting +from mezzanine.core.admin import BaseTranslationModelAdmin from mezzanine.utils.static import static_lazy as static from mezzanine.utils.urls import admin_url diff --git a/mezzanine/conf/context_processors.py b/mezzanine/conf/context_processors.py index 95221dd2a6..0065908078 100644 --- a/mezzanine/conf/context_processors.py +++ b/mezzanine/conf/context_processors.py @@ -1,6 +1,5 @@ from warnings import warn - # Deprecated settings and their defaults. DEPRECATED = {} diff --git a/mezzanine/conf/forms.py b/mezzanine/conf/forms.py index 7b2ed82f84..a760e34b38 100644 --- a/mezzanine/conf/forms.py +++ b/mezzanine/conf/forms.py @@ -1,15 +1,17 @@ from collections import defaultdict from django import forms -from django.utils.safestring import mark_safe -from django.utils.translation import activate, get_language, ugettext_lazy as _ from django.template.defaultfilters import urlize +from django.utils.safestring import mark_safe +from django.utils.translation import activate, get_language +from django.utils.translation import ugettext_lazy as _ -from mezzanine.conf import settings, registry +from mezzanine.conf import registry, settings from mezzanine.conf.models import Setting if settings.USE_MODELTRANSLATION: from collections import OrderedDict + from modeltranslation.utils import build_localized_fieldname diff --git a/mezzanine/conf/migrations/0001_initial.py b/mezzanine/conf/migrations/0001_initial.py index 292862ca9e..f5a33e7894 100644 --- a/mezzanine/conf/migrations/0001_initial.py +++ b/mezzanine/conf/migrations/0001_initial.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mezzanine/conf/translation.py b/mezzanine/conf/translation.py index 48ffe77759..6a3f90b1b5 100644 --- a/mezzanine/conf/translation.py +++ b/mezzanine/conf/translation.py @@ -1,4 +1,5 @@ -from modeltranslation.translator import translator, TranslationOptions +from modeltranslation.translator import TranslationOptions, translator + from mezzanine.conf.models import Setting diff --git a/mezzanine/core/__init__.py b/mezzanine/core/__init__.py index be27a47aae..7a5027f873 100644 --- a/mezzanine/core/__init__.py +++ b/mezzanine/core/__init__.py @@ -4,5 +4,4 @@ """ from mezzanine import __version__ # noqa - default_app_config = "mezzanine.core.apps.CoreConfig" diff --git a/mezzanine/core/admin.py b/mezzanine/core/admin.py index 4cd64e4b06..69dc5af178 100644 --- a/mezzanine/core/admin.py +++ b/mezzanine/core/admin.py @@ -4,21 +4,21 @@ from django.contrib.auth import get_user_model from django.contrib.auth.admin import UserAdmin from django.contrib.auth.models import User as AuthUser -from django.contrib.redirects.admin import RedirectAdmin from django.contrib.messages import error -from django.urls import NoReverseMatch -from django.forms import ValidationError, ModelForm +from django.contrib.redirects.admin import RedirectAdmin +from django.forms import ModelForm, ValidationError from django.http import HttpResponseRedirect from django.shortcuts import get_object_or_404 +from django.urls import NoReverseMatch from django.utils.translation import ugettext_lazy as _ from mezzanine.conf import settings from mezzanine.core.forms import DynamicInlineAdminForm from mezzanine.core.models import ( - Orderable, + CONTENT_STATUS_PUBLISHED, ContentTyped, + Orderable, SitePermission, - CONTENT_STATUS_PUBLISHED, ) from mezzanine.utils.models import base_concrete_model from mezzanine.utils.sites import current_site_id @@ -27,6 +27,7 @@ if settings.USE_MODELTRANSLATION: from collections import OrderedDict + from django.utils.translation import activate, get_language from modeltranslation.admin import TranslationAdmin, TranslationInlineModelAdmin diff --git a/mezzanine/core/auth_backends.py b/mezzanine/core/auth_backends.py index 7672c70da7..84b55e12f4 100644 --- a/mezzanine/core/auth_backends.py +++ b/mezzanine/core/auth_backends.py @@ -4,7 +4,6 @@ from django.db.models import Q from django.utils.http import base36_to_int - User = get_user_model() diff --git a/mezzanine/core/defaults.py b/mezzanine/core/defaults.py index 7ee3d60b52..e0fc0f0bb4 100644 --- a/mezzanine/core/defaults.py +++ b/mezzanine/core/defaults.py @@ -14,7 +14,6 @@ from mezzanine.conf import register_setting - register_setting( name="ADMIN_MENU_ORDER", description=_("Controls the ordering and grouping of the admin menu."), diff --git a/mezzanine/core/fields.py b/mezzanine/core/fields.py index fc3e48c8b0..7a4089b175 100644 --- a/mezzanine/core/fields.py +++ b/mezzanine/core/fields.py @@ -7,8 +7,8 @@ from django.utils.translation import ugettext_lazy as _ from mezzanine.core.forms import OrderWidget -from mezzanine.utils.importing import import_dotted_path from mezzanine.utils.html import escape +from mezzanine.utils.importing import import_dotted_path class OrderField(models.IntegerField): diff --git a/mezzanine/core/forms.py b/mezzanine/core/forms.py index 4cd855507e..7daca26e15 100644 --- a/mezzanine/core/forms.py +++ b/mezzanine/core/forms.py @@ -2,9 +2,8 @@ from uuid import uuid4 from django import forms -from django.forms.widgets import SelectDateWidget - from django.forms.utils import to_current_timezone +from django.forms.widgets import SelectDateWidget from django.utils.safestring import mark_safe from mezzanine.conf import settings diff --git a/mezzanine/core/management/__init__.py b/mezzanine/core/management/__init__.py index 30848ee76f..f4ff0bcc4c 100644 --- a/mezzanine/core/management/__init__.py +++ b/mezzanine/core/management/__init__.py @@ -1,6 +1,6 @@ from django.conf import settings -from django.contrib.sites.management import create_default_site from django.contrib.sites import models as sites_app +from django.contrib.sites.management import create_default_site try: from django.db.models.signals import post_migrate diff --git a/mezzanine/core/management/commands/createdb.py b/mezzanine/core/management/commands/createdb.py index 2b210f0b51..70b5dd2641 100644 --- a/mezzanine/core/management/commands/createdb.py +++ b/mezzanine/core/management/commands/createdb.py @@ -1,15 +1,14 @@ from socket import gethostname -from django.core.management.base import BaseCommand, CommandError from django.contrib.auth import get_user_model from django.contrib.sites.models import Site from django.core.management import call_command +from django.core.management.base import BaseCommand, CommandError from django.db import connection from mezzanine.conf import settings from mezzanine.utils.tests import copy_test_to_media - DEFAULT_USERNAME = "admin" DEFAULT_EMAIL = "example@example.com" DEFAULT_PASSWORD = "default" @@ -149,9 +148,11 @@ def create_shop(self): def translation_fields(self): try: from modeltranslation.management.commands import ( - update_translation_fields as update_fields, sync_translation_fields as create_fields, ) + from modeltranslation.management.commands import ( + update_translation_fields as update_fields, + ) except ImportError: return update = self.confirm( diff --git a/mezzanine/core/management/commands/runserver.py b/mezzanine/core/management/commands/runserver.py index e7c6eb29cf..8eb4b4b929 100644 --- a/mezzanine/core/management/commands/runserver.py +++ b/mezzanine/core/management/commands/runserver.py @@ -3,8 +3,8 @@ import django from django.conf import settings -from django.contrib.staticfiles.management.commands import runserver from django.contrib.staticfiles.handlers import StaticFilesHandler +from django.contrib.staticfiles.management.commands import runserver from django.core.management.color import supports_color from django.db import connection from django.http import Http404 diff --git a/mezzanine/core/managers.py b/mezzanine/core/managers.py index 45cfcd412d..3fcb8379a0 100644 --- a/mezzanine/core/managers.py +++ b/mezzanine/core/managers.py @@ -1,15 +1,14 @@ -import django - from functools import reduce -from operator import ior, iand +from operator import iand, ior from string import punctuation +import django from django.apps import apps +from django.contrib.sites.managers import CurrentSiteManager as DjangoCSM from django.core.exceptions import ImproperlyConfigured -from django.db.models import Manager, Q, CharField, TextField +from django.db.models import CharField, Manager, Q, TextField from django.db.models.manager import ManagerDescriptor from django.db.models.query import QuerySet -from django.contrib.sites.managers import CurrentSiteManager as DjangoCSM from django.utils.timezone import now from django.utils.translation import ugettext_lazy as _ @@ -17,7 +16,6 @@ from mezzanine.utils.sites import current_site_id from mezzanine.utils.urls import home_slug - if django.VERSION >= (1, 10): class ManagerDescriptor(ManagerDescriptor): diff --git a/mezzanine/core/middleware.py b/mezzanine/core/middleware.py index 573e6d62f8..e542062f93 100755 --- a/mezzanine/core/middleware.py +++ b/mezzanine/core/middleware.py @@ -1,5 +1,4 @@ import warnings - from functools import lru_cache from django.contrib import admin @@ -7,31 +6,31 @@ from django.contrib.messages import error from django.contrib.redirects.models import Redirect from django.core.exceptions import MiddlewareNotUsed -from django.urls import reverse, resolve from django.http import ( HttpResponse, - HttpResponseRedirect, - HttpResponsePermanentRedirect, HttpResponseGone, + HttpResponsePermanentRedirect, + HttpResponseRedirect, ) from django.middleware.csrf import CsrfViewMiddleware, get_token -from django.template import Template, RequestContext +from django.template import RequestContext, Template +from django.urls import resolve, reverse from django.utils.cache import get_max_age from django.utils.safestring import mark_safe from django.utils.translation import ugettext as _ from mezzanine.conf import settings -from mezzanine.core.models import SitePermission from mezzanine.core.management.commands.createdb import ( - DEFAULT_USERNAME, DEFAULT_PASSWORD, + DEFAULT_USERNAME, ) +from mezzanine.core.models import SitePermission from mezzanine.utils.cache import ( - cache_key_prefix, - nevercache_token, cache_get, - cache_set, cache_installed, + cache_key_prefix, + cache_set, + nevercache_token, ) from mezzanine.utils.conf import middlewares_or_subclasses_installed from mezzanine.utils.deprecation import MiddlewareMixin, is_authenticated diff --git a/mezzanine/core/migrations/0001_initial.py b/mezzanine/core/migrations/0001_initial.py index 8c970add5d..c6129ccef3 100644 --- a/mezzanine/core/migrations/0001_initial.py +++ b/mezzanine/core/migrations/0001_initial.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from django.db import models, migrations from django.conf import settings +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mezzanine/core/migrations/0002_auto_20150414_2140.py b/mezzanine/core/migrations/0002_auto_20150414_2140.py index dab9f3008a..68c268c1b2 100644 --- a/mezzanine/core/migrations/0002_auto_20150414_2140.py +++ b/mezzanine/core/migrations/0002_auto_20150414_2140.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from django.db import models, migrations from django.conf import settings +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mezzanine/core/models.py b/mezzanine/core/models.py index 5c984d3486..d96de92cb9 100644 --- a/mezzanine/core/models.py +++ b/mezzanine/core/models.py @@ -1,6 +1,6 @@ from json import loads -from urllib.request import urlopen from urllib.parse import urlencode +from urllib.request import urlopen from django.apps import apps from django.contrib.contenttypes.fields import GenericForeignKey @@ -10,18 +10,18 @@ from django.utils.html import format_html, strip_tags from django.utils.timesince import timesince from django.utils.timezone import now -from django.utils.translation import ugettext, ugettext_lazy as _ +from django.utils.translation import ugettext +from django.utils.translation import ugettext_lazy as _ from mezzanine.conf import settings -from mezzanine.core.fields import RichTextField, OrderField -from mezzanine.core.managers import DisplayableManager, CurrentSiteManager +from mezzanine.core.fields import OrderField, RichTextField +from mezzanine.core.managers import CurrentSiteManager, DisplayableManager from mezzanine.generic.fields import KeywordsField from mezzanine.utils.html import TagCloser from mezzanine.utils.models import base_concrete_model, get_user_model_name -from mezzanine.utils.sites import current_site_id, current_request +from mezzanine.utils.sites import current_request, current_site_id from mezzanine.utils.urls import admin_url, slugify, unique_slug - user_model_name = get_user_model_name() diff --git a/mezzanine/core/request.py b/mezzanine/core/request.py index a9eb0f169b..58a960ca45 100644 --- a/mezzanine/core/request.py +++ b/mezzanine/core/request.py @@ -2,7 +2,6 @@ from mezzanine.utils.deprecation import MiddlewareMixin - _thread_local = threading.local() diff --git a/mezzanine/core/sitemaps.py b/mezzanine/core/sitemaps.py index 85fede3a02..6d622657c3 100644 --- a/mezzanine/core/sitemaps.py +++ b/mezzanine/core/sitemaps.py @@ -5,7 +5,6 @@ from mezzanine.core.models import Displayable from mezzanine.utils.sites import current_site_id - blog_installed = "mezzanine.blog" in settings.INSTALLED_APPS if blog_installed: from mezzanine.blog.models import BlogPost diff --git a/mezzanine/core/templatetags/mezzanine_tags.py b/mezzanine/core/templatetags/mezzanine_tags.py index 4dbe5b1189..723face64a 100644 --- a/mezzanine/core/templatetags/mezzanine_tags.py +++ b/mezzanine/core/templatetags/mezzanine_tags.py @@ -1,5 +1,5 @@ -from hashlib import md5 import os +from hashlib import md5 try: from urllib.parse import quote, unquote @@ -13,28 +13,27 @@ from django.core.exceptions import ObjectDoesNotExist from django.core.files import File from django.core.files.storage import default_storage -from django.urls import reverse, resolve, NoReverseMatch from django.db.models import Model from django.template import Node, Template, TemplateSyntaxError from django.template.base import TextNode, TokenType from django.template.defaultfilters import escape from django.template.loader import get_template +from django.urls import NoReverseMatch, resolve, reverse from django.utils import translation from django.utils.html import strip_tags -from django.utils.text import capfirst from django.utils.safestring import SafeText, mark_safe +from django.utils.text import capfirst +from mezzanine import template from mezzanine.conf import settings from mezzanine.core.fields import RichTextField from mezzanine.core.forms import get_edit_form -from mezzanine.utils.cache import nevercache_token, cache_installed +from mezzanine.utils.cache import cache_installed, nevercache_token from mezzanine.utils.html import decode_entities from mezzanine.utils.importing import import_dotted_path from mezzanine.utils.sites import current_site_id, has_site_permission from mezzanine.utils.urls import admin_url, home_slug from mezzanine.utils.views import is_editable -from mezzanine import template - register = template.Library() diff --git a/mezzanine/core/urls.py b/mezzanine/core/urls.py index b35861820c..1f01377fb2 100644 --- a/mezzanine/core/urls.py +++ b/mezzanine/core/urls.py @@ -1,10 +1,9 @@ -from django.urls import path from django.contrib.auth import views as auth_views +from django.urls import path from mezzanine.conf import settings from mezzanine.core import views as core_views - urlpatterns = [] if "django.contrib.admin" in settings.INSTALLED_APPS: diff --git a/mezzanine/core/views.py b/mezzanine/core/views.py index 8d27eddab0..b5aa62c4b8 100644 --- a/mezzanine/core/views.py +++ b/mezzanine/core/views.py @@ -1,32 +1,28 @@ -import os import mimetypes - +import os from json import dumps - -from django.template.response import TemplateResponse - from urllib.parse import urljoin, urlparse from django.apps import apps from django.contrib import admin -from django.contrib.admin.views.decorators import staff_member_required from django.contrib.admin.options import ModelAdmin +from django.contrib.admin.views.decorators import staff_member_required from django.contrib.staticfiles import finders from django.core.exceptions import PermissionDenied -from django.urls import reverse -from django.http import HttpResponse, HttpResponseServerError, HttpResponseNotFound +from django.http import HttpResponse, HttpResponseNotFound, HttpResponseServerError from django.shortcuts import redirect from django.template.loader import get_template +from django.template.response import TemplateResponse +from django.urls import reverse from django.utils.translation import ugettext_lazy as _ from django.views.decorators.csrf import requires_csrf_token from mezzanine.conf import settings from mezzanine.core.forms import get_edit_form from mezzanine.core.models import Displayable, SitePermission -from mezzanine.utils.views import is_editable, paginate from mezzanine.utils.sites import has_site_permission from mezzanine.utils.urls import next_url - +from mezzanine.utils.views import is_editable, paginate mimetypes.init() diff --git a/mezzanine/forms/admin.py b/mezzanine/forms/admin.py index 62137b3f68..686417b9c2 100644 --- a/mezzanine/forms/admin.py +++ b/mezzanine/forms/admin.py @@ -1,7 +1,7 @@ from copy import deepcopy -from io import BytesIO, StringIO from csv import writer from datetime import datetime +from io import BytesIO, StringIO from mimetypes import guess_type from os.path import join @@ -10,19 +10,19 @@ from django.contrib.messages import info from django.core.files.storage import FileSystemStorage from django.http import HttpResponse, HttpResponseRedirect -from django.shortcuts import render, get_object_or_404 -from django.utils.translation import ungettext, ugettext_lazy as _ +from django.shortcuts import get_object_or_404, render +from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ungettext from mezzanine.conf import settings from mezzanine.core.admin import TabularDynamicInlineAdmin from mezzanine.core.forms import DynamicInlineAdminForm from mezzanine.forms.forms import EntriesForm -from mezzanine.forms.models import Form, Field, FormEntry, FieldEntry +from mezzanine.forms.models import Field, FieldEntry, Form, FormEntry from mezzanine.pages.admin import PageAdmin from mezzanine.utils.static import static_lazy as static from mezzanine.utils.urls import admin_url, slugify - fs = FileSystemStorage(location=settings.FORMS_UPLOAD_ROOT) # Copy the fieldsets for PageAdmin and add the extra fields for FormAdmin. diff --git a/mezzanine/forms/defaults.py b/mezzanine/forms/defaults.py index f84e600656..8545373f15 100644 --- a/mezzanine/forms/defaults.py +++ b/mezzanine/forms/defaults.py @@ -13,7 +13,6 @@ from mezzanine.conf import register_setting - register_setting( name="FORMS_FIELD_MAX_LENGTH", description=_("Max length allowed for field values in the forms app."), diff --git a/mezzanine/forms/fields.py b/mezzanine/forms/fields.py index 1089692ae7..81739534bb 100644 --- a/mezzanine/forms/fields.py +++ b/mezzanine/forms/fields.py @@ -1,15 +1,12 @@ -from django.core.exceptions import ImproperlyConfigured from django import forms - +from django.core.exceptions import ImproperlyConfigured from django.forms.widgets import SelectDateWidget - from django.utils.translation import ugettext_lazy as _ from mezzanine.conf import settings from mezzanine.core.forms import SplitSelectDateTimeWidget from mezzanine.utils.importing import import_dotted_path - # Constants for all available field types. TEXT = 1 TEXTAREA = 2 diff --git a/mezzanine/forms/forms.py b/mezzanine/forms/forms.py index 9fafb2b986..6fc335af0c 100644 --- a/mezzanine/forms/forms.py +++ b/mezzanine/forms/forms.py @@ -3,21 +3,19 @@ from uuid import uuid4 from django import forms -from django.forms.widgets import SelectDateWidget - from django.core.files.storage import FileSystemStorage -from django.urls import reverse +from django.forms.widgets import SelectDateWidget from django.template import Template +from django.urls import reverse from django.utils.safestring import mark_safe -from django.utils.translation import ugettext as _ from django.utils.timezone import now +from django.utils.translation import ugettext as _ from mezzanine.conf import settings from mezzanine.forms import fields -from mezzanine.forms.models import FormEntry, FieldEntry +from mezzanine.forms.models import FieldEntry, FormEntry from mezzanine.utils.email import split_addresses as split_choices - fs = FileSystemStorage(location=settings.FORMS_UPLOAD_ROOT) ############################## diff --git a/mezzanine/forms/migrations/0001_initial.py b/mezzanine/forms/migrations/0001_initial.py index 9893e09232..e7e6abbc32 100644 --- a/mezzanine/forms/migrations/0001_initial.py +++ b/mezzanine/forms/migrations/0001_initial.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- -from django.db import models, migrations +from django.db import migrations, models + import mezzanine.core.fields from mezzanine.forms.fields import NAMES diff --git a/mezzanine/forms/migrations/0002_auto_20141227_0224.py b/mezzanine/forms/migrations/0002_auto_20141227_0224.py index 1013f3610d..8c0bad2fae 100644 --- a/mezzanine/forms/migrations/0002_auto_20141227_0224.py +++ b/mezzanine/forms/migrations/0002_auto_20141227_0224.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- -from django.db import models, migrations +from django.db import migrations, models + import mezzanine.core.fields diff --git a/mezzanine/forms/migrations/0003_emailfield.py b/mezzanine/forms/migrations/0003_emailfield.py index 87385783ff..e8cefd4575 100644 --- a/mezzanine/forms/migrations/0003_emailfield.py +++ b/mezzanine/forms/migrations/0003_emailfield.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- -from django.db import models, migrations +from django.db import migrations, models + import mezzanine.pages.managers diff --git a/mezzanine/forms/migrations/0004_auto_20150517_0510.py b/mezzanine/forms/migrations/0004_auto_20150517_0510.py index 387e993cc5..5363f1f583 100644 --- a/mezzanine/forms/migrations/0004_auto_20150517_0510.py +++ b/mezzanine/forms/migrations/0004_auto_20150517_0510.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mezzanine/forms/page_processors.py b/mezzanine/forms/page_processors.py index 915a5f4ee7..49239dc9c3 100644 --- a/mezzanine/forms/page_processors.py +++ b/mezzanine/forms/page_processors.py @@ -6,7 +6,7 @@ from mezzanine.forms.models import Form from mezzanine.forms.signals import form_invalid, form_valid from mezzanine.pages.page_processors import processor_for -from mezzanine.utils.email import split_addresses, send_mail_template +from mezzanine.utils.email import send_mail_template, split_addresses from mezzanine.utils.views import is_spam diff --git a/mezzanine/forms/translation.py b/mezzanine/forms/translation.py index ab5b5c20c6..e98fd230da 100644 --- a/mezzanine/forms/translation.py +++ b/mezzanine/forms/translation.py @@ -1,6 +1,7 @@ -from modeltranslation.translator import translator, TranslationOptions +from modeltranslation.translator import TranslationOptions, translator + from mezzanine.core.translation import TranslatedRichText -from mezzanine.forms.models import Form, Field +from mezzanine.forms.models import Field, Form class TranslatedForm(TranslatedRichText): diff --git a/mezzanine/galleries/admin.py b/mezzanine/galleries/admin.py index c60e62d7e3..278f1ddd07 100644 --- a/mezzanine/galleries/admin.py +++ b/mezzanine/galleries/admin.py @@ -1,8 +1,8 @@ from django.contrib import admin from mezzanine.core.admin import TabularDynamicInlineAdmin -from mezzanine.pages.admin import PageAdmin from mezzanine.galleries.models import Gallery, GalleryImage +from mezzanine.pages.admin import PageAdmin from mezzanine.utils.static import static_lazy as static diff --git a/mezzanine/galleries/migrations/0001_initial.py b/mezzanine/galleries/migrations/0001_initial.py index 69c0b2d9de..23a6d40988 100644 --- a/mezzanine/galleries/migrations/0001_initial.py +++ b/mezzanine/galleries/migrations/0001_initial.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- -from django.db import models, migrations +from django.db import migrations, models + import mezzanine.core.fields diff --git a/mezzanine/galleries/migrations/0002_auto_20141227_0224.py b/mezzanine/galleries/migrations/0002_auto_20141227_0224.py index 416a9dec17..a9acb3dfe1 100644 --- a/mezzanine/galleries/migrations/0002_auto_20141227_0224.py +++ b/mezzanine/galleries/migrations/0002_auto_20141227_0224.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- -from django.db import models, migrations +from django.db import migrations, models + import mezzanine.core.fields diff --git a/mezzanine/galleries/models.py b/mezzanine/galleries/models.py index 0779d3c21f..b53bb87d1f 100644 --- a/mezzanine/galleries/models.py +++ b/mezzanine/galleries/models.py @@ -1,9 +1,9 @@ -from io import BytesIO import os +from io import BytesIO from string import punctuation from zipfile import ZipFile -from chardet import detect as charsetdetect +from chardet import detect as charsetdetect from django.core.files.base import ContentFile from django.core.files.storage import default_storage from django.db import models @@ -17,7 +17,6 @@ from mezzanine.utils.importing import import_dotted_path from mezzanine.utils.models import upload_to - # Set the directory where gallery images are uploaded to, # either MEDIA_ROOT + 'galleries', or filebrowser's upload # directory if being used. diff --git a/mezzanine/galleries/translation.py b/mezzanine/galleries/translation.py index d6d764f3b2..8fc97ffc62 100644 --- a/mezzanine/galleries/translation.py +++ b/mezzanine/galleries/translation.py @@ -1,6 +1,7 @@ -from modeltranslation.translator import translator, TranslationOptions +from modeltranslation.translator import TranslationOptions, translator + from mezzanine.core.translation import TranslatedRichText -from mezzanine.galleries.models import GalleryImage, Gallery +from mezzanine.galleries.models import Gallery, GalleryImage class TranslatedGallery(TranslatedRichText): diff --git a/mezzanine/generic/admin.py b/mezzanine/generic/admin.py index dca5e9b6ca..e5a6d5459b 100644 --- a/mezzanine/generic/admin.py +++ b/mezzanine/generic/admin.py @@ -1,11 +1,10 @@ from django.conf import settings from django.contrib import admin -from django_comments.admin import CommentsAdmin from django.utils.translation import ugettext_lazy as _ +from django_comments.admin import CommentsAdmin from mezzanine.generic.models import ThreadedComment - __all__ = ("ThreadedCommentAdmin",) diff --git a/mezzanine/generic/defaults.py b/mezzanine/generic/defaults.py index 87e162c3ed..634b4e87b4 100644 --- a/mezzanine/generic/defaults.py +++ b/mezzanine/generic/defaults.py @@ -14,7 +14,6 @@ from mezzanine.conf import register_setting - generic_comments = getattr(settings, "COMMENTS_APP", "") == "mezzanine.generic" if generic_comments: diff --git a/mezzanine/generic/fields.py b/mezzanine/generic/fields.py index e7d9f1d38d..4639ebe622 100644 --- a/mezzanine/generic/fields.py +++ b/mezzanine/generic/fields.py @@ -1,9 +1,9 @@ from copy import copy from django.contrib.contenttypes.fields import GenericRelation -from django.core.exceptions import ImproperlyConfigured, AppRegistryNotReady -from django.db.models import IntegerField, CharField, FloatField -from django.db.models.signals import post_save, post_delete +from django.core.exceptions import AppRegistryNotReady, ImproperlyConfigured +from django.db.models import CharField, FloatField, IntegerField +from django.db.models.signals import post_delete, post_save from mezzanine.utils.deprecation import get_related_model diff --git a/mezzanine/generic/forms.py b/mezzanine/generic/forms.py index 695e81c8de..0a5dbd0e37 100644 --- a/mezzanine/generic/forms.py +++ b/mezzanine/generic/forms.py @@ -1,15 +1,16 @@ from django import forms -from django_comments.forms import CommentSecurityForm, CommentForm -from django_comments.signals import comment_was_posted from django.utils.safestring import mark_safe -from django.utils.translation import ugettext, ugettext_lazy as _ +from django.utils.translation import ugettext +from django.utils.translation import ugettext_lazy as _ +from django_comments.forms import CommentForm, CommentSecurityForm +from django_comments.signals import comment_was_posted from mezzanine.conf import settings from mezzanine.core.forms import Html5Mixin from mezzanine.generic.models import Keyword, ThreadedComment from mezzanine.utils.cache import add_cache_bypass from mezzanine.utils.deprecation import is_authenticated -from mezzanine.utils.email import split_addresses, send_mail_template +from mezzanine.utils.email import send_mail_template, split_addresses from mezzanine.utils.static import static_lazy as static from mezzanine.utils.views import ip_for_request diff --git a/mezzanine/generic/migrations/0001_initial.py b/mezzanine/generic/migrations/0001_initial.py index 199633de70..1e867bee69 100644 --- a/mezzanine/generic/migrations/0001_initial.py +++ b/mezzanine/generic/migrations/0001_initial.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from django.db import models, migrations from django.conf import settings +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mezzanine/generic/migrations/0002_auto_20141227_0224.py b/mezzanine/generic/migrations/0002_auto_20141227_0224.py index 199383b0f1..d97fa749d7 100644 --- a/mezzanine/generic/migrations/0002_auto_20141227_0224.py +++ b/mezzanine/generic/migrations/0002_auto_20141227_0224.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- -from django.db import models, migrations +from django.db import migrations, models + import mezzanine.core.fields diff --git a/mezzanine/generic/models.py b/mezzanine/generic/models.py index 45847eefed..a0b583a829 100644 --- a/mezzanine/generic/models.py +++ b/mezzanine/generic/models.py @@ -1,15 +1,15 @@ from django.contrib.contenttypes.fields import GenericForeignKey from django.db import models from django.template.defaultfilters import truncatewords_html -from django.utils.translation import ugettext, ugettext_lazy as _ from django.utils.html import format_html - +from django.utils.translation import ugettext +from django.utils.translation import ugettext_lazy as _ from django_comments.models import Comment +from mezzanine.conf import settings +from mezzanine.core.models import Orderable, Slugged from mezzanine.generic.fields import RatingField from mezzanine.generic.managers import CommentManager, KeywordManager -from mezzanine.core.models import Slugged, Orderable -from mezzanine.conf import settings from mezzanine.utils.models import get_user_model_name from mezzanine.utils.sites import current_site_id diff --git a/mezzanine/generic/templatetags/comment_tags.py b/mezzanine/generic/templatetags/comment_tags.py index 224ff0c0ec..059d05655d 100644 --- a/mezzanine/generic/templatetags/comment_tags.py +++ b/mezzanine/generic/templatetags/comment_tags.py @@ -1,14 +1,13 @@ from collections import defaultdict -from django.urls import reverse from django.template.defaultfilters import linebreaksbr, urlize +from django.urls import reverse from mezzanine import template from mezzanine.conf import settings from mezzanine.generic.models import ThreadedComment from mezzanine.utils.importing import import_dotted_path - register = template.Library() diff --git a/mezzanine/generic/templatetags/disqus_tags.py b/mezzanine/generic/templatetags/disqus_tags.py index 2da9a230a8..9858c65aee 100644 --- a/mezzanine/generic/templatetags/disqus_tags.py +++ b/mezzanine/generic/templatetags/disqus_tags.py @@ -7,7 +7,6 @@ from mezzanine import template from mezzanine.utils.deprecation import is_authenticated - register = template.Library() diff --git a/mezzanine/generic/templatetags/keyword_tags.py b/mezzanine/generic/templatetags/keyword_tags.py index 97a1467c51..b2bf4d715a 100644 --- a/mezzanine/generic/templatetags/keyword_tags.py +++ b/mezzanine/generic/templatetags/keyword_tags.py @@ -1,11 +1,10 @@ from django.contrib.contenttypes.models import ContentType -from django.db.models import Model, Count +from django.db.models import Count, Model from mezzanine import template from mezzanine.conf import settings from mezzanine.generic.models import AssignedKeyword, Keyword - register = template.Library() diff --git a/mezzanine/generic/templatetags/rating_tags.py b/mezzanine/generic/templatetags/rating_tags.py index c66f9cbac3..f695a24690 100644 --- a/mezzanine/generic/templatetags/rating_tags.py +++ b/mezzanine/generic/templatetags/rating_tags.py @@ -1,7 +1,6 @@ from mezzanine import template from mezzanine.generic.forms import RatingForm - register = template.Library() diff --git a/mezzanine/generic/urls.py b/mezzanine/generic/urls.py index e42fd13b6e..dc9ed3f00b 100644 --- a/mezzanine/generic/urls.py +++ b/mezzanine/generic/urls.py @@ -2,7 +2,6 @@ from mezzanine.generic import views - urlpatterns = [ path("rating/", views.rating, name="rating"), path("comment/", views.comment, name="comment"), diff --git a/mezzanine/generic/views.py b/mezzanine/generic/views.py index fa2ec95c1e..e3d6460bfb 100644 --- a/mezzanine/generic/views.py +++ b/mezzanine/generic/views.py @@ -4,20 +4,20 @@ from django.apps import apps from django.contrib.admin.views.decorators import staff_member_required from django.contrib.messages import error -from django.urls import reverse from django.db.models import ObjectDoesNotExist from django.http import HttpResponse, HttpResponseBadRequest from django.shortcuts import redirect from django.template.response import TemplateResponse +from django.urls import reverse from django.utils.translation import ugettext_lazy as _ from mezzanine.conf import settings -from mezzanine.generic.forms import ThreadedCommentForm, RatingForm +from mezzanine.generic.forms import RatingForm, ThreadedCommentForm from mezzanine.generic.models import Keyword from mezzanine.utils.cache import add_cache_bypass from mezzanine.utils.deprecation import is_authenticated -from mezzanine.utils.views import set_cookie, is_spam from mezzanine.utils.importing import import_dotted_path +from mezzanine.utils.views import is_spam, set_cookie @staff_member_required diff --git a/mezzanine/pages/__init__.py b/mezzanine/pages/__init__.py index 25779d62b8..839c62f2eb 100644 --- a/mezzanine/pages/__init__.py +++ b/mezzanine/pages/__init__.py @@ -4,5 +4,4 @@ """ from mezzanine import __version__ # noqa - default_app_config = "mezzanine.pages.apps.PagesConfig" diff --git a/mezzanine/pages/admin.py b/mezzanine/pages/admin.py index 83159759d6..d38b8189c3 100644 --- a/mezzanine/pages/admin.py +++ b/mezzanine/pages/admin.py @@ -11,10 +11,9 @@ DisplayableAdmin, DisplayableAdminForm, ) -from mezzanine.pages.models import Page, RichTextPage, Link +from mezzanine.pages.models import Link, Page, RichTextPage from mezzanine.utils.urls import clean_slashes - # Add extra fields for pages to the Displayable fields. # We only add the menu field if PAGE_MENU_TEMPLATES has values. page_fieldsets = deepcopy(DisplayableAdmin.fieldsets) diff --git a/mezzanine/pages/defaults.py b/mezzanine/pages/defaults.py index 0dd49b4b33..00dc240290 100644 --- a/mezzanine/pages/defaults.py +++ b/mezzanine/pages/defaults.py @@ -13,7 +13,6 @@ from mezzanine.conf import register_setting - register_setting( name="ADD_PAGE_ORDER", description=_( diff --git a/mezzanine/pages/managers.py b/mezzanine/pages/managers.py index ae371793b5..d749ff92cb 100644 --- a/mezzanine/pages/managers.py +++ b/mezzanine/pages/managers.py @@ -1,7 +1,7 @@ from mezzanine.conf import settings from mezzanine.core.managers import DisplayableManager -from mezzanine.utils.urls import home_slug from mezzanine.utils.deprecation import is_authenticated +from mezzanine.utils.urls import home_slug class PageManager(DisplayableManager): diff --git a/mezzanine/pages/middleware.py b/mezzanine/pages/middleware.py index 26993e3bc4..7ffe6f9529 100644 --- a/mezzanine/pages/middleware.py +++ b/mezzanine/pages/middleware.py @@ -1,6 +1,6 @@ from django.contrib.auth.views import redirect_to_login from django.core.exceptions import MiddlewareNotUsed -from django.http import HttpResponse, Http404 +from django.http import Http404, HttpResponse from mezzanine.conf import settings from mezzanine.pages import context_processors, page_processors diff --git a/mezzanine/pages/migrations/0001_initial.py b/mezzanine/pages/migrations/0001_initial.py index 6f90e6b5c0..2d0551bf79 100644 --- a/mezzanine/pages/migrations/0001_initial.py +++ b/mezzanine/pages/migrations/0001_initial.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- -from django.db import models, migrations +from django.db import migrations, models + import mezzanine.core.fields import mezzanine.pages.fields diff --git a/mezzanine/pages/migrations/0002_auto_20141227_0224.py b/mezzanine/pages/migrations/0002_auto_20141227_0224.py index 43346ebfa9..ec4b1fa1cb 100644 --- a/mezzanine/pages/migrations/0002_auto_20141227_0224.py +++ b/mezzanine/pages/migrations/0002_auto_20141227_0224.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- -from django.db import models, migrations -import mezzanine.pages.fields +from django.db import migrations, models + import mezzanine.core.fields +import mezzanine.pages.fields class Migration(migrations.Migration): diff --git a/mezzanine/pages/migrations/0003_auto_20150527_1555.py b/mezzanine/pages/migrations/0003_auto_20150527_1555.py index 42c95f9e92..839128989a 100644 --- a/mezzanine/pages/migrations/0003_auto_20150527_1555.py +++ b/mezzanine/pages/migrations/0003_auto_20150527_1555.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mezzanine/pages/models.py b/mezzanine/pages/models.py index 2a2e3bb88d..8f568bdf23 100644 --- a/mezzanine/pages/models.py +++ b/mezzanine/pages/models.py @@ -1,17 +1,22 @@ -from mezzanine.utils.sites import override_current_site_id - from urllib.parse import urljoin -from django.urls import resolve, reverse from django.db import models -from django.utils.translation import ugettext_lazy as _, ugettext +from django.urls import resolve, reverse +from django.utils.translation import ugettext +from django.utils.translation import ugettext_lazy as _ from mezzanine.conf import settings -from mezzanine.core.models import ContentTyped, Displayable, Orderable, RichText +from mezzanine.core.models import ( + ContentTyped, + Displayable, + Orderable, + RichText, + wrapped_manager, +) from mezzanine.pages.fields import MenusField from mezzanine.pages.managers import PageManager +from mezzanine.utils.sites import override_current_site_id from mezzanine.utils.urls import path_to_slug -from mezzanine.core.models import wrapped_manager class BasePage(Orderable, Displayable): diff --git a/mezzanine/pages/page_processors.py b/mezzanine/pages/page_processors.py index f261551790..953c01206f 100644 --- a/mezzanine/pages/page_processors.py +++ b/mezzanine/pages/page_processors.py @@ -7,7 +7,6 @@ from mezzanine.pages.models import Page from mezzanine.utils.importing import get_app_name_list - processors = defaultdict(list) diff --git a/mezzanine/pages/templatetags/pages_tags.py b/mezzanine/pages/templatetags/pages_tags.py index c6e99985e1..fd745e4023 100644 --- a/mezzanine/pages/templatetags/pages_tags.py +++ b/mezzanine/pages/templatetags/pages_tags.py @@ -5,10 +5,9 @@ from django.template.loader import get_template from django.utils.translation import ugettext_lazy as _ +from mezzanine import template from mezzanine.pages.models import Page from mezzanine.utils.urls import home_slug -from mezzanine import template - register = template.Library() diff --git a/mezzanine/pages/translation.py b/mezzanine/pages/translation.py index 6ecd514e8a..763333cfb9 100644 --- a/mezzanine/pages/translation.py +++ b/mezzanine/pages/translation.py @@ -1,6 +1,7 @@ -from modeltranslation.translator import translator, TranslationOptions +from modeltranslation.translator import TranslationOptions, translator + from mezzanine.core.translation import TranslatedDisplayable, TranslatedRichText -from mezzanine.pages.models import Page, RichTextPage, Link +from mezzanine.pages.models import Link, Page, RichTextPage class TranslatedPage(TranslatedDisplayable): diff --git a/mezzanine/pages/urls.py b/mezzanine/pages/urls.py index 6f2e97a7ff..b1c1cb3814 100644 --- a/mezzanine/pages/urls.py +++ b/mezzanine/pages/urls.py @@ -1,9 +1,8 @@ -from django.urls import path from django.conf import settings +from django.urls import path from mezzanine.pages import page_processors, views - page_processors.autodiscover() diff --git a/mezzanine/pages/views.py b/mezzanine/pages/views.py index 8bc8ac320e..3b3f0a2184 100644 --- a/mezzanine/pages/views.py +++ b/mezzanine/pages/views.py @@ -1,8 +1,8 @@ +from django.contrib import messages from django.contrib.admin.views.decorators import staff_member_required from django.core.exceptions import ImproperlyConfigured -from django.http import HttpResponse, Http404 +from django.http import Http404, HttpResponse from django.shortcuts import get_object_or_404 -from django.contrib import messages from django.template.response import TemplateResponse from mezzanine.pages.models import Page, PageMoveException diff --git a/mezzanine/project_template/fabfile.py b/mezzanine/project_template/fabfile.py index 03c5065cd5..bf90e9644c 100644 --- a/mezzanine/project_template/fabfile.py +++ b/mezzanine/project_template/fabfile.py @@ -8,26 +8,18 @@ from importlib import import_module from posixpath import join -from mezzanine.utils.conf import real_project_name - -from fabric.api import ( - abort, - env, - cd, - prefix, - sudo as _sudo, - run as _run, - hide, - task, - local, -) +from fabric.api import abort, cd, env, hide, local, prefix +from fabric.api import run as _run +from fabric.api import sudo as _sudo +from fabric.api import task +from fabric.colors import blue, green, red, yellow from fabric.context_managers import settings as fab_settings from fabric.contrib.console import confirm from fabric.contrib.files import exists, upload_template from fabric.contrib.project import rsync_project -from fabric.colors import yellow, green, blue, red from fabric.decorators import hosts +from mezzanine.utils.conf import real_project_name ################ # Config setup # diff --git a/mezzanine/project_template/project_name/settings.py b/mezzanine/project_template/project_name/settings.py index f673a172c9..331a2db869 100644 --- a/mezzanine/project_template/project_name/settings.py +++ b/mezzanine/project_template/project_name/settings.py @@ -3,7 +3,6 @@ from django import VERSION as DJANGO_VERSION from django.utils.translation import ugettext_lazy as _ - ###################### # MEZZANINE SETTINGS # ###################### @@ -307,8 +306,8 @@ f = os.path.join(PROJECT_APP_PATH, "local_settings.py") if os.path.exists(f): - import sys import imp + import sys module_name = "%s.local_settings" % PROJECT_APP module = imp.new_module(module_name) diff --git a/mezzanine/project_template/project_name/urls.py b/mezzanine/project_template/project_name/urls.py index b2cd20298b..4d20bc4bc5 100644 --- a/mezzanine/project_template/project_name/urls.py +++ b/mezzanine/project_template/project_name/urls.py @@ -1,8 +1,8 @@ from django.conf.urls.i18n import i18n_patterns from django.contrib import admin -from django.urls import path, include -from django.views.i18n import set_language +from django.urls import include, path from django.views.generic import TemplateView +from django.views.i18n import set_language from mezzanine.conf import settings diff --git a/mezzanine/project_template/project_name/wsgi.py b/mezzanine/project_template/project_name/wsgi.py index 3158d5c6f9..45648d7961 100644 --- a/mezzanine/project_template/project_name/wsgi.py +++ b/mezzanine/project_template/project_name/wsgi.py @@ -10,6 +10,7 @@ import os from django.core.wsgi import get_wsgi_application + from mezzanine.utils.conf import real_project_name os.environ.setdefault( diff --git a/mezzanine/template/__init__.py b/mezzanine/template/__init__.py index 84428116da..a74fbe03cb 100644 --- a/mezzanine/template/__init__.py +++ b/mezzanine/template/__init__.py @@ -1,8 +1,8 @@ -from functools import wraps import warnings +from functools import wraps -from django import template from django import VERSION as DJANGO_VERSION +from django import template class Library(template.Library): diff --git a/mezzanine/template/loader_tags.py b/mezzanine/template/loader_tags.py index 4243ac6e18..38bb9788a2 100644 --- a/mezzanine/template/loader_tags.py +++ b/mezzanine/template/loader_tags.py @@ -3,12 +3,11 @@ from itertools import chain from django import VERSION as DJANGO_VERSION -from django.template import Template, TemplateSyntaxError, TemplateDoesNotExist +from django.template import Template, TemplateDoesNotExist, TemplateSyntaxError from django.template.loader_tags import ExtendsNode from mezzanine import template - register = template.Library() diff --git a/mezzanine/twitter/__init__.py b/mezzanine/twitter/__init__.py index ea2e50f934..4795166ebe 100644 --- a/mezzanine/twitter/__init__.py +++ b/mezzanine/twitter/__init__.py @@ -5,7 +5,6 @@ from mezzanine import __version__ # noqa - # Constants/choices for the different query types. QUERY_TYPE_USER = "user" diff --git a/mezzanine/twitter/admin.py b/mezzanine/twitter/admin.py index 0e4552134a..b8993c321f 100644 --- a/mezzanine/twitter/admin.py +++ b/mezzanine/twitter/admin.py @@ -1,6 +1,6 @@ +from django.template.defaultfilters import truncatechars from django.utils.safestring import mark_safe from django.utils.translation import ugettext_lazy as _ -from django.template.defaultfilters import truncatechars from mezzanine.twitter import get_auth_settings diff --git a/mezzanine/twitter/defaults.py b/mezzanine/twitter/defaults.py index a94bdfd54c..2e5901ff5e 100644 --- a/mezzanine/twitter/defaults.py +++ b/mezzanine/twitter/defaults.py @@ -10,10 +10,10 @@ them would require an application reload. """ from django.utils.translation import ugettext_lazy as _ + from mezzanine.conf import register_setting from mezzanine.twitter import QUERY_TYPE_CHOICES, QUERY_TYPE_SEARCH - register_setting( name="TWITTER_DEFAULT_QUERY_TYPE", label=_("Default Twitter Query Type"), diff --git a/mezzanine/twitter/management/commands/poll_twitter.py b/mezzanine/twitter/management/commands/poll_twitter.py index 4536593aaf..814754322c 100644 --- a/mezzanine/twitter/management/commands/poll_twitter.py +++ b/mezzanine/twitter/management/commands/poll_twitter.py @@ -1,5 +1,5 @@ -from django.core.management.base import BaseCommand from django import db +from django.core.management.base import BaseCommand from mezzanine.twitter.models import Query, TwitterQueryException diff --git a/mezzanine/twitter/migrations/0001_initial.py b/mezzanine/twitter/migrations/0001_initial.py index 696a58fd2c..677b85c7b0 100644 --- a/mezzanine/twitter/migrations/0001_initial.py +++ b/mezzanine/twitter/migrations/0001_initial.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.db import models, migrations +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/mezzanine/twitter/models.py b/mezzanine/twitter/models.py index f7046dbb7f..3b0bda7099 100644 --- a/mezzanine/twitter/models.py +++ b/mezzanine/twitter/models.py @@ -1,26 +1,24 @@ -from datetime import datetime import re - +from datetime import datetime from urllib.parse import quote +import requests from django.db import models from django.utils.html import urlize from django.utils.timezone import make_aware, utc from django.utils.translation import ugettext_lazy as _ from requests_oauthlib import OAuth1 -import requests from mezzanine.conf import settings from mezzanine.twitter import ( QUERY_TYPE_CHOICES, - QUERY_TYPE_USER, QUERY_TYPE_LIST, QUERY_TYPE_SEARCH, + QUERY_TYPE_USER, + get_auth_settings, ) -from mezzanine.twitter import get_auth_settings from mezzanine.twitter.managers import TweetManager - re_usernames = re.compile(r"(^|\W)@([0-9a-zA-Z+_]+)", re.IGNORECASE) re_hashtags = re.compile(r"#([0-9a-zA-Z+_]+)", re.IGNORECASE) replace_hashtags = '#\\1' diff --git a/mezzanine/twitter/templatetags/twitter_tags.py b/mezzanine/twitter/templatetags/twitter_tags.py index 4a9333479d..f6c869590e 100644 --- a/mezzanine/twitter/templatetags/twitter_tags.py +++ b/mezzanine/twitter/templatetags/twitter_tags.py @@ -1,10 +1,9 @@ from collections import defaultdict +from mezzanine import template from mezzanine.conf import settings -from mezzanine.twitter import QUERY_TYPE_USER, QUERY_TYPE_LIST, QUERY_TYPE_SEARCH +from mezzanine.twitter import QUERY_TYPE_LIST, QUERY_TYPE_SEARCH, QUERY_TYPE_USER from mezzanine.twitter.models import Tweet, TwitterQueryException -from mezzanine import template - register = template.Library() diff --git a/mezzanine/urls.py b/mezzanine/urls.py index 8578b93df5..20a10de896 100644 --- a/mezzanine/urls.py +++ b/mezzanine/urls.py @@ -3,15 +3,14 @@ all the various Mezzanine apps, third-party apps like Grappelli and filebrowser. """ -from django.urls import include, re_path, path from django.contrib.sitemaps.views import sitemap -from django.views.i18n import JavaScriptCatalog from django.http import HttpResponse +from django.urls import include, path, re_path +from django.views.i18n import JavaScriptCatalog from mezzanine.conf import settings from mezzanine.core.sitemaps import DisplayableSitemap - urlpatterns = [] # JavaScript localization feature diff --git a/mezzanine/utils/admin.py b/mezzanine/utils/admin.py index e1c965e6f1..2e7be5a002 100644 --- a/mezzanine/utils/admin.py +++ b/mezzanine/utils/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin -from django.shortcuts import redirect from django.http import HttpResponseRedirect +from django.shortcuts import redirect from mezzanine.utils.urls import admin_url diff --git a/mezzanine/utils/cache.py b/mezzanine/utils/cache.py index 5c18757048..05fc25cf8e 100644 --- a/mezzanine/utils/cache.py +++ b/mezzanine/utils/cache.py @@ -6,8 +6,8 @@ from django.utils.cache import _i18n_cache_key_suffix from mezzanine.conf import settings -from mezzanine.utils.sites import current_site_id from mezzanine.utils.conf import middlewares_or_subclasses_installed +from mezzanine.utils.sites import current_site_id def _hashed_key(key): diff --git a/mezzanine/utils/conf.py b/mezzanine/utils/conf.py index 57108273e0..b563fdc6a1 100644 --- a/mezzanine/utils/conf.py +++ b/mezzanine/utils/conf.py @@ -3,8 +3,8 @@ from inspect import getmro from warnings import warn -from django.db import OperationalError from django.conf import global_settings as defaults +from django.db import OperationalError from django.utils.module_loading import import_string from mezzanine.utils.deprecation import get_middleware_setting diff --git a/mezzanine/utils/deprecation.py b/mezzanine/utils/deprecation.py index a152db0171..190148fd77 100644 --- a/mezzanine/utils/deprecation.py +++ b/mezzanine/utils/deprecation.py @@ -7,7 +7,6 @@ import django from django.conf import settings - # Middleware mixin for Django 1.10 try: from django.utils.deprecation import MiddlewareMixin diff --git a/mezzanine/utils/docs.py b/mezzanine/utils/docs.py index 81b7cdd556..d94f5ef2c2 100644 --- a/mezzanine/utils/docs.py +++ b/mezzanine/utils/docs.py @@ -2,12 +2,12 @@ Utils called from project_root/docs/conf.py when Sphinx documentation is generated. """ +import os.path from collections import OrderedDict from datetime import datetime -import os.path from shutil import copyfile, move -from string import ascii_letters as letters from socket import gethostname +from string import ascii_letters as letters from warnings import warn from django.template.defaultfilters import urlize @@ -143,7 +143,7 @@ def build_changelog(docs_path, package_name="mezzanine"): # Load the repo. try: - from mercurial import ui, hg, error + from mercurial import error, hg, ui from mercurial.commands import tag except ImportError: pass diff --git a/mezzanine/utils/email.py b/mezzanine/utils/email.py index 872c5fc64e..85e55569e4 100644 --- a/mezzanine/utils/email.py +++ b/mezzanine/utils/email.py @@ -1,12 +1,12 @@ from django.contrib.auth.tokens import default_token_generator from django.core.mail import EmailMultiAlternatives -from django.urls import reverse from django.template import loader +from django.urls import reverse from django.utils.http import int_to_base36 from mezzanine.conf import settings -from mezzanine.utils.urls import admin_url, next_url from mezzanine.conf.context_processors import settings as context_settings +from mezzanine.utils.urls import admin_url, next_url def split_addresses(email_string_list): diff --git a/mezzanine/utils/html.py b/mezzanine/utils/html.py index 1e98922123..e7fd4eee5e 100644 --- a/mezzanine/utils/html.py +++ b/mezzanine/utils/html.py @@ -1,6 +1,6 @@ try: - from html.parser import HTMLParser from html.entities import name2codepoint + from html.parser import HTMLParser try: from html.parser import HTMLParseError @@ -18,7 +18,6 @@ class HTMLParseError(Exception): from mezzanine.utils.deprecation import mark_safe - SELF_CLOSING_TAGS = ["br", "img"] NON_SELF_CLOSING_TAGS = ["script", "iframe"] ABSOLUTE_URL_TAGS = {"img": "src", "a": "href", "iframe": "src"} @@ -51,6 +50,7 @@ def absolute_urls(html): """ from bs4 import BeautifulSoup + from mezzanine.core.request import current_request request = current_request() @@ -98,7 +98,8 @@ def escape(html): ``RICHTEXT_FILTER_LEVEL``, ``RICHTEXT_ALLOWED_TAGS``, ``RICHTEXT_ALLOWED_ATTRIBUTES``, ``RICHTEXT_ALLOWED_STYLES``. """ - from bleach import clean, ALLOWED_PROTOCOLS + from bleach import ALLOWED_PROTOCOLS, clean + from mezzanine.conf import settings from mezzanine.core import defaults @@ -130,8 +131,9 @@ def thumbnails(html): paths, using Mezzanine's ``thumbnail`` template tag. Used as one of the default values in the ``RICHTEXT_FILTERS`` setting. """ - from django.conf import settings from bs4 import BeautifulSoup + from django.conf import settings + from mezzanine.core.templatetags.mezzanine_tags import thumbnail # If MEDIA_URL isn't in the HTML string, there aren't any diff --git a/mezzanine/utils/models.py b/mezzanine/utils/models.py index ad2eb33c50..8e2117b5ee 100644 --- a/mezzanine/utils/models.py +++ b/mezzanine/utils/models.py @@ -3,7 +3,7 @@ from django.conf import settings from django.contrib.auth import get_user_model as django_get_user_model from django.core.exceptions import ImproperlyConfigured -from django.db.models import Model, Field +from django.db.models import Field, Model from django.utils.html import format_html from mezzanine.utils.importing import import_dotted_path diff --git a/mezzanine/utils/sites.py b/mezzanine/utils/sites.py index bf8d59bd73..f8a8383d58 100644 --- a/mezzanine/utils/sites.py +++ b/mezzanine/utils/sites.py @@ -9,7 +9,6 @@ from mezzanine.core.request import current_request from mezzanine.utils.conf import middlewares_or_subclasses_installed - SITE_PERMISSION_MIDDLEWARE = "mezzanine.core.middleware.SitePermissionMiddleware" @@ -36,7 +35,7 @@ def current_site_id(): if hasattr(override_current_site_id.thread_local, "site_id"): return override_current_site_id.thread_local.site_id - from mezzanine.utils.cache import cache_installed, cache_get, cache_set + from mezzanine.utils.cache import cache_get, cache_installed, cache_set request = current_request() site_id = getattr(request, "site_id", None) diff --git a/mezzanine/utils/static.py b/mezzanine/utils/static.py index fa98b58410..78dd452a15 100644 --- a/mezzanine/utils/static.py +++ b/mezzanine/utils/static.py @@ -1,8 +1,8 @@ """ Utils for working with static files. """ -from django.templatetags.static import static from django.conf import settings +from django.templatetags.static import static from django.utils.functional import lazy # The 'static' template tag returns cache-busting file names, which prevents diff --git a/mezzanine/utils/timezone.py b/mezzanine/utils/timezone.py index 5049890f7e..b1eab826ed 100644 --- a/mezzanine/utils/timezone.py +++ b/mezzanine/utils/timezone.py @@ -1,7 +1,8 @@ +import datetime import time -import tzlocal + import pytz -import datetime +import tzlocal def get_best_local_timezone(): diff --git a/mezzanine/utils/urls.py b/mezzanine/utils/urls.py index ba688d14f1..6bcb8201ea 100644 --- a/mezzanine/utils/urls.py +++ b/mezzanine/utils/urls.py @@ -2,12 +2,11 @@ import unicodedata from django.core.exceptions import ObjectDoesNotExist -from django.urls import resolve, reverse, NoReverseMatch, get_script_prefix from django.shortcuts import redirect +from django.urls import NoReverseMatch, get_script_prefix, resolve, reverse +from django.utils import translation from django.utils.encoding import smart_text - from django.utils.http import is_safe_url -from django.utils import translation from mezzanine.conf import settings from mezzanine.utils.importing import import_dotted_path diff --git a/mezzanine/utils/views.py b/mezzanine/utils/views.py index 00fa7e0d7a..c22c5468fc 100644 --- a/mezzanine/utils/views.py +++ b/mezzanine/utils/views.py @@ -1,14 +1,12 @@ import warnings - from datetime import datetime, timedelta - from urllib.parse import urlencode from urllib.request import Request, urlopen import django from django.contrib.auth import get_permission_codename -from django.core.paginator import Paginator, InvalidPage, EmptyPage -from django.forms import EmailField, URLField, Textarea +from django.core.paginator import EmptyPage, InvalidPage, Paginator +from django.forms import EmailField, Textarea, URLField from django.template import RequestContext from django.template.response import TemplateResponse from django.utils.translation import ugettext as _ diff --git a/setup.cfg b/setup.cfg index fc0ec0f8d9..89ab4d2df7 100644 --- a/setup.cfg +++ b/setup.cfg @@ -51,6 +51,7 @@ testing = codestyle = flake8 >= 3, <4 black==20.8b1 + isort >= 5, <6 [options.entry_points] console_scripts = diff --git a/tests/conftest.py b/tests/conftest.py index 47b6a4b8e8..f784d0ede0 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -2,11 +2,10 @@ import shutil import sys import tempfile +from pathlib import Path import django -from pathlib import Path - # Path to the temp mezzanine project folder TMP_PATH = Path(tempfile.mkdtemp()) / "project_template" diff --git a/tests/test_accounts.py b/tests/test_accounts.py index 943ed8e1f5..8afe4daf20 100644 --- a/tests/test_accounts.py +++ b/tests/test_accounts.py @@ -1,8 +1,8 @@ from django.contrib.auth import get_user_model from django.contrib.auth.tokens import default_token_generator from django.core import mail -from django.urls import reverse from django.forms.fields import DateField, DateTimeField +from django.urls import reverse from django.utils.http import int_to_base36 from mezzanine.accounts import ProfileNotConfigured @@ -10,7 +10,6 @@ from mezzanine.conf import settings from mezzanine.utils.tests import TestCase - User = get_user_model() diff --git a/tests/test_blog.py b/tests/test_blog.py index de70d0f80b..58db8433f2 100644 --- a/tests/test_blog.py +++ b/tests/test_blog.py @@ -1,13 +1,12 @@ -import re -import pytz import datetime +import re from unittest import skipUnless - from urllib.parse import urlparse -from django.urls import reverse +import pytz from django.template import Context, Template from django.test import override_settings +from django.urls import reverse from mezzanine.blog.models import BlogPost from mezzanine.conf import settings diff --git a/tests/test_conf.py b/tests/test_conf.py index 39684c1051..71388bd85e 100644 --- a/tests/test_conf.py +++ b/tests/test_conf.py @@ -1,11 +1,11 @@ import sys -from unittest import skipUnless import warnings +from unittest import skipUnless from django.conf import settings as django_settings from django.utils.encoding import force_text -from mezzanine.conf import settings, registry, register_setting +from mezzanine.conf import register_setting, registry, settings from mezzanine.conf.context_processors import TemplateSettings from mezzanine.conf.models import Setting from mezzanine.utils.tests import TestCase @@ -18,6 +18,7 @@ class ConfTests(TestCase): def test_threading_race(self): import multiprocessing.pool import random + from django.db import connections type_modifiers = { diff --git a/tests/test_core.py b/tests/test_core.py index 2ec7c2332a..0d792b1d0c 100644 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -1,25 +1,15 @@ import re -import pytz from unittest import skipUnless - -from django.utils.encoding import force_str - -from mezzanine.core.middleware import FetchFromCacheMiddleware -from mezzanine.core.templatetags.mezzanine_tags import initialize_nevercache -from mezzanine.utils.cache import cache_installed -from mezzanine.utils.sites import current_site_id, override_current_site_id -from mezzanine.utils.urls import admin_url - from urllib.parse import urlencode +import pytz from django.conf.urls import url from django.contrib.admin import AdminSite from django.contrib.admin.options import InlineModelAdmin from django.contrib.sites.models import Site from django.core import mail from django.core.exceptions import ValidationError -from django.core.management import call_command, CommandError -from django.urls import reverse +from django.core.management import CommandError, call_command from django.db import models from django.forms import Textarea from django.forms.models import modelform_factory @@ -27,24 +17,31 @@ from django.template import RequestContext, Template from django.templatetags.static import static from django.test.utils import override_settings +from django.urls import reverse +from django.utils.encoding import force_str from django.utils.html import strip_tags from django.utils.timezone import datetime, now, timedelta from mezzanine.conf import settings from mezzanine.core.admin import BaseDynamicInlineAdmin -from mezzanine.core.fields import RichTextField, MultiChoiceField +from mezzanine.core.fields import MultiChoiceField, RichTextField from mezzanine.core.managers import DisplayableManager +from mezzanine.core.middleware import FetchFromCacheMiddleware from mezzanine.core.models import CONTENT_STATUS_DRAFT, CONTENT_STATUS_PUBLISHED +from mezzanine.core.templatetags.mezzanine_tags import initialize_nevercache from mezzanine.forms.admin import FieldAdmin from mezzanine.forms.models import Form from mezzanine.pages.models import Page, RichTextPage +from mezzanine.utils.cache import cache_installed from mezzanine.utils.deprecation import ( get_middleware_setting, get_middleware_setting_name, ) +from mezzanine.utils.html import TagCloser, escape from mezzanine.utils.importing import import_dotted_path +from mezzanine.utils.sites import current_site_id, override_current_site_id from mezzanine.utils.tests import TestCase -from mezzanine.utils.html import TagCloser, escape +from mezzanine.utils.urls import admin_url class CoreTests(TestCase): diff --git a/tests/test_forms.py b/tests/test_forms.py index 7a6506aa61..190ee18592 100644 --- a/tests/test_forms.py +++ b/tests/test_forms.py @@ -1,7 +1,8 @@ from unittest import skipUnless -from django.template import RequestContext from django import forms +from django.template import RequestContext + from mezzanine.conf import settings from mezzanine.core.models import CONTENT_STATUS_PUBLISHED from mezzanine.forms import fields @@ -42,8 +43,10 @@ def test_submit_button_text(self): being translated back to the default language. """ from collections import OrderedDict + from django.urls import reverse - from django.utils.translation import get_language, activate, ugettext as _ + from django.utils.translation import activate, get_language + from django.utils.translation import ugettext as _ from modeltranslation.utils import auto_populate default_language = get_language() diff --git a/tests/test_galleries.py b/tests/test_galleries.py index 5f627e2e53..8a8afc4306 100644 --- a/tests/test_galleries.py +++ b/tests/test_galleries.py @@ -4,7 +4,7 @@ from mezzanine.conf import settings from mezzanine.core.templatetags.mezzanine_tags import thumbnail -from mezzanine.galleries.models import Gallery, GALLERIES_UPLOAD_DIR +from mezzanine.galleries.models import GALLERIES_UPLOAD_DIR, Gallery from mezzanine.utils.tests import TestCase, copy_test_to_media diff --git a/tests/test_generic.py b/tests/test_generic.py index 40cd517c9d..7ecd4f448a 100644 --- a/tests/test_generic.py +++ b/tests/test_generic.py @@ -1,16 +1,13 @@ -from django.template import Context -from django.template import Template - from unittest import skipUnless from django.contrib.contenttypes.models import ContentType +from django.template import Context, Template from django.urls import reverse from mezzanine.blog.models import BlogPost from mezzanine.conf import settings - from mezzanine.core.models import CONTENT_STATUS_PUBLISHED -from mezzanine.generic.forms import RatingForm, KeywordsWidget +from mezzanine.generic.forms import KeywordsWidget, RatingForm from mezzanine.generic.models import AssignedKeyword, Keyword, ThreadedComment from mezzanine.generic.views import comment from mezzanine.pages.models import RichTextPage diff --git a/tests/test_pages.py b/tests/test_pages.py index 6389f58392..b46c01faf1 100644 --- a/tests/test_pages.py +++ b/tests/test_pages.py @@ -1,10 +1,10 @@ -from django.contrib.sites.models import Site - from unittest import skipUnless + from django.apps import apps -from django.core.checks import Warning from django.contrib.auth import get_user_model from django.contrib.auth.models import AnonymousUser +from django.contrib.sites.models import Site +from django.core.checks import Warning from django.db import connection from django.http import HttpResponse from django.shortcuts import resolve_url @@ -17,15 +17,14 @@ from mezzanine.conf import settings from mezzanine.core.models import CONTENT_STATUS_PUBLISHED from mezzanine.core.request import current_request -from mezzanine.pages.models import Page, RichTextPage from mezzanine.pages.admin import PageAdminForm -from mezzanine.pages.fields import MenusField from mezzanine.pages.checks import check_context_processor +from mezzanine.pages.fields import MenusField +from mezzanine.pages.models import Page, RichTextPage from mezzanine.urls import PAGES_SLUG from mezzanine.utils.sites import override_current_site_id from mezzanine.utils.tests import TestCase - User = get_user_model() @@ -430,7 +429,9 @@ def test_page_slug_has_correct_lang(self): not the active one. """ from collections import OrderedDict - from django.utils.translation import get_language, activate + + from django.utils.translation import activate, get_language + from mezzanine.utils.urls import slugify default_language = get_language() diff --git a/tox.ini b/tox.ini index 7bca795de5..c7ae2c6f0b 100644 --- a/tox.ini +++ b/tox.ini @@ -2,9 +2,8 @@ skip_missing_interpreters = true envlist = py{36,37,38,39}-dj{22,30,31,32} - flake8 - black package + lint [testenv] # Run test suite @@ -31,24 +30,22 @@ commands = twine check "{envtmpdir}/dist/*" check-manifest --ignore-bad-ideas '*.mo' {toxinidir} -[testenv:format] -# This env is not run by default. It's provided here for you -# to easily autoformat code by running `tox -e format` -skip_install = true -deps = .[codestyle] -commands = black . - -[testenv:black] -# Lint with black +[testenv:lint] skip_install = true deps = .[codestyle] -commands = black . --check +commands = + isort --diff --atomic . + black --check . + flake8 . -[testenv:flake8] -# Lint with flake8 +[testenv:format] +# This env is not run by default. It's provided here for you to easily +# autoformat code by running `tox -e format` skip_install = true deps = .[codestyle] -commands = flake8 . +commands = + isort --atomic . + black . [flake8] # Configured to match black From 91785984e061d328bc3d4d8fdd2e933741746d16 Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Mon, 31 May 2021 17:52:47 -0600 Subject: [PATCH 042/101] style: pyupgrade --py36-plus --- .github/workflows/main.yml | 2 +- docs/conf.py | 1 - docs/docs_settings.py | 2 +- mezzanine/accounts/admin.py | 2 +- mezzanine/accounts/forms.py | 6 +- mezzanine/accounts/urls.py | 22 +- .../management/commands/mezzanine_project.py | 6 +- mezzanine/blog/feeds.py | 8 +- mezzanine/blog/forms.py | 2 +- mezzanine/blog/management/base.py | 2 +- .../management/commands/import_blogger.py | 2 +- .../blog/management/commands/import_blogml.py | 8 +- .../management/commands/import_posterous.py | 4 +- .../blog/management/commands/import_rss.py | 2 +- .../blog/management/commands/import_tumblr.py | 8 +- .../management/commands/import_wordpress.py | 4 +- mezzanine/blog/migrations/0001_initial.py | 208 +++++++++++++---- .../migrations/0002_auto_20150527_1555.py | 15 +- .../migrations/0003_auto_20170411_0504.py | 27 ++- mezzanine/blog/views.py | 6 +- mezzanine/boot/lazy_admin.py | 6 +- mezzanine/conf/__init__.py | 4 +- mezzanine/conf/admin.py | 4 +- mezzanine/conf/context_processors.py | 12 +- mezzanine/conf/forms.py | 4 +- mezzanine/conf/migrations/0001_initial.py | 32 ++- mezzanine/conf/models.py | 2 +- mezzanine/core/admin.py | 32 +-- mezzanine/core/fields.py | 10 +- mezzanine/core/forms.py | 24 +- .../management/commands/collecttemplates.py | 4 +- .../core/management/commands/runserver.py | 10 +- mezzanine/core/managers.py | 12 +- mezzanine/core/middleware.py | 12 +- mezzanine/core/migrations/0001_initial.py | 37 ++- .../migrations/0002_auto_20150414_2140.py | 14 +- mezzanine/core/models.py | 18 +- mezzanine/core/sitemaps.py | 2 +- mezzanine/core/templatetags/mezzanine_tags.py | 20 +- mezzanine/core/views.py | 6 +- mezzanine/forms/admin.py | 6 +- mezzanine/forms/fields.py | 2 +- mezzanine/forms/forms.py | 8 +- mezzanine/forms/migrations/0001_initial.py | 215 ++++++++++++++---- .../migrations/0002_auto_20141227_0224.py | 9 +- mezzanine/forms/migrations/0003_emailfield.py | 14 +- .../migrations/0004_auto_20150517_0510.py | 11 +- .../migrations/0005_auto_20151026_1600.py | 11 +- .../migrations/0006_auto_20170425_2225.py | 15 +- mezzanine/forms/page_processors.py | 4 +- .../galleries/migrations/0001_initial.py | 83 +++++-- .../migrations/0002_auto_20141227_0224.py | 9 +- mezzanine/galleries/models.py | 12 +- mezzanine/generic/fields.py | 14 +- mezzanine/generic/forms.py | 10 +- mezzanine/generic/migrations/0001_initial.py | 168 ++++++++++---- .../migrations/0002_auto_20141227_0224.py | 9 +- .../migrations/0003_auto_20170411_0504.py | 15 +- mezzanine/generic/models.py | 8 +- mezzanine/generic/templatetags/disqus_tags.py | 6 +- mezzanine/generic/templatetags/rating_tags.py | 4 +- mezzanine/generic/views.py | 11 +- mezzanine/pages/admin.py | 22 +- mezzanine/pages/fields.py | 2 +- mezzanine/pages/managers.py | 2 +- mezzanine/pages/middleware.py | 4 +- mezzanine/pages/migrations/0001_initial.py | 211 +++++++++++++---- .../migrations/0002_auto_20141227_0224.py | 17 +- .../migrations/0003_auto_20150527_1555.py | 15 +- .../migrations/0004_auto_20170411_0504.py | 15 +- mezzanine/pages/models.py | 8 +- mezzanine/pages/views.py | 12 +- mezzanine/project_template/fabfile.py | 36 +-- mezzanine/twitter/admin.py | 10 +- .../management/commands/poll_twitter.py | 2 +- mezzanine/twitter/migrations/0001_initial.py | 127 ++++++++--- mezzanine/twitter/models.py | 4 +- mezzanine/utils/admin.py | 6 +- mezzanine/utils/cache.py | 2 +- mezzanine/utils/conf.py | 2 +- mezzanine/utils/deprecation.py | 2 +- mezzanine/utils/docs.py | 12 +- mezzanine/utils/email.py | 4 +- mezzanine/utils/html.py | 2 +- mezzanine/utils/importing.py | 2 +- mezzanine/utils/models.py | 4 +- mezzanine/utils/urls.py | 4 +- mezzanine/utils/views.py | 2 +- pyproject.toml | 3 - setup.cfg | 1 + tests/test_conf.py | 6 +- tests/test_core.py | 6 +- tests/test_forms.py | 2 +- tests/test_generic.py | 4 +- tests/test_pages.py | 8 +- tox.ini | 10 + 96 files changed, 1231 insertions(+), 584 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3cb703cd17..467c2c30cf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -42,7 +42,7 @@ jobs: - name: Install dependencies run: pip install tox -U pip - name: Lint - run: tox -e package -e lint + run: tox -e package -e lint -e pyupgrade # Create a new semantic release release: diff --git a/docs/conf.py b/docs/conf.py index 6cd8b0885f..b1aea3c7d7 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # # Mezzanine documentation build configuration file, created by # sphinx-quickstart on Wed Mar 10 07:20:42 2010. diff --git a/docs/docs_settings.py b/docs/docs_settings.py index 6fe77b752a..e309dcb0b7 100644 --- a/docs/docs_settings.py +++ b/docs/docs_settings.py @@ -13,7 +13,7 @@ characters = "abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)" # Generate a SECRET_KEY for this build -SECRET_KEY = "".join([choice(characters) for i in range(50)]) +SECRET_KEY = "".join(choice(characters) for i in range(50)) if "mezzanine.accounts" not in INSTALLED_APPS: INSTALLED_APPS = tuple(INSTALLED_APPS) + ("mezzanine.accounts",) diff --git a/mezzanine/accounts/admin.py b/mezzanine/accounts/admin.py index 54591bb4e0..d653ddbda3 100644 --- a/mezzanine/accounts/admin.py +++ b/mezzanine/accounts/admin.py @@ -36,7 +36,7 @@ def save_model(self, request, obj, form, change): must_send_verification_mail_after_save = True else: send_approved_mail(request, obj) - super(UserProfileAdmin, self).save_model(request, obj, form, change) + super().save_model(request, obj, form, change) if must_send_verification_mail_after_save: user = User.objects.get(id=obj.id) send_verification_mail(request, user, "signup_verify") diff --git a/mezzanine/accounts/forms.py b/mezzanine/accounts/forms.py index d0edb61f93..0bbcfaa269 100644 --- a/mezzanine/accounts/forms.py +++ b/mezzanine/accounts/forms.py @@ -94,9 +94,9 @@ class Meta: exclude = _exclude_fields def __init__(self, *args, **kwargs): - super(ProfileForm, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) self._signup = self.instance.id is None - user_fields = set([f.name for f in User._meta.get_fields()]) + user_fields = {f.name for f in User._meta.get_fields()} try: self.fields["username"].help_text = ugettext( "Only letters, numbers, dashes or underscores please" @@ -197,7 +197,7 @@ def save(self, *args, **kwargs): """ kwargs["commit"] = False - user = super(ProfileForm, self).save(*args, **kwargs) + user = super().save(*args, **kwargs) try: self.cleaned_data["username"] except KeyError: diff --git a/mezzanine/accounts/urls.py b/mezzanine/accounts/urls.py index d04f20267f..81f3de7d1d 100644 --- a/mezzanine/accounts/urls.py +++ b/mezzanine/accounts/urls.py @@ -28,31 +28,33 @@ _slash = "/" if settings.APPEND_SLASH else "" urlpatterns = [ - url(r"^%s%s$" % (LOGIN_URL.strip("/"), _slash), views.login, name="login"), - url(r"^%s%s$" % (LOGOUT_URL.strip("/"), _slash), views.logout, name="logout"), - url(r"^%s%s$" % (SIGNUP_URL.strip("/"), _slash), views.signup, name="signup"), + url(r"^{}{}$".format(LOGIN_URL.strip("/"), _slash), views.login, name="login"), + url(r"^{}{}$".format(LOGOUT_URL.strip("/"), _slash), views.logout, name="logout"), + url(r"^{}{}$".format(SIGNUP_URL.strip("/"), _slash), views.signup, name="signup"), url( - r"^%s%s%s$" % (SIGNUP_VERIFY_URL.strip("/"), _verify_pattern, _slash), + r"^{}{}{}$".format(SIGNUP_VERIFY_URL.strip("/"), _verify_pattern, _slash), views.signup_verify, name="signup_verify", ), url( - r"^%s%s$" % (PROFILE_UPDATE_URL.strip("/"), _slash), + r"^{}{}$".format(PROFILE_UPDATE_URL.strip("/"), _slash), views.profile_update, name="profile_update", ), url( - r"^%s%s$" % (PASSWORD_RESET_URL.strip("/"), _slash), + r"^{}{}$".format(PASSWORD_RESET_URL.strip("/"), _slash), views.password_reset, name="mezzanine_password_reset", ), url( - r"^%s%s%s$" % (PASSWORD_RESET_VERIFY_URL.strip("/"), _verify_pattern, _slash), + r"^{}{}{}$".format( + PASSWORD_RESET_VERIFY_URL.strip("/"), _verify_pattern, _slash + ), views.password_reset_verify, name="password_reset_verify", ), url( - r"^%s%s$" % (ACCOUNT_URL.strip("/"), _slash), + r"^{}{}$".format(ACCOUNT_URL.strip("/"), _slash), views.account_redirect, name="account_redirect", ), @@ -61,12 +63,12 @@ if settings.ACCOUNTS_PROFILE_VIEWS_ENABLED: urlpatterns += [ url( - r"^%s%s$" % (PROFILE_URL.strip("/"), _slash), + r"^{}{}$".format(PROFILE_URL.strip("/"), _slash), views.profile_redirect, name="profile_redirect", ), url( - r"^%s/(?P.*)%s$" % (PROFILE_URL.strip("/"), _slash), + r"^{}/(?P.*){}$".format(PROFILE_URL.strip("/"), _slash), views.profile, name="profile", ), diff --git a/mezzanine/bin/management/commands/mezzanine_project.py b/mezzanine/bin/management/commands/mezzanine_project.py index a1d33fa9b7..b873cd6b38 100644 --- a/mezzanine/bin/management/commands/mezzanine_project.py +++ b/mezzanine/bin/management/commands/mezzanine_project.py @@ -16,7 +16,7 @@ class Command(BaseCommand): help = BaseCommand.help.replace("Django", "Mezzanine") def add_arguments(self, parser): - super(Command, self).add_arguments(parser) + super().add_arguments(parser) parser.add_argument( "-a", "--alternate", @@ -35,7 +35,7 @@ def handle(self, *args, **options): # Indicate that local_settings.py.template should be rendered options["files"].append("local_settings.py.template") - super(Command, self).handle(*args, **options) + super().handle(*args, **options) target = options.get("target", None) name = options["name"] @@ -98,4 +98,4 @@ def handle_template(self, template, subdir): """ if template is None: return str(os.path.join(mezzanine.__path__[0], subdir)) - return super(Command, self).handle_template(template, subdir) + return super().handle_template(template, subdir) diff --git a/mezzanine/blog/feeds.py b/mezzanine/blog/feeds.py index 0673418016..2d8d0957ca 100644 --- a/mezzanine/blog/feeds.py +++ b/mezzanine/blog/feeds.py @@ -37,7 +37,7 @@ def __init__(self, *args, **kwargs): self.tag = kwargs.pop("tag", None) self.category = kwargs.pop("category", None) self.username = kwargs.pop("username", None) - super(PostsRSS, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) self._public = True page = None if "mezzanine.pages" in settings.INSTALLED_APPS: @@ -51,7 +51,7 @@ def __init__(self, *args, **kwargs): self._public = not page.login_required if self._public: if page is not None: - self._title = "%s | %s" % (page.title, settings.SITE_TITLE) + self._title = f"{page.title} | {settings.SITE_TITLE}" self._description = strip_tags(page.description) else: self._title = settings.SITE_TITLE @@ -60,7 +60,7 @@ def __init__(self, *args, **kwargs): def __call__(self, *args, **kwarg): self._request = current_request() self._site = Site.objects.get(id=current_site_id()) - return super(PostsRSS, self).__call__(*args, **kwarg) + return super().__call__(*args, **kwarg) def add_domain(self, link): return add_domain(self._site.domain, link, self._request.is_secure()) @@ -112,7 +112,7 @@ def feed_url(self): return self.add_domain(self._request.path) def item_link(self, item): - return self.add_domain(super(PostsRSS, self).item_link(item)) + return self.add_domain(super().item_link(item)) def item_author_name(self, item): return item.user.get_full_name() or item.user.username diff --git a/mezzanine/blog/forms.py b/mezzanine/blog/forms.py index a0233dd231..231d3b0c4d 100644 --- a/mezzanine/blog/forms.py +++ b/mezzanine/blog/forms.py @@ -25,6 +25,6 @@ def __init__(self): for field in hidden_field_defaults: initial[field] = BlogPost._meta.get_field(field).default initial["status"] = CONTENT_STATUS_DRAFT - super(BlogPostForm, self).__init__(initial=initial) + super().__init__(initial=initial) for field in hidden_field_defaults: self.fields[field].widget = forms.HiddenInput() diff --git a/mezzanine/blog/management/base.py b/mezzanine/blog/management/base.py index d8ed4ec4aa..886823c629 100644 --- a/mezzanine/blog/management/base.py +++ b/mezzanine/blog/management/base.py @@ -57,7 +57,7 @@ def add_arguments(self, parser): def __init__(self, **kwargs): self.posts = [] self.pages = [] - super(BaseImporterCommand, self).__init__(**kwargs) + super().__init__(**kwargs) def add_post( self, diff --git a/mezzanine/blog/management/commands/import_blogger.py b/mezzanine/blog/management/commands/import_blogger.py index fb0b6b5611..b08bb5e1b6 100644 --- a/mezzanine/blog/management/commands/import_blogger.py +++ b/mezzanine/blog/management/commands/import_blogger.py @@ -15,7 +15,7 @@ class Command(BaseImporterCommand): """ def add_arguments(self, parser): - super(Command, self).add_arguments(parser) + super().add_arguments(parser) parser.add_argument( "-b", "--blogger-id", diff --git a/mezzanine/blog/management/commands/import_blogml.py b/mezzanine/blog/management/commands/import_blogml.py index d2058193e5..3ce1a7e7ed 100644 --- a/mezzanine/blog/management/commands/import_blogml.py +++ b/mezzanine/blog/management/commands/import_blogml.py @@ -18,7 +18,7 @@ class Command(BaseImporterCommand): """ def add_arguments(self, parser): - super(Command, self).add_arguments(parser) + super().add_arguments(parser) parser.add_argument( "-x", "--xmldumpfname", @@ -69,7 +69,7 @@ def _process_post_element(post_element, blog_categories): ) ] post_dict["categories"] = list( - (blog_categories[category_id] for category_id in post_category_refs) + blog_categories[category_id] for category_id in post_category_refs ) post_dict["tags"] = [ x.attrib["ref"] @@ -100,9 +100,9 @@ def _process_categories(root_tree): cat_elements = root_tree.findall( search_paths["find_categories"], namespaces=ns ) - cat_ids = tuple((x.attrib["id"] for x in cat_elements)) + cat_ids = tuple(x.attrib["id"] for x in cat_elements) cat_title_txt = tuple( - (x.find("blogml:title", namespaces=ns).text for x in cat_elements) + x.find("blogml:title", namespaces=ns).text for x in cat_elements ) categories_dict = dict(zip(cat_ids, cat_title_txt)) return categories_dict diff --git a/mezzanine/blog/management/commands/import_posterous.py b/mezzanine/blog/management/commands/import_posterous.py index 13763b23e6..14d1e99cbd 100644 --- a/mezzanine/blog/management/commands/import_posterous.py +++ b/mezzanine/blog/management/commands/import_posterous.py @@ -13,7 +13,7 @@ class Command(BaseImporterCommand): """ def add_arguments(self, parser): - super(Command, self).add_arguments(parser) + super().add_arguments(parser) parser.add_argument( "-a", "--api-token", dest="api_token", help="Posterous API Key" ) @@ -97,7 +97,7 @@ def handle_import(self, options): ) if not post["comments_count"]: continue - path = "sites/%s/posts/%s/comments" % (site["id"], post["id"]) + path = "sites/{}/posts/{}/comments".format(site["id"], post["id"]) time.sleep(2) comments = self.request(path) for comment in comments: diff --git a/mezzanine/blog/management/commands/import_rss.py b/mezzanine/blog/management/commands/import_rss.py index 049862d141..b88715393b 100644 --- a/mezzanine/blog/management/commands/import_rss.py +++ b/mezzanine/blog/management/commands/import_rss.py @@ -14,7 +14,7 @@ class Command(BaseImporterCommand): """ def add_arguments(self, parser): - super(Command, self).add_arguments(parser) + super().add_arguments(parser) parser.add_argument("-r", "--rss-url", dest="rss_url", help="RSS feed URL") parser.add_argument( "-p", diff --git a/mezzanine/blog/management/commands/import_tumblr.py b/mezzanine/blog/management/commands/import_tumblr.py index fcb7449b91..e94c650fdf 100644 --- a/mezzanine/blog/management/commands/import_tumblr.py +++ b/mezzanine/blog/management/commands/import_tumblr.py @@ -30,7 +30,7 @@ class Command(BaseImporterCommand): """ def add_arguments(self, parser): - super(Command, self).add_arguments(parser) + super().add_arguments(parser) parser.add_argument( "-t", "--tumblr-user", dest="tumblr_user", help="Tumblr username" ) @@ -51,7 +51,7 @@ def handle_import(self, options): while True: retries = MAX_RETRIES_PER_CALL try: - call_url = "%s?start=%s" % (json_url, start_index) + call_url = f"{json_url}?start={start_index}" if verbosity >= 2: print("Calling %s" % call_url) response = urlopen(call_url) @@ -67,8 +67,8 @@ def handle_import(self, options): sleep(3) continue elif response.code != 200: - raise IOError("HTTP status %s" % response.code) - except IOError as e: + raise OSError("HTTP status %s" % response.code) + except OSError as e: error = "Error communicating with Tumblr API (%s)" % e raise CommandError(error) diff --git a/mezzanine/blog/management/commands/import_wordpress.py b/mezzanine/blog/management/commands/import_wordpress.py index 4eac9daaaf..b38b6a49a2 100644 --- a/mezzanine/blog/management/commands/import_wordpress.py +++ b/mezzanine/blog/management/commands/import_wordpress.py @@ -18,7 +18,7 @@ class Command(BaseImporterCommand): """ def add_arguments(self, parser): - super(Command, self).add_arguments(parser) + super().add_arguments(parser) parser.add_argument("-u", "--url", dest="url", help="URL to import file") def get_text(self, xml, name): @@ -27,7 +27,7 @@ def get_text(self, xml, name): """ nodes = xml.getElementsByTagName("wp:comment_" + name)[0].childNodes accepted_types = [Node.CDATA_SECTION_NODE, Node.TEXT_NODE] - return "".join([n.data for n in nodes if n.nodeType in accepted_types]) + return "".join(n.data for n in nodes if n.nodeType in accepted_types) def handle_import(self, options): """ diff --git a/mezzanine/blog/migrations/0001_initial.py b/mezzanine/blog/migrations/0001_initial.py index fab369f202..82fe72fef5 100644 --- a/mezzanine/blog/migrations/0001_initial.py +++ b/mezzanine/blog/migrations/0001_initial.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from django.conf import settings from django.db import migrations, models @@ -9,59 +8,190 @@ class Migration(migrations.Migration): dependencies = [ - ('sites', '0001_initial'), + ("sites", "0001_initial"), migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ migrations.CreateModel( - name='BlogCategory', + name="BlogCategory", fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('title', models.CharField(max_length=500, verbose_name='Title')), - ('slug', models.CharField(help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, null=True, verbose_name='URL', blank=True)), - ('site', models.ForeignKey(editable=False, to='sites.Site', on_delete=models.CASCADE)), + ( + "id", + models.AutoField( + verbose_name="ID", + serialize=False, + auto_created=True, + primary_key=True, + ), + ), + ("title", models.CharField(max_length=500, verbose_name="Title")), + ( + "slug", + models.CharField( + help_text="Leave blank to have the URL auto-generated from the title.", + max_length=2000, + null=True, + verbose_name="URL", + blank=True, + ), + ), + ( + "site", + models.ForeignKey( + editable=False, to="sites.Site", on_delete=models.CASCADE + ), + ), ], options={ - 'ordering': ('title',), - 'verbose_name': 'Blog Category', - 'verbose_name_plural': 'Blog Categories', + "ordering": ("title",), + "verbose_name": "Blog Category", + "verbose_name_plural": "Blog Categories", }, bases=(models.Model,), ), migrations.CreateModel( - name='BlogPost', + name="BlogPost", fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('comments_count', models.IntegerField(default=0, editable=False)), - ('keywords_string', models.CharField(max_length=500, editable=False, blank=True)), - ('rating_count', models.IntegerField(default=0, editable=False)), - ('rating_sum', models.IntegerField(default=0, editable=False)), - ('rating_average', models.FloatField(default=0, editable=False)), - ('title', models.CharField(max_length=500, verbose_name='Title')), - ('slug', models.CharField(help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, null=True, verbose_name='URL', blank=True)), - ('_meta_title', models.CharField(help_text='Optional title to be used in the HTML title tag. If left blank, the main title field will be used.', max_length=500, null=True, verbose_name='Title', blank=True)), - ('description', models.TextField(verbose_name='Description', blank=True)), - ('gen_description', models.BooleanField(default=True, help_text='If checked, the description will be automatically generated from content. Uncheck if you want to manually set a custom description.', verbose_name='Generate description')), - ('created', models.DateTimeField(null=True, editable=False)), - ('updated', models.DateTimeField(null=True, editable=False)), - ('status', models.IntegerField(default=2, help_text='With Draft chosen, will only be shown for admin users on the site.', verbose_name='Status', choices=[(1, 'Draft'), (2, 'Published')])), - ('publish_date', models.DateTimeField(help_text="With Published chosen, won't be shown until this time", null=True, verbose_name='Published from', blank=True)), - ('expiry_date', models.DateTimeField(help_text="With Published chosen, won't be shown after this time", null=True, verbose_name='Expires on', blank=True)), - ('short_url', models.URLField(null=True, blank=True)), - ('in_sitemap', models.BooleanField(default=True, verbose_name='Show in sitemap')), - ('content', mezzanine.core.fields.RichTextField(verbose_name='Content')), - ('allow_comments', models.BooleanField(default=True, verbose_name='Allow comments')), - ('featured_image', mezzanine.core.fields.FileField(max_length=255, null=True, verbose_name='Featured Image', blank=True)), - ('categories', models.ManyToManyField(related_name='blogposts', verbose_name='Categories', to='blog.BlogCategory', blank=True)), - ('related_posts', models.ManyToManyField(related_name='related_posts_rel_+', verbose_name='Related posts', to='blog.BlogPost', blank=True)), - ('site', models.ForeignKey(editable=False, to='sites.Site', on_delete=models.CASCADE)), - ('user', models.ForeignKey(related_name='blogposts', verbose_name='Author', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)), + ( + "id", + models.AutoField( + verbose_name="ID", + serialize=False, + auto_created=True, + primary_key=True, + ), + ), + ("comments_count", models.IntegerField(default=0, editable=False)), + ( + "keywords_string", + models.CharField(max_length=500, editable=False, blank=True), + ), + ("rating_count", models.IntegerField(default=0, editable=False)), + ("rating_sum", models.IntegerField(default=0, editable=False)), + ("rating_average", models.FloatField(default=0, editable=False)), + ("title", models.CharField(max_length=500, verbose_name="Title")), + ( + "slug", + models.CharField( + help_text="Leave blank to have the URL auto-generated from the title.", + max_length=2000, + null=True, + verbose_name="URL", + blank=True, + ), + ), + ( + "_meta_title", + models.CharField( + help_text="Optional title to be used in the HTML title tag. If left blank, the main title field will be used.", + max_length=500, + null=True, + verbose_name="Title", + blank=True, + ), + ), + ( + "description", + models.TextField(verbose_name="Description", blank=True), + ), + ( + "gen_description", + models.BooleanField( + default=True, + help_text="If checked, the description will be automatically generated from content. Uncheck if you want to manually set a custom description.", + verbose_name="Generate description", + ), + ), + ("created", models.DateTimeField(null=True, editable=False)), + ("updated", models.DateTimeField(null=True, editable=False)), + ( + "status", + models.IntegerField( + default=2, + help_text="With Draft chosen, will only be shown for admin users on the site.", + verbose_name="Status", + choices=[(1, "Draft"), (2, "Published")], + ), + ), + ( + "publish_date", + models.DateTimeField( + help_text="With Published chosen, won't be shown until this time", + null=True, + verbose_name="Published from", + blank=True, + ), + ), + ( + "expiry_date", + models.DateTimeField( + help_text="With Published chosen, won't be shown after this time", + null=True, + verbose_name="Expires on", + blank=True, + ), + ), + ("short_url", models.URLField(null=True, blank=True)), + ( + "in_sitemap", + models.BooleanField(default=True, verbose_name="Show in sitemap"), + ), + ( + "content", + mezzanine.core.fields.RichTextField(verbose_name="Content"), + ), + ( + "allow_comments", + models.BooleanField(default=True, verbose_name="Allow comments"), + ), + ( + "featured_image", + mezzanine.core.fields.FileField( + max_length=255, + null=True, + verbose_name="Featured Image", + blank=True, + ), + ), + ( + "categories", + models.ManyToManyField( + related_name="blogposts", + verbose_name="Categories", + to="blog.BlogCategory", + blank=True, + ), + ), + ( + "related_posts", + models.ManyToManyField( + related_name="related_posts_rel_+", + verbose_name="Related posts", + to="blog.BlogPost", + blank=True, + ), + ), + ( + "site", + models.ForeignKey( + editable=False, to="sites.Site", on_delete=models.CASCADE + ), + ), + ( + "user", + models.ForeignKey( + related_name="blogposts", + verbose_name="Author", + to=settings.AUTH_USER_MODEL, + on_delete=models.CASCADE, + ), + ), ], options={ - 'ordering': ('-publish_date',), - 'verbose_name': 'Blog post', - 'verbose_name_plural': 'Blog posts', + "ordering": ("-publish_date",), + "verbose_name": "Blog post", + "verbose_name_plural": "Blog posts", }, bases=(models.Model, mezzanine.utils.models.AdminThumbMixin), ), diff --git a/mezzanine/blog/migrations/0002_auto_20150527_1555.py b/mezzanine/blog/migrations/0002_auto_20150527_1555.py index 45eed9c527..30eb7e24e1 100644 --- a/mezzanine/blog/migrations/0002_auto_20150527_1555.py +++ b/mezzanine/blog/migrations/0002_auto_20150527_1555.py @@ -1,17 +1,22 @@ -# -*- coding: utf-8 -*- from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('blog', '0001_initial'), + ("blog", "0001_initial"), ] operations = [ migrations.AlterField( - model_name='blogpost', - name='publish_date', - field=models.DateTimeField(help_text="With Published chosen, won't be shown until this time", null=True, verbose_name='Published from', db_index=True, blank=True), + model_name="blogpost", + name="publish_date", + field=models.DateTimeField( + help_text="With Published chosen, won't be shown until this time", + null=True, + verbose_name="Published from", + db_index=True, + blank=True, + ), ), ] diff --git a/mezzanine/blog/migrations/0003_auto_20170411_0504.py b/mezzanine/blog/migrations/0003_auto_20170411_0504.py index ca8683a61a..399c2623ac 100644 --- a/mezzanine/blog/migrations/0003_auto_20170411_0504.py +++ b/mezzanine/blog/migrations/0003_auto_20170411_0504.py @@ -1,24 +1,35 @@ -# -*- coding: utf-8 -*- from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('blog', '0002_auto_20150527_1555'), + ("blog", "0002_auto_20150527_1555"), ] operations = [ migrations.AlterField( - model_name='blogcategory', - name='slug', - field=models.CharField(blank=True, default='', help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, verbose_name='URL'), + model_name="blogcategory", + name="slug", + field=models.CharField( + blank=True, + default="", + help_text="Leave blank to have the URL auto-generated from the title.", + max_length=2000, + verbose_name="URL", + ), preserve_default=False, ), migrations.AlterField( - model_name='blogpost', - name='slug', - field=models.CharField(blank=True, default='', help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, verbose_name='URL'), + model_name="blogpost", + name="slug", + field=models.CharField( + blank=True, + default="", + help_text="Leave blank to have the URL auto-generated from the title.", + max_length=2000, + verbose_name="URL", + ), preserve_default=False, ), ] diff --git a/mezzanine/blog/views.py b/mezzanine/blog/views.py index b2ebbf0467..c07fbe7900 100644 --- a/mezzanine/blog/views.py +++ b/mezzanine/blog/views.py @@ -47,12 +47,12 @@ def blog_post_list( if category is not None: category = get_object_or_404(BlogCategory, slug=category) blog_posts = blog_posts.filter(categories=category) - templates.append(u"blog/blog_post_list_%s.html" % str(category.slug)) + templates.append("blog/blog_post_list_%s.html" % str(category.slug)) author = None if username is not None: author = get_object_or_404(User, username=username) blog_posts = blog_posts.filter(user=author) - templates.append(u"blog/blog_post_list_%s.html" % username) + templates.append("blog/blog_post_list_%s.html" % username) prefetch = ("categories", "keywords__keyword") blog_posts = blog_posts.select_related("user").prefetch_related(*prefetch) @@ -97,7 +97,7 @@ def blog_post_detail( "related_posts": related_posts, } context.update(extra_context or {}) - templates = [u"blog/blog_post_detail_%s.html" % str(slug), template] + templates = ["blog/blog_post_detail_%s.html" % str(slug), template] return TemplateResponse(request, templates, context) diff --git a/mezzanine/boot/lazy_admin.py b/mezzanine/boot/lazy_admin.py index ff16fc7d8e..74bbb18e55 100644 --- a/mezzanine/boot/lazy_admin.py +++ b/mezzanine/boot/lazy_admin.py @@ -17,7 +17,7 @@ class LazyAdminSite(AdminSite): def __init__(self, *args, **kwargs): self._deferred = [] - super(LazyAdminSite, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) def register(self, *args, **kwargs): for name, deferred_args, deferred_kwargs in self._deferred: @@ -25,7 +25,7 @@ def register(self, *args, **kwargs): self._deferred.append(("register", args, kwargs)) break else: - super(LazyAdminSite, self).register(*args, **kwargs) + super().register(*args, **kwargs) def unregister(self, *args, **kwargs): self._deferred.append(("unregister", args, kwargs)) @@ -57,7 +57,7 @@ def lazy_registration(self): @property def urls(self): - urls = [url(r"", super(LazyAdminSite, self).urls)] + urls = [url(r"", super().urls)] # Filebrowser admin media library. fb_name = getattr(settings, "PACKAGE_NAME_FILEBROWSER", "") diff --git a/mezzanine/conf/__init__.py b/mezzanine/conf/__init__.py index 3268b562be..2cc1c1c26a 100644 --- a/mezzanine/conf/__init__.py +++ b/mezzanine/conf/__init__.py @@ -86,7 +86,7 @@ def register_setting( } -class Settings(object): +class Settings: """ An object that provides settings via dynamic attribute access. @@ -104,7 +104,7 @@ class Settings(object): of access for all settings. """ - class Placeholder(object): + class Placeholder: """A Weakly-referable wrapper of ``object``.""" pass diff --git a/mezzanine/conf/admin.py b/mezzanine/conf/admin.py index 22d1ddc0d0..456ba20fc6 100644 --- a/mezzanine/conf/admin.py +++ b/mezzanine/conf/admin.py @@ -51,11 +51,11 @@ def changelist_view(self, request, extra_context=None): info(request, _("Settings were successfully updated.")) return self.changelist_redirect() extra_context["settings_form"] = settings_form - extra_context["title"] = u"%s %s" % ( + extra_context["title"] = "{} {}".format( _("Change"), force_text(Setting._meta.verbose_name_plural), ) - return super(SettingsAdmin, self).changelist_view(request, extra_context) + return super().changelist_view(request, extra_context) admin.site.register(Setting, SettingsAdmin) diff --git a/mezzanine/conf/context_processors.py b/mezzanine/conf/context_processors.py index 0065908078..4d653c2caa 100644 --- a/mezzanine/conf/context_processors.py +++ b/mezzanine/conf/context_processors.py @@ -16,7 +16,7 @@ class TemplateSettings(dict): """ def __init__(self, settings, allowed_settings, *args, **kwargs): - super(TemplateSettings, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) self.settings = settings self.allowed_settings = set(allowed_settings) @@ -38,19 +38,19 @@ def __getitem__(self, k): try: return getattr(self.settings, k) except AttributeError: - return super(TemplateSettings, self).__getitem__(k) + return super().__getitem__(k) def __setitem__(self, k, v): self.allowed_settings.add(k) - super(TemplateSettings, self).__setitem__(k, v) + super().__setitem__(k, v) def __repr__(self): return repr( - dict( - (k, self[k]) + { + k: self[k] for k in self.allowed_settings if hasattr(self.settings, k) or k in self - ) + } ) def __str__(self): diff --git a/mezzanine/conf/forms.py b/mezzanine/conf/forms.py index a760e34b38..ee59d4e357 100644 --- a/mezzanine/conf/forms.py +++ b/mezzanine/conf/forms.py @@ -29,7 +29,7 @@ class SettingsForm(forms.Form): """ def __init__(self, *args, **kwargs): - super(SettingsForm, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) # Create a form field for each editable setting's from its type. active_language = get_language() for name in sorted(registry.keys()): @@ -101,7 +101,7 @@ def __iter__(self): Calculate and apply a group heading to each field and order by the heading. """ - fields = list(super(SettingsForm, self).__iter__()) + fields = list(super().__iter__()) group = lambda field: field.name.split("_", 1)[0].title() misc = _("Miscellaneous") groups = defaultdict(int) diff --git a/mezzanine/conf/migrations/0001_initial.py b/mezzanine/conf/migrations/0001_initial.py index f5a33e7894..6572c983e6 100644 --- a/mezzanine/conf/migrations/0001_initial.py +++ b/mezzanine/conf/migrations/0001_initial.py @@ -1,27 +1,37 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('sites', '0001_initial'), + ("sites", "0001_initial"), ] operations = [ migrations.CreateModel( - name='Setting', + name="Setting", fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('name', models.CharField(max_length=50)), - ('value', models.CharField(max_length=2000)), - ('site', models.ForeignKey(editable=False, to='sites.Site', on_delete=models.CASCADE)), + ( + "id", + models.AutoField( + verbose_name="ID", + serialize=False, + auto_created=True, + primary_key=True, + ), + ), + ("name", models.CharField(max_length=50)), + ("value", models.CharField(max_length=2000)), + ( + "site", + models.ForeignKey( + editable=False, to="sites.Site", on_delete=models.CASCADE + ), + ), ], options={ - 'verbose_name': 'Setting', - 'verbose_name_plural': 'Settings', + "verbose_name": "Setting", + "verbose_name_plural": "Settings", }, bases=(models.Model,), ), diff --git a/mezzanine/conf/models.py b/mezzanine/conf/models.py index e46b7a20ae..8353486685 100644 --- a/mezzanine/conf/models.py +++ b/mezzanine/conf/models.py @@ -17,4 +17,4 @@ class Meta: verbose_name_plural = _("Settings") def __str__(self): - return "%s: %s" % (self.name, self.value) + return f"{self.name}: {self.value}" diff --git a/mezzanine/core/admin.py b/mezzanine/core/admin.py index 69dc5af178..178ae07634 100644 --- a/mezzanine/core/admin.py +++ b/mezzanine/core/admin.py @@ -116,7 +116,7 @@ class DisplayableAdmin(BaseTranslationModelAdmin): form = DisplayableAdminForm def __init__(self, *args, **kwargs): - super(DisplayableAdmin, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) try: self.search_fields = list( set( @@ -139,7 +139,7 @@ def save_model(self, request, obj, form, change): Save model for every language so that field auto-population is done for every each of it. """ - super(DisplayableAdmin, self).save_model(request, obj, form, change) + super().save_model(request, obj, form, change) if settings.USE_MODELTRANSLATION: lang = get_language() for code in OrderedDict(settings.LANGUAGES): @@ -153,7 +153,7 @@ def save_model(self, request, obj, form, change): activate(lang) -class BaseDynamicInlineAdmin(object): +class BaseDynamicInlineAdmin: """ Admin inline that uses JS to inject an "Add another" link which when clicked, dynamically reveals another fieldset. Also handles @@ -169,7 +169,7 @@ def get_fields(self, request, obj=None): For subclasses of ``Orderable``, the ``_order`` field must always be present and be the last field. """ - fields = super(BaseDynamicInlineAdmin, self).get_fields(request, obj) + fields = super().get_fields(request, obj) if issubclass(self.model, Orderable): fields = list(fields) try: @@ -183,7 +183,7 @@ def get_fieldsets(self, request, obj=None): """ Same as above, but for fieldsets. """ - fieldsets = super(BaseDynamicInlineAdmin, self).get_fieldsets(request, obj) + fieldsets = super().get_fieldsets(request, obj) if issubclass(self.model, Orderable): for fieldset in fieldsets: fields = [ @@ -236,7 +236,7 @@ def __init__(self, *args, **kwargs): if grappelli_name not in settings.INSTALLED_APPS: error = "StackedDynamicInlineAdmin requires Grappelli installed." raise Exception(error) - super(StackedDynamicInlineAdmin, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) class OwnableAdmin(admin.ModelAdmin): @@ -260,7 +260,7 @@ def save_form(self, request, form, change): obj = form.save(commit=False) if obj.user_id is None: obj.user = request.user - return super(OwnableAdmin, self).save_form(request, form, change) + return super().save_form(request, form, change) def get_queryset(self, request): """ @@ -273,16 +273,16 @@ class has been added to the sequence in the setting not imply permission to edit. """ opts = self.model._meta - model_name = ("%s.%s" % (opts.app_label, opts.object_name)).lower() + model_name = (f"{opts.app_label}.{opts.object_name}").lower() models_all_editable = settings.OWNABLE_MODELS_ALL_EDITABLE models_all_editable = [m.lower() for m in models_all_editable] - qs = super(OwnableAdmin, self).get_queryset(request) + qs = super().get_queryset(request) if request.user.is_superuser or model_name in models_all_editable: return qs return qs.filter(user__id=request.user.id) -class ContentTypedAdmin(object): +class ContentTypedAdmin: def __init__(self, *args, **kwargs): """ For subclasses that are registered with an Admin class @@ -291,7 +291,7 @@ def __init__(self, *args, **kwargs): adding all model fields when no fieldsets are defined on the Admin class. """ - super(ContentTypedAdmin, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) self.concrete_model = base_concrete_model(ContentTyped, self.model) @@ -365,7 +365,7 @@ def change_view(self, request, object_id, **kwargs): change_url = admin_url(content_model.__class__, "change", content_model.id) return HttpResponseRedirect(change_url) - return super(ContentTypedAdmin, self).change_view(request, object_id, **kwargs) + return super().change_view(request, object_id, **kwargs) def changelist_view(self, request, extra_context=None): """ Redirect to the changelist view for subclasses. """ @@ -375,7 +375,7 @@ def changelist_view(self, request, extra_context=None): extra_context = extra_context or {} extra_context["content_models"] = self.get_content_models() - return super(ContentTypedAdmin, self).changelist_view(request, extra_context) + return super().changelist_view(request, extra_context) def get_content_models(self): """ Return all subclasses that are admin registered. """ @@ -424,7 +424,7 @@ def save_model(self, request, obj, form, change): """ Provides a warning if the user is an active admin with no admin access. """ - super(SitePermissionUserAdmin, self).save_model(request, obj, form, change) + super().save_model(request, obj, form, change) user = self.model.objects.get(id=obj.id) has_perms = len(user.get_all_permissions()) > 0 has_sites = SitePermission.objects.filter(user=user).exists() @@ -475,7 +475,7 @@ def get_queryset(self, request): """ Filters the list view by current site. """ - queryset = super(SiteRedirectAdmin, self).get_queryset(request) + queryset = super().get_queryset(request) return queryset.filter(site_id=current_site_id()) def save_form(self, request, form, change): @@ -485,7 +485,7 @@ def save_form(self, request, form, change): obj = form.save(commit=False) if not obj.site_id: obj.site_id = current_site_id() - return super(SiteRedirectAdmin, self).save_form(request, form, change) + return super().save_form(request, form, change) if "django.contrib.redirects" in settings.INSTALLED_APPS: diff --git a/mezzanine/core/fields.py b/mezzanine/core/fields.py index 7a4089b175..860a5517af 100644 --- a/mezzanine/core/fields.py +++ b/mezzanine/core/fields.py @@ -14,7 +14,7 @@ class OrderField(models.IntegerField): def formfield(self, **kwargs): kwargs.update({"widget": OrderWidget, "required": False}) - return super(OrderField, self).formfield(**kwargs) + return super().formfield(**kwargs) class RichTextField(models.TextField): @@ -44,7 +44,7 @@ def formfield(self, **kwargs): ) kwargs["widget"] = widget_class() kwargs.setdefault("required", False) - formfield = super(RichTextField, self).formfield(**kwargs) + formfield = super().formfield(**kwargs) return formfield def clean(self, value, model_instance): @@ -76,7 +76,7 @@ def formfield(self, *args, **kwargs): def get_db_prep_value(self, value, connection, **kwargs): if isinstance(value, (tuple, list)): - value = ",".join([str(i) for i in value]) + value = ",".join(str(i) for i in value) return value def from_db_value(self, value, expression, connection): @@ -110,7 +110,7 @@ class FileField(models.FileField): def __init__(self, *args, **kwargs): for fb_arg in ("format", "extensions"): kwargs.pop(fb_arg, None) - super(FileField, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) else: @@ -119,4 +119,4 @@ class FileField(FileBrowseField): def __init__(self, *args, **kwargs): kwargs.setdefault("directory", kwargs.pop("upload_to", None)) kwargs.setdefault("max_length", 255) - super(FileField, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) diff --git a/mezzanine/core/forms.py b/mezzanine/core/forms.py index 7daca26e15..787434c73c 100644 --- a/mezzanine/core/forms.py +++ b/mezzanine/core/forms.py @@ -10,7 +10,7 @@ from mezzanine.utils.static import static_lazy as static -class Html5Mixin(object): +class Html5Mixin: """ Mixin for form classes. Adds HTML5 features to forms for client side validation by the browser, like a "required" attribute and @@ -18,7 +18,7 @@ class Html5Mixin(object): """ def __init__(self, *args, **kwargs): - super(Html5Mixin, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) if hasattr(self, "fields"): first_field = None @@ -53,7 +53,7 @@ def media(self): return forms.Media(js=js, css=css) def __init__(self, *args, **kwargs): - super(TinyMceWidget, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) self.attrs["class"] = "mceEditor" def use_required_attribute(self, initial): @@ -73,7 +73,7 @@ def is_hidden(self): return False def render(self, *args, **kwargs): - rendered = super(OrderWidget, self).render(*args, **kwargs) + rendered = super().render(*args, **kwargs) arrows = [ "" % (settings.STATIC_URL, arrow) @@ -118,12 +118,10 @@ def decompress(self, value): def value_from_datadict(self, data, files, name): return " ".join( - [ - x or "" - for x in super(SplitSelectDateTimeWidget, self).value_from_datadict( - data, files, name - ) - ] + x or "" + for x in super(SplitSelectDateTimeWidget, self).value_from_datadict( + data, files, name + ) ) @@ -135,7 +133,7 @@ class CheckboxSelectMultiple(forms.CheckboxSelectMultiple): dont_use_model_field_default_for_empty_data = True def render(self, *args, **kwargs): - rendered = super(CheckboxSelectMultiple, self).render(*args, **kwargs) + rendered = super().render(*args, **kwargs) return mark_safe("%s" % rendered) @@ -169,7 +167,7 @@ class Meta: fields = field_names.split(",") def __init__(self, *args, **kwargs): - super(EditForm, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) self.uuid = str(uuid4()) for f in self.fields.keys(): field_class = self.fields[f].__class__ @@ -182,7 +180,7 @@ def __init__(self, *args, **kwargs): css_class = self.fields[f].widget.attrs.get("class", "") css_class += " " + field_class.__name__.lower() self.fields[f].widget.attrs["class"] = css_class - self.fields[f].widget.attrs["id"] = "%s-%s" % (f, self.uuid) + self.fields[f].widget.attrs["id"] = f"{f}-{self.uuid}" if settings.FORMS_USE_HTML5 and self.fields[f].required: self.fields[f].widget.attrs["required"] = "" diff --git a/mezzanine/core/management/commands/collecttemplates.py b/mezzanine/core/management/commands/collecttemplates.py index 53279695de..e21bc08aad 100644 --- a/mezzanine/core/management/commands/collecttemplates.py +++ b/mezzanine/core/management/commands/collecttemplates.py @@ -103,7 +103,7 @@ def handle(self, *apps, **options): prev = " [copied from %s]" % template_src[name] else: prev = "" - self.stdout.write("While copying %s [from %s]:\n" % (name, app)) + self.stdout.write(f"While copying {name} [from {app}]:\n") self.stdout.write("Template exists%s.\n" % prev) confirm = input("Overwrite? (yes/no/abort): ") while confirm not in ("yes", "no", "abort"): @@ -124,4 +124,4 @@ def handle(self, *apps, **options): count += 1 if verbosity >= 1: s = "s" if count != 1 else "" - self.stdout.write("\nCopied %s template%s\n" % (count, s)) + self.stdout.write(f"\nCopied {count} template{s}\n") diff --git a/mezzanine/core/management/commands/runserver.py b/mezzanine/core/management/commands/runserver.py index 8eb4b4b929..1ccc1c21dd 100644 --- a/mezzanine/core/management/commands/runserver.py +++ b/mezzanine/core/management/commands/runserver.py @@ -19,7 +19,7 @@ def _should_handle(self, path): return path.startswith((settings.STATIC_URL, settings.MEDIA_URL)) def get_response(self, request): - response = super(MezzStaticFilesHandler, self).get_response(request) + response = super().get_response(request) if response.status_code == 404: locations = ( (settings.STATIC_URL, settings.STATIC_ROOT), @@ -45,7 +45,7 @@ def banner(): db_name = { "microsoft": "sql server", }.get(conn.vendor, conn.vendor) - db_name = "%s%s" % ( + db_name = "{}{}".format( db_name[:1].upper(), db_name.replace("sql", "SQL").replace("db", "DB")[1:], ) @@ -148,7 +148,7 @@ class Command(runserver.Command): """ def add_arguments(self, parser): - super(Command, self).add_arguments(parser) + super().add_arguments(parser) parser.add_argument( "--nobanner", action="store_false", @@ -167,10 +167,10 @@ def inner_run(self, *args, **kwargs): self.stdout.write(banner()) except: # noqa pass - super(Command, self).inner_run(*args, **kwargs) + super().inner_run(*args, **kwargs) def get_handler(self, *args, **options): - handler = super(Command, self).get_handler(*args, **options) + handler = super().get_handler(*args, **options) if settings.DEBUG or options["insecure_serving"]: handler = MezzStaticFilesHandler(handler) return handler diff --git a/mezzanine/core/managers.py b/mezzanine/core/managers.py index 3fcb8379a0..e907b4f03b 100644 --- a/mezzanine/core/managers.py +++ b/mezzanine/core/managers.py @@ -100,7 +100,7 @@ def __init__(self, *args, **kwargs): self._search_ordered = False self._search_terms = set() self._search_fields = kwargs.pop("search_fields", {}) - super(SearchableQuerySet, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) def search(self, query, search_fields=None): """ @@ -200,7 +200,7 @@ def _clone(self, *args, **kwargs): """ Ensure attributes are copied to subsequent queries. """ - clone = super(SearchableQuerySet, self)._clone(*args, **kwargs) + clone = super()._clone(*args, **kwargs) clone._search_terms = self._search_terms clone._search_fields = self._search_fields clone._search_ordered = self._search_ordered @@ -212,7 +212,7 @@ def order_by(self, *field_names): """ if not self._search_ordered: self._search_ordered = len(self._search_terms) > 0 - return super(SearchableQuerySet, self).order_by(*field_names) + return super().order_by(*field_names) def annotate_scores(self): """ @@ -228,7 +228,7 @@ def annotate_scores(self): we assume one match for one of the fields, and use the average weight of all search fields with relationships. """ - results = super(SearchableQuerySet, self).iterator() + results = super().iterator() if self._search_terms and not self._search_ordered: results = list(results) for i, result in enumerate(results): @@ -264,7 +264,7 @@ class SearchableManager(Manager): def __init__(self, *args, **kwargs): self._search_fields = kwargs.pop("search_fields", {}) - super(SearchableManager, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) def get_search_fields(self): """ @@ -311,7 +311,7 @@ def contribute_to_class(self, model, name): accessed from abstract classes, which is behaviour the search API has always relied on. Here we reinstate it. """ - super(SearchableManager, self).contribute_to_class(model, name) + super().contribute_to_class(model, name) setattr(model, name, ManagerDescriptor(self)) def search(self, *args, **kwargs): diff --git a/mezzanine/core/middleware.py b/mezzanine/core/middleware.py index e542062f93..31a8df7ce4 100755 --- a/mezzanine/core/middleware.py +++ b/mezzanine/core/middleware.py @@ -109,7 +109,7 @@ class TemplateForDeviceMiddleware(MiddlewareMixin): """ def __init__(self, *args, **kwargs): - super(TemplateForDeviceMiddleware, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) warnings.warn( "`TemplateForDeviceMiddleware` is deprecated. " "Please remove it from your middleware settings.", @@ -124,7 +124,7 @@ class TemplateForHostMiddleware(MiddlewareMixin): """ def __init__(self, *args, **kwargs): - super(TemplateForHostMiddleware, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) warnings.warn( "`TemplateForHostMiddleware` is deprecated. Please upgrade " "to the template loader. See: https://goo.gl/SzHPR4", @@ -264,7 +264,7 @@ def __init__(self, *args): "#module-django.middleware.security for alternative solutions.", DeprecationWarning, ) - super(SSLRedirectMiddleware, self).__init__(*args) + super().__init__(*args) def languages(self): if not hasattr(self, "_languages"): @@ -275,10 +275,10 @@ def process_request(self, request): force_host = settings.SSL_FORCE_HOST response = None if force_host and request.get_host().split(":")[0] != force_host: - url = "http://%s%s" % (force_host, request.get_full_path()) + url = f"http://{force_host}{request.get_full_path()}" response = HttpResponsePermanentRedirect(url) elif settings.SSL_ENABLED and not settings.DEV_SERVER: - url = "%s%s" % (request.get_host(), request.get_full_path()) + url = f"{request.get_host()}{request.get_full_path()}" path = request.path if settings.USE_I18N and path[1:3] in self.languages(): path = path[3:] @@ -310,7 +310,7 @@ class RedirectFallbackMiddleware(MiddlewareMixin): """ def __init__(self, *args, **kwargs): - super(RedirectFallbackMiddleware, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) if "django.contrib.redirects" not in settings.INSTALLED_APPS: raise MiddlewareNotUsed diff --git a/mezzanine/core/migrations/0001_initial.py b/mezzanine/core/migrations/0001_initial.py index c6129ccef3..faf842c660 100644 --- a/mezzanine/core/migrations/0001_initial.py +++ b/mezzanine/core/migrations/0001_initial.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from django.conf import settings from django.db import migrations, models @@ -6,21 +5,43 @@ class Migration(migrations.Migration): dependencies = [ - ('sites', '0001_initial'), + ("sites", "0001_initial"), migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ migrations.CreateModel( - name='SitePermission', + name="SitePermission", fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('sites', models.ManyToManyField(to='sites.Site', verbose_name='Sites', blank=True)), - ('user', models.ForeignKey(related_name='sitepermissions', verbose_name='Author', to=settings.AUTH_USER_MODEL, unique=True, on_delete=models.CASCADE)), + ( + "id", + models.AutoField( + verbose_name="ID", + serialize=False, + auto_created=True, + primary_key=True, + ), + ), + ( + "sites", + models.ManyToManyField( + to="sites.Site", verbose_name="Sites", blank=True + ), + ), + ( + "user", + models.ForeignKey( + related_name="sitepermissions", + verbose_name="Author", + to=settings.AUTH_USER_MODEL, + unique=True, + on_delete=models.CASCADE, + ), + ), ], options={ - 'verbose_name': 'Site permission', - 'verbose_name_plural': 'Site permissions', + "verbose_name": "Site permission", + "verbose_name_plural": "Site permissions", }, bases=(models.Model,), ), diff --git a/mezzanine/core/migrations/0002_auto_20150414_2140.py b/mezzanine/core/migrations/0002_auto_20150414_2140.py index 68c268c1b2..fcf071725e 100644 --- a/mezzanine/core/migrations/0002_auto_20150414_2140.py +++ b/mezzanine/core/migrations/0002_auto_20150414_2140.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from django.conf import settings from django.db import migrations, models @@ -6,13 +5,18 @@ class Migration(migrations.Migration): dependencies = [ - ('core', '0001_initial'), + ("core", "0001_initial"), ] operations = [ migrations.AlterField( - model_name='sitepermission', - name='user', - field=models.OneToOneField(related_name='sitepermissions', verbose_name='Author', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE), + model_name="sitepermission", + name="user", + field=models.OneToOneField( + related_name="sitepermissions", + verbose_name="Author", + to=settings.AUTH_USER_MODEL, + on_delete=models.CASCADE, + ), ), ] diff --git a/mezzanine/core/models.py b/mezzanine/core/models.py index d96de92cb9..e1bd11ee20 100644 --- a/mezzanine/core/models.py +++ b/mezzanine/core/models.py @@ -60,7 +60,7 @@ def save(self, update_site=False, *args, **kwargs): """ if update_site or (self.id is None and self.site_id is None): self.site_id = current_site_id() - super(SiteRelated, self).save(*args, **kwargs) + super().save(*args, **kwargs) class Slugged(SiteRelated): @@ -89,7 +89,7 @@ def save(self, *args, **kwargs): """ if not self.slug: self.slug = self.generate_unique_slug() - super(Slugged, self).save(*args, **kwargs) + super().save(*args, **kwargs) def generate_unique_slug(self): """ @@ -159,7 +159,7 @@ def save(self, *args, **kwargs): """ if self.gen_description: self.description = strip_tags(self.description_from_content()) - super(MetaData, self).save(*args, **kwargs) + super().save(*args, **kwargs) def meta_title(self): """ @@ -222,7 +222,7 @@ def save(self, *args, **kwargs): self.updated = _now if not self.id: self.created = _now - super(TimeStamped, self).save(*args, **kwargs) + super().save(*args, **kwargs) CONTENT_STATUS_DRAFT = 1 @@ -280,7 +280,7 @@ def save(self, *args, **kwargs): """ if self.publish_date is None: self.publish_date = now() - super(Displayable, self).save(*args, **kwargs) + super().save(*args, **kwargs) def get_admin_url(self): return admin_url(self, "change", self.id) @@ -437,7 +437,7 @@ class Meta: del attrs["Meta"].order_with_respect_to if not hasattr(attrs["Meta"], "ordering"): setattr(attrs["Meta"], "ordering", ("_order",)) - return super(OrderableBase, cls).__new__(cls, name, bases, attrs) + return super().__new__(cls, name, bases, attrs) class Orderable(models.Model, metaclass=OrderableBase): @@ -472,7 +472,7 @@ def with_respect_to(self): field = getattr(self.__class__, name) if isinstance(field, GenericForeignKey): names = (field.ct_field, field.fk_field) - return dict([(n, getattr(self, n)) for n in names]) + return {n: getattr(self, n) for n in names} return {name: value} def save(self, *args, **kwargs): @@ -484,7 +484,7 @@ def save(self, *args, **kwargs): lookup["_order__isnull"] = False concrete_model = base_concrete_model(Orderable, self) self._order = concrete_model.objects.filter(**lookup).count() - super(Orderable, self).save(*args, **kwargs) + super().save(*args, **kwargs) def delete(self, *args, **kwargs): """ @@ -495,7 +495,7 @@ def delete(self, *args, **kwargs): concrete_model = base_concrete_model(Orderable, self) after = concrete_model.objects.filter(**lookup) after.update(_order=models.F("_order") - 1) - super(Orderable, self).delete(*args, **kwargs) + super().delete(*args, **kwargs) def _get_next_or_previous_by_order(self, is_next, **kwargs): """ diff --git a/mezzanine/core/sitemaps.py b/mezzanine/core/sitemaps.py index 6d622657c3..7ae38b3dda 100644 --- a/mezzanine/core/sitemaps.py +++ b/mezzanine/core/sitemaps.py @@ -32,4 +32,4 @@ def get_urls(self, **kwargs): Ensure the correct host by injecting the current site. """ kwargs["site"] = Site.objects.get(id=current_site_id()) - return super(DisplayableSitemap, self).get_urls(**kwargs) + return super().get_urls(**kwargs) diff --git a/mezzanine/core/templatetags/mezzanine_tags.py b/mezzanine/core/templatetags/mezzanine_tags.py index 723face64a..453eaae119 100644 --- a/mezzanine/core/templatetags/mezzanine_tags.py +++ b/mezzanine/core/templatetags/mezzanine_tags.py @@ -88,7 +88,7 @@ def nevercache(parser, token): if token_type == TokenType.BLOCK and token.contents == end_tag: return TextNode(delimiter + "".join(text) + delimiter) start, end = tag_mapping[token_type] - text.append("%s%s%s" % (start, token.contents, end)) + text.append(f"{start}{token.contents}{end}") parser.unclosed_block_tag(end_tag) else: @@ -316,15 +316,15 @@ def thumbnail( image_dir, image_name = os.path.split(image_url) image_prefix, image_ext = os.path.splitext(image_name) filetype = {".png": "PNG", ".gif": "GIF"}.get(image_ext.lower(), "JPEG") - thumb_name = "%s-%sx%s" % (image_prefix, width, height) + thumb_name = f"{image_prefix}-{width}x{height}" if not upscale: thumb_name += "-no-upscale" if left != 0.5 or top != 0.5: left = min(1, max(0, left)) top = min(1, max(0, top)) - thumb_name = "%s-%sx%s" % (thumb_name, left, top) + thumb_name = f"{thumb_name}-{left}x{top}" thumb_name += "-padded-%s" % padding_color if padding else "" - thumb_name = "%s%s" % (thumb_name, image_ext) + thumb_name = f"{thumb_name}{image_ext}" # `image_name` is used here for the directory path, as each image # requires its own sub-directory using its own name - this is so @@ -342,14 +342,14 @@ def thumbnail( pass thumb_path = os.path.join(thumb_dir, thumb_name) - thumb_url = "%s/%s/%s" % ( + thumb_url = "{}/{}/{}".format( settings.THUMBNAILS_DIR_NAME, quote(image_name.encode("utf-8")), quote(thumb_name.encode("utf-8")), ) image_url_path = os.path.dirname(image_url) if image_url_path: - thumb_url = "%s/%s" % (image_url_path, thumb_url) + thumb_url = f"{image_url_path}/{thumb_url}" try: thumb_exists = os.path.exists(thumb_path) @@ -540,14 +540,14 @@ def parse_field(field): fields = [f for f in fields if len(f) == 2 and f[0] is fields[0][0]] if not parsed.strip(): try: - parsed = "".join([str(getattr(*field)) for field in fields]) + parsed = "".join(str(getattr(*field)) for field in fields) except AttributeError: pass if settings.INLINE_EDITING_ENABLED and fields and "request" in context: obj = fields[0][0] if isinstance(obj, Model) and is_editable(obj, context["request"]): - field_names = ",".join([f[1] for f in fields]) + field_names = ",".join(f[1] for f in fields) context["editable_form"] = get_edit_form(obj, field_names) context["original"] = parsed t = get_template("includes/editable_form.html") @@ -621,7 +621,7 @@ def admin_app_list(request): else: add_url = None if admin_url_name: - model_label = "%s.%s" % (opts.app_label, opts.object_name) + model_label = f"{opts.app_label}.{opts.object_name}" try: app_index, app_title, model_index, model_title = menu_order[ model_label @@ -765,7 +765,7 @@ def translate_url(context, language): url_name = ( view.url_name if not view.namespace - else "%s:%s" % (view.namespace, view.url_name) + else f"{view.namespace}:{view.url_name}" ) url = reverse(url_name, args=view.args, kwargs=view.kwargs) except NoReverseMatch: diff --git a/mezzanine/core/views.py b/mezzanine/core/views.py index b5aa62c4b8..431a45a04b 100644 --- a/mezzanine/core/views.py +++ b/mezzanine/core/views.py @@ -147,13 +147,13 @@ def static_proxy(request): if not urlparse(static_url).scheme: static_url = urljoin(host, static_url) base_tag = "" % static_url - with open(path, "r") as f: + with open(path) as f: response = f.read().replace("", "" + base_tag) else: try: with open(path, "rb") as f: response = f.read() - except IOError: + except OSError: return HttpResponseNotFound() return HttpResponse(response, content_type=content_type) @@ -180,7 +180,7 @@ def displayable_links_js(request): page = is_page(obj) if real: verbose_name = _("Page") if page else obj._meta.verbose_name - title = "%s: %s" % (verbose_name, title) + title = f"{verbose_name}: {title}" links.append((not page and real, {"title": str(title), "value": url})) sorted_links = sorted(links, key=lambda link: (link[0], link[1]["value"])) return HttpResponse(dumps([link[1] for link in sorted_links])) diff --git a/mezzanine/forms/admin.py b/mezzanine/forms/admin.py index 686417b9c2..1bcbf62121 100644 --- a/mezzanine/forms/admin.py +++ b/mezzanine/forms/admin.py @@ -56,7 +56,7 @@ def __init__(self, *args, **kwargs): Ensure the label and help_text fields are rendered as text inputs instead of text areas. """ - super(FieldAdminInlineForm, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) for name in self.fields: # We just want to swap some textareas for inputs here, but # there are some extra considerations for modeltranslation: @@ -110,7 +110,7 @@ def get_urls(self): """ Add the entries view to urls. """ - urls = super(FormAdmin, self).get_urls() + urls = super().get_urls() extra_urls = [ url( r"^(?P\d+)/entries/$", @@ -142,7 +142,7 @@ def entries_view(self, request, form_id): if request.POST.get("export"): response = HttpResponse(content_type="text/csv") timestamp = slugify(datetime.now().ctime()) - fname = "%s-%s.csv" % (form.slug, timestamp) + fname = f"{form.slug}-{timestamp}.csv" header = "attachment; filename=%s" % fname response["Content-Disposition"] = header queue = StringIO() diff --git a/mezzanine/forms/fields.py b/mezzanine/forms/fields.py index 81739534bb..a8b24e3ded 100644 --- a/mezzanine/forms/fields.py +++ b/mezzanine/forms/fields.py @@ -79,7 +79,7 @@ MULTIPLE = (CHECKBOX_MULTIPLE, SELECT_MULTIPLE) # HTML5 Widgets -html5_field = lambda name, base: type(str(""), (base,), {"input_type": name}) +html5_field = lambda name, base: type("", (base,), {"input_type": name}) if getattr(settings, "FORMS_USE_HTML5", False): WIDGETS.update( { diff --git a/mezzanine/forms/forms.py b/mezzanine/forms/forms.py index 6fc335af0c..9fe5bee675 100644 --- a/mezzanine/forms/forms.py +++ b/mezzanine/forms/forms.py @@ -131,7 +131,7 @@ def __init__(self, form, context, *args, **kwargs): if kwargs.get("instance"): for field_entry in kwargs["instance"].fields.all(): field_entries[field_entry.field_id] = field_entry.value - super(FormForForm, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) # Create the form fields. for field in self.form_fields: field_key = "field_%s" % field.id @@ -203,7 +203,7 @@ def save(self, **kwargs): Create a ``FormEntry`` instance and related ``FieldEntry`` instances for each form field. """ - entry = super(FormForForm, self).save(commit=False) + entry = super().save(commit=False) entry.form = self.form entry.entry_time = now() entry.save() @@ -215,7 +215,7 @@ def save(self, **kwargs): if value and self.fields[field_key].widget.needs_multipart_form: value = fs.save(join("forms", str(uuid4()), value.name), value) if isinstance(value, list): - value = ", ".join([v.strip() for v in value]) + value = ", ".join(v.strip() for v in value) if field.id in entry_fields: field_entry = entry.fields.get(field_id=field.id) field_entry.value = value @@ -257,7 +257,7 @@ def __init__(self, form, request, *args, **kwargs): self.request = request self.form_fields = form.fields.all() self.entry_time_name = str(FormEntry._meta.get_field("entry_time").verbose_name) - super(EntriesForm, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) for field in self.form_fields: field_key = "field_%s" % field.id # Checkbox for including in export. diff --git a/mezzanine/forms/migrations/0001_initial.py b/mezzanine/forms/migrations/0001_initial.py index e7e6abbc32..3005d31df7 100644 --- a/mezzanine/forms/migrations/0001_initial.py +++ b/mezzanine/forms/migrations/0001_initial.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from django.db import migrations, models import mezzanine.core.fields @@ -8,87 +7,207 @@ class Migration(migrations.Migration): dependencies = [ - ('pages', '__first__'), + ("pages", "__first__"), ] operations = [ migrations.CreateModel( - name='Field', + name="Field", fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('_order', models.IntegerField(null=True, verbose_name='Order')), - ('label', models.CharField(max_length=200, verbose_name='Label')), - ('field_type', models.IntegerField(verbose_name='Type', choices=NAMES)), - ('required', models.BooleanField(default=True, verbose_name='Required')), - ('visible', models.BooleanField(default=True, verbose_name='Visible')), - ('choices', models.CharField(help_text='Comma separated options where applicable. If an option itself contains commas, surround the option with `backticks`.', max_length=1000, verbose_name='Choices', blank=True)), - ('default', models.CharField(max_length=2000, verbose_name='Default value', blank=True)), - ('placeholder_text', models.CharField(verbose_name='Placeholder Text', max_length=100, editable=False, blank=True)), - ('help_text', models.CharField(max_length=100, verbose_name='Help text', blank=True)), + ( + "id", + models.AutoField( + verbose_name="ID", + serialize=False, + auto_created=True, + primary_key=True, + ), + ), + ("_order", models.IntegerField(null=True, verbose_name="Order")), + ("label", models.CharField(max_length=200, verbose_name="Label")), + ("field_type", models.IntegerField(verbose_name="Type", choices=NAMES)), + ( + "required", + models.BooleanField(default=True, verbose_name="Required"), + ), + ("visible", models.BooleanField(default=True, verbose_name="Visible")), + ( + "choices", + models.CharField( + help_text="Comma separated options where applicable. If an option itself contains commas, surround the option with `backticks`.", + max_length=1000, + verbose_name="Choices", + blank=True, + ), + ), + ( + "default", + models.CharField( + max_length=2000, verbose_name="Default value", blank=True + ), + ), + ( + "placeholder_text", + models.CharField( + verbose_name="Placeholder Text", + max_length=100, + editable=False, + blank=True, + ), + ), + ( + "help_text", + models.CharField( + max_length=100, verbose_name="Help text", blank=True + ), + ), ], options={ - 'ordering': ('_order',), - 'verbose_name': 'Field', - 'verbose_name_plural': 'Fields', + "ordering": ("_order",), + "verbose_name": "Field", + "verbose_name_plural": "Fields", }, bases=(models.Model,), ), migrations.CreateModel( - name='FieldEntry', + name="FieldEntry", fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('field_id', models.IntegerField()), - ('value', models.CharField(max_length=2000, null=True)), + ( + "id", + models.AutoField( + verbose_name="ID", + serialize=False, + auto_created=True, + primary_key=True, + ), + ), + ("field_id", models.IntegerField()), + ("value", models.CharField(max_length=2000, null=True)), ], options={ - 'verbose_name': 'Form field entry', - 'verbose_name_plural': 'Form field entries', + "verbose_name": "Form field entry", + "verbose_name_plural": "Form field entries", }, bases=(models.Model,), ), migrations.CreateModel( - name='Form', + name="Form", fields=[ - ('page_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='pages.Page', on_delete=models.CASCADE)), - ('content', mezzanine.core.fields.RichTextField(verbose_name='Content')), - ('button_text', models.CharField(default='Submit', max_length=50, verbose_name='Button text')), - ('response', mezzanine.core.fields.RichTextField(verbose_name='Response')), - ('send_email', models.BooleanField(default=True, help_text='To send an email to the email address supplied in the form upon submission, check this box.', verbose_name='Send email to user')), - ('email_from', models.EmailField(help_text='The address the email will be sent from', max_length=75, verbose_name='From address', blank=True)), - ('email_copies', models.CharField(help_text='Provide a comma separated list of email addresses to be notified upon form submission. Leave blank to disable notifications.', max_length=200, verbose_name='Send email to others', blank=True)), - ('email_subject', models.CharField(max_length=200, verbose_name='Subject', blank=True)), - ('email_message', models.TextField(help_text='Emails sent based on the above options will contain each of the form fields entered. You can also enter a message here that will be included in the email.', verbose_name='Message', blank=True)), + ( + "page_ptr", + models.OneToOneField( + parent_link=True, + auto_created=True, + primary_key=True, + serialize=False, + to="pages.Page", + on_delete=models.CASCADE, + ), + ), + ( + "content", + mezzanine.core.fields.RichTextField(verbose_name="Content"), + ), + ( + "button_text", + models.CharField( + default="Submit", max_length=50, verbose_name="Button text" + ), + ), + ( + "response", + mezzanine.core.fields.RichTextField(verbose_name="Response"), + ), + ( + "send_email", + models.BooleanField( + default=True, + help_text="To send an email to the email address supplied in the form upon submission, check this box.", + verbose_name="Send email to user", + ), + ), + ( + "email_from", + models.EmailField( + help_text="The address the email will be sent from", + max_length=75, + verbose_name="From address", + blank=True, + ), + ), + ( + "email_copies", + models.CharField( + help_text="Provide a comma separated list of email addresses to be notified upon form submission. Leave blank to disable notifications.", + max_length=200, + verbose_name="Send email to others", + blank=True, + ), + ), + ( + "email_subject", + models.CharField( + max_length=200, verbose_name="Subject", blank=True + ), + ), + ( + "email_message", + models.TextField( + help_text="Emails sent based on the above options will contain each of the form fields entered. You can also enter a message here that will be included in the email.", + verbose_name="Message", + blank=True, + ), + ), ], options={ - 'ordering': ('_order',), - 'verbose_name': 'Form', - 'verbose_name_plural': 'Forms', + "ordering": ("_order",), + "verbose_name": "Form", + "verbose_name_plural": "Forms", }, - bases=('pages.page', models.Model), + bases=("pages.page", models.Model), ), migrations.CreateModel( - name='FormEntry', + name="FormEntry", fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('entry_time', models.DateTimeField(verbose_name='Date/time')), - ('form', models.ForeignKey(related_name='entries', to='forms.Form', on_delete=models.CASCADE)), + ( + "id", + models.AutoField( + verbose_name="ID", + serialize=False, + auto_created=True, + primary_key=True, + ), + ), + ("entry_time", models.DateTimeField(verbose_name="Date/time")), + ( + "form", + models.ForeignKey( + related_name="entries", + to="forms.Form", + on_delete=models.CASCADE, + ), + ), ], options={ - 'verbose_name': 'Form entry', - 'verbose_name_plural': 'Form entries', + "verbose_name": "Form entry", + "verbose_name_plural": "Form entries", }, bases=(models.Model,), ), migrations.AddField( - model_name='fieldentry', - name='entry', - field=models.ForeignKey(related_name='fields', to='forms.FormEntry', on_delete=models.CASCADE), + model_name="fieldentry", + name="entry", + field=models.ForeignKey( + related_name="fields", to="forms.FormEntry", on_delete=models.CASCADE + ), preserve_default=True, ), migrations.AddField( - model_name='field', - name='form', - field=models.ForeignKey(related_name='fields', to='forms.Form', on_delete=models.CASCADE), + model_name="field", + name="form", + field=models.ForeignKey( + related_name="fields", to="forms.Form", on_delete=models.CASCADE + ), preserve_default=True, ), ] diff --git a/mezzanine/forms/migrations/0002_auto_20141227_0224.py b/mezzanine/forms/migrations/0002_auto_20141227_0224.py index 8c0bad2fae..cd0e256475 100644 --- a/mezzanine/forms/migrations/0002_auto_20141227_0224.py +++ b/mezzanine/forms/migrations/0002_auto_20141227_0224.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from django.db import migrations, models import mezzanine.core.fields @@ -7,14 +6,14 @@ class Migration(migrations.Migration): dependencies = [ - ('forms', '0001_initial'), + ("forms", "0001_initial"), ] operations = [ migrations.AlterField( - model_name='field', - name='_order', - field=mezzanine.core.fields.OrderField(null=True, verbose_name='Order'), + model_name="field", + name="_order", + field=mezzanine.core.fields.OrderField(null=True, verbose_name="Order"), preserve_default=True, ), ] diff --git a/mezzanine/forms/migrations/0003_emailfield.py b/mezzanine/forms/migrations/0003_emailfield.py index e8cefd4575..c51f7ce3e9 100644 --- a/mezzanine/forms/migrations/0003_emailfield.py +++ b/mezzanine/forms/migrations/0003_emailfield.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from django.db import migrations, models import mezzanine.pages.managers @@ -7,13 +6,18 @@ class Migration(migrations.Migration): dependencies = [ - ('forms', '0002_auto_20141227_0224'), + ("forms", "0002_auto_20141227_0224"), ] operations = [ migrations.AlterField( - model_name='form', - name='email_from', - field=models.EmailField(help_text='The address the email will be sent from', max_length=254, verbose_name='From address', blank=True), + model_name="form", + name="email_from", + field=models.EmailField( + help_text="The address the email will be sent from", + max_length=254, + verbose_name="From address", + blank=True, + ), ), ] diff --git a/mezzanine/forms/migrations/0004_auto_20150517_0510.py b/mezzanine/forms/migrations/0004_auto_20150517_0510.py index 5363f1f583..b48f22b72b 100644 --- a/mezzanine/forms/migrations/0004_auto_20150517_0510.py +++ b/mezzanine/forms/migrations/0004_auto_20150517_0510.py @@ -1,17 +1,18 @@ -# -*- coding: utf-8 -*- from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('forms', '0003_emailfield'), + ("forms", "0003_emailfield"), ] operations = [ migrations.AlterField( - model_name='form', - name='button_text', - field=models.CharField(max_length=50, verbose_name='Button text', blank=True), + model_name="form", + name="button_text", + field=models.CharField( + max_length=50, verbose_name="Button text", blank=True + ), ), ] diff --git a/mezzanine/forms/migrations/0005_auto_20151026_1600.py b/mezzanine/forms/migrations/0005_auto_20151026_1600.py index 8d48dd0de2..158cc12d3b 100644 --- a/mezzanine/forms/migrations/0005_auto_20151026_1600.py +++ b/mezzanine/forms/migrations/0005_auto_20151026_1600.py @@ -1,17 +1,18 @@ -# -*- coding: utf-8 -*- from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('forms', '0004_auto_20150517_0510'), + ("forms", "0004_auto_20150517_0510"), ] operations = [ migrations.AlterField( - model_name='field', - name='placeholder_text', - field=models.CharField(max_length=100, verbose_name='Placeholder Text', blank=True), + model_name="field", + name="placeholder_text", + field=models.CharField( + max_length=100, verbose_name="Placeholder Text", blank=True + ), ), ] diff --git a/mezzanine/forms/migrations/0006_auto_20170425_2225.py b/mezzanine/forms/migrations/0006_auto_20170425_2225.py index 5c3f78517c..e5b9757cbb 100644 --- a/mezzanine/forms/migrations/0006_auto_20170425_2225.py +++ b/mezzanine/forms/migrations/0006_auto_20170425_2225.py @@ -1,22 +1,21 @@ -# -*- coding: utf-8 -*- from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('forms', '0005_auto_20151026_1600'), + ("forms", "0005_auto_20151026_1600"), ] operations = [ migrations.AlterField( - model_name='field', - name='help_text', - field=models.TextField(blank=True, verbose_name='Help text'), + model_name="field", + name="help_text", + field=models.TextField(blank=True, verbose_name="Help text"), ), migrations.AlterField( - model_name='field', - name='label', - field=models.TextField(verbose_name='Label'), + model_name="field", + name="label", + field=models.TextField(verbose_name="Label"), ), ] diff --git a/mezzanine/forms/page_processors.py b/mezzanine/forms/page_processors.py index 49239dc9c3..473f9849bf 100644 --- a/mezzanine/forms/page_processors.py +++ b/mezzanine/forms/page_processors.py @@ -16,7 +16,7 @@ def format_value(value): select multiple values in emails. """ if isinstance(value, list): - value = ", ".join([v.strip() for v in value]) + value = ", ".join(v.strip() for v in value) return value @@ -39,7 +39,7 @@ def form_processor(request, page): entry = form.save() subject = page.form.email_subject if not subject: - subject = "%s - %s" % (page.form.title, entry.entry_time) + subject = f"{page.form.title} - {entry.entry_time}" fields = [ (v.label, format_value(form.cleaned_data[k])) for (k, v) in form.fields.items() diff --git a/mezzanine/galleries/migrations/0001_initial.py b/mezzanine/galleries/migrations/0001_initial.py index 23a6d40988..04b3bc6c02 100644 --- a/mezzanine/galleries/migrations/0001_initial.py +++ b/mezzanine/galleries/migrations/0001_initial.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from django.db import migrations, models import mezzanine.core.fields @@ -7,37 +6,83 @@ class Migration(migrations.Migration): dependencies = [ - ('pages', '__first__'), + ("pages", "__first__"), ] operations = [ migrations.CreateModel( - name='Gallery', + name="Gallery", fields=[ - ('page_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='pages.Page', on_delete=models.CASCADE)), - ('content', mezzanine.core.fields.RichTextField(verbose_name='Content')), - ('zip_import', models.FileField(help_text="Upload a zip file containing images, and they'll be imported into this gallery.", upload_to='galleries', verbose_name='Zip import', blank=True)), + ( + "page_ptr", + models.OneToOneField( + parent_link=True, + auto_created=True, + primary_key=True, + serialize=False, + to="pages.Page", + on_delete=models.CASCADE, + ), + ), + ( + "content", + mezzanine.core.fields.RichTextField(verbose_name="Content"), + ), + ( + "zip_import", + models.FileField( + help_text="Upload a zip file containing images, and they'll be imported into this gallery.", + upload_to="galleries", + verbose_name="Zip import", + blank=True, + ), + ), ], options={ - 'ordering': ('_order',), - 'verbose_name': 'Gallery', - 'verbose_name_plural': 'Galleries', + "ordering": ("_order",), + "verbose_name": "Gallery", + "verbose_name_plural": "Galleries", }, - bases=('pages.page', models.Model), + bases=("pages.page", models.Model), ), migrations.CreateModel( - name='GalleryImage', + name="GalleryImage", fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('_order', models.IntegerField(null=True, verbose_name='Order')), - ('file', mezzanine.core.fields.FileField(max_length=200, verbose_name='File')), - ('description', models.CharField(max_length=1000, verbose_name='Description', blank=True)), - ('gallery', models.ForeignKey(related_name='images', to='galleries.Gallery', on_delete=models.CASCADE)), + ( + "id", + models.AutoField( + verbose_name="ID", + serialize=False, + auto_created=True, + primary_key=True, + ), + ), + ("_order", models.IntegerField(null=True, verbose_name="Order")), + ( + "file", + mezzanine.core.fields.FileField( + max_length=200, verbose_name="File" + ), + ), + ( + "description", + models.CharField( + max_length=1000, verbose_name="Description", blank=True + ), + ), + ( + "gallery", + models.ForeignKey( + related_name="images", + to="galleries.Gallery", + on_delete=models.CASCADE, + ), + ), ], options={ - 'ordering': ('_order',), - 'verbose_name': 'Image', - 'verbose_name_plural': 'Images', + "ordering": ("_order",), + "verbose_name": "Image", + "verbose_name_plural": "Images", }, bases=(models.Model,), ), diff --git a/mezzanine/galleries/migrations/0002_auto_20141227_0224.py b/mezzanine/galleries/migrations/0002_auto_20141227_0224.py index a9acb3dfe1..cd1499ca70 100644 --- a/mezzanine/galleries/migrations/0002_auto_20141227_0224.py +++ b/mezzanine/galleries/migrations/0002_auto_20141227_0224.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from django.db import migrations, models import mezzanine.core.fields @@ -7,14 +6,14 @@ class Migration(migrations.Migration): dependencies = [ - ('galleries', '0001_initial'), + ("galleries", "0001_initial"), ] operations = [ migrations.AlterField( - model_name='galleryimage', - name='_order', - field=mezzanine.core.fields.OrderField(null=True, verbose_name='Order'), + model_name="galleryimage", + name="_order", + field=mezzanine.core.fields.OrderField(null=True, verbose_name="Order"), preserve_default=True, ), ] diff --git a/mezzanine/galleries/models.py b/mezzanine/galleries/models.py index b53bb87d1f..4b245e66bd 100644 --- a/mezzanine/galleries/models.py +++ b/mezzanine/galleries/models.py @@ -52,7 +52,7 @@ def save(self, delete_zip_import=True, *args, **kwargs): If a zip file is uploaded, extract any images from it and add them to the gallery, before removing the zip file. """ - super(BaseGallery, self).save(*args, **kwargs) + super().save(*args, **kwargs) if self.zip_import: zip_file = ZipFile(self.zip_import) for name in zip_file.namelist(): @@ -154,14 +154,12 @@ def save(self, *args, **kwargs): name = force_text(self.file) name = name.rsplit("/", 1)[-1].rsplit(".", 1)[0] name = name.replace("'", "") - name = "".join([c if c not in punctuation else " " for c in name]) + name = "".join(c if c not in punctuation else " " for c in name) # str.title() doesn't deal with unicode very well. # http://bugs.python.org/issue6412 name = "".join( - [ - s.upper() if i == 0 or name[i - 1] == " " else s - for i, s in enumerate(name) - ] + s.upper() if i == 0 or name[i - 1] == " " else s + for i, s in enumerate(name) ) self.description = name - super(GalleryImage, self).save(*args, **kwargs) + super().save(*args, **kwargs) diff --git a/mezzanine/generic/fields.py b/mezzanine/generic/fields.py index 4639ebe622..766b5d1cfd 100644 --- a/mezzanine/generic/fields.py +++ b/mezzanine/generic/fields.py @@ -43,7 +43,7 @@ def __init__(self, *args, **kwargs): self.related_model except (AppRegistryNotReady, AttributeError): # if not, all is good - super(BaseGenericRelation, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) else: # otherwise, warn the user to stick to the new (as of 4.0) # ``default_related_model`` attribute @@ -64,7 +64,7 @@ def contribute_to_class(self, cls, name): """ for field in cls._meta.many_to_many: if isinstance(field, self.__class__): - e = "Multiple %s fields are not supported (%s.%s, %s.%s)" % ( + e = "Multiple {} fields are not supported ({}.{}, {}.{})".format( self.__class__.__name__, cls.__name__, cls.__name__, @@ -73,7 +73,7 @@ def contribute_to_class(self, cls, name): ) raise ImproperlyConfigured(e) self.related_field_name = name - super(BaseGenericRelation, self).contribute_to_class(cls, name) + super().contribute_to_class(cls, name) # Not applicable to abstract classes, and in fact will break. if not cls._meta.abstract: for (name_string, field) in self.fields.items(): @@ -171,7 +171,7 @@ def __init__(self, *args, **kwargs): admin class fieldsets and pass validation, and also so that it shows up in the admin form. """ - super(KeywordsField, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) self.editable = True def formfield(self, **kwargs): @@ -182,7 +182,7 @@ def formfield(self, **kwargs): from mezzanine.generic.forms import KeywordsWidget kwargs["widget"] = KeywordsWidget - return super(KeywordsField, self).formfield(**kwargs) + return super().formfield(**kwargs) def save_form_data(self, instance, data): """ @@ -214,7 +214,7 @@ def contribute_to_class(self, cls, name): Swap out any reference to ``KeywordsField`` with the ``KEYWORDS_FIELD_string`` field in ``search_fields``. """ - super(KeywordsField, self).contribute_to_class(cls, name) + super().contribute_to_class(cls, name) string_field_name = list(self.fields.keys())[0] % self.related_field_name if hasattr(cls, "search_fields") and name in cls.search_fields: try: @@ -235,7 +235,7 @@ def related_items_changed(self, instance, related_manager): Stores the keywords as a single string for searching. """ assigned = related_manager.select_related("keyword") - keywords = " ".join([str(a.keyword) for a in assigned]) + keywords = " ".join(str(a.keyword) for a in assigned) string_field_name = list(self.fields.keys())[0] % self.related_field_name if getattr(instance, string_field_name) != keywords: setattr(instance, string_field_name, keywords) diff --git a/mezzanine/generic/forms.py b/mezzanine/generic/forms.py index 0a5dbd0e37..be88607500 100644 --- a/mezzanine/generic/forms.py +++ b/mezzanine/generic/forms.py @@ -43,7 +43,7 @@ def __init__(self, attrs=None): Setup the text and hidden form field widgets. """ widgets = (forms.HiddenInput, forms.TextInput(attrs={"class": "vTextField"})) - super(KeywordsWidget, self).__init__(widgets, attrs) + super().__init__(widgets, attrs) self._ids = [] def decompress(self, value): @@ -74,11 +74,11 @@ def render(self, *args, **kwargs): Wraps the output HTML with a list of all available ``Keyword`` instances that can be clicked on to toggle a keyword. """ - rendered = super(KeywordsWidget, self).render(*args, **kwargs) + rendered = super().render(*args, **kwargs) links = "" for keyword in Keyword.objects.all().order_by("title"): prefix = "+" if str(keyword.id) not in self._ids else "-" - links += "%s%s" % (prefix, str(keyword)) + links += f"{prefix}{str(keyword)}" rendered += mark_safe("

      %s

      " % links) return rendered @@ -119,7 +119,7 @@ def __init__(self, request, *args, **kwargs): elif field == "email": value = user.email kwargs["initial"][field] = value - super(ThreadedCommentForm, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) def get_comment_model(self): """ @@ -200,7 +200,7 @@ class RatingForm(CommentSecurityForm): def __init__(self, request, *args, **kwargs): self.request = request - super(RatingForm, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) if request and is_authenticated(request.user): current = self.rating_manager.filter(user=request.user).first() if current: diff --git a/mezzanine/generic/migrations/0001_initial.py b/mezzanine/generic/migrations/0001_initial.py index 1e867bee69..434ab04a6a 100644 --- a/mezzanine/generic/migrations/0001_initial.py +++ b/mezzanine/generic/migrations/0001_initial.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from django.conf import settings from django.db import migrations, models @@ -6,76 +5,167 @@ class Migration(migrations.Migration): dependencies = [ - ('sites', '0001_initial'), + ("sites", "0001_initial"), migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('django_comments', '__first__'), - ('contenttypes', '0001_initial'), + ("django_comments", "__first__"), + ("contenttypes", "0001_initial"), ] operations = [ migrations.CreateModel( - name='AssignedKeyword', + name="AssignedKeyword", fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('_order', models.IntegerField(null=True, verbose_name='Order')), - ('object_pk', models.IntegerField()), - ('content_type', models.ForeignKey(to='contenttypes.ContentType', on_delete=models.CASCADE)), + ( + "id", + models.AutoField( + verbose_name="ID", + serialize=False, + auto_created=True, + primary_key=True, + ), + ), + ("_order", models.IntegerField(null=True, verbose_name="Order")), + ("object_pk", models.IntegerField()), + ( + "content_type", + models.ForeignKey( + to="contenttypes.ContentType", on_delete=models.CASCADE + ), + ), ], options={ - 'ordering': ('_order',), + "ordering": ("_order",), }, bases=(models.Model,), ), migrations.CreateModel( - name='Keyword', + name="Keyword", fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('title', models.CharField(max_length=500, verbose_name='Title')), - ('slug', models.CharField(help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, null=True, verbose_name='URL', blank=True)), - ('site', models.ForeignKey(editable=False, to='sites.Site', on_delete=models.CASCADE)), + ( + "id", + models.AutoField( + verbose_name="ID", + serialize=False, + auto_created=True, + primary_key=True, + ), + ), + ("title", models.CharField(max_length=500, verbose_name="Title")), + ( + "slug", + models.CharField( + help_text="Leave blank to have the URL auto-generated from the title.", + max_length=2000, + null=True, + verbose_name="URL", + blank=True, + ), + ), + ( + "site", + models.ForeignKey( + editable=False, to="sites.Site", on_delete=models.CASCADE + ), + ), ], options={ - 'verbose_name': 'Keyword', - 'verbose_name_plural': 'Keywords', + "verbose_name": "Keyword", + "verbose_name_plural": "Keywords", }, bases=(models.Model,), ), migrations.CreateModel( - name='Rating', + name="Rating", fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('value', models.IntegerField(verbose_name='Value')), - ('rating_date', models.DateTimeField(auto_now_add=True, verbose_name='Rating date', null=True)), - ('object_pk', models.IntegerField()), - ('content_type', models.ForeignKey(to='contenttypes.ContentType', on_delete=models.CASCADE)), - ('user', models.ForeignKey(related_name='ratings', verbose_name='Rater', to=settings.AUTH_USER_MODEL, null=True, on_delete=models.CASCADE)), + ( + "id", + models.AutoField( + verbose_name="ID", + serialize=False, + auto_created=True, + primary_key=True, + ), + ), + ("value", models.IntegerField(verbose_name="Value")), + ( + "rating_date", + models.DateTimeField( + auto_now_add=True, verbose_name="Rating date", null=True + ), + ), + ("object_pk", models.IntegerField()), + ( + "content_type", + models.ForeignKey( + to="contenttypes.ContentType", on_delete=models.CASCADE + ), + ), + ( + "user", + models.ForeignKey( + related_name="ratings", + verbose_name="Rater", + to=settings.AUTH_USER_MODEL, + null=True, + on_delete=models.CASCADE, + ), + ), ], options={ - 'verbose_name': 'Rating', - 'verbose_name_plural': 'Ratings', + "verbose_name": "Rating", + "verbose_name_plural": "Ratings", }, bases=(models.Model,), ), migrations.CreateModel( - name='ThreadedComment', + name="ThreadedComment", fields=[ - ('comment_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='django_comments.Comment', on_delete=models.CASCADE)), - ('rating_count', models.IntegerField(default=0, editable=False)), - ('rating_sum', models.IntegerField(default=0, editable=False)), - ('rating_average', models.FloatField(default=0, editable=False)), - ('by_author', models.BooleanField(default=False, verbose_name='By the blog author')), - ('replied_to', models.ForeignKey(related_name='comments', editable=False, to='generic.ThreadedComment', null=True, on_delete=models.CASCADE)), + ( + "comment_ptr", + models.OneToOneField( + parent_link=True, + auto_created=True, + primary_key=True, + serialize=False, + to="django_comments.Comment", + on_delete=models.CASCADE, + ), + ), + ("rating_count", models.IntegerField(default=0, editable=False)), + ("rating_sum", models.IntegerField(default=0, editable=False)), + ("rating_average", models.FloatField(default=0, editable=False)), + ( + "by_author", + models.BooleanField( + default=False, verbose_name="By the blog author" + ), + ), + ( + "replied_to", + models.ForeignKey( + related_name="comments", + editable=False, + to="generic.ThreadedComment", + null=True, + on_delete=models.CASCADE, + ), + ), ], options={ - 'verbose_name': 'Comment', - 'verbose_name_plural': 'Comments', + "verbose_name": "Comment", + "verbose_name_plural": "Comments", }, - bases=('django_comments.comment',), + bases=("django_comments.comment",), ), migrations.AddField( - model_name='assignedkeyword', - name='keyword', - field=models.ForeignKey(related_name='assignments', verbose_name='Keyword', to='generic.Keyword', on_delete=models.CASCADE), + model_name="assignedkeyword", + name="keyword", + field=models.ForeignKey( + related_name="assignments", + verbose_name="Keyword", + to="generic.Keyword", + on_delete=models.CASCADE, + ), preserve_default=True, ), ] diff --git a/mezzanine/generic/migrations/0002_auto_20141227_0224.py b/mezzanine/generic/migrations/0002_auto_20141227_0224.py index d97fa749d7..f2516b275d 100644 --- a/mezzanine/generic/migrations/0002_auto_20141227_0224.py +++ b/mezzanine/generic/migrations/0002_auto_20141227_0224.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from django.db import migrations, models import mezzanine.core.fields @@ -7,14 +6,14 @@ class Migration(migrations.Migration): dependencies = [ - ('generic', '0001_initial'), + ("generic", "0001_initial"), ] operations = [ migrations.AlterField( - model_name='assignedkeyword', - name='_order', - field=mezzanine.core.fields.OrderField(null=True, verbose_name='Order'), + model_name="assignedkeyword", + name="_order", + field=mezzanine.core.fields.OrderField(null=True, verbose_name="Order"), preserve_default=True, ), ] diff --git a/mezzanine/generic/migrations/0003_auto_20170411_0504.py b/mezzanine/generic/migrations/0003_auto_20170411_0504.py index 74452bccb5..dabad5737d 100644 --- a/mezzanine/generic/migrations/0003_auto_20170411_0504.py +++ b/mezzanine/generic/migrations/0003_auto_20170411_0504.py @@ -1,18 +1,23 @@ -# -*- coding: utf-8 -*- from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('generic', '0002_auto_20141227_0224'), + ("generic", "0002_auto_20141227_0224"), ] operations = [ migrations.AlterField( - model_name='keyword', - name='slug', - field=models.CharField(blank=True, default='', help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, verbose_name='URL'), + model_name="keyword", + name="slug", + field=models.CharField( + blank=True, + default="", + help_text="Leave blank to have the URL auto-generated from the title.", + max_length=2000, + verbose_name="URL", + ), preserve_default=False, ), ] diff --git a/mezzanine/generic/models.py b/mezzanine/generic/models.py index a0b583a829..34343a3201 100644 --- a/mezzanine/generic/models.py +++ b/mezzanine/generic/models.py @@ -46,7 +46,7 @@ def get_absolute_url(self): appended that references the individual comment. """ url = self.content_object.get_absolute_url() - return "%s#comment-%s" % (url, self.id) + return f"{url}#comment-{self.id}" def save(self, *args, **kwargs): """ @@ -56,7 +56,7 @@ def save(self, *args, **kwargs): if not self.id: self.is_public = settings.COMMENTS_DEFAULT_APPROVED self.site_id = current_site_id() - super(ThreadedComment, self).save(*args, **kwargs) + super().save(*args, **kwargs) ################################ # Admin listing column methods # @@ -162,6 +162,6 @@ def save(self, *args, **kwargs): valid = map(str, settings.RATINGS_RANGE) if str(self.value) not in valid: raise ValueError( - "Invalid rating. %s is not in %s" % (self.value, ", ".join(valid)) + "Invalid rating. {} is not in {}".format(self.value, ", ".join(valid)) ) - super(Rating, self).save(*args, **kwargs) + super().save(*args, **kwargs) diff --git a/mezzanine/generic/templatetags/disqus_tags.py b/mezzanine/generic/templatetags/disqus_tags.py index 9858c65aee..a2d65aa2a7 100644 --- a/mezzanine/generic/templatetags/disqus_tags.py +++ b/mezzanine/generic/templatetags/disqus_tags.py @@ -16,7 +16,7 @@ def disqus_id_for(obj): Returns a unique identifier for the object to be used in DISQUS JavaScript. """ - return "%s-%s" % (obj._meta.object_name, obj.id) + return f"{obj._meta.object_name}-{obj.id}" @register.inclusion_tag("generic/includes/disqus_sso.html", takes_context=True) @@ -54,9 +54,9 @@ def _get_disqus_sso(user, public_key, secret_key): # generate our hmac signature sig = hmac.HMAC( secret_key.encode("utf8"), - ("%s %s" % (message, timestamp)).encode("utf8"), + (f"{message} {timestamp}").encode("utf8"), hashlib.sha1, ).hexdigest() # Messages are of the form - return "%s %s %s" % (message, sig, timestamp) + return f"{message} {sig} {timestamp}" diff --git a/mezzanine/generic/templatetags/rating_tags.py b/mezzanine/generic/templatetags/rating_tags.py index f695a24690..6f9e130733 100644 --- a/mezzanine/generic/templatetags/rating_tags.py +++ b/mezzanine/generic/templatetags/rating_tags.py @@ -13,9 +13,9 @@ def rating_for(context, obj): context["rating_object"] = context["rating_obj"] = obj context["rating_form"] = RatingForm(context["request"], obj) ratings = context["request"].COOKIES.get("mezzanine-rating", "") - rating_string = "%s.%s" % (obj._meta, obj.pk) + rating_string = f"{obj._meta}.{obj.pk}" context["rated"] = rating_string in ratings rating_name = obj.get_ratingfield_name() for f in ("average", "count", "sum"): - context["rating_" + f] = getattr(obj, "%s_%s" % (rating_name, f)) + context["rating_" + f] = getattr(obj, f"{rating_name}_{f}") return context.flatten() diff --git a/mezzanine/generic/views.py b/mezzanine/generic/views.py index e3d6460bfb..d376feb2db 100644 --- a/mezzanine/generic/views.py +++ b/mezzanine/generic/views.py @@ -30,7 +30,7 @@ def admin_keywords_submit(request): keyword_ids, titles = [], [] remove = punctuation.replace("-", "") # Strip punctuation, allow dashes. for title in request.POST.get("text_keywords", "").split(","): - title = "".join([c for c in title if c not in remove]).strip() + title = "".join(c for c in title if c not in remove).strip() if title: kw, created = Keyword.objects.get_or_create_iexact(title=title) keyword_id = str(kw.id) @@ -38,7 +38,8 @@ def admin_keywords_submit(request): keyword_ids.append(keyword_id) titles.append(title) return HttpResponse( - "%s|%s" % (",".join(keyword_ids), ", ".join(titles)), content_type="text/plain" + "{}|{}".format(",".join(keyword_ids), ", ".join(titles)), + content_type="text/plain", ) @@ -73,7 +74,7 @@ def initial_validation(request, prefix): "sign up to complete this action." ), ) - redirect_url = "%s?next=%s" % (settings.LOGIN_URL, reverse(prefix)) + redirect_url = f"{settings.LOGIN_URL}?next={reverse(prefix)}" elif posted_session_key in request.session: post_data = request.session.pop(posted_session_key) if not redirect_url: @@ -144,10 +145,10 @@ def rating(request): rating_name = obj.get_ratingfield_name() json = {} for f in ("average", "count", "sum"): - json["rating_" + f] = getattr(obj, "%s_%s" % (rating_name, f)) + json["rating_" + f] = getattr(obj, f"{rating_name}_{f}") response = HttpResponse(dumps(json)) if rating_form.undoing: - ratings = set(rating_form.previous) ^ set([rating_form.current]) + ratings = set(rating_form.previous) ^ {rating_form.current} else: ratings = rating_form.previous + [rating_form.current] set_cookie(response, "mezzanine-rating", ",".join(ratings)) diff --git a/mezzanine/pages/admin.py b/mezzanine/pages/admin.py index d38b8189c3..26c49ee69c 100644 --- a/mezzanine/pages/admin.py +++ b/mezzanine/pages/admin.py @@ -62,7 +62,7 @@ def add_view(self, request, **kwargs): """ if self.model is Page: return HttpResponseRedirect(self.get_content_models()[0].add_url) - return super(PageAdmin, self).add_view(request, **kwargs) + return super().add_view(request, **kwargs) def change_view(self, request, object_id, **kwargs): """ @@ -79,7 +79,7 @@ def change_view(self, request, object_id, **kwargs): } ) - return super(PageAdmin, self).change_view(request, object_id, **kwargs) + return super().change_view(request, object_id, **kwargs) def delete_view(self, request, object_id, **kwargs): """ @@ -88,7 +88,7 @@ def delete_view(self, request, object_id, **kwargs): page = get_object_or_404(Page, pk=object_id) content_model = page.get_content_model() self.check_permission(request, content_model, "delete") - return super(PageAdmin, self).delete_view(request, object_id, **kwargs) + return super().delete_view(request, object_id, **kwargs) def save_model(self, request, obj, form, change): """ @@ -106,7 +106,7 @@ def save_model(self, request, obj, form, change): if parent is not None and not change: obj.parent_id = parent obj.save() - super(PageAdmin, self).save_model(request, obj, form, change) + super().save_model(request, obj, form, change) def _maintain_parent(self, request, response): """ @@ -116,7 +116,7 @@ def _maintain_parent(self, request, response): location = response._headers.get("location") parent = request.GET.get("parent") if parent and location and "?" not in location[1]: - url = "%s?parent=%s" % (location[1], parent) + url = f"{location[1]}?parent={parent}" return HttpResponseRedirect(url) return response @@ -125,7 +125,7 @@ def response_add(self, request, obj): Enforce page permissions and maintain the parent ID in the querystring. """ - response = super(PageAdmin, self).response_add(request, obj) + response = super().response_add(request, obj) return self._maintain_parent(request, response) def response_change(self, request, obj): @@ -133,7 +133,7 @@ def response_change(self, request, obj): Enforce page permissions and maintain the parent ID in the querystring. """ - response = super(PageAdmin, self).response_change(request, obj) + response = super().response_change(request, obj) return self._maintain_parent(request, response) def get_content_models(self): @@ -141,12 +141,12 @@ def get_content_models(self): Return all Page subclasses that are admin registered, ordered based on the ``ADD_PAGE_ORDER`` setting. """ - models = super(PageAdmin, self).get_content_models() + models = super().get_content_models() order = [name.lower() for name in settings.ADD_PAGE_ORDER] def sort_key(page): - name = "%s.%s" % (page._meta.app_label, page._meta.object_name) + name = f"{page._meta.app_label}.{page._meta.object_name}" unordered = len(order) try: return (order.index(name.lower()), "") @@ -173,7 +173,7 @@ def formfield_for_dbfield(self, db_field, request, **kwargs): if db_field.name == "slug": kwargs["required"] = True kwargs["help_text"] = None - return super(LinkAdmin, self).formfield_for_dbfield(db_field, request, **kwargs) + return super().formfield_for_dbfield(db_field, request, **kwargs) def save_form(self, request, form, change): """ @@ -182,7 +182,7 @@ def save_form(self, request, form, change): obj = form.save(commit=False) if not obj.id and "in_sitemap" not in form.fields: obj.in_sitemap = False - return super(LinkAdmin, self).save_form(request, form, change) + return super().save_form(request, form, change) admin.site.register(Page, PageAdmin) diff --git a/mezzanine/pages/fields.py b/mezzanine/pages/fields.py index ad82b0dc04..b1b89a6a49 100644 --- a/mezzanine/pages/fields.py +++ b/mezzanine/pages/fields.py @@ -10,7 +10,7 @@ class MenusField(MultiChoiceField): def __init__(self, *args, **kwargs): defaults = {"max_length": 100} defaults.update(kwargs) - super(MenusField, self).__init__(*args, **defaults) + super().__init__(*args, **defaults) self._overridden_default = "default" in kwargs self._overridden_choices = "choices" in kwargs diff --git a/mezzanine/pages/managers.py b/mezzanine/pages/managers.py index d749ff92cb..598242fee2 100644 --- a/mezzanine/pages/managers.py +++ b/mezzanine/pages/managers.py @@ -18,7 +18,7 @@ def published(self, for_user=None, include_login_required=False): ``login_required`` field manually, such as the case in ``PageMiddleware``. """ - published = super(PageManager, self).published(for_user=for_user) + published = super().published(for_user=for_user) unauthenticated = for_user and not is_authenticated(for_user) if ( unauthenticated diff --git a/mezzanine/pages/middleware.py b/mezzanine/pages/middleware.py index 7ffe6f9529..db2568a972 100644 --- a/mezzanine/pages/middleware.py +++ b/mezzanine/pages/middleware.py @@ -33,7 +33,7 @@ class PageMiddleware(MiddlewareMixin): """ def __init__(self, *args, **kwargs): - super(PageMiddleware, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) if "mezzanine.pages" not in settings.INSTALLED_APPS: raise MiddlewareNotUsed @@ -109,7 +109,7 @@ def process_view(self, request, view_func, view_args, view_kwargs): if k not in extra_context: extra_context[k] = v except (TypeError, ValueError): - name = "%s.%s" % (processor.__module__, processor.__name__) + name = f"{processor.__module__}.{processor.__name__}" error = ( "The page processor %s returned %s but must " "return HttpResponse or dict." diff --git a/mezzanine/pages/migrations/0001_initial.py b/mezzanine/pages/migrations/0001_initial.py index 2d0551bf79..1e23e73347 100644 --- a/mezzanine/pages/migrations/0001_initial.py +++ b/mezzanine/pages/migrations/0001_initial.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from django.db import migrations, models import mezzanine.core.fields @@ -8,75 +7,199 @@ class Migration(migrations.Migration): dependencies = [ - ('sites', '0001_initial'), + ("sites", "0001_initial"), ] operations = [ migrations.CreateModel( - name='Page', + name="Page", fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('keywords_string', models.CharField(max_length=500, editable=False, blank=True)), - ('title', models.CharField(max_length=500, verbose_name='Title')), - ('slug', models.CharField(help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, null=True, verbose_name='URL', blank=True)), - ('_meta_title', models.CharField(help_text='Optional title to be used in the HTML title tag. If left blank, the main title field will be used.', max_length=500, null=True, verbose_name='Title', blank=True)), - ('description', models.TextField(verbose_name='Description', blank=True)), - ('gen_description', models.BooleanField(default=True, help_text='If checked, the description will be automatically generated from content. Uncheck if you want to manually set a custom description.', verbose_name='Generate description')), - ('created', models.DateTimeField(null=True, editable=False)), - ('updated', models.DateTimeField(null=True, editable=False)), - ('status', models.IntegerField(default=2, help_text='With Draft chosen, will only be shown for admin users on the site.', verbose_name='Status', choices=[(1, 'Draft'), (2, 'Published')])), - ('publish_date', models.DateTimeField(help_text="With Published chosen, won't be shown until this time", null=True, verbose_name='Published from', blank=True)), - ('expiry_date', models.DateTimeField(help_text="With Published chosen, won't be shown after this time", null=True, verbose_name='Expires on', blank=True)), - ('short_url', models.URLField(null=True, blank=True)), - ('in_sitemap', models.BooleanField(default=True, verbose_name='Show in sitemap')), - ('_order', models.IntegerField(null=True, verbose_name='Order')), - ('in_menus', mezzanine.pages.fields.MenusField(default=(1, 2, 3), choices=[(1, 'Top navigation bar'), (2, 'Left-hand tree'), (3, 'Footer')], max_length=100, blank=True, null=True, verbose_name='Show in menus')), - ('titles', models.CharField(max_length=1000, null=True, editable=False)), - ('content_model', models.CharField(max_length=50, null=True, editable=False)), - ('login_required', models.BooleanField(default=False, help_text='If checked, only logged in users can view this page', verbose_name='Login required')), + ( + "id", + models.AutoField( + verbose_name="ID", + serialize=False, + auto_created=True, + primary_key=True, + ), + ), + ( + "keywords_string", + models.CharField(max_length=500, editable=False, blank=True), + ), + ("title", models.CharField(max_length=500, verbose_name="Title")), + ( + "slug", + models.CharField( + help_text="Leave blank to have the URL auto-generated from the title.", + max_length=2000, + null=True, + verbose_name="URL", + blank=True, + ), + ), + ( + "_meta_title", + models.CharField( + help_text="Optional title to be used in the HTML title tag. If left blank, the main title field will be used.", + max_length=500, + null=True, + verbose_name="Title", + blank=True, + ), + ), + ( + "description", + models.TextField(verbose_name="Description", blank=True), + ), + ( + "gen_description", + models.BooleanField( + default=True, + help_text="If checked, the description will be automatically generated from content. Uncheck if you want to manually set a custom description.", + verbose_name="Generate description", + ), + ), + ("created", models.DateTimeField(null=True, editable=False)), + ("updated", models.DateTimeField(null=True, editable=False)), + ( + "status", + models.IntegerField( + default=2, + help_text="With Draft chosen, will only be shown for admin users on the site.", + verbose_name="Status", + choices=[(1, "Draft"), (2, "Published")], + ), + ), + ( + "publish_date", + models.DateTimeField( + help_text="With Published chosen, won't be shown until this time", + null=True, + verbose_name="Published from", + blank=True, + ), + ), + ( + "expiry_date", + models.DateTimeField( + help_text="With Published chosen, won't be shown after this time", + null=True, + verbose_name="Expires on", + blank=True, + ), + ), + ("short_url", models.URLField(null=True, blank=True)), + ( + "in_sitemap", + models.BooleanField(default=True, verbose_name="Show in sitemap"), + ), + ("_order", models.IntegerField(null=True, verbose_name="Order")), + ( + "in_menus", + mezzanine.pages.fields.MenusField( + default=(1, 2, 3), + choices=[ + (1, "Top navigation bar"), + (2, "Left-hand tree"), + (3, "Footer"), + ], + max_length=100, + blank=True, + null=True, + verbose_name="Show in menus", + ), + ), + ( + "titles", + models.CharField(max_length=1000, null=True, editable=False), + ), + ( + "content_model", + models.CharField(max_length=50, null=True, editable=False), + ), + ( + "login_required", + models.BooleanField( + default=False, + help_text="If checked, only logged in users can view this page", + verbose_name="Login required", + ), + ), ], options={ - 'ordering': ('titles',), - 'verbose_name': 'Page', - 'verbose_name_plural': 'Pages', + "ordering": ("titles",), + "verbose_name": "Page", + "verbose_name_plural": "Pages", }, bases=(models.Model,), ), migrations.CreateModel( - name='Link', + name="Link", fields=[ - ('page_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='pages.Page', on_delete=models.CASCADE)), + ( + "page_ptr", + models.OneToOneField( + parent_link=True, + auto_created=True, + primary_key=True, + serialize=False, + to="pages.Page", + on_delete=models.CASCADE, + ), + ), ], options={ - 'ordering': ('_order',), - 'verbose_name': 'Link', - 'verbose_name_plural': 'Links', + "ordering": ("_order",), + "verbose_name": "Link", + "verbose_name_plural": "Links", }, - bases=('pages.page',), + bases=("pages.page",), ), migrations.CreateModel( - name='RichTextPage', + name="RichTextPage", fields=[ - ('page_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='pages.Page', on_delete=models.CASCADE)), - ('content', mezzanine.core.fields.RichTextField(verbose_name='Content')), + ( + "page_ptr", + models.OneToOneField( + parent_link=True, + auto_created=True, + primary_key=True, + serialize=False, + to="pages.Page", + on_delete=models.CASCADE, + ), + ), + ( + "content", + mezzanine.core.fields.RichTextField(verbose_name="Content"), + ), ], options={ - 'ordering': ('_order',), - 'verbose_name': 'Rich text page', - 'verbose_name_plural': 'Rich text pages', + "ordering": ("_order",), + "verbose_name": "Rich text page", + "verbose_name_plural": "Rich text pages", }, - bases=('pages.page', models.Model), + bases=("pages.page", models.Model), ), migrations.AddField( - model_name='page', - name='parent', - field=models.ForeignKey(related_name='children', blank=True, to='pages.Page', null=True, on_delete=models.CASCADE), + model_name="page", + name="parent", + field=models.ForeignKey( + related_name="children", + blank=True, + to="pages.Page", + null=True, + on_delete=models.CASCADE, + ), preserve_default=True, ), migrations.AddField( - model_name='page', - name='site', - field=models.ForeignKey(editable=False, to='sites.Site', on_delete=models.CASCADE), + model_name="page", + name="site", + field=models.ForeignKey( + editable=False, to="sites.Site", on_delete=models.CASCADE + ), preserve_default=True, ), ] diff --git a/mezzanine/pages/migrations/0002_auto_20141227_0224.py b/mezzanine/pages/migrations/0002_auto_20141227_0224.py index ec4b1fa1cb..cd739cd8de 100644 --- a/mezzanine/pages/migrations/0002_auto_20141227_0224.py +++ b/mezzanine/pages/migrations/0002_auto_20141227_0224.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- from django.db import migrations, models import mezzanine.core.fields @@ -8,20 +7,22 @@ class Migration(migrations.Migration): dependencies = [ - ('pages', '0001_initial'), + ("pages", "0001_initial"), ] operations = [ migrations.AlterField( - model_name='page', - name='_order', - field=mezzanine.core.fields.OrderField(null=True, verbose_name='Order'), + model_name="page", + name="_order", + field=mezzanine.core.fields.OrderField(null=True, verbose_name="Order"), preserve_default=True, ), migrations.AlterField( - model_name='page', - name='in_menus', - field=mezzanine.pages.fields.MenusField(max_length=100, null=True, verbose_name='Show in menus', blank=True), + model_name="page", + name="in_menus", + field=mezzanine.pages.fields.MenusField( + max_length=100, null=True, verbose_name="Show in menus", blank=True + ), preserve_default=True, ), ] diff --git a/mezzanine/pages/migrations/0003_auto_20150527_1555.py b/mezzanine/pages/migrations/0003_auto_20150527_1555.py index 839128989a..c97de6f97a 100644 --- a/mezzanine/pages/migrations/0003_auto_20150527_1555.py +++ b/mezzanine/pages/migrations/0003_auto_20150527_1555.py @@ -1,17 +1,22 @@ -# -*- coding: utf-8 -*- from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('pages', '0002_auto_20141227_0224'), + ("pages", "0002_auto_20141227_0224"), ] operations = [ migrations.AlterField( - model_name='page', - name='publish_date', - field=models.DateTimeField(help_text="With Published chosen, won't be shown until this time", null=True, verbose_name='Published from', db_index=True, blank=True), + model_name="page", + name="publish_date", + field=models.DateTimeField( + help_text="With Published chosen, won't be shown until this time", + null=True, + verbose_name="Published from", + db_index=True, + blank=True, + ), ), ] diff --git a/mezzanine/pages/migrations/0004_auto_20170411_0504.py b/mezzanine/pages/migrations/0004_auto_20170411_0504.py index f230f70bc8..66b79a928f 100644 --- a/mezzanine/pages/migrations/0004_auto_20170411_0504.py +++ b/mezzanine/pages/migrations/0004_auto_20170411_0504.py @@ -1,18 +1,23 @@ -# -*- coding: utf-8 -*- from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('pages', '0003_auto_20150527_1555'), + ("pages", "0003_auto_20150527_1555"), ] operations = [ migrations.AlterField( - model_name='page', - name='slug', - field=models.CharField(blank=True, default='', help_text='Leave blank to have the URL auto-generated from the title.', max_length=2000, verbose_name='URL'), + model_name="page", + name="slug", + field=models.CharField( + blank=True, + default="", + help_text="Leave blank to have the URL auto-generated from the title.", + max_length=2000, + verbose_name="URL", + ), preserve_default=False, ), ] diff --git a/mezzanine/pages/models.py b/mezzanine/pages/models.py index 8f568bdf23..f3851bc3d9 100644 --- a/mezzanine/pages/models.py +++ b/mezzanine/pages/models.py @@ -86,7 +86,7 @@ def save(self, *args, **kwargs): titles.insert(0, parent.title) parent = parent.parent self.titles = " / ".join(titles) - super(Page, self).save(*args, **kwargs) + super().save(*args, **kwargs) def description_from_content(self): """ @@ -98,7 +98,7 @@ def description_from_content(self): if self.__class__ == Page: if self.content_model: return self.get_content_model().description_from_content() - return super(Page, self).description_from_content() + return super().description_from_content() def get_ascendants(self, for_user=None): """ @@ -136,9 +136,9 @@ def get_slug(self): """ Recursively build the slug from the chain of parents. """ - slug = super(Page, self).get_slug() + slug = super().get_slug() if self.parent is not None: - return "%s/%s" % (self.parent.slug, slug) + return f"{self.parent.slug}/{slug}" return slug def set_slug(self, new_slug): diff --git a/mezzanine/pages/views.py b/mezzanine/pages/views.py index 3b3f0a2184..868f93e9c4 100644 --- a/mezzanine/pages/views.py +++ b/mezzanine/pages/views.py @@ -45,7 +45,7 @@ def get_id(s): return HttpResponse("ok") -def page(request, slug, template=u"pages/page.html", extra_context=None): +def page(request, slug, template="pages/page.html", extra_context=None): """ Select a template for a page and render it. The request object should have a ``page`` attribute that's added via @@ -81,23 +81,21 @@ def page(request, slug, template=u"pages/page.html", extra_context=None): # is configured as a page instance, the template "pages/index.html" is # used, since the slug "/" won't match a template name. template_name = str(slug) if slug != home_slug() else "index" - templates = [u"pages/%s.html" % template_name] + templates = ["pages/%s.html" % template_name] method_template = request.page.get_content_model().get_template_name() if method_template: templates.insert(0, method_template) if request.page.content_model is not None: - templates.append( - u"pages/%s/%s.html" % (template_name, request.page.content_model) - ) + templates.append(f"pages/{template_name}/{request.page.content_model}.html") for parent in request.page.get_ascendants(for_user=request.user): parent_template_name = str(parent.slug) # Check for a template matching the page's content model. if request.page.content_model is not None: templates.append( - u"pages/%s/%s.html" % (parent_template_name, request.page.content_model) + f"pages/{parent_template_name}/{request.page.content_model}.html" ) # Check for a template matching the page's content model. if request.page.content_model is not None: - templates.append(u"pages/%s.html" % request.page.content_model) + templates.append("pages/%s.html" % request.page.content_model) templates.append(template) return TemplateResponse(request, templates, extra_context or {}) diff --git a/mezzanine/project_template/fabfile.py b/mezzanine/project_template/fabfile.py index bf90e9644c..d1668947c9 100644 --- a/mezzanine/project_template/fabfile.py +++ b/mezzanine/project_template/fabfile.py @@ -52,12 +52,12 @@ env.proj_name = conf.get("PROJECT_NAME", env.proj_app) env.venv_home = conf.get("VIRTUALENV_HOME", "/home/%s/.virtualenvs" % env.user) env.venv_path = join(env.venv_home, env.proj_name) -env.proj_path = "/home/%s/mezzanine/%s" % (env.user, env.proj_name) -env.manage = "%s/bin/python %s/manage.py" % (env.venv_path, env.proj_path) +env.proj_path = f"/home/{env.user}/mezzanine/{env.proj_name}" +env.manage = f"{env.venv_path}/bin/python {env.proj_path}/manage.py" env.domains = conf.get("DOMAINS", [conf.get("LIVE_HOSTNAME", env.hosts[0])]) env.domains_nginx = " ".join(env.domains) env.domains_regex = "|".join(env.domains) -env.domains_python = ", ".join(["'%s'" % s for s in env.domains]) +env.domains_python = ", ".join("'%s'" % s for s in env.domains) env.ssl_disabled = "#" if len(env.domains) > 1 else "" env.vcs_tools = ["git", "hg"] env.deploy_tool = conf.get("DEPLOY_TOOL", "rsync") @@ -78,7 +78,7 @@ # Remote git repos need to be "bare" and reside separated from the project if env.deploy_tool == "git": - env.repo_path = "/home/%s/git/%s.git" % (env.user, env.proj_name) + env.repo_path = f"/home/{env.user}/git/{env.proj_name}.git" else: env.repo_path = env.proj_path @@ -170,7 +170,7 @@ def update_changed_requirements(): else: # All requirements are pinned. return - pip("-r %s/%s" % (env.proj_path, env.reqs_path)) + pip(f"-r {env.proj_path}/{env.reqs_path}") ########################################### @@ -226,7 +226,7 @@ def get_templates(): """ injected = {} for name, data in templates.items(): - injected[name] = dict([(k, v % env) for k, v in data.items()]) + injected[name] = {k: v % env for k, v in data.items()} return injected @@ -248,7 +248,7 @@ def upload_template_and_reload(name): if exists(remote_path): with hide("stdout"): remote_data = sudo("cat %s" % remote_path, show=False) - with open(local_path, "r") as f: + with open(local_path) as f: local_data = f.read() # Escape all non-string-formatting-placeholder occurrences of '%': local_data = re.sub(r"%(?!\(\w+\)s)", "%%", local_data) @@ -260,9 +260,9 @@ def upload_template_and_reload(name): return upload_template(local_path, remote_path, env, use_sudo=True, backup=False) if owner: - sudo("chown %s %s" % (owner, remote_path)) + sudo(f"chown {owner} {remote_path}") if mode: - sudo("chmod %s %s" % (mode, remote_path)) + sudo(f"chmod {mode} {remote_path}") if reload_command: sudo(reload_command) @@ -282,7 +282,7 @@ def rsync_upload(): "/.git", "/.hg", ] - local_dir = "'%s%s'" % (os.getcwd(), os.sep) + local_dir = f"'{os.getcwd()}{os.sep}'" return rsync_project( remote_dir=env.proj_path, local_dir=local_dir, exclude=excludes ) @@ -293,7 +293,7 @@ def vcs_upload(): Uploads the project with the selected VCS tool. """ if env.deploy_tool == "git": - remote_path = "ssh://%s@%s%s" % (env.user, env.host_string, env.repo_path) + remote_path = f"ssh://{env.user}@{env.host_string}{env.repo_path}" if not exists(env.repo_path): run("mkdir -p %s" % env.repo_path) with cd(env.repo_path): @@ -303,7 +303,7 @@ def vcs_upload(): run("GIT_WORK_TREE=%s git checkout -f master" % env.proj_path) run("GIT_WORK_TREE=%s git reset --hard" % env.proj_path) elif env.deploy_tool == "hg": - remote_path = "ssh://%s@%s/%s" % (env.user, env.host_string, env.repo_path) + remote_path = f"ssh://{env.user}@{env.host_string}/{env.repo_path}" with cd(env.repo_path): if not exists("%s/.hg" % env.repo_path): run("hg init") @@ -370,7 +370,7 @@ def backup(filename): # We cd to / because user "postgres" might not have read permissions # elsewhere. with cd("/"): - postgres("pg_dump -Fc %s > %s" % (env.proj_name, tmp_file)) + postgres(f"pg_dump -Fc {env.proj_name} > {tmp_file}") run("cp %s ." % tmp_file) sudo("rm -f %s" % tmp_file) @@ -380,7 +380,7 @@ def restore(filename): """ Restores the project database from a previous backup. """ - return postgres("pg_restore -c -d %s %s" % (env.proj_name, filename)) + return postgres(f"pg_restore -c -d {env.proj_name} {filename}") @task @@ -394,7 +394,7 @@ def python(code, show=True): "import django;" "django.setup();" % env.proj_app ) - full_code = 'python -c "%s%s"' % (setup, code.replace("`", "\\\`")) # noqa + full_code = 'python -c "{}{}"'.format(setup, code.replace("`", "\\\\`")) # noqa with project(): if show: print_command(code) @@ -416,7 +416,7 @@ def manage(command): """ Runs a Django management command. """ - return run("%s %s" % (env.manage, command)) + return run(f"{env.manage} {command}") ########################### @@ -473,7 +473,7 @@ def install(): # Set up virtualenv run("mkdir -p %s" % env.venv_home) - run("echo 'export WORKON_HOME=%s' >> /home/%s/.bashrc" % (env.venv_home, env.user)) + run(f"echo 'export WORKON_HOME={env.venv_home}' >> /home/{env.user}/.bashrc") run( "echo 'source /usr/local/bin/virtualenvwrapper.sh' >> " "/home/%s/.bashrc" % env.user @@ -565,7 +565,7 @@ def create(): upload_template_and_reload("settings") with project(): if env.reqs_path: - pip("-r %s/%s" % (env.proj_path, env.reqs_path)) + pip(f"-r {env.proj_path}/{env.reqs_path}") pip("gunicorn setproctitle psycopg2 " "django-compressor python-memcached") # Bootstrap the DB manage("createdb --noinput --nodata") diff --git a/mezzanine/twitter/admin.py b/mezzanine/twitter/admin.py index b8993c321f..e660d7276f 100644 --- a/mezzanine/twitter/admin.py +++ b/mezzanine/twitter/admin.py @@ -18,7 +18,7 @@ """ -class TweetableAdminMixin(object): +class TweetableAdminMixin: """ Admin mixin that adds a "Send to Twitter" checkbox to the add/change views, which when checked, will send a tweet with the title and link @@ -34,9 +34,7 @@ def formfield_for_dbfield(self, db_field, request, **kwargs): formsets attribute of the admin class fell apart quite horrifically. """ - formfield = super(TweetableAdminMixin, self).formfield_for_dbfield( - db_field, request, **kwargs - ) + formfield = super().formfield_for_dbfield(db_field, request, **kwargs) if Api and db_field.name == "status" and get_auth_settings(): def wrapper(render): @@ -54,10 +52,10 @@ def save_model(self, request, obj, form, change): """ Sends a tweet with the title/short_url if applicable. """ - super(TweetableAdminMixin, self).save_model(request, obj, form, change) + super().save_model(request, obj, form, change) if Api and request.POST.get("send_tweet", False): auth_settings = get_auth_settings() obj.set_short_url() message = truncatechars(obj, 140 - len(obj.short_url) - 1) api = Api(*auth_settings) - api.PostUpdate("%s %s" % (message, obj.short_url)) + api.PostUpdate(f"{message} {obj.short_url}") diff --git a/mezzanine/twitter/management/commands/poll_twitter.py b/mezzanine/twitter/management/commands/poll_twitter.py index 814754322c..9627ef042e 100644 --- a/mezzanine/twitter/management/commands/poll_twitter.py +++ b/mezzanine/twitter/management/commands/poll_twitter.py @@ -20,7 +20,7 @@ def handle(self, **options): try: query.run() except TwitterQueryException as e: - print("Twitter query error [%s]: %s" % (query, e)) + print(f"Twitter query error [{query}]: {e}") try: db.close_connection() except: # noqa diff --git a/mezzanine/twitter/migrations/0001_initial.py b/mezzanine/twitter/migrations/0001_initial.py index 677b85c7b0..798bddeb07 100644 --- a/mezzanine/twitter/migrations/0001_initial.py +++ b/mezzanine/twitter/migrations/0001_initial.py @@ -1,49 +1,120 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ - ] + dependencies = [] operations = [ migrations.CreateModel( - name='Query', + name="Query", fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('type', models.CharField(max_length=10, verbose_name='Type', choices=[('user', 'User'), ('list', 'List'), ('search', 'Search')])), - ('value', models.CharField(max_length=140, verbose_name='Value')), - ('interested', models.BooleanField(default=True, verbose_name='Interested')), + ( + "id", + models.AutoField( + verbose_name="ID", + serialize=False, + auto_created=True, + primary_key=True, + ), + ), + ( + "type", + models.CharField( + max_length=10, + verbose_name="Type", + choices=[ + ("user", "User"), + ("list", "List"), + ("search", "Search"), + ], + ), + ), + ("value", models.CharField(max_length=140, verbose_name="Value")), + ( + "interested", + models.BooleanField(default=True, verbose_name="Interested"), + ), ], options={ - 'ordering': ('-id',), - 'verbose_name': 'Twitter query', - 'verbose_name_plural': 'Twitter queries', + "ordering": ("-id",), + "verbose_name": "Twitter query", + "verbose_name_plural": "Twitter queries", }, bases=(models.Model,), ), migrations.CreateModel( - name='Tweet', + name="Tweet", fields=[ - ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('remote_id', models.CharField(max_length=50, verbose_name='Twitter ID')), - ('created_at', models.DateTimeField(null=True, verbose_name='Date/time')), - ('text', models.TextField(null=True, verbose_name='Message')), - ('profile_image_url', models.URLField(null=True, verbose_name='Profile image URL')), - ('user_name', models.CharField(max_length=100, null=True, verbose_name='User name')), - ('full_name', models.CharField(max_length=100, null=True, verbose_name='Full name')), - ('retweeter_profile_image_url', models.URLField(null=True, verbose_name='Profile image URL (Retweeted by)')), - ('retweeter_user_name', models.CharField(max_length=100, null=True, verbose_name='User name (Retweeted by)')), - ('retweeter_full_name', models.CharField(max_length=100, null=True, verbose_name='Full name (Retweeted by)')), - ('query', models.ForeignKey(related_name='tweets', to='twitter.Query', on_delete=models.CASCADE)), + ( + "id", + models.AutoField( + verbose_name="ID", + serialize=False, + auto_created=True, + primary_key=True, + ), + ), + ( + "remote_id", + models.CharField(max_length=50, verbose_name="Twitter ID"), + ), + ( + "created_at", + models.DateTimeField(null=True, verbose_name="Date/time"), + ), + ("text", models.TextField(null=True, verbose_name="Message")), + ( + "profile_image_url", + models.URLField(null=True, verbose_name="Profile image URL"), + ), + ( + "user_name", + models.CharField( + max_length=100, null=True, verbose_name="User name" + ), + ), + ( + "full_name", + models.CharField( + max_length=100, null=True, verbose_name="Full name" + ), + ), + ( + "retweeter_profile_image_url", + models.URLField( + null=True, verbose_name="Profile image URL (Retweeted by)" + ), + ), + ( + "retweeter_user_name", + models.CharField( + max_length=100, + null=True, + verbose_name="User name (Retweeted by)", + ), + ), + ( + "retweeter_full_name", + models.CharField( + max_length=100, + null=True, + verbose_name="Full name (Retweeted by)", + ), + ), + ( + "query", + models.ForeignKey( + related_name="tweets", + to="twitter.Query", + on_delete=models.CASCADE, + ), + ), ], options={ - 'ordering': ('-created_at',), - 'verbose_name': 'Tweet', - 'verbose_name_plural': 'Tweets', + "ordering": ("-created_at",), + "verbose_name": "Tweet", + "verbose_name_plural": "Tweets", }, bases=(models.Model,), ), diff --git a/mezzanine/twitter/models.py b/mezzanine/twitter/models.py index 3b0bda7099..411778c42a 100644 --- a/mezzanine/twitter/models.py +++ b/mezzanine/twitter/models.py @@ -41,7 +41,7 @@ class Meta: ordering = ("-id",) def __str__(self): - return "%s: %s" % (self.get_type_display(), self.value) + return f"{self.get_type_display()}: {self.value}" def run(self): """ @@ -159,7 +159,7 @@ class Meta: ordering = ("-created_at",) def __str__(self): - return "%s: %s" % (self.user_name, self.text) + return f"{self.user_name}: {self.text}" def is_retweet(self): return self.retweeter_user_name is not None diff --git a/mezzanine/utils/admin.py b/mezzanine/utils/admin.py index 2e7be5a002..e1b38a0b71 100644 --- a/mezzanine/utils/admin.py +++ b/mezzanine/utils/admin.py @@ -32,7 +32,7 @@ def add_view(self, *args, **kwargs): except (self.model.DoesNotExist, self.model.MultipleObjectsReturned): kwargs.setdefault("extra_context", {}) kwargs["extra_context"]["singleton"] = True - response = super(SingletonAdmin, self).add_view(*args, **kwargs) + response = super().add_view(*args, **kwargs) return self.handle_save(args[0], response) return redirect(admin_url(self.model, "change", singleton.id)) @@ -44,7 +44,7 @@ def changelist_view(self, *args, **kwargs): try: singleton = self.model.objects.get() except self.model.MultipleObjectsReturned: - return super(SingletonAdmin, self).changelist_view(*args, **kwargs) + return super().changelist_view(*args, **kwargs) except self.model.DoesNotExist: return redirect(admin_url(self.model, "add")) return redirect(admin_url(self.model, "change", singleton.id)) @@ -57,5 +57,5 @@ def change_view(self, *args, **kwargs): """ kwargs.setdefault("extra_context", {}) kwargs["extra_context"]["singleton"] = self.model.objects.count() == 1 - response = super(SingletonAdmin, self).change_view(*args, **kwargs) + response = super().change_view(*args, **kwargs) return self.handle_save(args[0], response) diff --git a/mezzanine/utils/cache.py b/mezzanine/utils/cache.py index 05fc25cf8e..6f746c3af7 100644 --- a/mezzanine/utils/cache.py +++ b/mezzanine/utils/cache.py @@ -81,7 +81,7 @@ def cache_key_prefix(request): Cache key for Mezzanine's cache middleware. Adds the current site ID. """ - cache_key = "%s.%s.%s" % ( + cache_key = "{}.{}.{}".format( settings.CACHE_MIDDLEWARE_KEY_PREFIX, current_site_id(), # This last part used to indicate the device type for the request, diff --git a/mezzanine/utils/conf.py b/mezzanine/utils/conf.py index b563fdc6a1..278ccc4643 100644 --- a/mezzanine/utils/conf.py +++ b/mezzanine/utils/conf.py @@ -11,7 +11,7 @@ from mezzanine.utils.timezone import get_best_local_timezone -class SitesAllowedHosts(object): +class SitesAllowedHosts: """ This is a fallback for Django's ALLOWED_HOSTS setting which is required when DEBUG is False. It looks up the diff --git a/mezzanine/utils/deprecation.py b/mezzanine/utils/deprecation.py index 190148fd77..29f43e9356 100644 --- a/mezzanine/utils/deprecation.py +++ b/mezzanine/utils/deprecation.py @@ -12,7 +12,7 @@ from django.utils.deprecation import MiddlewareMixin except ImportError: - class MiddlewareMixin(object): + class MiddlewareMixin: pass diff --git a/mezzanine/utils/docs.py b/mezzanine/utils/docs.py index d94f5ef2c2..ff35b8a36c 100644 --- a/mezzanine/utils/docs.py +++ b/mezzanine/utils/docs.py @@ -68,7 +68,7 @@ def build_settings_docs(docs_path, prefix=None): ) if setting["choices"]: choices = ", ".join( - ["%s: ``%s``" % (str(v), force_text(k)) for k, v in setting["choices"]] + f"{str(v)}: ``{force_text(k)}``" for k, v in setting["choices"] ) lines.extend(["", "Choices: %s" % choices, ""]) lines.extend(["", "Default: ``%s``" % setting_default]) @@ -92,7 +92,7 @@ def build_deploy_docs(docs_path): lines = [] for name in sorted(commands.keys()): doc = commands[name].__doc__.strip().split("\n")[0] - lines.append(" * ``fab %s`` - %s" % (name, doc)) + lines.append(f" * ``fab {name}`` - {doc}") with open(os.path.join(docs_path, "fabfile.rst"), "w") as f: f.write("\n".join(lines)) @@ -184,7 +184,7 @@ def build_changelog(docs_path, package_name="mezzanine"): last = "" if word[-1] in ",.": last, word = word[-1], word[:-1] - words[i] = "``%s``%s" % (word, last) + words[i] = f"``{word}``{last}" description = " ".join(words) if version_file in files: for line in cs[version_file].data().split("\n"): @@ -242,7 +242,7 @@ def build_changelog(docs_path, package_name="mezzanine"): if not hotfix: continue user = cs.user().decode("utf-8").split("<")[0].strip() - entry = "%s - %s" % (description, user) + entry = f"{description} - {user}" if hotfix or entry not in versions[version]["changes"]: if hotfix: versions[hotfix] = { @@ -255,7 +255,7 @@ def build_changelog(docs_path, package_name="mezzanine"): # Write out the changelog. with open(changelog_file, "w") as f: for version, version_info in versions.items(): - header = "Version %s (%s)" % (version, version_info["date"]) + header = "Version {} ({})".format(version, version_info["date"]) f.write("%s\n" % header) f.write("%s\n" % ("-" * len(header))) f.write("\n") @@ -332,7 +332,7 @@ def build_requirements(docs_path, package_name="mezzanine"): requirements_file = os.path.join( project_path, package_name, "project_template", "requirements.txt" ) - with open(requirements_file, "r") as f: + with open(requirements_file) as f: requirements = f.readlines() with open(requirements_file, "w") as f: f.write("Mezzanine==%s\n" % __version__) diff --git a/mezzanine/utils/email.py b/mezzanine/utils/email.py index 85e55569e4..b8b0be1028 100644 --- a/mezzanine/utils/email.py +++ b/mezzanine/utils/email.py @@ -60,9 +60,7 @@ def send_mail_template( ): addr_bcc = [addr_bcc] # Loads a template passing in vars as context. - render = lambda type: loader.get_template("%s.%s" % (template, type)).render( - context - ) + render = lambda type: loader.get_template(f"{template}.{type}").render(context) # Create and send email. msg = EmailMultiAlternatives( subject, render("txt"), addr_from, addr_to, addr_bcc, headers=headers diff --git a/mezzanine/utils/html.py b/mezzanine/utils/html.py index e7fd4eee5e..8734c5405a 100644 --- a/mezzanine/utils/html.py +++ b/mezzanine/utils/html.py @@ -169,7 +169,7 @@ def __init__(self, html): except HTMLParseError: pass else: - self.html += "".join(["" % tag for tag in self.tags]) + self.html += "".join("" % tag for tag in self.tags) def handle_starttag(self, tag, attrs): if tag not in SELF_CLOSING_TAGS: diff --git a/mezzanine/utils/importing.py b/mezzanine/utils/importing.py index c229b0cd18..bc88295de3 100644 --- a/mezzanine/utils/importing.py +++ b/mezzanine/utils/importing.py @@ -21,7 +21,7 @@ def import_dotted_path(path): module = import_module(module_path) return getattr(module, member_name) except (ValueError, ImportError, AttributeError) as e: - raise ImportError("Could not import the name: %s: %s" % (path, e)) + raise ImportError(f"Could not import the name: {path}: {e}") def get_app_name_list(): diff --git a/mezzanine/utils/models.py b/mezzanine/utils/models.py index 8e2117b5ee..851ec08bfe 100644 --- a/mezzanine/utils/models.py +++ b/mezzanine/utils/models.py @@ -86,7 +86,7 @@ def upload_to(field_path, default): return default -class AdminThumbMixin(object): +class AdminThumbMixin: """ Provides a thumbnail method on models for admin classes to reference in the ``list_display`` definition. @@ -127,7 +127,7 @@ def __new__(cls, name, bases, attrs): """ if name == "ModelMixin": # Actual ModelMixin class definition. - return super(ModelMixinBase, cls).__new__(cls, name, bases, attrs) + return super().__new__(cls, name, bases, attrs) try: mixin_for = attrs.pop("Meta").mixin_for if not issubclass(mixin_for, Model): diff --git a/mezzanine/utils/urls.py b/mezzanine/utils/urls.py index 6bcb8201ea..2c8efb27d1 100644 --- a/mezzanine/utils/urls.py +++ b/mezzanine/utils/urls.py @@ -17,7 +17,7 @@ def admin_url(model, url, object_id=None): Returns the URL for the given model and admin url name. """ opts = model._meta - url = "admin:%s_%s_%s" % (opts.app_label, opts.object_name.lower(), url) + url = f"admin:{opts.app_label}_{opts.object_name.lower()}_{url}" args = () if object_id is not None: args = (object_id,) @@ -74,7 +74,7 @@ def unique_slug(queryset, slug_field, slug): if i > 0: if i > 1: slug = slug.rsplit("-", 1)[0] - slug = "%s-%s" % (slug, i) + slug = f"{slug}-{i}" try: queryset.get(**{slug_field: slug}) except ObjectDoesNotExist: diff --git a/mezzanine/utils/views.py b/mezzanine/utils/views.py index c22c5468fc..e18fd20040 100644 --- a/mezzanine/utils/views.py +++ b/mezzanine/utils/views.py @@ -29,7 +29,7 @@ def is_editable(obj, request): return obj.is_editable(request) else: codename = get_permission_codename("change", obj._meta) - perm = "%s.%s" % (obj._meta.app_label, codename) + perm = f"{obj._meta.app_label}.{codename}" return ( is_authenticated(request.user) and has_site_permission(request.user) diff --git a/pyproject.toml b/pyproject.toml index 044dfcbc22..b3973ce958 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,9 +8,6 @@ exclude = ''' | \.venv | build | dist - | migrations )/ ) ''' - -force_exclude = "migrations/" diff --git a/setup.cfg b/setup.cfg index 89ab4d2df7..fda5ffc4ad 100644 --- a/setup.cfg +++ b/setup.cfg @@ -52,6 +52,7 @@ codestyle = flake8 >= 3, <4 black==20.8b1 isort >= 5, <6 + pyupgrade >= 2, <3 [options.entry_points] console_scripts = diff --git a/tests/test_conf.py b/tests/test_conf.py index 71388bd85e..2bb13bc591 100644 --- a/tests/test_conf.py +++ b/tests/test_conf.py @@ -25,7 +25,7 @@ def test_threading_race(self): int: lambda s: s + 1, float: lambda s: s + 1.0, bool: lambda s: not s, - str: lambda s: s + u"test", + str: lambda s: s + "test", bytes: lambda s: s + b"test", } @@ -102,11 +102,11 @@ def test_settings(self): elif setting_type is bool: setting_value = not setting_value elif setting_type is str: - setting_value += u"test" + setting_value += "test" elif setting_type is bytes: setting_value += b"test" else: - setting = "%s: %s" % (setting_name, setting_type) + setting = f"{setting_name}: {setting_type}" self.fail("Unsupported setting type for %s" % setting) values_by_name[setting_name] = setting_value Setting.objects.create(name=setting_name, value=setting_value) diff --git a/tests/test_core.py b/tests/test_core.py index 0d792b1d0c..b95b980a16 100644 --- a/tests/test_core.py +++ b/tests/test_core.py @@ -258,7 +258,7 @@ def test_multisite(self): def _static_proxy(self, querystring): self.client.login(username=self._username, password=self._password) - proxy_url = "%s?%s" % (reverse("static_proxy"), querystring) + proxy_url = "{}?{}".format(reverse("static_proxy"), querystring) response = self.client.get(proxy_url) self.assertEqual(response.status_code, 200) @@ -305,7 +305,7 @@ def test_password_reset(self): # Go to admin-login, search for reset-link response = self.client.get("/admin/", follow=True) - self.assertContains(response, u"Forgot password?") + self.assertContains(response, "Forgot password?") url = re.findall( b"Forgot password\\?", response.content ) @@ -571,7 +571,7 @@ def test_override_site_id(self): self.assertEqual(current_site_id(), 1) -class CSRFTestViews(object): +class CSRFTestViews: def nevercache_view(request): template = "{% load mezzanine_tags %}" template += "{% nevercache %}" diff --git a/tests/test_forms.py b/tests/test_forms.py index 190ee18592..1d16e24011 100644 --- a/tests/test_forms.py +++ b/tests/test_forms.py @@ -29,7 +29,7 @@ def test_forms(self): response = self.client.get(form.get_absolute_url()) self.assertEqual(response.status_code, 200) visible_fields = form.fields.visible() - data = dict([("field_%s" % f.id, "test") for f in visible_fields]) + data = {"field_%s" % f.id: "test" for f in visible_fields} response = self.client.post(form.get_absolute_url(), data=data) self.assertEqual(response.status_code, 200) diff --git a/tests/test_generic.py b/tests/test_generic.py index 7ecd4f448a..f7371ccf38 100644 --- a/tests/test_generic.py +++ b/tests/test_generic.py @@ -103,7 +103,7 @@ def test_keywords(self): Test that the keywords_string field is correctly populated. """ page = RichTextPage.objects.create(title="test keywords") - keywords = set(["how", "now", "brown", "cow"]) + keywords = {"how", "now", "brown", "cow"} Keyword.objects.all().delete() for keyword in keywords: keyword_id = Keyword.objects.get_or_create(title=keyword)[0].id @@ -180,7 +180,7 @@ def test_keywords_widget(self): keyword_widget = KeywordsWidget() - keywords = set(["how", "now", "brown"]) + keywords = {"how", "now", "brown"} Keyword.objects.all().delete() keyword_id_list = [] for keyword in keywords: diff --git a/tests/test_pages.py b/tests/test_pages.py index b46c01faf1..af6b8f2436 100644 --- a/tests/test_pages.py +++ b/tests/test_pages.py @@ -33,7 +33,7 @@ def setUp(self): """ Make sure we have a thread-local request with a site_id attribute set. """ - super(PagesTests, self).setUp() + super().setUp() from mezzanine.core.request import _thread_local request = self._request_factory.get("/") @@ -205,7 +205,7 @@ def test_login_required(self): # With LocaleMiddleware and a string LOGIN_URL there can be # a second redirect that encodes the next parameter. login_next = urlquote_plus(login_next) - login = "%s%s?next=%s" % (login_prefix, login_url, login_next) + login = f"{login_prefix}{login_url}?next={login_next}" if accounts_installed: # For an inaccessible page with mezzanine.accounts we should # see a login page, without it 404 is more appropriate than an @@ -219,7 +219,7 @@ def test_login_required(self): if accounts_installed: # View / pattern name redirect properly, without encoding next. - login = "%s%s?next=%s" % (login_prefix, login_url, private_url) + login = f"{login_prefix}{login_url}?next={private_url}" with override_settings(LOGIN_URL="login"): # Note: The "login" is a pattern name in accounts.urls. response = self.client.get(public_url, follow=True) @@ -390,7 +390,7 @@ def test_unicode_slug_parm_to_processor_for(self): """ from mezzanine.pages.page_processors import processor_for - @processor_for(u"test unicode string") + @processor_for("test unicode string") def test_page_processor(request, page): return {} diff --git a/tox.ini b/tox.ini index c7ae2c6f0b..572006bc29 100644 --- a/tox.ini +++ b/tox.ini @@ -38,12 +38,22 @@ commands = black --check . flake8 . +[testenv:pyupgrade] +# Run pyupgrade with non-zero exit code (notice `+` at the end of command) +skip_install = true +allowlist_externals = sh +deps = .[codestyle] +commands = + sh -c 'find . -path ./.tox -prune -false -o -name "*.py" -exec pyupgrade --py36-plus \{\} +' + [testenv:format] # This env is not run by default. It's provided here for you to easily # autoformat code by running `tox -e format` skip_install = true +allowlist_externals = sh deps = .[codestyle] commands = + sh -c 'find . -path ./.tox -prune -false -o -name "*.py" -exec pyupgrade --py36-plus \{\} \;' isort --atomic . black . From 87cc3265dd94280af737c88812169f05d7fb661c Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Mon, 31 May 2021 18:02:58 -0600 Subject: [PATCH 043/101] chore: add coverage reports --- .coveragerc | 7 +++++++ .gitignore | 1 + MANIFEST.in | 2 +- pytest.ini | 8 ++++++++ setup.cfg | 1 + 5 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 .coveragerc create mode 100644 pytest.ini diff --git a/.coveragerc b/.coveragerc new file mode 100644 index 0000000000..730b53144d --- /dev/null +++ b/.coveragerc @@ -0,0 +1,7 @@ +[run] +omit = + mezzanine/*/migrations/* + */tests/* + +[report] +show_missing = True diff --git a/.gitignore b/.gitignore index d64ddeba00..ce223b70a1 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ Mezzanine.egg-info/ build/ docs/build/ dist/ +htmlcov/ mezzanine/project_template/static/ /mezzanine/.project /mezzanine/.pydevproject diff --git a/MANIFEST.in b/MANIFEST.in index 8a73a77df4..bc8f292425 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -8,4 +8,4 @@ global-exclude __pycache__ global-exclude *.py[co] prune .tx prune tests -exclude .releaserc tox.ini +exclude .releaserc .isort.cfg tox.ini pytest.ini .coveragerc diff --git a/pytest.ini b/pytest.ini new file mode 100644 index 0000000000..3b507d18b0 --- /dev/null +++ b/pytest.ini @@ -0,0 +1,8 @@ +[pytest] +addopts = + --tb short + --cov=mezzanine + --cov-report html + --cov-report term:skip-covered + # Original coverage was 54% (not great), but at least ensure we don't go below + --cov-fail-under 54 diff --git a/setup.cfg b/setup.cfg index fda5ffc4ad..b26f78249f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -48,6 +48,7 @@ install_requires = [options.extras_require] testing = pytest-django >= 4, <5 + pytest-cov >= 2, < 3 codestyle = flake8 >= 3, <4 black==20.8b1 From bb265c5dced581ba2a95c3a233473b1844429bf2 Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Mon, 31 May 2021 18:04:22 -0600 Subject: [PATCH 044/101] chore: remove deprecated ugettext functions --- mezzanine/accounts/defaults.py | 2 +- mezzanine/accounts/forms.py | 24 +++++++++---------- mezzanine/accounts/views.py | 2 +- mezzanine/blog/admin.py | 2 +- mezzanine/blog/defaults.py | 2 +- mezzanine/blog/models.py | 2 +- mezzanine/blog/views.py | 2 +- mezzanine/conf/admin.py | 2 +- mezzanine/conf/forms.py | 2 +- mezzanine/conf/models.py | 2 +- mezzanine/core/admin.py | 2 +- mezzanine/core/defaults.py | 2 +- mezzanine/core/fields.py | 2 +- mezzanine/core/managers.py | 2 +- mezzanine/core/middleware.py | 2 +- mezzanine/core/models.py | 6 ++--- mezzanine/core/views.py | 2 +- mezzanine/forms/admin.py | 2 +- mezzanine/forms/defaults.py | 2 +- mezzanine/forms/fields.py | 2 +- mezzanine/forms/forms.py | 2 +- mezzanine/forms/models.py | 2 +- mezzanine/galleries/models.py | 2 +- mezzanine/generic/admin.py | 2 +- mezzanine/generic/defaults.py | 2 +- mezzanine/generic/forms.py | 8 +++---- mezzanine/generic/models.py | 6 ++--- mezzanine/generic/views.py | 2 +- mezzanine/pages/defaults.py | 2 +- mezzanine/pages/models.py | 6 ++--- mezzanine/pages/templatetags/pages_tags.py | 2 +- .../project_template/project_name/settings.py | 2 +- mezzanine/twitter/__init__.py | 2 +- mezzanine/twitter/admin.py | 2 +- mezzanine/twitter/defaults.py | 2 +- mezzanine/twitter/models.py | 2 +- mezzanine/utils/views.py | 2 +- tests/test_forms.py | 2 +- 38 files changed, 58 insertions(+), 58 deletions(-) diff --git a/mezzanine/accounts/defaults.py b/mezzanine/accounts/defaults.py index 06624d361f..ba45af86b9 100644 --- a/mezzanine/accounts/defaults.py +++ b/mezzanine/accounts/defaults.py @@ -10,7 +10,7 @@ them would require an application reload. """ from django.conf import settings -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from mezzanine.conf import register_setting diff --git a/mezzanine/accounts/forms.py b/mezzanine/accounts/forms.py index 0bbcfaa269..7551e9037c 100644 --- a/mezzanine/accounts/forms.py +++ b/mezzanine/accounts/forms.py @@ -4,8 +4,8 @@ from django.db.models import Q from django.db.models.manager import Manager from django.utils.http import int_to_base36 -from django.utils.translation import ugettext -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext +from django.utils.translation import gettext_lazy as _ from mezzanine.accounts import ( ProfileNotConfigured, @@ -62,9 +62,9 @@ def clean(self): password = self.cleaned_data.get("password") self._user = authenticate(username=username, password=password) if self._user is None: - raise forms.ValidationError(ugettext("Invalid username/email and password")) + raise forms.ValidationError(gettext("Invalid username/email and password")) elif not self._user.is_active: - raise forms.ValidationError(ugettext("Your account is inactive")) + raise forms.ValidationError(gettext("Your account is inactive")) return self.cleaned_data def save(self): @@ -98,7 +98,7 @@ def __init__(self, *args, **kwargs): self._signup = self.instance.id is None user_fields = {f.name for f in User._meta.get_fields()} try: - self.fields["username"].help_text = ugettext( + self.fields["username"].help_text = gettext( "Only letters, numbers, dashes or underscores please" ) except KeyError: @@ -115,7 +115,7 @@ def __init__(self, *args, **kwargs): if not self._signup: self.fields[field].required = False if field == "password1": - self.fields[field].help_text = ugettext( + self.fields[field].help_text = gettext( "Leave blank unless you want " "to change your password" ) @@ -144,7 +144,7 @@ def clean_username(self): username = self.cleaned_data.get("username") if username.lower() != slugify(username).lower(): raise forms.ValidationError( - ugettext( + gettext( "Username can only contain letters, numbers, dashes " "or underscores." ) @@ -154,7 +154,7 @@ def clean_username(self): User.objects.exclude(id=self.instance.id).get(**lookup) except User.DoesNotExist: return username - raise forms.ValidationError(ugettext("This username is already registered")) + raise forms.ValidationError(gettext("This username is already registered")) def clean_password2(self): """ @@ -167,10 +167,10 @@ def clean_password2(self): if password1: errors = [] if password1 != password2: - errors.append(ugettext("Passwords do not match")) + errors.append(gettext("Passwords do not match")) if len(password1) < settings.ACCOUNTS_MIN_PASSWORD_LENGTH: errors.append( - ugettext("Password must be at least %s characters") + gettext("Password must be at least %s characters") % settings.ACCOUNTS_MIN_PASSWORD_LENGTH ) if errors: @@ -185,7 +185,7 @@ def clean_email(self): qs = User.objects.exclude(id=self.instance.id).filter(email=email) if len(qs) == 0: return email - raise forms.ValidationError(ugettext("This email is already registered")) + raise forms.ValidationError(gettext("This email is already registered")) def save(self, *args, **kwargs): """ @@ -266,7 +266,7 @@ def clean(self): try: user = User.objects.get(username_or_email, is_active=True) except User.DoesNotExist: - raise forms.ValidationError(ugettext("Invalid username/email")) + raise forms.ValidationError(gettext("Invalid username/email")) else: self._user = user return self.cleaned_data diff --git a/mezzanine/accounts/views.py b/mezzanine/accounts/views.py index 6fcf399b68..adc80e6bf0 100644 --- a/mezzanine/accounts/views.py +++ b/mezzanine/accounts/views.py @@ -6,7 +6,7 @@ from django.shortcuts import get_object_or_404, redirect from django.template.response import TemplateResponse from django.urls import NoReverseMatch, get_script_prefix -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from mezzanine.accounts import get_profile_form from mezzanine.accounts.forms import LoginForm, PasswordResetForm diff --git a/mezzanine/blog/admin.py b/mezzanine/blog/admin.py index dc5b773fff..9dd05b7521 100644 --- a/mezzanine/blog/admin.py +++ b/mezzanine/blog/admin.py @@ -1,7 +1,7 @@ from copy import deepcopy from django.contrib import admin -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from mezzanine.blog.models import BlogCategory, BlogPost from mezzanine.conf import settings diff --git a/mezzanine/blog/defaults.py b/mezzanine/blog/defaults.py index aa0216925c..f7a82752bb 100644 --- a/mezzanine/blog/defaults.py +++ b/mezzanine/blog/defaults.py @@ -10,7 +10,7 @@ them would require an application reload. """ from django.conf import settings -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from mezzanine.conf import register_setting diff --git a/mezzanine/blog/models.py b/mezzanine/blog/models.py index bfabd87469..7a7d0683e6 100644 --- a/mezzanine/blog/models.py +++ b/mezzanine/blog/models.py @@ -1,6 +1,6 @@ from django.db import models from django.urls import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from mezzanine.conf import settings from mezzanine.core.fields import FileField diff --git a/mezzanine/blog/views.py b/mezzanine/blog/views.py index c07fbe7900..0b35e043b7 100644 --- a/mezzanine/blog/views.py +++ b/mezzanine/blog/views.py @@ -4,7 +4,7 @@ from django.http import Http404 from django.shortcuts import get_object_or_404 from django.template.response import TemplateResponse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from mezzanine.blog.feeds import PostsAtom, PostsRSS from mezzanine.blog.models import BlogCategory, BlogPost diff --git a/mezzanine/conf/admin.py b/mezzanine/conf/admin.py index 456ba20fc6..404159fdf5 100644 --- a/mezzanine/conf/admin.py +++ b/mezzanine/conf/admin.py @@ -4,7 +4,7 @@ from django.contrib.messages import info from django.http import HttpResponseRedirect from django.utils.encoding import force_text -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from mezzanine.conf import settings from mezzanine.conf.forms import SettingsForm diff --git a/mezzanine/conf/forms.py b/mezzanine/conf/forms.py index ee59d4e357..88d1a9d256 100644 --- a/mezzanine/conf/forms.py +++ b/mezzanine/conf/forms.py @@ -4,7 +4,7 @@ from django.template.defaultfilters import urlize from django.utils.safestring import mark_safe from django.utils.translation import activate, get_language -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from mezzanine.conf import registry, settings from mezzanine.conf.models import Setting diff --git a/mezzanine/conf/models.py b/mezzanine/conf/models.py index 8353486685..27923b54e3 100644 --- a/mezzanine/conf/models.py +++ b/mezzanine/conf/models.py @@ -1,5 +1,5 @@ from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from mezzanine.core.models import SiteRelated diff --git a/mezzanine/core/admin.py b/mezzanine/core/admin.py index 178ae07634..672f904cda 100644 --- a/mezzanine/core/admin.py +++ b/mezzanine/core/admin.py @@ -10,7 +10,7 @@ from django.http import HttpResponseRedirect from django.shortcuts import get_object_or_404 from django.urls import NoReverseMatch -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from mezzanine.conf import settings from mezzanine.core.forms import DynamicInlineAdminForm diff --git a/mezzanine/core/defaults.py b/mezzanine/core/defaults.py index e0fc0f0bb4..3adfda80c7 100644 --- a/mezzanine/core/defaults.py +++ b/mezzanine/core/defaults.py @@ -10,7 +10,7 @@ them would require an application reload. """ from django.conf import settings -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from mezzanine.conf import register_setting diff --git a/mezzanine/core/fields.py b/mezzanine/core/fields.py index 860a5517af..c86d55a0ab 100644 --- a/mezzanine/core/fields.py +++ b/mezzanine/core/fields.py @@ -4,7 +4,7 @@ from django.db import models from django.forms import MultipleChoiceField from django.utils.text import capfirst -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from mezzanine.core.forms import OrderWidget from mezzanine.utils.html import escape diff --git a/mezzanine/core/managers.py b/mezzanine/core/managers.py index e907b4f03b..d835cf7c8b 100644 --- a/mezzanine/core/managers.py +++ b/mezzanine/core/managers.py @@ -10,7 +10,7 @@ from django.db.models.manager import ManagerDescriptor from django.db.models.query import QuerySet from django.utils.timezone import now -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from mezzanine.conf import settings from mezzanine.utils.sites import current_site_id diff --git a/mezzanine/core/middleware.py b/mezzanine/core/middleware.py index 31a8df7ce4..2793b8c363 100755 --- a/mezzanine/core/middleware.py +++ b/mezzanine/core/middleware.py @@ -17,7 +17,7 @@ from django.urls import resolve, reverse from django.utils.cache import get_max_age from django.utils.safestring import mark_safe -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from mezzanine.conf import settings from mezzanine.core.management.commands.createdb import ( diff --git a/mezzanine/core/models.py b/mezzanine/core/models.py index e1bd11ee20..7bed1b9637 100644 --- a/mezzanine/core/models.py +++ b/mezzanine/core/models.py @@ -10,8 +10,8 @@ from django.utils.html import format_html, strip_tags from django.utils.timesince import timesince from django.utils.timezone import now -from django.utils.translation import ugettext -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext +from django.utils.translation import gettext_lazy as _ from mezzanine.conf import settings from mezzanine.core.fields import OrderField, RichTextField @@ -117,7 +117,7 @@ def get_slug(self): def admin_link(self): return format_html( - "{}", self.get_absolute_url(), ugettext("View on site") + "{}", self.get_absolute_url(), gettext("View on site") ) admin_link.short_description = "" diff --git a/mezzanine/core/views.py b/mezzanine/core/views.py index 431a45a04b..95d38a05f1 100644 --- a/mezzanine/core/views.py +++ b/mezzanine/core/views.py @@ -14,7 +14,7 @@ from django.template.loader import get_template from django.template.response import TemplateResponse from django.urls import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views.decorators.csrf import requires_csrf_token from mezzanine.conf import settings diff --git a/mezzanine/forms/admin.py b/mezzanine/forms/admin.py index 1bcbf62121..28fa441277 100644 --- a/mezzanine/forms/admin.py +++ b/mezzanine/forms/admin.py @@ -11,7 +11,7 @@ from django.core.files.storage import FileSystemStorage from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import get_object_or_404, render -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.utils.translation import ungettext from mezzanine.conf import settings diff --git a/mezzanine/forms/defaults.py b/mezzanine/forms/defaults.py index 8545373f15..9932c3d4c1 100644 --- a/mezzanine/forms/defaults.py +++ b/mezzanine/forms/defaults.py @@ -9,7 +9,7 @@ that are only read during startup shouldn't be editable, since changing them would require an application reload. """ -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from mezzanine.conf import register_setting diff --git a/mezzanine/forms/fields.py b/mezzanine/forms/fields.py index a8b24e3ded..78bba2aa1d 100644 --- a/mezzanine/forms/fields.py +++ b/mezzanine/forms/fields.py @@ -1,7 +1,7 @@ from django import forms from django.core.exceptions import ImproperlyConfigured from django.forms.widgets import SelectDateWidget -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from mezzanine.conf import settings from mezzanine.core.forms import SplitSelectDateTimeWidget diff --git a/mezzanine/forms/forms.py b/mezzanine/forms/forms.py index 9fe5bee675..40565460cf 100644 --- a/mezzanine/forms/forms.py +++ b/mezzanine/forms/forms.py @@ -9,7 +9,7 @@ from django.urls import reverse from django.utils.safestring import mark_safe from django.utils.timezone import now -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ from mezzanine.conf import settings from mezzanine.forms import fields diff --git a/mezzanine/forms/models.py b/mezzanine/forms/models.py index 508e25fb43..4708a3ce22 100644 --- a/mezzanine/forms/models.py +++ b/mezzanine/forms/models.py @@ -1,5 +1,5 @@ from django.db import models -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from mezzanine.conf import settings from mezzanine.core.fields import RichTextField diff --git a/mezzanine/galleries/models.py b/mezzanine/galleries/models.py index 4b245e66bd..062beffc91 100644 --- a/mezzanine/galleries/models.py +++ b/mezzanine/galleries/models.py @@ -8,7 +8,7 @@ from django.core.files.storage import default_storage from django.db import models from django.utils.encoding import force_text -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from mezzanine.conf import settings from mezzanine.core.fields import FileField diff --git a/mezzanine/generic/admin.py b/mezzanine/generic/admin.py index e5a6d5459b..f1768cd766 100644 --- a/mezzanine/generic/admin.py +++ b/mezzanine/generic/admin.py @@ -1,6 +1,6 @@ from django.conf import settings from django.contrib import admin -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django_comments.admin import CommentsAdmin from mezzanine.generic.models import ThreadedComment diff --git a/mezzanine/generic/defaults.py b/mezzanine/generic/defaults.py index 634b4e87b4..7b3d31df25 100644 --- a/mezzanine/generic/defaults.py +++ b/mezzanine/generic/defaults.py @@ -10,7 +10,7 @@ them would require an application reload. """ from django.conf import settings -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from mezzanine.conf import register_setting diff --git a/mezzanine/generic/forms.py b/mezzanine/generic/forms.py index be88607500..473e7ee5cc 100644 --- a/mezzanine/generic/forms.py +++ b/mezzanine/generic/forms.py @@ -1,7 +1,7 @@ from django import forms from django.utils.safestring import mark_safe -from django.utils.translation import ugettext -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext +from django.utils.translation import gettext_lazy as _ from django_comments.forms import CommentForm, CommentSecurityForm from django_comments.signals import comment_was_posted @@ -169,7 +169,7 @@ def save(self, request): ) notify_emails = split_addresses(settings.COMMENTS_NOTIFICATION_EMAILS) if notify_emails: - subject = ugettext("New comment for: ") + str(obj) + subject = gettext("New comment for: ") + str(obj) context = { "comment": comment, "comment_url": add_cache_bypass(comment.get_absolute_url()), @@ -222,7 +222,7 @@ def clean(self): self.previous = request.COOKIES.get("mezzanine-rating", "").split(",") already_rated = self.current in self.previous if already_rated and not is_authenticated(self.request.user): - raise forms.ValidationError(ugettext("Already rated.")) + raise forms.ValidationError(gettext("Already rated.")) return self.cleaned_data def save(self): diff --git a/mezzanine/generic/models.py b/mezzanine/generic/models.py index 34343a3201..6f8130181d 100644 --- a/mezzanine/generic/models.py +++ b/mezzanine/generic/models.py @@ -2,8 +2,8 @@ from django.db import models from django.template.defaultfilters import truncatewords_html from django.utils.html import format_html -from django.utils.translation import ugettext -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext +from django.utils.translation import gettext_lazy as _ from django_comments.models import Comment from mezzanine.conf import settings @@ -82,7 +82,7 @@ def avatar_link(self): def admin_link(self): return format_html( - "{}", self.get_absolute_url(), ugettext("View on site") + "{}", self.get_absolute_url(), gettext("View on site") ) admin_link.short_description = "" diff --git a/mezzanine/generic/views.py b/mezzanine/generic/views.py index d376feb2db..eb1c69d138 100644 --- a/mezzanine/generic/views.py +++ b/mezzanine/generic/views.py @@ -9,7 +9,7 @@ from django.shortcuts import redirect from django.template.response import TemplateResponse from django.urls import reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from mezzanine.conf import settings from mezzanine.generic.forms import RatingForm, ThreadedCommentForm diff --git a/mezzanine/pages/defaults.py b/mezzanine/pages/defaults.py index 00dc240290..0ef3ca3fc1 100644 --- a/mezzanine/pages/defaults.py +++ b/mezzanine/pages/defaults.py @@ -9,7 +9,7 @@ that are only read during startup shouldn't be editable, since changing them would require an application reload. """ -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from mezzanine.conf import register_setting diff --git a/mezzanine/pages/models.py b/mezzanine/pages/models.py index f3851bc3d9..21bde97397 100644 --- a/mezzanine/pages/models.py +++ b/mezzanine/pages/models.py @@ -2,8 +2,8 @@ from django.db import models from django.urls import resolve, reverse -from django.utils.translation import ugettext -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext +from django.utils.translation import gettext_lazy as _ from mezzanine.conf import settings from mezzanine.core.models import ( @@ -303,7 +303,7 @@ class PageMoveException(Exception): """ def __init__(self, msg=None): - self.msg = msg or ugettext("Illegal page move") + self.msg = msg or gettext("Illegal page move") def __str__(self): return self.msg diff --git a/mezzanine/pages/templatetags/pages_tags.py b/mezzanine/pages/templatetags/pages_tags.py index fd745e4023..26e31fc502 100644 --- a/mezzanine/pages/templatetags/pages_tags.py +++ b/mezzanine/pages/templatetags/pages_tags.py @@ -3,7 +3,7 @@ from django.core.exceptions import ImproperlyConfigured from django.template import TemplateSyntaxError, Variable from django.template.loader import get_template -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from mezzanine import template from mezzanine.pages.models import Page diff --git a/mezzanine/project_template/project_name/settings.py b/mezzanine/project_template/project_name/settings.py index 331a2db869..be116536f8 100644 --- a/mezzanine/project_template/project_name/settings.py +++ b/mezzanine/project_template/project_name/settings.py @@ -1,7 +1,7 @@ import os from django import VERSION as DJANGO_VERSION -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ ###################### # MEZZANINE SETTINGS # diff --git a/mezzanine/twitter/__init__.py b/mezzanine/twitter/__init__.py index 4795166ebe..34393c3781 100644 --- a/mezzanine/twitter/__init__.py +++ b/mezzanine/twitter/__init__.py @@ -1,7 +1,7 @@ """ Provides models and utilities for displaying different types of Twitter feeds. """ -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from mezzanine import __version__ # noqa diff --git a/mezzanine/twitter/admin.py b/mezzanine/twitter/admin.py index e660d7276f..1a8725ddd8 100644 --- a/mezzanine/twitter/admin.py +++ b/mezzanine/twitter/admin.py @@ -1,6 +1,6 @@ from django.template.defaultfilters import truncatechars from django.utils.safestring import mark_safe -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from mezzanine.twitter import get_auth_settings diff --git a/mezzanine/twitter/defaults.py b/mezzanine/twitter/defaults.py index 2e5901ff5e..21f3505617 100644 --- a/mezzanine/twitter/defaults.py +++ b/mezzanine/twitter/defaults.py @@ -9,7 +9,7 @@ that are only read during startup shouldn't be editable, since changing them would require an application reload. """ -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from mezzanine.conf import register_setting from mezzanine.twitter import QUERY_TYPE_CHOICES, QUERY_TYPE_SEARCH diff --git a/mezzanine/twitter/models.py b/mezzanine/twitter/models.py index 411778c42a..7455e860ea 100644 --- a/mezzanine/twitter/models.py +++ b/mezzanine/twitter/models.py @@ -6,7 +6,7 @@ from django.db import models from django.utils.html import urlize from django.utils.timezone import make_aware, utc -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from requests_oauthlib import OAuth1 from mezzanine.conf import settings diff --git a/mezzanine/utils/views.py b/mezzanine/utils/views.py index e18fd20040..4d12e5d4b2 100644 --- a/mezzanine/utils/views.py +++ b/mezzanine/utils/views.py @@ -9,7 +9,7 @@ from django.forms import EmailField, Textarea, URLField from django.template import RequestContext from django.template.response import TemplateResponse -from django.utils.translation import ugettext as _ +from django.utils.translation import gettext as _ import mezzanine from mezzanine.conf import settings diff --git a/tests/test_forms.py b/tests/test_forms.py index 1d16e24011..f1276a35d8 100644 --- a/tests/test_forms.py +++ b/tests/test_forms.py @@ -46,7 +46,7 @@ def test_submit_button_text(self): from django.urls import reverse from django.utils.translation import activate, get_language - from django.utils.translation import ugettext as _ + from django.utils.translation import gettext as _ from modeltranslation.utils import auto_populate default_language = get_language() From 3701d79da81190835f7c25bfb24e623748a28bea Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Mon, 31 May 2021 23:58:47 -0600 Subject: [PATCH 045/101] test: initial test fixes for Django 3+ --- tests/test_conf.py | 18 +++--------------- tests/test_pages.py | 2 +- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/tests/test_conf.py b/tests/test_conf.py index 2bb13bc591..177ebe5eb5 100644 --- a/tests/test_conf.py +++ b/tests/test_conf.py @@ -1,17 +1,14 @@ -import sys import warnings from unittest import skipUnless from django.conf import settings as django_settings -from django.utils.encoding import force_text +from django.utils.encoding import force_str from mezzanine.conf import register_setting, registry, settings from mezzanine.conf.context_processors import TemplateSettings from mezzanine.conf.models import Setting from mezzanine.utils.tests import TestCase -PY2 = sys.version_info[0] == 2 - class ConfTests(TestCase): @skipUnless(False, "Only run manually - see Github issue #1126") @@ -130,15 +127,6 @@ def test_editable_override(self): second_value = settings.FOO self.assertEqual(first_value, second_value) - @skipUnless(PY2, "Needed only in Python 2") - def test_bytes_conversion(self): - - settings.clear_cache() - - register_setting(name="BYTES_TEST_SETTING", editable=True, default=b"") - Setting.objects.create(name="BYTES_TEST_SETTING", value="A unicode value") - self.assertEqual(settings.BYTES_TEST_SETTING, b"A unicode value") - def test_invalid_value_warning(self): """ Test that a warning is raised when a database setting has an invalid @@ -264,9 +252,9 @@ def test_repr(self): self.assertIn("'EXTRA_THING'", repr(ts3)) self.assertIn("'foo'", repr(ts3)) - def test_force_text(self): + def test_force_str(self): ts = TemplateSettings(settings, []) with warnings.catch_warnings(record=True) as w: warnings.simplefilter("always") - self.assertEqual(force_text(ts), "{}") + self.assertEqual(force_str(ts), "{}") self.assertEqual(len(w), 0) diff --git a/tests/test_pages.py b/tests/test_pages.py index af6b8f2436..e5db7c1d29 100644 --- a/tests/test_pages.py +++ b/tests/test_pages.py @@ -1,4 +1,5 @@ from unittest import skipUnless +from urllib.parse import urlparse from django.apps import apps from django.contrib.auth import get_user_model @@ -11,7 +12,6 @@ from django.template import Context, Template, TemplateSyntaxError from django.test.utils import override_settings from django.utils.http import urlquote_plus -from django.utils.six.moves.urllib.parse import urlparse from django.utils.translation import get_language from mezzanine.conf import settings From 46d2b4d4e2eded8674cbae0339fbeb3671a210e7 Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Tue, 20 Jul 2021 16:25:59 -0600 Subject: [PATCH 046/101] fix: fix `ifinstalled` tag for Django 3+ Fixes #1972 --- mezzanine/core/templatetags/mezzanine_tags.py | 41 +++++++++---------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/mezzanine/core/templatetags/mezzanine_tags.py b/mezzanine/core/templatetags/mezzanine_tags.py index 453eaae119..3fc0110c30 100644 --- a/mezzanine/core/templatetags/mezzanine_tags.py +++ b/mezzanine/core/templatetags/mezzanine_tags.py @@ -155,6 +155,16 @@ def is_installed(app_name): return app_name in settings.INSTALLED_APPS +class OptionalNodeList(Node): + def __init__(self, nodelist=None): + self.nodelist = nodelist + + def render(self, context): + if self.nodelist is None: + return "" + return self.nodelist.render(context) + + @register.tag def ifinstalled(parser, token): """ @@ -165,9 +175,8 @@ def ifinstalled(parser, token): {% include "app_name/template.html" %} {% endifinstalled %} - so we need to manually pull out all tokens if the app isn't - installed, since if we used a normal ``if`` tag with a False arg, - the include tag will still try and find the template to include. + If the app is not installed the entire contents of the block will be skipped without + being parsed (like a comment). """ try: tag, app = token.split_contents() @@ -179,25 +188,13 @@ def ifinstalled(parser, token): ) end_tag = "end" + tag - unmatched_end_tag = 1 - if app.strip("\"'") not in settings.INSTALLED_APPS: - while unmatched_end_tag: - token = parser.tokens.pop(0) - if token.token_type == TokenType.BLOCK: - block_name = token.contents.split()[0] - if block_name == tag: - unmatched_end_tag += 1 - if block_name == end_tag: - unmatched_end_tag -= 1 - parser.tokens.insert(0, token) - nodelist = parser.parse((end_tag,)) - parser.delete_first_token() - - class IfInstalledNode(Node): - def render(self, context): - return nodelist.render(context) - - return IfInstalledNode() + if app.strip("\"'") in settings.INSTALLED_APPS: + nodelist = parser.parse((end_tag,)) + parser.delete_first_token() + else: + nodelist = None + parser.skip_past(end_tag) + return OptionalNodeList(nodelist) @register.render_tag From 99a0441505a93e6318dd5434c3f461c19f66bb4d Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Tue, 20 Jul 2021 16:26:50 -0600 Subject: [PATCH 047/101] fix: make `settings._editable_caches` more robust Fixes #1989 --- mezzanine/conf/__init__.py | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/mezzanine/conf/__init__.py b/mezzanine/conf/__init__.py index 2cc1c1c26a..066b3aebf9 100644 --- a/mezzanine/conf/__init__.py +++ b/mezzanine/conf/__init__.py @@ -119,15 +119,6 @@ class Placeholder: bytes: partial(bytes, encoding="utf8"), } - def __init__(self): - """ - The ``_editable_caches`` attribute maps Request objects to dicts of - editable settings loaded from the database. We cache settings per- - request to ensure that the database is hit at most once per request, - and that each request sees the same settings for its duration. - """ - self._editable_caches = WeakKeyDictionary() - @property def _current_request(self): return current_request() or self.NULL_REQUEST @@ -159,6 +150,12 @@ def _get_editable(self, request): ``_editable_caches``, a WeakKeyDictionary that will automatically discard each entry when no more references to the request exist. """ + if not hasattr(self, "_editable_caches"): + # The ``_editable_caches`` attribute maps Request objects to dicts of + # editable settings loaded from the database. We cache settings per-request + # to ensure that the database is hit at most once per request, and that each + # request sees the same settings for its duration. + self._editable_caches = WeakKeyDictionary() try: editable_settings = self._editable_caches[request] except KeyError: From 80302552be95ec6abbfda493a20fd622e1d55a0d Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Tue, 20 Jul 2021 17:33:12 -0600 Subject: [PATCH 048/101] chore: update settings template --- mezzanine/project_template/project_name/settings.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/mezzanine/project_template/project_name/settings.py b/mezzanine/project_template/project_name/settings.py index be116536f8..1ec87306f3 100644 --- a/mezzanine/project_template/project_name/settings.py +++ b/mezzanine/project_template/project_name/settings.py @@ -1,6 +1,5 @@ import os -from django import VERSION as DJANGO_VERSION from django.utils.translation import gettext_lazy as _ ###################### @@ -130,6 +129,8 @@ # a mode you'd pass directly to os.chmod. FILE_UPLOAD_PERMISSIONS = 0o644 +DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" + ############# # DATABASES # @@ -218,10 +219,6 @@ }, ] -if DJANGO_VERSION < (1, 9): - del TEMPLATES[0]["OPTIONS"]["builtins"] - - ################ # APPLICATIONS # ################ @@ -269,11 +266,6 @@ "mezzanine.core.middleware.FetchFromCacheMiddleware", ) -if DJANGO_VERSION < (1, 10): - MIDDLEWARE_CLASSES = MIDDLEWARE - del MIDDLEWARE - - # Store these package names here as they may change in the future since # at the moment we are using custom forks of them. PACKAGE_NAME_FILEBROWSER = "filebrowser_safe" From e88a33494a376ef44465c2f62284b773d0317ac0 Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Tue, 20 Jul 2021 17:54:14 -0600 Subject: [PATCH 049/101] fix: maintain parent GET param when saving pages --- mezzanine/pages/admin.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mezzanine/pages/admin.py b/mezzanine/pages/admin.py index 26c49ee69c..4fa28856d1 100644 --- a/mezzanine/pages/admin.py +++ b/mezzanine/pages/admin.py @@ -105,7 +105,6 @@ def save_model(self, request, obj, form, change): parent = request.GET.get("parent") if parent is not None and not change: obj.parent_id = parent - obj.save() super().save_model(request, obj, form, change) def _maintain_parent(self, request, response): @@ -113,10 +112,13 @@ def _maintain_parent(self, request, response): Maintain the parent ID in the querystring for response_add and response_change. """ - location = response._headers.get("location") + try: + location = response["Location"] + except KeyError: + location = None parent = request.GET.get("parent") - if parent and location and "?" not in location[1]: - url = f"{location[1]}?parent={parent}" + if parent and location and "?" not in location: + url = f"{location}?parent={parent}" return HttpResponseRedirect(url) return response From f77af405bcebcc741971cd458d054bbb123155d5 Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Tue, 20 Jul 2021 18:05:21 -0600 Subject: [PATCH 050/101] fix: fix admin URLs in Django 3.2 --- mezzanine/boot/lazy_admin.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mezzanine/boot/lazy_admin.py b/mezzanine/boot/lazy_admin.py index 74bbb18e55..c2cdc1e13e 100644 --- a/mezzanine/boot/lazy_admin.py +++ b/mezzanine/boot/lazy_admin.py @@ -57,7 +57,7 @@ def lazy_registration(self): @property def urls(self): - urls = [url(r"", super().urls)] + urls = [] # Filebrowser admin media library. fb_name = getattr(settings, "PACKAGE_NAME_FILEBROWSER", "") @@ -66,7 +66,7 @@ def urls(self): fb_urls = import_dotted_path("%s.sites.site" % fb_name).urls except ImportError: fb_urls = "%s.urls" % fb_name - urls = [ + urls += [ # This gives the media library a root URL (which filebrowser # doesn't provide), so that we can target it in the # ADMIN_MENU_ORDER setting, allowing each view to correctly @@ -77,7 +77,7 @@ def urls(self): name="media-library", ), url(r"^media-library/", include(fb_urls)), - ] + urls + ] # Give the urlpattern for the user password change view an # actual name, so that it can be reversed with multiple @@ -87,13 +87,13 @@ def urls(self): user_change_password = getattr(admin, "user_change_password", None) if user_change_password: bits = (User._meta.app_label, User._meta.object_name.lower()) - urls = [ + urls += [ url( r"^%s/%s/(\d+)/password/$" % bits, self.admin_view(user_change_password), name="user_change_password", ), - ] + urls + ] break # Misc Mezzanine urlpatterns that should reside under /admin/ url, @@ -117,12 +117,12 @@ def urls(self): if "mezzanine.pages" in settings.INSTALLED_APPS: from mezzanine.pages.views import admin_page_ordering - urls.append( + urls += [ url( r"^admin_page_ordering/$", admin_page_ordering, name="admin_page_ordering", ) - ) + ] - return urls + return urls + [url(r"", super().urls)] From 81036645a8752cd578d9ee1fd05d832b2d5dd877 Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Tue, 20 Jul 2021 18:12:19 -0600 Subject: [PATCH 051/101] chore: run pyupgrade --- mezzanine/generic/templatetags/disqus_tags.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mezzanine/generic/templatetags/disqus_tags.py b/mezzanine/generic/templatetags/disqus_tags.py index a2d65aa2a7..6e0a189008 100644 --- a/mezzanine/generic/templatetags/disqus_tags.py +++ b/mezzanine/generic/templatetags/disqus_tags.py @@ -54,7 +54,7 @@ def _get_disqus_sso(user, public_key, secret_key): # generate our hmac signature sig = hmac.HMAC( secret_key.encode("utf8"), - (f"{message} {timestamp}").encode("utf8"), + (f"{message} {timestamp}").encode(), hashlib.sha1, ).hexdigest() From df21736b17aa002c407517af32561ac12fd7231a Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Tue, 20 Jul 2021 18:32:31 -0600 Subject: [PATCH 052/101] ci: remove --parallel from tox options Hopefully it fixes random errors on GitHub Actions --- .github/workflows/main.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 467c2c30cf..7eafface39 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,9 +23,7 @@ jobs: run: pip install tox tox-gh-actions -U pip - name: Run tests run: | - tox --skip-missing-interpreters=false --parallel - env: - TOX_PARALLEL_NO_SPINNER: 1 + tox --skip-missing-interpreters=false - name: Publish Test Report uses: mikepenz/action-junit-report@v2 with: From e135c283030789726dfd22304948a35579730c37 Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Tue, 20 Jul 2021 18:41:16 -0600 Subject: [PATCH 053/101] chore: add Django classifiers --- setup.cfg | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/setup.cfg b/setup.cfg index b26f78249f..96203c2133 100644 --- a/setup.cfg +++ b/setup.cfg @@ -22,6 +22,11 @@ classifiers = Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 + Framework :: Django + Framework :: Django :: 2.1 + Framework :: Django :: 3.0 + Framework :: Django :: 3.1 + Framework :: Django :: 3.2 Topic :: Internet :: WWW/HTTP Topic :: Internet :: WWW/HTTP :: Dynamic Content Topic :: Internet :: WWW/HTTP :: WSGI From c2ee5b45eaf886ace68c186ec5544898949aa570 Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Tue, 20 Jul 2021 18:46:20 -0600 Subject: [PATCH 054/101] docs: add Django versions --- README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rst b/README.rst index 44690cd092..8790fa7166 100644 --- a/README.rst +++ b/README.rst @@ -1,6 +1,7 @@ .. image:: https://img.shields.io/pypi/v/mezzanine.svg :target: https://pypi.org/project/mezzanine/ .. image:: https://img.shields.io/pypi/pyversions/mezzanine.svg +.. image:: https://img.shields.io/pypi/djversions/mezzanine.svg .. image:: https://github.com/stephenmcd/mezzanine/workflows/Test%20and%20release/badge.svg :target: https://github.com/stephenmcd/mezzanine/actions?query=workflow%3A%22Test+and+release%22 .. image:: https://img.shields.io/badge/code%20style-black-000000.svg From 6cec67c88d6fe65fef836bdefb5a84a0e5b043bf Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Wed, 21 Jul 2021 16:53:40 -0600 Subject: [PATCH 055/101] chore: deprecate loader_tags BREAKING CHANGE: mezzanine.template.loader_tags has been deprecated. If you're still using the {% overextends %} tag provided by it switch to Django's {% extend %} tag for identical results. Fixes #1974. --- mezzanine/core/checks.py | 171 ++---------------- .../project_template/project_name/settings.py | 3 - mezzanine/template/loader_tags.py | 148 +-------------- pytest.ini | 2 +- 4 files changed, 20 insertions(+), 304 deletions(-) diff --git a/mezzanine/core/checks.py b/mezzanine/core/checks.py index 9993196182..bf6d7e3182 100644 --- a/mezzanine/core/checks.py +++ b/mezzanine/core/checks.py @@ -1,180 +1,39 @@ -import pprint - -from django import VERSION as DJANGO_VERSION -from django.conf import global_settings from django.core.checks import Warning, register from mezzanine.conf import settings from mezzanine.utils.conf import middlewares_or_subclasses_installed from mezzanine.utils.sites import SITE_PERMISSION_MIDDLEWARE +LOADER_TAGS_WARNING = ( + "You have included 'mezzanine.template.loader_tags' as a builtin in your template " + "configuration. 'loader_tags' no longer exists and should be removed. If you're " + "still using the {% overextends %} tag please replace it with Django's " + "{% extend %} for identical results." +) + @register() def check_template_settings(app_configs, **kwargs): - issues = [] - if not settings.TEMPLATES: - - suggested_config = _build_suggested_template_config(settings) - - declaration = "TEMPLATES = " - config_formatted = pprint.pformat(suggested_config) - config_formatted = "\n".join( - " " * len(declaration) + line for line in config_formatted.splitlines() - ) - config_formatted = declaration + config_formatted[len(declaration) :] - - issues.append( - Warning( - "Please update your settings to use the TEMPLATES setting rather " - "than the deprecated individual TEMPLATE_ settings. The latter " - "are unsupported and correct behaviour is not guaranteed. Here's " - "a suggestion based on on your existing configuration:\n\n%s\n" - % config_formatted, - id="mezzanine.core.W01", - ) - ) - - if settings.DEBUG != settings.TEMPLATE_DEBUG: - issues.append( - Warning( - "TEMPLATE_DEBUG and DEBUG settings have different values, " - "which may not be what you want. Mezzanine used to fix this " - "for you, but doesn't any more. Update your settings.py to " - "use the TEMPLATES setting to have template debugging " - "controlled by the DEBUG setting.", - id="mezzanine.core.W02", - ) - ) - - else: - loader_tags_built_in = any( - "mezzanine.template.loader_tags" - in config.get("OPTIONS", {}).get("builtins", {}) - for config in settings.TEMPLATES - ) - if not DJANGO_VERSION < (1, 9) and not loader_tags_built_in: - issues.append( - Warning( - "You haven't included 'mezzanine.template.loader_tags' as a " - "builtin in any of your template configurations. Mezzanine's " - "'overextends' tag will not be available in your templates.", - id="mezzanine.core.W03", - ) - ) + if any( + "mezzanine.template.loader_tags" + in config.get("OPTIONS", {}).get("builtins", {}) + for config in settings.TEMPLATES + ): + issues.append(Warning(LOADER_TAGS_WARNING, id="mezzanine.core.W05")) return issues -def _build_suggested_template_config(settings): - - suggested_templates_config = { - "BACKEND": "django.template.backends.django.DjangoTemplates", - "OPTIONS": { - "builtins": [ - "mezzanine.template.loader_tags", - ], - }, - } - - def set_setting(name, value, unconditional=False): - if value or unconditional: - suggested_templates_config[name] = value - - def set_option(name, value): - if value: - suggested_templates_config["OPTIONS"][name.lower()] = value - - def get_debug(_): - if settings.TEMPLATE_DEBUG != settings.DEBUG: - return settings.TEMPLATE_DEBUG - - def get_default(default): - def getter(name): - value = getattr(settings, name) - if value == getattr(global_settings, name): - value = default - return value - - return getter - - default_context_processors = [ - "django.contrib.auth.context_processors.auth", - "django.contrib.messages.context_processors.messages", - "django.core.context_processors.debug", - "django.core.context_processors.i18n", - "django.core.context_processors.static", - "django.core.context_processors.media", - "django.core.context_processors.request", - "django.core.context_processors.tz", - "mezzanine.conf.context_processors.settings", - "mezzanine.pages.context_processors.page", - ] - - def get_loaders(_): - """ - Django's default TEMPLATES setting doesn't specify loaders, instead - dynamically sets a default based on whether or not APP_DIRS is True. - We check here if the existing TEMPLATE_LOADERS setting matches one - of those default cases, and omit the 'loaders' option if so. - """ - template_loaders = list(settings.TEMPLATE_LOADERS) - default_loaders = list(global_settings.TEMPLATE_LOADERS) - - if template_loaders == default_loaders: - # Equivalent to Django's default with APP_DIRS True - template_loaders = None - app_dirs = True - elif template_loaders == default_loaders[:1]: - # Equivalent to Django's default with APP_DIRS False - template_loaders = None - app_dirs = False - else: - # This project has a custom loaders setting, which we'll use. - # Custom loaders are incompatible with APP_DIRS. - app_dirs = False - - return template_loaders, app_dirs - - def set_loaders(name, value): - template_loaders, app_dirs = value - set_option(name, template_loaders) - set_setting("APP_DIRS", app_dirs, unconditional=True) - - old_settings = [ - ("ALLOWED_INCLUDE_ROOTS", settings.__getattr__, set_option), - ("TEMPLATE_STRING_IF_INVALID", settings.__getattr__, set_option), - ("TEMPLATE_DIRS", settings.__getattr__, set_setting), - ( - "TEMPLATE_CONTEXT_PROCESSORS", - get_default(default_context_processors), - set_option, - ), - ("TEMPLATE_DEBUG", get_debug, set_option), - ("TEMPLATE_LOADERS", get_loaders, set_loaders), - ] - - def convert_setting_name(old_name): - return old_name.rpartition("TEMPLATE_")[2] - - for setting_name, getter, setter in old_settings: - value = getter(setting_name) - new_setting_name = convert_setting_name(setting_name) - setter(new_setting_name, value) - - return [suggested_templates_config] - - @register() def check_sites_middleware(app_configs, **kwargs): if not middlewares_or_subclasses_installed([SITE_PERMISSION_MIDDLEWARE]): return [ Warning( - SITE_PERMISSION_MIDDLEWARE - + " missing from settings.MIDDLEWARE - per site" - " permissions not applied", + f"{SITE_PERMISSION_MIDDLEWARE} missing from settings.MIDDLEWARE - " + "per site permissions not applied", id="mezzanine.core.W04", ) ] diff --git a/mezzanine/project_template/project_name/settings.py b/mezzanine/project_template/project_name/settings.py index 1ec87306f3..edb4c748d8 100644 --- a/mezzanine/project_template/project_name/settings.py +++ b/mezzanine/project_template/project_name/settings.py @@ -207,9 +207,6 @@ "mezzanine.conf.context_processors.settings", "mezzanine.pages.context_processors.page", ], - "builtins": [ - "mezzanine.template.loader_tags", - ], "loaders": [ "mezzanine.template.loaders.host_themes.Loader", "django.template.loaders.filesystem.Loader", diff --git a/mezzanine/template/loader_tags.py b/mezzanine/template/loader_tags.py index 38bb9788a2..31364cf22f 100644 --- a/mezzanine/template/loader_tags.py +++ b/mezzanine/template/loader_tags.py @@ -1,147 +1,7 @@ -import os -import warnings -from itertools import chain - -from django import VERSION as DJANGO_VERSION -from django.template import Template, TemplateDoesNotExist, TemplateSyntaxError -from django.template.loader_tags import ExtendsNode - -from mezzanine import template +from django import template register = template.Library() - -class OverExtendsNode(ExtendsNode): - """ - Allows the template ``foo/bar.html`` to extend ``foo/bar.html``, - given that there is another version of it that can be loaded. This - allows templates to be created in a project that extend their app - template counterparts, or even app templates that extend other app - templates with the same relative name/path. - - We use our own version of ``find_template``, that uses an explict - list of template directories to search for the template, based on - the directories that the known template loaders - (``app_directories`` and ``filesystem``) use. This list gets stored - in the template context, and each time a template is found, its - absolute path gets removed from the list, so that subsequent - searches for the same relative name/path can find parent templates - in other directories, which allows circular inheritance to occur. - - Django's ``app_directories``, ``filesystem``, and ``cached`` - loaders are supported. The ``eggs`` loader, and any loader that - implements ``load_template_source`` with a source string returned, - should also theoretically work. - """ - - def find_template(self, name, context, peeking=False): - """ - Replacement for Django's ``find_template`` that uses the current - template context to keep track of which template directories it - has used when finding a template. This allows multiple templates - with the same relative name/path to be discovered, so that - circular template inheritance can occur. - """ - - # These imports want settings, which aren't available when this - # module is imported to ``add_to_builtins``, so do them here. - import django.template.loaders.app_directories as app_directories - - from mezzanine.conf import settings - - # Store a dictionary in the template context mapping template - # names to the lists of template directories available to - # search for that template. Each time a template is loaded, its - # origin directory is removed from its directories list. - context_name = "OVEREXTENDS_DIRS" - if context_name not in context: - context[context_name] = {} - if name not in context[context_name]: - all_dirs = list( - chain.from_iterable( - [ - template_engine.get("DIRS", []) - for template_engine in settings.TEMPLATES - ] - ) - ) + list(app_directories.get_app_template_dirs("templates")) - # os.path.abspath is needed under uWSGI, and also ensures we - # have consistent path separators across different OSes. - context[context_name][name] = list(map(os.path.abspath, all_dirs)) - - # Build a list of template loaders to use. For loaders that wrap - # other loaders like the ``cached`` template loader, unwind its - # internal loaders and add those instead. - loaders = [] - for loader in context.template.engine.template_loaders: - loaders.extend(getattr(loader, "loaders", [loader])) - - # Go through the loaders and try to find the template. When - # found, removed its absolute path from the context dict so - # that it won't be used again when the same relative name/path - # is requested. - for loader in loaders: - dirs = context[context_name][name] - try: - source, path = loader.load_template_source(name, dirs) - except TemplateDoesNotExist: - pass - else: - # Only remove the absolute path for the initial call in - # get_parent, and not when we're peeking during the - # second call. - if not peeking: - remove_path = os.path.abspath(path[: -len(name) - 1]) - context[context_name][name].remove(remove_path) - return Template(source) - raise TemplateDoesNotExist(name) - - def get_parent(self, context): - """ - Load the parent template using our own ``find_template``, which - will cause its absolute path to not be used again. Then peek at - the first node, and if its parent arg is the same as the - current parent arg, we know circular inheritance is going to - occur, in which case we try and find the template again, with - the absolute directory removed from the search list. - """ - parent = self.parent_name.resolve(context) - # If parent is a template object, just return it. - if hasattr(parent, "render"): - return parent - template = self.find_template(parent, context) - for node in template.nodelist: - if ( - isinstance(node, ExtendsNode) - and node.parent_name.resolve(context) == parent - ): - return self.find_template(parent, context, peeking=True) - return template - - -@register.tag -def overextends(parser, token): - """ - Extended version of Django's ``extends`` tag that allows circular - inheritance to occur, eg a template can both be overridden and - extended at once. - """ - if DJANGO_VERSION >= (1, 9): - warnings.warn( - "The `overextends` template tag is deprecated in favour of " - "Django's built-in `extends` tag, which supports recursive " - "extension in Django 1.9 and above.", - DeprecationWarning, - stacklevel=2, - ) - - bits = token.split_contents() - if len(bits) != 2: - raise TemplateSyntaxError("'%s' takes one argument" % bits[0]) - parent_name = parser.compile_filter(bits[1]) - nodelist = parser.parse() - if nodelist.get_nodes_by_type(ExtendsNode): - raise TemplateSyntaxError( - "'%s' cannot appear more than once " "in the same template" % bits[0] - ) - return OverExtendsNode(nodelist, parent_name, None) +# TODO: Remove this file a couple releases after Mezzanine 5 +# We've kept this file because users upgrading to Mezzanine 5 might still refer to it. +# However, mezzanine.core.checks should warn them about it being deprecated. diff --git a/pytest.ini b/pytest.ini index 3b507d18b0..4f3cbfe277 100644 --- a/pytest.ini +++ b/pytest.ini @@ -5,4 +5,4 @@ addopts = --cov-report html --cov-report term:skip-covered # Original coverage was 54% (not great), but at least ensure we don't go below - --cov-fail-under 54 + --cov-fail-under 55 From 95b138a961d5a102cfe79ed792cba1e9b93d134a Mon Sep 17 00:00:00 2001 From: Ed Rivas Date: Wed, 21 Jul 2021 17:36:51 -0600 Subject: [PATCH 056/101] fix: override Django's collapse.js Instead of competing with it. Should also fix #1987. --- .../admin/collapse_backport.js => admin/js/collapse.js} | 8 ++++---- mezzanine/core/templates/admin/base_site.html | 4 ---- 2 files changed, 4 insertions(+), 8 deletions(-) rename mezzanine/core/static/{mezzanine/js/admin/collapse_backport.js => admin/js/collapse.js} (73%) diff --git a/mezzanine/core/static/mezzanine/js/admin/collapse_backport.js b/mezzanine/core/static/admin/js/collapse.js similarity index 73% rename from mezzanine/core/static/mezzanine/js/admin/collapse_backport.js rename to mezzanine/core/static/admin/js/collapse.js index 37feecfd1b..1737eac248 100644 --- a/mezzanine/core/static/mezzanine/js/admin/collapse_backport.js +++ b/mezzanine/core/static/admin/js/collapse.js @@ -2,15 +2,15 @@ jQuery(function($) { /// FIELDSETS - $('fieldset[class*="collapse"]').each(function() { + $('fieldset.collapse').each(function() { $(this).addClass("collapse-open"); $(this).removeClass("collapse"); }); - $('fieldset[class*="collapse-closed"]').each(function() { + $('fieldset.collapse-closed').each(function() { $(this).addClass("collapsed"); $(this).find('h2:first').addClass("collapse-toggle"); }); - $('fieldset[class*="collapse-open"]').each(function() { + $('fieldset.collapse-open').each(function() { $(this).find('h2:first').addClass("collapse-toggle"); }); $('h2.collapse-toggle').bind("click", function(e){ @@ -20,7 +20,7 @@ jQuery(function($) { }); /// OPEN FIELDSETS WITH ERRORS - $('fieldset[class*="collapse-closed"]').children('div[class*="errors"]').each(function(i) { + $('fieldset.collapse-closed').children('div[class*="errors"]').each(function(i) { $(this).parent().toggleClass("collapsed"); $(this).parent().toggleClass('collapse-closed'); $(this).parent().toggleClass('collapse-open'); diff --git a/mezzanine/core/templates/admin/base_site.html b/mezzanine/core/templates/admin/base_site.html index 8a59711ed1..41e5fe0b4d 100644 --- a/mezzanine/core/templates/admin/base_site.html +++ b/mezzanine/core/templates/admin/base_site.html @@ -64,10 +64,6 @@ {% endif %} - - {% if settings.GRAPPELLI_INSTALLED %} - - {% endif %} {% endif %} {% endif %}