-
-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '5.0' of github.com:plone/buildout.coredev into 5.0
- Loading branch information
Showing
8 changed files
with
273 additions
and
80 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,38 +1,24 @@ | ||
| [buildout] | ||
| #always-checkout = force | ||
| always-checkout = force | ||
| auto-checkout = | ||
| Products.CMFFormController | ||
| Products.CMFPlone | ||
| Products.CMFQuickInstallerTool | ||
| Products.contentmigration | ||
| Products.PortalTransforms | ||
| Products.TinyMCE | ||
| mockup | ||
| plone.app.collection | ||
| plone.app.content | ||
| plone.app.contentrules | ||
| plone.app.contenttypes | ||
| plone.app.controlpanel | ||
| plone.app.discussion | ||
| plone.app.caching | ||
| plone.app.dexterity | ||
| plone.app.event | ||
| plone.app.iterate | ||
| plone.app.layout | ||
| plone.app.contentlisting | ||
| plone.app.contentrules | ||
| plone.app.controlpanel | ||
| plone.app.locales | ||
| plone.app.multilingual | ||
| plone.app.portlets | ||
| plone.app.testing | ||
| plone.app.textfield | ||
| plone.app.theming | ||
| plone.app.upgrade | ||
| plone.app.users | ||
| plone.app.vocabularies | ||
| plone.dexterity | ||
| plone.formwidget.recurrence | ||
| plone.portlet.collection | ||
| plone.schemaeditor | ||
| plonetheme.barceloneta | ||
| plone.outputfilters | ||
| # test fixes only | ||
| Products.ATContentTypes | ||
| plone.app.caching | ||
| plone.app.discussion | ||
| plone.app.lockingbehavior | ||
| plone.locking | ||
| plone.app.z3cform |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,230 @@ | ||
| Repository: plone.app.event | ||
| Repository: Products.PortalTransforms | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2015-06-24T11:00:09+02:00 | ||
| Author: Godefroid Chapelle (gotcha) <gotcha@bubblenet.be> | ||
| Commit: https://github.com/plone/Products.PortalTransforms/commit/9aafffdec8cc031206d8785139a4927d67cce256 | ||
|
|
||
| fix safe_html with entities after a <script> tag | ||
|
|
||
| Files changed: | ||
| M CHANGES.rst | ||
| M Products/PortalTransforms/tests/test_transforms.py | ||
| M Products/PortalTransforms/transforms/safe_html.py | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index 8450ec6..bc9c368 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -4,6 +4,9 @@ Changelog | ||
| 2.1.7 (unreleased) | ||
| ------------------ | ||
|
|
||
| +- fix safe_html with entities after a <script> tag | ||
| + [gotcha] | ||
| + | ||
| - Remove CMFDefault dependency | ||
| [tomgross] | ||
|
|
||
| diff --git a/Products/PortalTransforms/tests/test_transforms.py b/Products/PortalTransforms/tests/test_transforms.py | ||
| index 1dce9ef..98e214c 100644 | ||
| --- a/Products/PortalTransforms/tests/test_transforms.py | ||
| +++ b/Products/PortalTransforms/tests/test_transforms.py | ||
| @@ -1,3 +1,4 @@ | ||
| +# -*- coding: utf8 -*- | ||
| import os | ||
| import copy | ||
| import logging | ||
| @@ -214,12 +215,63 @@ def test_script(self): | ||
| data = self.pt.convertTo(target_mimetype='text/x-html-safe', orig=orig) | ||
| self.assertEqual(data.getData(), orig) | ||
|
|
||
| + def test_unicode_in_script(self): | ||
| + orig = ('<script type="text/javascript">' | ||
| + ' $("h1 > ul").attr("alt", "Officiële");' | ||
| + '</script>' | ||
| + ) | ||
| + data = self.pt.convertTo(target_mimetype='text/x-html-safe', orig=orig) | ||
| + self.assertEqual(data.getData(), orig) | ||
| + | ||
| def test_entities(self): | ||
| orig = "<code>a > 0 && b < 1</code>" | ||
| escaped = "<code>a > 0 && b < 1</code>" | ||
| data = self.pt.convertTo(target_mimetype='text/x-html-safe', orig=orig) | ||
| self.assertEqual(data.getData(), escaped) | ||
|
|
||
| + def test_script_with_entities_and_unicode(self): | ||
| + orig = ('<script type="text/javascript">' | ||
| + ' var el = "test";' | ||
| + '</script>' | ||
| + '<p>(KU Loket) Officiële inschrijvingen </p>' | ||
| + ) | ||
| + data = self.pt.convertTo(target_mimetype='text/x-html-safe', orig=orig) | ||
| + self.assertEqual(data.getData(), orig) | ||
| + | ||
| + def test_script_with_entities(self): | ||
| + orig = ('<script type="text/javascript">' | ||
| + ' var el = "test";' | ||
| + '</script>' | ||
| + '<p>(KU Loket)</p>' | ||
| + ) | ||
| + data = self.pt.convertTo(target_mimetype='text/x-html-safe', orig=orig) | ||
| + self.assertEqual(data.getData(), orig) | ||
| + | ||
| + def test_entities_with_script(self): | ||
| + orig = ('<p>(KU Loket)</p>' | ||
| + '<script type="text/javascript">' | ||
| + ' var el = "test";' | ||
| + '</script>' | ||
| + ) | ||
| + data = self.pt.convertTo(target_mimetype='text/x-html-safe', orig=orig) | ||
| + self.assertEqual(data.getData(), orig) | ||
| + | ||
| + def test_script_with_unicode(self): | ||
| + orig = ('<script type="text/javascript">' | ||
| + ' var el = "test";' | ||
| + '</script>' | ||
| + '<p>Officiële inschrijvingen </p>' | ||
| + ) | ||
| + data = self.pt.convertTo(target_mimetype='text/x-html-safe', orig=orig) | ||
| + self.assertEqual(data.getData(), orig) | ||
| + | ||
| + def test_entities_and_unicode(self): | ||
| + orig = '<p>(KU Loket) Officiële inschrijvingen </p>' | ||
| + data = self.pt.convertTo(target_mimetype='text/x-html-safe', orig=orig) | ||
| + self.assertEqual(data.getData(), orig) | ||
| + | ||
| + | ||
| + | ||
| class WordTransformsTest(ATSiteTestCase): | ||
|
|
||
| def afterSetUp(self): | ||
| diff --git a/Products/PortalTransforms/transforms/safe_html.py b/Products/PortalTransforms/transforms/safe_html.py | ||
| index e5e243c..8fed210 100644 | ||
| --- a/Products/PortalTransforms/transforms/safe_html.py | ||
| +++ b/Products/PortalTransforms/transforms/safe_html.py | ||
| @@ -2534,9 +2534,9 @@ def unknown_starttag(self, tag, attrs): | ||
| pass | ||
|
|
||
| def unknown_endtag(self, tag): | ||
| + self.inside_script = False | ||
| if tag in self.nasty and not tag in self.valid: | ||
| self.suppress = False | ||
| - self.inside_script = False | ||
| if self.suppress: | ||
| return | ||
| if safeToInt(self.valid.get(tag)): | ||
|
|
||
|
|
||
| Repository: Products.PortalTransforms | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2015-06-24T12:01:28+02:00 | ||
| Author: Godefroid Chapelle (gotcha) <gotcha@bubblenet.be> | ||
| Commit: https://github.com/plone/Products.PortalTransforms/commit/f2f3721c236611c0145dc7213eb611ccca436ff4 | ||
|
|
||
| tune manifest | ||
|
|
||
| Files changed: | ||
| M MANIFEST.in | ||
|
|
||
| diff --git a/MANIFEST.in b/MANIFEST.in | ||
| index f220fc4..6442174 100644 | ||
| --- a/MANIFEST.in | ||
| +++ b/MANIFEST.in | ||
| @@ -1,4 +1,5 @@ | ||
| include * | ||
| +exclude .installed.cfg | ||
|
|
||
| recursive-include docs * | ||
| recursive-include Products * | ||
|
|
||
|
|
||
| Repository: Products.PortalTransforms | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2015-06-24T12:01:42+02:00 | ||
| Author: Godefroid Chapelle (gotcha) <gotcha@bubblenet.be> | ||
| Commit: https://github.com/plone/Products.PortalTransforms/commit/021a27c72864dd43605f0682682646d15e8528f2 | ||
|
|
||
| Preparing release 2.1.7 | ||
|
|
||
| Files changed: | ||
| M CHANGES.rst | ||
| M setup.py | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index bc9c368..87bc302 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -1,7 +1,7 @@ | ||
| Changelog | ||
| ========= | ||
|
|
||
| -2.1.7 (unreleased) | ||
| +2.1.7 (2015-06-24) | ||
| ------------------ | ||
|
|
||
| - fix safe_html with entities after a <script> tag | ||
| diff --git a/setup.py b/setup.py | ||
| index 705ac4d..0df2a04 100644 | ||
| --- a/setup.py | ||
| +++ b/setup.py | ||
| @@ -1,6 +1,6 @@ | ||
| from setuptools import setup, find_packages | ||
|
|
||
| -version = '2.1.7.dev0' | ||
| +version = '2.1.7' | ||
|
|
||
| setup(name='Products.PortalTransforms', | ||
| version=version, | ||
|
|
||
|
|
||
| Repository: Products.PortalTransforms | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2015-06-03T23:28:43+02:00 | ||
| Author: Johannes Raggam (thet) <raggam-nl@adm.at> | ||
| Commit: https://github.com/plone/plone.app.event/commit/ff49586286b76efdf3e212203e1f561a8b80b382 | ||
| Date: 2015-06-24T12:02:09+02:00 | ||
| Author: Godefroid Chapelle (gotcha) <gotcha@bubblenet.be> | ||
| Commit: https://github.com/plone/Products.PortalTransforms/commit/2db3e5d663e878f7e4663b2bd5f63924d7f0d6ea | ||
|
|
||
| correct lang in po | ||
| Back to development: 2.1.8 | ||
|
|
||
| Files changed: | ||
| M plone/app/event/locales/de/LC_MESSAGES/plone.app.event.po | ||
|
|
||
| diff --git a/plone/app/event/locales/de/LC_MESSAGES/plone.app.event.po b/plone/app/event/locales/de/LC_MESSAGES/plone.app.event.po | ||
| index f23e4e4..8c028e8 100644 | ||
| --- a/plone/app/event/locales/de/LC_MESSAGES/plone.app.event.po | ||
| +++ b/plone/app/event/locales/de/LC_MESSAGES/plone.app.event.po | ||
| @@ -11,8 +11,8 @@ msgstr "" | ||
| "Content-Type: text/plain; charset=utf-8\n" | ||
| "Content-Transfer-Encoding: 8bit\n" | ||
| "Plural-Forms: nplurals=1; plural=0\n" | ||
| -"Language-Code: en\n" | ||
| -"Language-Name: English\n" | ||
| +"Language-Code: de\n" | ||
| +"Language-Name: Deutsch\n" | ||
| "Preferred-Encodings: utf-8 latin1\n" | ||
| "Domain: plone.app.event\n" | ||
| M CHANGES.rst | ||
| M setup.py | ||
|
|
||
| diff --git a/CHANGES.rst b/CHANGES.rst | ||
| index 87bc302..d65fbc1 100644 | ||
| --- a/CHANGES.rst | ||
| +++ b/CHANGES.rst | ||
| @@ -1,6 +1,12 @@ | ||
| Changelog | ||
| ========= | ||
|
|
||
| +2.1.8 (unreleased) | ||
| +------------------ | ||
| + | ||
| +- Nothing changed yet. | ||
| + | ||
| + | ||
| 2.1.7 (2015-06-24) | ||
| ------------------ | ||
|
|
||
| diff --git a/setup.py b/setup.py | ||
| index 0df2a04..8c7cc42 100644 | ||
| --- a/setup.py | ||
| +++ b/setup.py | ||
| @@ -1,6 +1,6 @@ | ||
| from setuptools import setup, find_packages | ||
|
|
||
| -version = '2.1.7' | ||
| +version = '2.1.8.dev0' | ||
|
|
||
| setup(name='Products.PortalTransforms', | ||
| version=version, | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.