diff --git a/last_commit.txt b/last_commit.txt index 8b4559f7f1..cd494d4449 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,85 +1,57 @@ -Repository: plone.app.querystring +Repository: plone.intelligenttext Branch: refs/heads/master -Date: 2018-09-18T15:37:34+02:00 -Author: Philip Bauer (pbauer) -Commit: https://github.com/plone/plone.app.querystring/commit/ce9ac91721b8a04dbba2d960549f69969b24bf81 +Date: 2018-10-05T10:26:06+02:00 +Author: David Glick (davisagli) +Commit: https://github.com/plone/plone.intelligenttext/commit/f8630f8d43fe4135f9ecf7c690c734eeb8562213 -fix query_index_modifiers and tests with py3 - -Files changed: -M plone/app/querystring/indexmodifiers/query_index_modifiers.py -M plone/app/querystring/testing.py -M plone/app/querystring/tests/testRegistryReader.py - -b'diff --git a/plone/app/querystring/indexmodifiers/query_index_modifiers.py b/plone/app/querystring/indexmodifiers/query_index_modifiers.py\nindex 7b591de..e36de01 100644\n--- a/plone/app/querystring/indexmodifiers/query_index_modifiers.py\n+++ b/plone/app/querystring/indexmodifiers/query_index_modifiers.py\n@@ -24,7 +24,7 @@ class Subject(object):\n def __call__(self, value):\n query = value[\'query\']\n # query can be a unicode string or a list of unicode strings.\n- if isinstance(query, six.text_type):\n+ if six.PY2 and isinstance(query, six.text_type):\n query = query.encode("utf-8")\n elif isinstance(query, list):\n # We do not want to change the collections\' own query string,\n@@ -34,7 +34,7 @@ def __call__(self, value):\n # unicode strings\n i = 0\n for item in copy_of_query:\n- if isinstance(item, six.text_type):\n+ if six.PY2 and isinstance(item, six.text_type):\n copy_of_query[i] = item.encode("utf-8")\n i += 1\n query = copy_of_query\n@@ -55,7 +55,7 @@ def __call__(self, value):\n def _normalize(val):\n """Encode value, parse dates.\n """\n- if isinstance(val, six.text_type):\n+ if six.PY2 and isinstance(val, six.text_type):\n val = val.encode("utf-8")\n \n if isinstance(val, six.string_types):\ndiff --git a/plone/app/querystring/testing.py b/plone/app/querystring/testing.py\nindex 44c37ef..ee6929f 100644\n--- a/plone/app/querystring/testing.py\n+++ b/plone/app/querystring/testing.py\n@@ -1,37 +1,25 @@\n # -*- coding: utf-8 -*-\n-\n-from zope.configuration import xmlconfig\n-\n-from plone.testing import z2\n-\n-from plone.app.testing import PloneSandboxLayer\n-from plone.app.testing import TEST_USER_ID\n-from plone.app.testing import TEST_USER_NAME\n+from plone.app.contenttypes.testing import PLONE_APP_CONTENTTYPES_FIXTURE\n from plone.app.testing import applyProfile\n from plone.app.testing import login\n+from plone.app.testing import PloneSandboxLayer\n from plone.app.testing import setRoles\n+from plone.app.testing import TEST_USER_ID\n+from plone.app.testing import TEST_USER_NAME\n from plone.app.testing.layers import IntegrationTesting\n-\n-try:\n- from Products.CMFPlone.factory import _IMREALLYPLONE5 # noqa\n- PLONE50 = True\n-except ImportError:\n- PLONE50 = False\n+from plone.testing import z2\n+from zope.configuration import xmlconfig\n \n \n class PloneAppQuerystringTestProfileLayer(PloneSandboxLayer):\n \n+ defaultBases = (PLONE_APP_CONTENTTYPES_FIXTURE,)\n+\n def setUpZope(self, app, configurationContext):\n- import Products.ATContentTypes\n- self.loadZCML(package=Products.ATContentTypes)\n- z2.installProduct(app, \'Products.Archetypes\')\n- z2.installProduct(app, \'Products.ATContentTypes\')\n import plone.app.querystring.tests\n self.loadZCML(\'configure.zcml\', package=plone.app.querystring.tests)\n \n def setUpPloneSite(self, portal):\n- if PLONE50:\n- applyProfile(portal, \'Products.ATContentTypes:default\')\n applyProfile(portal, \'plone.app.querystring.tests:registry\')\n setRoles(portal, TEST_USER_ID, [\'Manager\'])\n login(portal, TEST_USER_NAME)\ndiff --git a/plone/app/querystring/tests/testRegistryReader.py b/plone/app/querystring/tests/testRegistryReader.py\nindex 1966a1a..b400c84 100644\n--- a/plone/app/querystring/tests/testRegistryReader.py\n+++ b/plone/app/querystring/tests/testRegistryReader.py\n@@ -134,4 +134,4 @@ def test_registry_adapter(self):\n registry = self.createRegistry(td.minimal_correct_xml)\n reader = IQuerystringRegistryReader(registry)\n result = reader()\n- self.assertEqual(result.keys(), [\'sortable_indexes\', \'indexes\'])\n+ self.assertEqual(list(result.keys()), [\'sortable_indexes\', \'indexes\'])\n' - -Repository: plone.app.querystring - - -Branch: refs/heads/master -Date: 2018-09-18T15:37:34+02:00 -Author: Gil Forcada (gforcada) -Commit: https://github.com/plone/plone.app.querystring/commit/d8f717d5ccb28d42a54412cca600de2ae6cd17a0 - -Make comparison stable - -Files changed: -M plone/app/querystring/tests/testRegistryReader.py - -b"diff --git a/plone/app/querystring/tests/testRegistryReader.py b/plone/app/querystring/tests/testRegistryReader.py\nindex b400c84..4f8ea15 100644\n--- a/plone/app/querystring/tests/testRegistryReader.py\n+++ b/plone/app/querystring/tests/testRegistryReader.py\n@@ -134,4 +134,7 @@ def test_registry_adapter(self):\n registry = self.createRegistry(td.minimal_correct_xml)\n reader = IQuerystringRegistryReader(registry)\n result = reader()\n- self.assertEqual(list(result.keys()), ['sortable_indexes', 'indexes'])\n+ self.assertEqual(\n+ sorted(list(result.keys())),\n+ ['indexes', 'sortable_indexes'],\n+ )\n" - -Repository: plone.app.querystring - - -Branch: refs/heads/master -Date: 2018-09-18T15:40:52+02:00 -Author: Philip Bauer (pbauer) -Commit: https://github.com/plone/plone.app.querystring/commit/f221586dd33c7a3477ad95c2608d276e7d9b7a84 - -add changenote and classifiers +Return str in Python 3 Files changed: M CHANGES.rst -M setup.py +M plone/intelligenttext/README.rst +M plone/intelligenttext/transforms.py -b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex 05b897b..acfc74d 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -9,6 +9,9 @@ Bug fixes:\n - Fix a case, where objects id starts with roots id\n [eikichi18]\n \n+- Fix query_index_modifiers and tests with py3\n+ [pbauer, gforcada]\n+\n \n 1.4.8 (2018-02-05)\n ------------------\ndiff --git a/setup.py b/setup.py\nindex d99a900..97e3a1a 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -17,9 +17,12 @@\n classifiers=[\n "Framework :: Plone",\n "Framework :: Plone :: 5.1",\n+ "Framework :: Plone :: 5.2",\n "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",\n "Programming Language :: Python",\n "Programming Language :: Python :: 2.7",\n+ "Programming Language :: Python :: 3.6",\n+ "Programming Language :: Python :: 3.7",\n ],\n keywords=\'collection queries\',\n author=\'Plone Foundation\',\n' +b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex 2fa51bc..58b2a2f 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -15,7 +15,8 @@ New features:\n \n Bug fixes:\n \n-- *add item here*\n+- Return str from transform in Python 3.\n+ [davisagli]\n \n \n 2.2.1 (2018-01-17)\ndiff --git a/plone/intelligenttext/README.rst b/plone/intelligenttext/README.rst\nindex 775dba0..faaed50 100644\n--- a/plone/intelligenttext/README.rst\n+++ b/plone/intelligenttext/README.rst\n@@ -73,7 +73,7 @@ Indentation should be preserved::\n ... URL: http://foo.com"""\n >>> bprint(convertWebIntelligentPlainTextToHtml(orig))\n A test
  URL: http://test.com
    Mail: test@test.com
      URL: http://foo.com\n- >>> convertWebIntelligentPlainTextToHtml(orig).count(b\' \')\n+ >>> convertWebIntelligentPlainTextToHtml(orig).count(\' \')\n 12\n \n HTML entities should be escaped::\ndiff --git a/plone/intelligenttext/transforms.py b/plone/intelligenttext/transforms.py\nindex e87cd73..23c7768 100644\n--- a/plone/intelligenttext/transforms.py\n+++ b/plone/intelligenttext/transforms.py\n@@ -55,7 +55,8 @@ def __call__(self):\n # Finally, make \\n\'s into br\'s\n text = text.replace(\'\\n\', \'
