diff options
| author | adam <adam@pkgsrc.org> | 2018-10-26 09:27:09 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2018-10-26 09:27:09 +0000 |
| commit | 84ec4202fe3cb2f6e98f360c08fc62861011c83e (patch) | |
| tree | 3431de8e8cbc8249b16913906defe18f33b7b8d1 /www | |
| parent | 95d49a813a1d8da2d90621c052098016e34eed03 (diff) | |
| download | pkgsrc-84ec4202fe3cb2f6e98f360c08fc62861011c83e.tar.gz | |
py-mezzanine: updated to 4.3.1
Version 4.3.1:
* Allow fabfile to be importable when building docs
* Remove top-level __init__.py from new projects.
* Fix HTML escaping.
Version 4.3.0:
* Added explicit on_delete arguments for all ForeignKey models
* Only generate thumbnails in RichText when absolute width/height used.
* Removed null attribute from slug CharField
* Converted all template.render calls to pass a dict instead of a Context object
* Fixed MezzanineBackend.authenticate backend to accept a request argument, added in Django 1.11
* Fixed test_multiple_comment_forms to be agnostic of the order of HTML attributes
* Altered annotation behaviour of search results. Previously this was done implicitly in the SearchQuerySet.iterator() method,. which Django would call internally when evaluating the queryset. Django 1.11 changed its behaviour to use a ModelIterator class instead of. just calling iterator() on the queryset. Rather than suppy a custom. ModelIterator, we just make the annotate explicit
* Updated setup and test configuration to include Django 1.11
* password reset: 'http' -> request.schema. This fixes a potential security vulnerability in which the password. reset url is exposed to untrusted intermediary nodes in the network.
* Add explicit on_delete arguments to foreign keys in migrations
* Use TextField for Field.label and Field.help_text. Now length limits for user-defined labels and help_texts are enforced in the admin instead of the DB, which should prevent any further migrations
* Get rid of max_length settings for mezzanine.forms
* Timezone aware blog months.
* Test and simplify blog_months
* Weigh search results by age. Weigh search results by their age by default. Add a new setting,. SEARCH_AGE_SCALE_FACTOR, controlling how much emphasis to put on the. age when ranking results (set this to 0 to revert to the old behavior)
* Split dev and prod ALLOWED_HOSTS. Django started checking ALLOWED_HOSTS when DEBUG=True a few releases back.
* Update docs related to ALLOWED_HOSTS
* Fix the old url parsing in import wordpress
* Use Django's six module
* Don't warn Mezzanine about itself
* Looser check for LocalMiddleware.
* Modified the blog homepage pattern to a working version. Added import it requires
* Remove explicit show_banner argument from inner_run. This broke --noreload for me.
* Handle MIDDLEWARE_CLASSES -> MIDDLEWARE
* Don't use lazy static loading when Django's ManifestStaticFilesStorage is configured.
* Link to Pillow docs for dependencies
* Adding new site to site list. Adding "The National: New Australian Art" to the site list. https://the-national.com.au
* Doesn't convert JPG/JPEG images to RGBA.
* Remove all device-detection features
* Remove mentions of device handling from docs
* Use template loaders instead of middlware for host-based template swapping
* Add docs on upgrading from TemplateForHostMiddleware
* Create __init__.py so Python can find directory
* Properly parse positional args. As demonstrated by using call_command, the positional args not. processed. This may be a left-over from optarg migration. Usage property is no longer necessary
* Fix build fail while in here
* Added more tests por pages
* Update page_not_found view args.
* Rename Displayable is_public to published
* Test Nginx config before restarting. This way the configuration won't be updated if it's broken, and you also get an error message in the terminal explaining why it's broken (instead of just telling you to check service status/journal)
* Enable browser-native spell checking in WYSIWYG tinymce editor, which got wiped in 82339b0 . Previously introduced in 86f6ef6
* Fixing the support for external links which are moved to child categories in the menu hierarchy
* Update LOGOUT_URL to make use of ACCOUNT_URL
* Ensure template vars for form defaults are properly escaped
* Fix drag-n-drop for Form field inlines. Inherit from DynamicInlineAdminForm to inject the necessary JS files
* Fix failing tests that assume threadlocals have been set up
* Pulled out middleware present check into its own function. And fixed Python 3 compat
* Made all middleware installation checking consistent. All check by string first, and then for classes and subclasses,. correctly ignoring things that aren't classes
* Fix failing tests that assume threadlocals have been set up
* Fix keywords widget for Django 1.11.
* Fix sense of SITE_PERMISSION_MIDDLEWARE check. Issue introduced by commit 00f4a63c
* Fix sense of other check for SITE_PERMISSION_MIDDLEWARE. Issue introduced by commit 00f4a63
* Added basic tests for TemplateSettings. The tests follow the existing functionality
* Gave TemplateSettings a useful __repr__. Previously it just returned '{}' always, from super()s empty dict
* Don't emit warning when doing force_text(TestSettings()). This is to fix the behaviour of getting lots of instances of: UserWarning: __unicode__ is not in TEMPLATE_ACCESSIBLE_SETTINGS. if you have django-debug-tool installed
* Prevent changes to FORMS_EXTRA_FIELDS setting creating new migrations
* Support access to related model on Django 2+
* Fix safe string handling in richtext filters
* Fix some test warnings
* Add deprecation handling for mark_safe as decorator
* Fix SplitSelectDateTimeWidget which Django 1.9 broke.
* Fix usage of request.scheme in password reset email
* Make thumbnail tag recognize .PNG and .GIF. Files with the upper case extensions .PNG and .GIF are now recognized by. the thumbnail template tag as being PNG- and GIF images, respectively,. instead of being treated as JPEG images
* Added gcc and rsync for the full deployment on the freshly installed Debian (eg. on OVH)
* Support SelectDateWidget in django 1.8 and django 2.x
* Narrow exception handling to ImportError only
Diffstat (limited to 'www')
20 files changed, 25 insertions, 655 deletions
diff --git a/www/py-mezzanine/ALTERNATIVES b/www/py-mezzanine/ALTERNATIVES index 0ab18064b67..011f8ee9ee8 100644 --- a/www/py-mezzanine/ALTERNATIVES +++ b/www/py-mezzanine/ALTERNATIVES @@ -1 +1 @@ -bin/mezzanine-project @PREFIX@/bin/mezzanine-project@PYVERSSUFFIX@ +bin/mezzanine-project @PREFIX@/bin/mezzanine-project-@PYVERSSUFFIX@ diff --git a/www/py-mezzanine/MESSAGE b/www/py-mezzanine/MESSAGE deleted file mode 100644 index 9a1d41824f5..00000000000 --- a/www/py-mezzanine/MESSAGE +++ /dev/null @@ -1,55 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.2 2013/01/03 15:31:08 ryoon Exp $ - -To use Mezzanine, you will need to perform the following steps. - -1. If you want to use with PostgreSQL server, install - databases/postgresql91-server and enable it, then create database. - - $ sudo ${PREFIX}/share/examples/rc.d/pgsql onestart - $ sudo -u pgsql createuser -P - Enter name of role to add: YOURUSERNAME - Enter password for new role: YOURPASSWORD - Enter it again: YOURPASSWORD - Shall the new role be a superuser? (y/n) n - Shall the new role be allowed to create databases? (y/n) y - Shall the new role be allowed to create more new roles? (y/n) n - $ createdb dev.db -U YOURUSERNAME - -2. Change current directory to somewhere you want to deploy website. - - $ mezzanine-project project_name - # cd project_name - -3. Edit local_settings.py. - -DEBUG = True - -DATABASES = { - "default": { - # Ends with "postgresql_psycopg2", "mysql", "sqlite3" or "oracle". - "ENGINE": "django.db.backends.postgresql_psycopg2", - # DB name or path to database file if using sqlite3. - "NAME": "dev.db", - # Not used with sqlite3. - "USER": "YOUUSERNAME", - # Not used with sqlite3. - "PASSWORD": "YOURPASSWORD", - # Set to empty string for localhost. Not used with sqlite3. - "HOST": "", - # Set to empty string for default. Not used with sqlite3. - "PORT": "", - } -} - -4. Create database. - - ${PYTHONBIN} manage.py createdb --noinput - -5. Run web server - - ${PYTHONBIN} manage.py runserver - -6. Access http://localhost:8000/admin/ and setup. Username/password are - admin/default. -=========================================================================== diff --git a/www/py-mezzanine/Makefile b/www/py-mezzanine/Makefile index fb1f6f273c7..72c7a395ff7 100644 --- a/www/py-mezzanine/Makefile +++ b/www/py-mezzanine/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2017/12/30 13:44:21 adam Exp $ +# $NetBSD: Makefile,v 1.11 2018/10/26 09:27:09 adam Exp $ -DISTNAME= Mezzanine-4.2.3 +DISTNAME= Mezzanine-4.3.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} CATEGORIES= www python MASTER_SITES= ${MASTER_SITE_PYPI:=M/Mezzanine/} @@ -16,28 +16,22 @@ DEPENDS+= ${PYPKGPREFIX}-bleach>=2.0:../../www/py-bleach DEPENDS+= ${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet DEPENDS+= ${PYPKGPREFIX}-django>=1.8:../../www/py-django DEPENDS+= ${PYPKGPREFIX}-django-contrib-comments-[0-9]*:../../www/py-django-contrib-comments +DEPENDS+= ${PYPKGPREFIX}-filebrowser_safe>=0.5.0:../../www/py-filebrowser_safe DEPENDS+= ${PYPKGPREFIX}-future>=0.9.0:../../devel/py-future +DEPENDS+= ${PYPKGPREFIX}-grappelli_safe>=0.5.0:../../www/py-grappelli_safe DEPENDS+= ${PYPKGPREFIX}-requests>=2.1.0:../../devel/py-requests DEPENDS+= ${PYPKGPREFIX}-requests-oauthlib>=0.4.0:../../security/py-requests-oauthlib DEPENDS+= ${PYPKGPREFIX}-tzlocal>=1.0:../../time/py-tzlocal - -DEPENDS+= ${PYPKGPREFIX}-filebrowser_safe-[0-9]*:../../www/py-filebrowser_safe -DEPENDS+= ${PYPKGPREFIX}-grappelli_safe-[0-9]*:../../www/py-grappelli_safe - -BUILD_DEPENDS+= ${PYPKGPREFIX}-flakes>=0.6.1:../../devel/py-flakes -BUILD_DEPENDS+= ${PYPKGPREFIX}-pep8>=1.4.1:../../devel/py-pep8 +TEST_DEPENDS+= ${PYPKGPREFIX}-flakes>=0.6.1:../../devel/py-flakes +TEST_DEPENDS+= ${PYPKGPREFIX}-pep8>=1.4.1:../../devel/py-pep8 USE_LANGUAGES= # none -MESSAGE_SUBST+= PYTHONBIN=${PYTHONBIN} - REPLACE_PYTHON= mezzanine/project_template/manage.py -pre-configure: - find ${WRKSRC} -name '*.orig' -delete - post-install: - cd ${DESTDIR}${PREFIX}/bin && ${MV} mezzanine-project mezzanine-project${PYVERSSUFFIX} || ${TRUE} + cd ${DESTDIR}${PREFIX}/bin && \ + ${MV} mezzanine-project mezzanine-project-${PYVERSSUFFIX} || ${TRUE} .include "../../lang/python/application.mk" .include "../../lang/python/egg.mk" diff --git a/www/py-mezzanine/PLIST b/www/py-mezzanine/PLIST index 05adc1e09f6..b264c3d951d 100644 --- a/www/py-mezzanine/PLIST +++ b/www/py-mezzanine/PLIST @@ -1,5 +1,5 @@ -@comment $NetBSD: PLIST,v 1.2 2017/12/30 13:44:21 adam Exp $ -bin/mezzanine-project${PYVERSSUFFIX} +@comment $NetBSD: PLIST,v 1.3 2018/10/26 09:27:09 adam Exp $ +bin/mezzanine-project-${PYVERSSUFFIX} ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt @@ -892,6 +892,9 @@ ${PYSITELIB}/mezzanine/forms/migrations/0004_auto_20150517_0510.pyo ${PYSITELIB}/mezzanine/forms/migrations/0005_auto_20151026_1600.py ${PYSITELIB}/mezzanine/forms/migrations/0005_auto_20151026_1600.pyc ${PYSITELIB}/mezzanine/forms/migrations/0005_auto_20151026_1600.pyo +${PYSITELIB}/mezzanine/forms/migrations/0006_auto_20170425_2225.py +${PYSITELIB}/mezzanine/forms/migrations/0006_auto_20170425_2225.pyc +${PYSITELIB}/mezzanine/forms/migrations/0006_auto_20170425_2225.pyo ${PYSITELIB}/mezzanine/forms/migrations/__init__.py ${PYSITELIB}/mezzanine/forms/migrations/__init__.pyc ${PYSITELIB}/mezzanine/forms/migrations/__init__.pyo @@ -1171,105 +1174,9 @@ ${PYSITELIB}/mezzanine/generic/views.pyo ${PYSITELIB}/mezzanine/mobile/__init__.py ${PYSITELIB}/mezzanine/mobile/__init__.pyc ${PYSITELIB}/mezzanine/mobile/__init__.pyo -${PYSITELIB}/mezzanine/mobile/locale/ar/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/ar/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/bg/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/bg/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/ca/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/ca/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/cs/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/cs/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/da/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/da/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/de/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/de/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/en/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/en/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/eo/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/eo/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/es/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/es/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/et/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/et/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/fa/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/fa/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/fa_IR/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/fa_IR/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/fi/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/fi/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/fr/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/fr/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/hr_HR/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/hr_HR/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/hu/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/hu/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/id_ID/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/id_ID/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/is_IS/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/is_IS/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/it/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/it/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/ja/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/ja/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/ko/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/ko/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/lv/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/lv/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/nb/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/nb/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/nl/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/nl/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/pap/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/pap/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/pl/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/pl/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/pt_BR/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/pt_BR/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/pt_PT/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/pt_PT/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/ru/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/ru/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/sk/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/sk/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/sr_Latn/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/sr_Latn/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/sv/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/sv/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/tr/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/tr/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/uk_UA/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/uk_UA/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/vi_VN/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/vi_VN/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/zh/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/zh/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/zh_CN/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/zh_CN/LC_MESSAGES/django.po -${PYSITELIB}/mezzanine/mobile/locale/zh_TW/LC_MESSAGES/django.mo -${PYSITELIB}/mezzanine/mobile/locale/zh_TW/LC_MESSAGES/django.po ${PYSITELIB}/mezzanine/mobile/models.py ${PYSITELIB}/mezzanine/mobile/models.pyc ${PYSITELIB}/mezzanine/mobile/models.pyo -${PYSITELIB}/mezzanine/mobile/static/css/global-mobile.css -${PYSITELIB}/mezzanine/mobile/static/css/jquery.mobile-1.2.1.min.css -${PYSITELIB}/mezzanine/mobile/static/css/mobile.rtl.css -${PYSITELIB}/mezzanine/mobile/static/img/icon-home.png -${PYSITELIB}/mezzanine/mobile/static/img/mobile-bg.gif -${PYSITELIB}/mezzanine/mobile/static/js/jquery.mobile-1.2.1.min.js -${PYSITELIB}/mezzanine/mobile/templates/mobile/404.html -${PYSITELIB}/mezzanine/mobile/templates/mobile/500.html -${PYSITELIB}/mezzanine/mobile/templates/mobile/base.html -${PYSITELIB}/mezzanine/mobile/templates/mobile/blog/blog_post_detail.html -${PYSITELIB}/mezzanine/mobile/templates/mobile/blog/blog_post_list.html -${PYSITELIB}/mezzanine/mobile/templates/mobile/includes/footer_scripts.html -${PYSITELIB}/mezzanine/mobile/templates/mobile/includes/pagination.html -${PYSITELIB}/mezzanine/mobile/templates/mobile/includes/search.html -${PYSITELIB}/mezzanine/mobile/templates/mobile/index.html -${PYSITELIB}/mezzanine/mobile/templates/mobile/pages/form.html -${PYSITELIB}/mezzanine/mobile/templates/mobile/pages/menus/mobile.html -${PYSITELIB}/mezzanine/mobile/templates/mobile/pages/page.html -${PYSITELIB}/mezzanine/mobile/templates/mobile/pages/richtextpage.html -${PYSITELIB}/mezzanine/mobile/templates/mobile/search_results.html ${PYSITELIB}/mezzanine/pages/__init__.py ${PYSITELIB}/mezzanine/pages/__init__.pyc ${PYSITELIB}/mezzanine/pages/__init__.pyo @@ -1467,6 +1374,12 @@ ${PYSITELIB}/mezzanine/template/__init__.pyo ${PYSITELIB}/mezzanine/template/loader_tags.py ${PYSITELIB}/mezzanine/template/loader_tags.pyc ${PYSITELIB}/mezzanine/template/loader_tags.pyo +${PYSITELIB}/mezzanine/template/loaders/__init__.py +${PYSITELIB}/mezzanine/template/loaders/__init__.pyc +${PYSITELIB}/mezzanine/template/loaders/__init__.pyo +${PYSITELIB}/mezzanine/template/loaders/host_themes.py +${PYSITELIB}/mezzanine/template/loaders/host_themes.pyc +${PYSITELIB}/mezzanine/template/loaders/host_themes.pyo ${PYSITELIB}/mezzanine/twitter/__init__.py ${PYSITELIB}/mezzanine/twitter/__init__.pyc ${PYSITELIB}/mezzanine/twitter/__init__.pyo @@ -1598,9 +1511,6 @@ ${PYSITELIB}/mezzanine/utils/conf.pyo ${PYSITELIB}/mezzanine/utils/deprecation.py ${PYSITELIB}/mezzanine/utils/deprecation.pyc ${PYSITELIB}/mezzanine/utils/deprecation.pyo -${PYSITELIB}/mezzanine/utils/device.py -${PYSITELIB}/mezzanine/utils/device.pyc -${PYSITELIB}/mezzanine/utils/device.pyo ${PYSITELIB}/mezzanine/utils/docs.py ${PYSITELIB}/mezzanine/utils/docs.pyc ${PYSITELIB}/mezzanine/utils/docs.pyo diff --git a/www/py-mezzanine/distinfo b/www/py-mezzanine/distinfo index 95048748f51..e1715e4c094 100644 --- a/www/py-mezzanine/distinfo +++ b/www/py-mezzanine/distinfo @@ -1,21 +1,6 @@ -$NetBSD: distinfo,v 1.3 2017/12/30 13:44:21 adam Exp $ +$NetBSD: distinfo,v 1.4 2018/10/26 09:27:09 adam Exp $ -SHA1 (Mezzanine-4.2.3.tar.gz) = a3319d8f4e0387855b49a75feea0f4c1e510d2cf -RMD160 (Mezzanine-4.2.3.tar.gz) = bb444a9d656a8a886c74b41ca1478aa9b1299f89 -SHA512 (Mezzanine-4.2.3.tar.gz) = 3a9ad97e2ab18b6e907b46c55a03c1533a674a0b7fc5025d82aa2bcb5957a4ca4e289763a8019f8fd1e0f8fe06f4d612f89c71fea87de868ed82e6faa536e674 -Size (Mezzanine-4.2.3.tar.gz) = 6249272 bytes -SHA1 (patch-mezzanine_blog_migrations_0003__auto__20170411__0504.py) = dfb439df9fcdec0557e1d946ea1ef1a6abd3a712 -SHA1 (patch-mezzanine_blog_templatetags_blog__tags.py) = 19ce513504304b49c1b30105f1d4a53d4db8f633 -SHA1 (patch-mezzanine_core_auth__backends.py) = 64a01c0b7a85a4f12f27d10b000ba6c7a12fb1f8 -SHA1 (patch-mezzanine_core_managers.py) = 76e7e5528f225499f5c22fa6b9b8227e1f47c651 -SHA1 (patch-mezzanine_core_models.py) = 9fcbd5feb064d5860a41f7e0eb0db988dd7b8ad4 -SHA1 (patch-mezzanine_core_templatetags_mezzanine__tags.py) = f6d0e7cc7833f6d08a91db8a2dff7f970a09b79e -SHA1 (patch-mezzanine_generic_migrations_0003__auto__20170411__0504.py) = db912eef23154db88eab374de4ad49544d596fcc -SHA1 (patch-mezzanine_generic_templatetags_comment__tags.py) = 18c79b0128b4f4e9a6e5a86a1d48418b4e673fec -SHA1 (patch-mezzanine_generic_templatetags_rating__tags.py) = 8c7889f3a5d5a4c2c03bc4668429063a898499ee -SHA1 (patch-mezzanine_generic_tests.py) = 174bf0846ce29b249741b143c3991bd0be5c5ba7 -SHA1 (patch-mezzanine_pages_migrations_0004__auto__20170411__0504.py) = 904fd0894fb1e75dbf95a86213c621d4c2b5bf15 -SHA1 (patch-mezzanine_pages_templatetags_pages__tags.py) = 55d199b354056c8bc0550fd47c566ef192424fb0 -SHA1 (patch-mezzanine_template_____init____.py) = 231910e2080c80fbd89281af371744ca88b6bf61 -SHA1 (patch-mezzanine_utils_email.py) = 6faad20f8604228edee60d024cf854378bbf89aa -SHA1 (patch-setup.py) = b6b3b12e560adcc2d3e13221023df5b5eb22171a +SHA1 (Mezzanine-4.3.1.tar.gz) = 3d8a60489488772f345b7bd538af5ac69c958814 +RMD160 (Mezzanine-4.3.1.tar.gz) = 86f7837c50a2658b5e1715570110fec1bb15dbdb +SHA512 (Mezzanine-4.3.1.tar.gz) = 9f16e5403faa069b95fcc1b8d5eea0e6bfc70861708a11074aa002ecf1a424354f3aa3cd5af68a7d01c4b6ed2b381a4cdcee1ceac75d06d659a9e4c59a94f74b +Size (Mezzanine-4.3.1.tar.gz) = 6208692 bytes diff --git a/www/py-mezzanine/patches/patch-mezzanine_blog_migrations_0003__auto__20170411__0504.py b/www/py-mezzanine/patches/patch-mezzanine_blog_migrations_0003__auto__20170411__0504.py deleted file mode 100644 index 65ee7561ac8..00000000000 --- a/www/py-mezzanine/patches/patch-mezzanine_blog_migrations_0003__auto__20170411__0504.py +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-mezzanine_blog_migrations_0003__auto__20170411__0504.py,v 1.1 2017/12/30 13:44:21 adam Exp $ - -Django 1.11 support. -https://github.com/stephenmcd/mezzanine/pull/1750 - ---- mezzanine/blog/migrations/0003_auto_20170411_0504.py.orig 2017-12-25 08:30:07.000000000 +0000 -+++ mezzanine/blog/migrations/0003_auto_20170411_0504.py -@@ -0,0 +1,27 @@ -+# -*- 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 -+ -+ -+class Migration(migrations.Migration): -+ -+ dependencies = [ -+ ('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'), -+ 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'), -+ preserve_default=False, -+ ), -+ ] diff --git a/www/py-mezzanine/patches/patch-mezzanine_blog_templatetags_blog__tags.py b/www/py-mezzanine/patches/patch-mezzanine_blog_templatetags_blog__tags.py deleted file mode 100644 index 7fa364ee475..00000000000 --- a/www/py-mezzanine/patches/patch-mezzanine_blog_templatetags_blog__tags.py +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mezzanine_blog_templatetags_blog__tags.py,v 1.1 2017/12/30 13:44:21 adam Exp $ - -Django 1.11 support. -https://github.com/stephenmcd/mezzanine/pull/1750 - ---- mezzanine/blog/templatetags/blog_tags.py.orig 2017-12-25 08:31:08.000000000 +0000 -+++ mezzanine/blog/templatetags/blog_tags.py -@@ -94,4 +94,4 @@ def quick_blog(context): - Admin dashboard tag for the quick blog form. - """ - context["form"] = BlogPostForm() -- return context -+ return context.flatten() diff --git a/www/py-mezzanine/patches/patch-mezzanine_core_auth__backends.py b/www/py-mezzanine/patches/patch-mezzanine_core_auth__backends.py deleted file mode 100644 index d491038789d..00000000000 --- a/www/py-mezzanine/patches/patch-mezzanine_core_auth__backends.py +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-mezzanine_core_auth__backends.py,v 1.1 2017/12/30 13:44:21 adam Exp $ - -Django 1.11 support. -https://github.com/stephenmcd/mezzanine/pull/1750 - ---- mezzanine/core/auth_backends.py.orig 2017-12-25 08:31:51.000000000 +0000 -+++ mezzanine/core/auth_backends.py -@@ -24,7 +24,7 @@ class MezzanineBackend(ModelBackend): - For signup verficiation, False is given for is_active. - """ - -- def authenticate(self, **kwargs): -+ def authenticate(self, *args, **kwargs): - if kwargs: - username = kwargs.pop("username", None) - if username: diff --git a/www/py-mezzanine/patches/patch-mezzanine_core_managers.py b/www/py-mezzanine/patches/patch-mezzanine_core_managers.py deleted file mode 100644 index c04d5c39b43..00000000000 --- a/www/py-mezzanine/patches/patch-mezzanine_core_managers.py +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-mezzanine_core_managers.py,v 1.1 2017/12/30 13:44:21 adam Exp $ - -Django 1.11 support. -https://github.com/stephenmcd/mezzanine/pull/1750 - ---- mezzanine/core/managers.py.orig 2016-08-12 00:47:57.000000000 +0000 -+++ mezzanine/core/managers.py -@@ -187,7 +187,7 @@ class SearchableQuerySet(QuerySet): - self._search_ordered = len(self._search_terms) > 0 - return super(SearchableQuerySet, self).order_by(*field_names) - -- def iterator(self): -+ def annotate_scores(self): - """ - If search has occurred and no ordering has occurred, decorate - each result with the number of search terms so that it can be -@@ -351,7 +351,8 @@ class SearchableManager(Manager): - queryset = model.objects.published(for_user=user) - except AttributeError: - queryset = model.objects.get_queryset() -- all_results.extend(queryset.search(*args, **kwargs)) -+ all_results.extend( -+ queryset.search(*args, **kwargs).annotate_scores()) - return sorted(all_results, key=lambda r: r.result_count, reverse=True) - - diff --git a/www/py-mezzanine/patches/patch-mezzanine_core_models.py b/www/py-mezzanine/patches/patch-mezzanine_core_models.py deleted file mode 100644 index 086324a548a..00000000000 --- a/www/py-mezzanine/patches/patch-mezzanine_core_models.py +++ /dev/null @@ -1,48 +0,0 @@ -$NetBSD: patch-mezzanine_core_models.py,v 1.1 2017/12/30 13:44:21 adam Exp $ - -Django 1.11 support. -https://github.com/stephenmcd/mezzanine/pull/1750 - ---- mezzanine/core/models.py.orig 2017-03-10 16:47:14.000000000 +0000 -+++ mezzanine/core/models.py -@@ -46,7 +46,8 @@ class SiteRelated(models.Model): - class Meta: - abstract = True - -- site = models.ForeignKey("sites.Site", editable=False) -+ site = models.ForeignKey("sites.Site", on_delete=models.CASCADE, -+ editable=False) - - def save(self, update_site=False, *args, **kwargs): - """ -@@ -67,7 +68,7 @@ class Slugged(SiteRelated): - """ - - title = models.CharField(_("Title"), max_length=500) -- slug = models.CharField(_("URL"), max_length=2000, blank=True, null=True, -+ slug = models.CharField(_("URL"), max_length=2000, blank=True, - help_text=_("Leave blank to have the URL auto-generated from " - "the title.")) - -@@ -485,8 +486,8 @@ class Ownable(models.Model): - Abstract model that provides ownership of an object for a user. - """ - -- user = models.ForeignKey(user_model_name, 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 -@@ -555,8 +556,8 @@ class SitePermission(models.Model): - access. - """ - -- user = models.OneToOneField(user_model_name, verbose_name=_("Author"), -- related_name="%(class)ss") -+ 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")) - diff --git a/www/py-mezzanine/patches/patch-mezzanine_core_templatetags_mezzanine__tags.py b/www/py-mezzanine/patches/patch-mezzanine_core_templatetags_mezzanine__tags.py deleted file mode 100644 index 3aefda34220..00000000000 --- a/www/py-mezzanine/patches/patch-mezzanine_core_templatetags_mezzanine__tags.py +++ /dev/null @@ -1,102 +0,0 @@ -$NetBSD: patch-mezzanine_core_templatetags_mezzanine__tags.py,v 1.1 2017/12/30 13:44:21 adam Exp $ - -Django 1.11 support. -https://github.com/stephenmcd/mezzanine/pull/1750 - ---- mezzanine/core/templatetags/mezzanine_tags.py.orig 2016-11-05 04:09:20.000000000 +0000 -+++ mezzanine/core/templatetags/mezzanine_tags.py -@@ -17,7 +17,7 @@ from django.core.files import File - from django.core.files.storage import default_storage - from django.core.urlresolvers import reverse, resolve, NoReverseMatch - from django.db.models import Model --from django.template import Context, Node, Template, TemplateSyntaxError -+from django.template import Node, Template, TemplateSyntaxError - from django.template.base import (TOKEN_BLOCK, TOKEN_COMMENT, - TOKEN_TEXT, TOKEN_VAR, TextNode) - from django.template.defaultfilters import escape -@@ -106,11 +106,11 @@ def fields_for(context, form, template=" - Renders fields for a form with an optional template choice. - """ - context["form_for_fields"] = form -- return get_template(template).render(context) -+ return get_template(template).render(context.flatten()) - - --@register.inclusion_tag("includes/form_errors.html", takes_context=True) --def errors_for(context, form): -+@register.inclusion_tag("includes/form_errors.html") -+def errors_for(form): - """ - Renders an alert if the form has any errors. - """ -@@ -456,7 +456,7 @@ def editable_loader(context): - context.get("page", None)) - template_vars["accounts_logout_url"] = context.get( - "accounts_logout_url", None) -- template_vars["toolbar"] = t.render(Context(template_vars)) -+ template_vars["toolbar"] = t.render(template_vars) - template_vars["richtext_media"] = RichTextField().formfield( - ).widget.media - return template_vars -@@ -510,7 +510,7 @@ def editable(parsed, context, token): - context["editable_form"] = get_edit_form(obj, field_names) - context["original"] = parsed - t = get_template("includes/editable_form.html") -- return t.render(context) -+ return t.render(context.flatten()) - return parsed - - -@@ -641,17 +641,14 @@ 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. - """ -- template_vars = context.flatten() - user = context["request"].user - if user.is_staff: -- template_vars["dropdown_menu_app_list"] = admin_app_list( -- context["request"]) -+ context["dropdown_menu_app_list"] = admin_app_list(context["request"]) - if user.is_superuser: - sites = Site.objects.all() - else: -@@ -659,11 +656,9 @@ def admin_dropdown_menu(context): - sites = user.sitepermissions.sites.all() - except ObjectDoesNotExist: - sites = Site.objects.none() -- template_vars["dropdown_menu_sites"] = list(sites) -- template_vars["dropdown_menu_selected_site_id"] = current_site_id() -- template_vars["settings"] = context["settings"] -- template_vars["request"] = context["request"] -- return template_vars -+ context["dropdown_menu_sites"] = list(sites) -+ context["dropdown_menu_selected_site_id"] = current_site_id() -+ return context.flatten() - - - @register.inclusion_tag("admin/includes/app_list.html", takes_context=True) -@@ -672,7 +667,7 @@ def app_list(context): - Renders the app list for the admin dashboard widget. - """ - context["dashboard_app_list"] = admin_app_list(context["request"]) -- return context -+ return context.flatten() - - - @register.inclusion_tag("admin/includes/recent_actions.html", -@@ -681,7 +676,7 @@ def recent_actions(context): - """ - Renders the recent actions list for the admin dashboard widget. - """ -- return context -+ return context.flatten() - - - @register.render_tag diff --git a/www/py-mezzanine/patches/patch-mezzanine_generic_migrations_0003__auto__20170411__0504.py b/www/py-mezzanine/patches/patch-mezzanine_generic_migrations_0003__auto__20170411__0504.py deleted file mode 100644 index c18b6bb8cb7..00000000000 --- a/www/py-mezzanine/patches/patch-mezzanine_generic_migrations_0003__auto__20170411__0504.py +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-mezzanine_generic_migrations_0003__auto__20170411__0504.py,v 1.1 2017/12/30 13:44:21 adam Exp $ - -Django 1.11 support. -https://github.com/stephenmcd/mezzanine/pull/1750 - ---- mezzanine/generic/migrations/0003_auto_20170411_0504.py.orig 2017-12-25 08:38:47.000000000 +0000 -+++ mezzanine/generic/migrations/0003_auto_20170411_0504.py -@@ -0,0 +1,21 @@ -+# -*- 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 -+ -+ -+class Migration(migrations.Migration): -+ -+ dependencies = [ -+ ('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'), -+ preserve_default=False, -+ ), -+ ] diff --git a/www/py-mezzanine/patches/patch-mezzanine_generic_templatetags_comment__tags.py b/www/py-mezzanine/patches/patch-mezzanine_generic_templatetags_comment__tags.py deleted file mode 100644 index 9348e91bba0..00000000000 --- a/www/py-mezzanine/patches/patch-mezzanine_generic_templatetags_comment__tags.py +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-mezzanine_generic_templatetags_comment__tags.py,v 1.1 2017/12/30 13:44:21 adam Exp $ - -Django 1.11 support. -https://github.com/stephenmcd/mezzanine/pull/1750 - ---- mezzanine/generic/templatetags/comment_tags.py.orig 2016-08-12 01:16:03.000000000 +0000 -+++ mezzanine/generic/templatetags/comment_tags.py -@@ -31,7 +31,7 @@ def comments_for(context, obj): - 'comment_url': reverse("comment"), - 'object_for_comments': obj, - }) -- return context -+ return context.flatten() - - - @register.inclusion_tag("generic/includes/comment.html", takes_context=True) -@@ -61,7 +61,7 @@ def comment_thread(context, parent): - "no_comments": parent_id is None and not context["all_comments"], - "replied_to": replied_to, - }) -- return context -+ return context.flatten() - - - @register.inclusion_tag("admin/includes/recent_comments.html", -@@ -73,7 +73,7 @@ def recent_comments(context): - latest = context["settings"].COMMENTS_NUM_LATEST - comments = ThreadedComment.objects.all().select_related("user") - context["comments"] = comments.order_by("-id")[:latest] -- return context -+ return context.flatten() - - - @register.filter diff --git a/www/py-mezzanine/patches/patch-mezzanine_generic_templatetags_rating__tags.py b/www/py-mezzanine/patches/patch-mezzanine_generic_templatetags_rating__tags.py deleted file mode 100644 index 3ac93e91010..00000000000 --- a/www/py-mezzanine/patches/patch-mezzanine_generic_templatetags_rating__tags.py +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-mezzanine_generic_templatetags_rating__tags.py,v 1.1 2017/12/30 13:44:21 adam Exp $ - -Django 1.11 support. -https://github.com/stephenmcd/mezzanine/pull/1750 - ---- mezzanine/generic/templatetags/rating_tags.py.orig 2016-01-17 01:21:39.000000000 +0000 -+++ mezzanine/generic/templatetags/rating_tags.py -@@ -21,4 +21,4 @@ def rating_for(context, obj): - rating_name = obj.get_ratingfield_name() - for f in ("average", "count", "sum"): - context["rating_" + f] = getattr(obj, "%s_%s" % (rating_name, f)) -- return context -+ return context.flatten() diff --git a/www/py-mezzanine/patches/patch-mezzanine_generic_tests.py b/www/py-mezzanine/patches/patch-mezzanine_generic_tests.py deleted file mode 100644 index 61c4e8251f6..00000000000 --- a/www/py-mezzanine/patches/patch-mezzanine_generic_tests.py +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-mezzanine_generic_tests.py,v 1.1 2017/12/30 13:44:21 adam Exp $ - -Django 1.11 support. -https://github.com/stephenmcd/mezzanine/pull/1750 - ---- mezzanine/generic/tests.py.orig 2017-12-25 08:42:20.000000000 +0000 -+++ mezzanine/generic/tests.py -@@ -170,7 +170,7 @@ class GenericTests(TestCase): - - result = template.render(Context(context)) - -- self.assertIn( -+ self.assertInHTML( - '<input id="id_object_pk" name="object_pk" ' - 'type="hidden" value="%d" />' % context['post2'].pk, - result diff --git a/www/py-mezzanine/patches/patch-mezzanine_pages_migrations_0004__auto__20170411__0504.py b/www/py-mezzanine/patches/patch-mezzanine_pages_migrations_0004__auto__20170411__0504.py deleted file mode 100644 index 360513a9903..00000000000 --- a/www/py-mezzanine/patches/patch-mezzanine_pages_migrations_0004__auto__20170411__0504.py +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-mezzanine_pages_migrations_0004__auto__20170411__0504.py,v 1.1 2017/12/30 13:44:21 adam Exp $ - -Django 1.11 support. -https://github.com/stephenmcd/mezzanine/pull/1750 - ---- mezzanine/pages/migrations/0004_auto_20170411_0504.py.orig 2017-12-25 08:43:14.000000000 +0000 -+++ mezzanine/pages/migrations/0004_auto_20170411_0504.py -@@ -0,0 +1,21 @@ -+# -*- 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 -+ -+ -+class Migration(migrations.Migration): -+ -+ dependencies = [ -+ ('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'), -+ preserve_default=False, -+ ), -+ ] diff --git a/www/py-mezzanine/patches/patch-mezzanine_pages_templatetags_pages__tags.py b/www/py-mezzanine/patches/patch-mezzanine_pages_templatetags_pages__tags.py deleted file mode 100644 index ecccdfa518e..00000000000 --- a/www/py-mezzanine/patches/patch-mezzanine_pages_templatetags_pages__tags.py +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-mezzanine_pages_templatetags_pages__tags.py,v 1.1 2017/12/30 13:44:21 adam Exp $ - -Django 1.11 support. -https://github.com/stephenmcd/mezzanine/pull/1750 - ---- mezzanine/pages/templatetags/pages_tags.py.orig 2016-01-17 01:21:39.000000000 +0000 -+++ mezzanine/pages/templatetags/pages_tags.py -@@ -4,7 +4,7 @@ from future.builtins import str - from collections import defaultdict - - from django.core.exceptions import ImproperlyConfigured --from django.template import Context, TemplateSyntaxError, Variable -+from django.template import TemplateSyntaxError, Variable - from django.template.loader import get_template - from django.utils.translation import ugettext_lazy as _ - -@@ -131,7 +131,7 @@ def page_menu(context, token): - context["page_branch_in_footer"] = True - - t = get_template(template_name) -- return t.render(Context(context)) -+ return t.render(context.flatten()) - - - @register.as_tag diff --git a/www/py-mezzanine/patches/patch-mezzanine_template_____init____.py b/www/py-mezzanine/patches/patch-mezzanine_template_____init____.py deleted file mode 100644 index 95ae563c250..00000000000 --- a/www/py-mezzanine/patches/patch-mezzanine_template_____init____.py +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-mezzanine_template_____init____.py,v 1.1 2017/12/30 13:44:21 adam Exp $ - -Django 1.11 support. -https://github.com/stephenmcd/mezzanine/pull/1750 - ---- mezzanine/template/__init__.py.orig 2017-03-10 16:47:14.000000000 +0000 -+++ mezzanine/template/__init__.py -@@ -7,6 +7,7 @@ from django import template - from django import VERSION as DJANGO_VERSION - from django.template.context import Context - from django.template.loader import get_template, select_template -+from django.utils.html import conditional_escape - - from mezzanine.utils.device import templates_for_device - -@@ -127,9 +128,9 @@ class Library(template.Library): - if takes_context: - parts.insert(0, context) - result = tag_func(*parts) -- autoescape = context.autoescape -- context = context_class(result, autoescape=autoescape) -- return self.template.render(context) -+ if context.autoescape: -+ result = conditional_escape(result) -+ return self.template.render(context.flatten()) - - return InclusionTagNode() - return self.tag(tag_wrapper) diff --git a/www/py-mezzanine/patches/patch-mezzanine_utils_email.py b/www/py-mezzanine/patches/patch-mezzanine_utils_email.py deleted file mode 100644 index 7665b5bd4c5..00000000000 --- a/www/py-mezzanine/patches/patch-mezzanine_utils_email.py +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-mezzanine_utils_email.py,v 1.1 2017/12/30 13:44:21 adam Exp $ - -Django 1.11 support. -https://github.com/stephenmcd/mezzanine/pull/1750 - ---- mezzanine/utils/email.py.orig 2016-01-17 01:21:39.000000000 +0000 -+++ mezzanine/utils/email.py -@@ -4,7 +4,7 @@ from future.builtins import bytes, str - from django.contrib.auth.tokens import default_token_generator - from django.core.mail import EmailMultiAlternatives - from django.core.urlresolvers import reverse --from django.template import loader, Context -+from django.template import loader - from django.utils.http import int_to_base36 - - from mezzanine.conf import settings -@@ -25,7 +25,7 @@ def subject_template(template, context): - Loads and renders an email subject template, returning the - subject string. - """ -- subject = loader.get_template(template).render(Context(context)) -+ subject = loader.get_template(template).render(context) - return " ".join(subject.splitlines()).strip() - - -@@ -55,7 +55,7 @@ def send_mail_template(subject, 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(context)) -+ (template, type)).render(context) - # Create and send email. - msg = EmailMultiAlternatives(subject, render("txt"), - addr_from, addr_to, addr_bcc, diff --git a/www/py-mezzanine/patches/patch-setup.py b/www/py-mezzanine/patches/patch-setup.py deleted file mode 100644 index 9bb59a1aa14..00000000000 --- a/www/py-mezzanine/patches/patch-setup.py +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-setup.py,v 1.1 2017/12/30 13:44:21 adam Exp $ - -Django 1.11 support. -https://github.com/stephenmcd/mezzanine/pull/1750 - ---- setup.py.orig 2017-12-25 08:47:37.000000000 +0000 -+++ setup.py -@@ -51,7 +51,7 @@ try: - packages=find_packages(), - install_requires=[ - "django-contrib-comments", -- "django >= 1.8, < 1.11", -+ "django >= 1.8", - "filebrowser_safe >= 0.4.6", - "grappelli_safe >= 0.4.5", - "tzlocal >= 1.0", |