\')\n \n- text = text.encode(\'utf-8\')\n+ if not PY3:\n+ text = text.encode(\'utf-8\')\n \n return text\n \n' -Repository: plone.app.querystring +Repository: plone.intelligenttext Branch: refs/heads/master -Date: 2018-10-05T19:26:45Z -Author: Franco Pellegrini (frapell) -Commit: https://github.com/plone/plone.app.querystring/commit/0d32fb1a10c4026ee904e182c354cdba9125d387 +Date: 2018-10-05T10:26:06+02:00 +Author: David Glick (davisagli) +Commit: https://github.com/plone/plone.intelligenttext/commit/0b4d1afaf4d57c3bfe7c814ee28c8629860d805b -Merge branch 'master' into python3 +Drop support for Python 3.3 which is not present on travis Files changed: +M .travis.yml M CHANGES.rst M setup.py +M tox.ini -b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex acfc74d..1d089bf 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -1,7 +1,24 @@\n Changelog\n =========\n \n-1.4.9 (unreleased)\n+1.4.10 (unreleased)\n+-------------------\n+\n+Breaking changes:\n+\n+- *add item here*\n+\n+New features:\n+\n+- *add item here*\n+\n+Bug fixes:\n+\n+- Fix query_index_modifiers and tests with py3\n+ [pbauer, gforcada]\n+\n+\n+1.4.9 (2018-09-28)\n ------------------\n \n Bug fixes:\n@@ -9,9 +26,6 @@ Bug fixes:\n - Fix a case, where objects id starts with roots id\n [eikichi18]\n \n-- Fix query_index_modifiers and tests with py3\n- [pbauer, gforcada]\n-\n \n 1.4.8 (2018-02-05)\n ------------------\ndiff --git a/setup.py b/setup.py\nindex 97e3a1a..16b4a7e 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -1,7 +1,7 @@\n # -*- coding: utf-8 -*-\n from setuptools import setup, find_packages\n \n-version = \'1.4.9.dev0\'\n+version = \'1.4.10.dev0\'\n \n long_description = open("README.rst").read() + "\\n"\n long_description += open("CHANGES.rst").read()\n@@ -27,9 +27,9 @@\n keywords=\'collection queries\',\n author=\'Plone Foundation\',\n author_email=\'plone-developers@lists.sourceforge.net\',\n- url=\'https://pypi.python.org/pypi/plone.app.querystring\',\n+ url=\'https://pypi.org/project/plone.app.querystring\',\n license=\'GPL version 2\',\n- packages=find_packages(exclude=[\'ez_setup\']),\n+ packages=find_packages(),\n namespace_packages=[\'plone\', \'plone.app\'],\n include_package_data=True,\n zip_safe=False,\n' +b'diff --git a/.travis.yml b/.travis.yml\nindex f0f1749..0c67c11 100644\n--- a/.travis.yml\n+++ b/.travis.yml\n@@ -4,7 +4,6 @@ sudo: false\n python:\n - 2.6\n - 2.7\n- - 3.3\n - 3.4\n - 3.5\n - 3.6\ndiff --git a/CHANGES.rst b/CHANGES.rst\nindex 58b2a2f..617e6be 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -7,7 +7,7 @@ Changelog\n \n Breaking changes:\n \n-- *add item here*\n+- Dropped support for Python 3.3.\n \n New features:\n \ndiff --git a/setup.py b/setup.py\nindex f37a3d3..50db590 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -28,7 +28,6 @@\n "Programming Language :: Python",\n "Programming Language :: Python :: 2.6",\n "Programming Language :: Python :: 2.7",\n- "Programming Language :: Python :: 3.3",\n "Programming Language :: Python :: 3.4",\n "Programming Language :: Python :: 3.5",\n "Programming Language :: Python :: 3.4",\ndiff --git a/tox.ini b/tox.ini\nindex 1a84942..040678c 100644\n--- a/tox.ini\n+++ b/tox.ini\n@@ -1,6 +1,6 @@\n [tox]\n envlist =\n- py26,py27,py33,py34,py35,py36,pypy,pypy3\n+ py26,py27,py34,py35,py36,pypy,pypy3\n \n [testenv]\n commands =\n' -Repository: plone.app.querystring +Repository: plone.intelligenttext Branch: refs/heads/master -Date: 2018-10-12T22:39:59-04:00 +Date: 2018-10-13T15:18:28-04:00 Author: David Glick (davisagli) -Commit: https://github.com/plone/plone.app.querystring/commit/98f4857336d38fc8154a1ad1d6033f24f54bb13c +Commit: https://github.com/plone/plone.intelligenttext/commit/b7d2f5be9acc3ea4dd4646c1a884c638bf2da75e -Merge pull request #89 from plone/python3 +Merge pull request #8 from plone/python3 -fix query_index_modifiers and tests with py3 +Python3 Files changed: +M .travis.yml M CHANGES.rst -M plone/app/querystring/indexmodifiers/query_index_modifiers.py -M plone/app/querystring/testing.py -M plone/app/querystring/tests/testRegistryReader.py +M plone/intelligenttext/README.rst +M plone/intelligenttext/transforms.py M setup.py +M tox.ini -b'diff --git a/CHANGES.rst b/CHANGES.rst\nindex 0bbb0ca..1d089bf 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -14,7 +14,8 @@ New features:\n \n Bug fixes:\n \n-- *add item here*\n+- Fix query_index_modifiers and tests with py3\n+ [pbauer, gforcada]\n \n \n 1.4.9 (2018-09-28)\ndiff --git a/plone/app/querystring/indexmodifiers/query_index_modifiers.py b/plone/app/querystring/indexmodifiers/query_index_modifiers.py\nindex 7b591de..e36de01 100644\n--- a/plone/app/querystring/indexmodifiers/query_index_modifiers.py\n+++ b/plone/app/querystring/indexmodifiers/query_index_modifiers.py\n@@ -24,7 +24,7 @@ class Subject(object):\n def __call__(self, value):\n query = value[\'query\']\n # query can be a unicode string or a list of unicode strings.\n- if isinstance(query, six.text_type):\n+ if six.PY2 and isinstance(query, six.text_type):\n query = query.encode("utf-8")\n elif isinstance(query, list):\n # We do not want to change the collections\' own query string,\n@@ -34,7 +34,7 @@ def __call__(self, value):\n # unicode strings\n i = 0\n for item in copy_of_query:\n- if isinstance(item, six.text_type):\n+ if six.PY2 and isinstance(item, six.text_type):\n copy_of_query[i] = item.encode("utf-8")\n i += 1\n query = copy_of_query\n@@ -55,7 +55,7 @@ def __call__(self, value):\n def _normalize(val):\n """Encode value, parse dates.\n """\n- if isinstance(val, six.text_type):\n+ if six.PY2 and isinstance(val, six.text_type):\n val = val.encode("utf-8")\n \n if isinstance(val, six.string_types):\ndiff --git a/plone/app/querystring/testing.py b/plone/app/querystring/testing.py\nindex 44c37ef..ee6929f 100644\n--- a/plone/app/querystring/testing.py\n+++ b/plone/app/querystring/testing.py\n@@ -1,37 +1,25 @@\n # -*- coding: utf-8 -*-\n-\n-from zope.configuration import xmlconfig\n-\n-from plone.testing import z2\n-\n-from plone.app.testing import PloneSandboxLayer\n-from plone.app.testing import TEST_USER_ID\n-from plone.app.testing import TEST_USER_NAME\n+from plone.app.contenttypes.testing import PLONE_APP_CONTENTTYPES_FIXTURE\n from plone.app.testing import applyProfile\n from plone.app.testing import login\n+from plone.app.testing import PloneSandboxLayer\n from plone.app.testing import setRoles\n+from plone.app.testing import TEST_USER_ID\n+from plone.app.testing import TEST_USER_NAME\n from plone.app.testing.layers import IntegrationTesting\n-\n-try:\n- from Products.CMFPlone.factory import _IMREALLYPLONE5 # noqa\n- PLONE50 = True\n-except ImportError:\n- PLONE50 = False\n+from plone.testing import z2\n+from zope.configuration import xmlconfig\n \n \n class PloneAppQuerystringTestProfileLayer(PloneSandboxLayer):\n \n+ defaultBases = (PLONE_APP_CONTENTTYPES_FIXTURE,)\n+\n def setUpZope(self, app, configurationContext):\n- import Products.ATContentTypes\n- self.loadZCML(package=Products.ATContentTypes)\n- z2.installProduct(app, \'Products.Archetypes\')\n- z2.installProduct(app, \'Products.ATContentTypes\')\n import plone.app.querystring.tests\n self.loadZCML(\'configure.zcml\', package=plone.app.querystring.tests)\n \n def setUpPloneSite(self, portal):\n- if PLONE50:\n- applyProfile(portal, \'Products.ATContentTypes:default\')\n applyProfile(portal, \'plone.app.querystring.tests:registry\')\n setRoles(portal, TEST_USER_ID, [\'Manager\'])\n login(portal, TEST_USER_NAME)\ndiff --git a/plone/app/querystring/tests/testRegistryReader.py b/plone/app/querystring/tests/testRegistryReader.py\nindex 1966a1a..4f8ea15 100644\n--- a/plone/app/querystring/tests/testRegistryReader.py\n+++ b/plone/app/querystring/tests/testRegistryReader.py\n@@ -134,4 +134,7 @@ def test_registry_adapter(self):\n registry = self.createRegistry(td.minimal_correct_xml)\n reader = IQuerystringRegistryReader(registry)\n result = reader()\n- self.assertEqual(result.keys(), [\'sortable_indexes\', \'indexes\'])\n+ self.assertEqual(\n+ sorted(list(result.keys())),\n+ [\'indexes\', \'sortable_indexes\'],\n+ )\ndiff --git a/setup.py b/setup.py\nindex 0925c9d..16b4a7e 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -21,6 +21,8 @@\n "License :: OSI Approved :: GNU General Public License v2 (GPLv2)",\n "Programming Language :: Python",\n "Programming Language :: Python :: 2.7",\n+ "Programming Language :: Python :: 3.6",\n+ "Programming Language :: Python :: 3.7",\n ],\n keywords=\'collection queries\',\n author=\'Plone Foundation\',\n' +b'diff --git a/.travis.yml b/.travis.yml\nindex f0f1749..0c67c11 100644\n--- a/.travis.yml\n+++ b/.travis.yml\n@@ -4,7 +4,6 @@ sudo: false\n python:\n - 2.6\n - 2.7\n- - 3.3\n - 3.4\n - 3.5\n - 3.6\ndiff --git a/CHANGES.rst b/CHANGES.rst\nindex 2fa51bc..617e6be 100644\n--- a/CHANGES.rst\n+++ b/CHANGES.rst\n@@ -7,7 +7,7 @@ Changelog\n \n Breaking changes:\n \n-- *add item here*\n+- Dropped support for Python 3.3.\n \n New features:\n \n@@ -15,7 +15,8 @@ New features:\n \n Bug fixes:\n \n-- *add item here*\n+- Return str from transform in Python 3.\n+ [davisagli]\n \n \n 2.2.1 (2018-01-17)\ndiff --git a/plone/intelligenttext/README.rst b/plone/intelligenttext/README.rst\nindex 775dba0..faaed50 100644\n--- a/plone/intelligenttext/README.rst\n+++ b/plone/intelligenttext/README.rst\n@@ -73,7 +73,7 @@ Indentation should be preserved::\n ... URL: http://foo.com"""\n >>> bprint(convertWebIntelligentPlainTextToHtml(orig))\n A test
  URL: http://test.com
    Mail: test@test.com
      URL: http://foo.com\n- >>> convertWebIntelligentPlainTextToHtml(orig).count(b\' \')\n+ >>> convertWebIntelligentPlainTextToHtml(orig).count(\' \')\n 12\n \n HTML entities should be escaped::\ndiff --git a/plone/intelligenttext/transforms.py b/plone/intelligenttext/transforms.py\nindex e87cd73..23c7768 100644\n--- a/plone/intelligenttext/transforms.py\n+++ b/plone/intelligenttext/transforms.py\n@@ -55,7 +55,8 @@ def __call__(self):\n # Finally, make \\n\'s into br\'s\n text = text.replace(\'\\n\', \'
\')\n \n- text = text.encode(\'utf-8\')\n+ if not PY3:\n+ text = text.encode(\'utf-8\')\n \n return text\n \ndiff --git a/setup.py b/setup.py\nindex f37a3d3..50db590 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -28,7 +28,6 @@\n "Programming Language :: Python",\n "Programming Language :: Python :: 2.6",\n "Programming Language :: Python :: 2.7",\n- "Programming Language :: Python :: 3.3",\n "Programming Language :: Python :: 3.4",\n "Programming Language :: Python :: 3.5",\n "Programming Language :: Python :: 3.4",\ndiff --git a/tox.ini b/tox.ini\nindex 1a84942..040678c 100644\n--- a/tox.ini\n+++ b/tox.ini\n@@ -1,6 +1,6 @@\n [tox]\n envlist =\n- py26,py27,py33,py34,py35,py36,pypy,pypy3\n+ py26,py27,py34,py35,py36,pypy,pypy3\n \n [testenv]\n commands =\n'