-
-
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.
[fc] Repository: plone.app.contenttypes
Branch: refs/heads/master Date: 2024-12-11T12:20:00-08:00 Author: David Glick (davisagli) <[email protected]> Commit: plone/plone.app.contenttypes@a9bafbf fix accidental storage with aq wrapper in migrate_base_class_to_new_class Files changed: A news/714.bugfix M plone/app/contenttypes/utils.py Repository: plone.app.contenttypes Branch: refs/heads/master Date: 2024-12-11T13:05:51-08:00 Author: David Glick (davisagli) <[email protected]> Commit: plone/plone.app.contenttypes@c74347c Merge pull request #715 from plone/714-migration-aq-wrapper fix accidental storage with aq wrapper in migrate_base_class_to_new_class Files changed: A news/714.bugfix M plone/app/contenttypes/utils.py
- Loading branch information
Showing
1 changed file
with
17 additions
and
49 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,66 +1,34 @@ | ||
| Repository: plone.volto | ||
| Repository: plone.app.contenttypes | ||
|
|
||
|
|
||
| Branch: refs/heads/main | ||
| Date: 2024-12-11T10:21:14-08:00 | ||
| Branch: refs/heads/master | ||
| Date: 2024-12-11T12:20:00-08:00 | ||
| Author: David Glick (davisagli) <[email protected]> | ||
| Commit: https://github.com/plone/plone.volto/commit/4de2f36ad220413c89d5e068f3bae26967b5def1 | ||
| Commit: https://github.com/plone/plone.app.contenttypes/commit/a9bafbfc805f70f82796877b15fa0edef8951eb2 | ||
|
|
||
| plone.app.multilingual is not a hard dependency | ||
| fix accidental storage with aq wrapper in migrate_base_class_to_new_class | ||
|
|
||
| Files changed: | ||
| M setup.py | ||
| A news/714.bugfix | ||
| M plone/app/contenttypes/utils.py | ||
|
|
||
| b'diff --git a/setup.py b/setup.py\nindex 8264775..d6a548d 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -44,7 +44,6 @@\n "collective.monkeypatcher",\n "plone.api",\n "plone.app.caching",\n- "plone.app.multilingual",\n "plone.distribution",\n "plone.restapi>=8.41.0",\n "Products.CMFPlone",\n@@ -55,6 +54,7 @@\n "responses",\n "plone.app.discussion",\n "plone.app.iterate",\n+ "plone.app.multilingual",\n "plone.app.robotframework",\n "plone.app.testing",\n "plone.app.upgrade",\n' | ||
| b'diff --git a/news/714.bugfix b/news/714.bugfix\nnew file mode 100644\nindex 000000000..aec0e46e8\n--- /dev/null\n+++ b/news/714.bugfix\n@@ -0,0 +1 @@\n+Fix migrate_base_class_to_new_class util to remove Acquisition wrappers. @davisagli\ndiff --git a/plone/app/contenttypes/utils.py b/plone/app/contenttypes/utils.py\nindex 1e4ccde0f..7c9aace2e 100644\n--- a/plone/app/contenttypes/utils.py\n+++ b/plone/app/contenttypes/utils.py\n@@ -1,3 +1,4 @@\n+from Acquisition import aq_base\n from plone.dexterity.interfaces import IDexterityContent\n from plone.dexterity.interfaces import IDexterityFTI\n from plone.folder.interfaces import IOrdering\n@@ -97,7 +98,7 @@ def migrate_base_class_to_new_class(\n parent = obj.__parent__\n parent._delOb(obj_id)\n obj.__class__ = new_class\n- parent._setOb(obj_id, obj)\n+ parent._setOb(obj_id, aq_base(obj))\n \n is_container = isinstance(obj, BTreeFolder2Base)\n \n' | ||
|
|
||
| Repository: plone.volto | ||
| Repository: plone.app.contenttypes | ||
|
|
||
|
|
||
| Branch: refs/heads/main | ||
| Date: 2024-12-11T10:22:43-08:00 | ||
| Branch: refs/heads/master | ||
| Date: 2024-12-11T13:05:51-08:00 | ||
| Author: David Glick (davisagli) <[email protected]> | ||
| Commit: https://github.com/plone/plone.volto/commit/29b2cea2579482f8e7730b981876b6fce6796f97 | ||
| Commit: https://github.com/plone/plone.app.contenttypes/commit/c74347c893b08f66e5c4fe513970f998004c265a | ||
|
|
||
| changelog | ||
| Merge pull request #715 from plone/714-migration-aq-wrapper | ||
|
|
||
| Files changed: | ||
| A news/168.bugfix | ||
|
|
||
| b'diff --git a/news/168.bugfix b/news/168.bugfix\nnew file mode 100644\nindex 0000000..6d76592\n--- /dev/null\n+++ b/news/168.bugfix\n@@ -0,0 +1 @@\n+Fix plone.app.multilingual dependency to be a dependency for tests only. @davisagli\n' | ||
|
|
||
| Repository: plone.volto | ||
|
|
||
|
|
||
| Branch: refs/heads/main | ||
| Date: 2024-12-11T10:24:45-08:00 | ||
| Author: David Glick (davisagli) <[email protected]> | ||
| Commit: https://github.com/plone/plone.volto/commit/af295193ef1c88367938b84b59839ec88e0fe30b | ||
|
|
||
| fix dependency checker | ||
|
|
||
| Files changed: | ||
| M .meta.toml | ||
| M pyproject.toml | ||
|
|
||
| b'diff --git a/.meta.toml b/.meta.toml\nindex a54195b..dce91ce 100644\n--- a/.meta.toml\n+++ b/.meta.toml\n@@ -13,7 +13,7 @@ extra_lines = """\n [pyproject]\n codespell_skip = "*.min.js,*lock.yaml"\n codespell_ignores = "vew"\n-dependencies_ignores = "[\'collective.folderishtypes\', \'plone.app.caching\', \'requests\', \'responses\', \'zest.releaser\', \'zestreleaser.towncrier\']"\n+dependencies_ignores = "[\'collective.folderishtypes\', \'plone.app.caching\', \'plone.app.multilingual\', \'requests\', \'responses\', \'zest.releaser\', \'zestreleaser.towncrier\']"\n dependencies_mappings = [\n "\'Products.CMFPlone\' = [\'Acquisition\', \'BTrees\', \'Missing\', \'OFS\', \'plone.app.contenttypes\', \'plone.app.layout\', \'plone.app.linkintegrity\', \'plone.app.redirector\', \'plone.app.registry\', \'plone.app.textfield\', \'plone.app.vocabularies\', \'plone.app.z3cform\', \'plone.autoform\', \'plone.base\', \'plone.behavior\', \'plone.dexterity\', \'plone.indexer\', \'plone.namedfile\', \'plone.protect\', \'plone.registry\', \'plone.rfc822\', \'plone.schema\', \'plone.supermodel\', \'Products.BTreeFolder2\', \'Products.CMFCore\', \'Products.Five\', \'Products.GenericSetup\', \'Products.SiteErrorLog\', \'transaction\', \'z3c.form\', \'z3c.relationfield\', \'zope.component\', \'zope.i18n\', \'zope.i18nmessageid\', \'zope.interface\', \'zope.lifecycleevent\', \'zope.publisher\', \'zope.schema\', \'Zope\']",\n "\'plone.restapi\' = [\'plone.rest\']",\ndiff --git a/pyproject.toml b/pyproject.toml\nindex 69fdae5..876dadc 100644\n--- a/pyproject.toml\n+++ b/pyproject.toml\n@@ -124,7 +124,7 @@ python-dateutil = [\'dateutil\']\n pytest-plone = [\'pytest\', \'zope.pytestlayer\', \'plone.testing\', \'plone.app.testing\']\n \'Products.CMFPlone\' = [\'Acquisition\', \'BTrees\', \'Missing\', \'OFS\', \'plone.app.contenttypes\', \'plone.app.layout\', \'plone.app.linkintegrity\', \'plone.app.redirector\', \'plone.app.registry\', \'plone.app.textfield\', \'plone.app.vocabularies\', \'plone.app.z3cform\', \'plone.autoform\', \'plone.base\', \'plone.behavior\', \'plone.dexterity\', \'plone.indexer\', \'plone.namedfile\', \'plone.protect\', \'plone.registry\', \'plone.rfc822\', \'plone.schema\', \'plone.supermodel\', \'Products.BTreeFolder2\', \'Products.CMFCore\', \'Products.Five\', \'Products.GenericSetup\', \'Products.SiteErrorLog\', \'transaction\', \'z3c.form\', \'z3c.relationfield\', \'zope.component\', \'zope.i18n\', \'zope.i18nmessageid\', \'zope.interface\', \'zope.lifecycleevent\', \'zope.publisher\', \'zope.schema\', \'Zope\']\n \'plone.restapi\' = [\'plone.rest\']\n-ignore-packages = [\'collective.folderishtypes\', \'plone.app.caching\', \'requests\', \'responses\', \'scripts.utils\', \'zest.releaser\', \'zestreleaser.towncrier\']\n+ignore-packages = [\'collective.folderishtypes\', \'plone.app.caching\', \'plone.app.multilingual\', \'requests\', \'responses\', \'scripts.utils\', \'zest.releaser\', \'zestreleaser.towncrier\']\n \n ##\n # Add extra configuration options in .meta.toml:\n' | ||
|
|
||
| Repository: plone.volto | ||
|
|
||
|
|
||
| Branch: refs/heads/main | ||
| Date: 2024-12-11T11:28:59-08:00 | ||
| Author: David Glick (davisagli) <[email protected]> | ||
| Commit: https://github.com/plone/plone.volto/commit/92a7a262590c86def9ff8f8946b34e412089ab80 | ||
|
|
||
| Merge pull request #168 from plone/fix-multilingual-dependency | ||
|
|
||
| plone.app.multilingual is not a hard dependency | ||
| fix accidental storage with aq wrapper in migrate_base_class_to_new_class | ||
|
|
||
| Files changed: | ||
| A news/168.bugfix | ||
| M .meta.toml | ||
| M pyproject.toml | ||
| M setup.py | ||
| A news/714.bugfix | ||
| M plone/app/contenttypes/utils.py | ||
|
|
||
| b'diff --git a/.meta.toml b/.meta.toml\nindex a54195b..dce91ce 100644\n--- a/.meta.toml\n+++ b/.meta.toml\n@@ -13,7 +13,7 @@ extra_lines = """\n [pyproject]\n codespell_skip = "*.min.js,*lock.yaml"\n codespell_ignores = "vew"\n-dependencies_ignores = "[\'collective.folderishtypes\', \'plone.app.caching\', \'requests\', \'responses\', \'zest.releaser\', \'zestreleaser.towncrier\']"\n+dependencies_ignores = "[\'collective.folderishtypes\', \'plone.app.caching\', \'plone.app.multilingual\', \'requests\', \'responses\', \'zest.releaser\', \'zestreleaser.towncrier\']"\n dependencies_mappings = [\n "\'Products.CMFPlone\' = [\'Acquisition\', \'BTrees\', \'Missing\', \'OFS\', \'plone.app.contenttypes\', \'plone.app.layout\', \'plone.app.linkintegrity\', \'plone.app.redirector\', \'plone.app.registry\', \'plone.app.textfield\', \'plone.app.vocabularies\', \'plone.app.z3cform\', \'plone.autoform\', \'plone.base\', \'plone.behavior\', \'plone.dexterity\', \'plone.indexer\', \'plone.namedfile\', \'plone.protect\', \'plone.registry\', \'plone.rfc822\', \'plone.schema\', \'plone.supermodel\', \'Products.BTreeFolder2\', \'Products.CMFCore\', \'Products.Five\', \'Products.GenericSetup\', \'Products.SiteErrorLog\', \'transaction\', \'z3c.form\', \'z3c.relationfield\', \'zope.component\', \'zope.i18n\', \'zope.i18nmessageid\', \'zope.interface\', \'zope.lifecycleevent\', \'zope.publisher\', \'zope.schema\', \'Zope\']",\n "\'plone.restapi\' = [\'plone.rest\']",\ndiff --git a/news/168.bugfix b/news/168.bugfix\nnew file mode 100644\nindex 0000000..6d76592\n--- /dev/null\n+++ b/news/168.bugfix\n@@ -0,0 +1 @@\n+Fix plone.app.multilingual dependency to be a dependency for tests only. @davisagli\ndiff --git a/pyproject.toml b/pyproject.toml\nindex 69fdae5..876dadc 100644\n--- a/pyproject.toml\n+++ b/pyproject.toml\n@@ -124,7 +124,7 @@ python-dateutil = [\'dateutil\']\n pytest-plone = [\'pytest\', \'zope.pytestlayer\', \'plone.testing\', \'plone.app.testing\']\n \'Products.CMFPlone\' = [\'Acquisition\', \'BTrees\', \'Missing\', \'OFS\', \'plone.app.contenttypes\', \'plone.app.layout\', \'plone.app.linkintegrity\', \'plone.app.redirector\', \'plone.app.registry\', \'plone.app.textfield\', \'plone.app.vocabularies\', \'plone.app.z3cform\', \'plone.autoform\', \'plone.base\', \'plone.behavior\', \'plone.dexterity\', \'plone.indexer\', \'plone.namedfile\', \'plone.protect\', \'plone.registry\', \'plone.rfc822\', \'plone.schema\', \'plone.supermodel\', \'Products.BTreeFolder2\', \'Products.CMFCore\', \'Products.Five\', \'Products.GenericSetup\', \'Products.SiteErrorLog\', \'transaction\', \'z3c.form\', \'z3c.relationfield\', \'zope.component\', \'zope.i18n\', \'zope.i18nmessageid\', \'zope.interface\', \'zope.lifecycleevent\', \'zope.publisher\', \'zope.schema\', \'Zope\']\n \'plone.restapi\' = [\'plone.rest\']\n-ignore-packages = [\'collective.folderishtypes\', \'plone.app.caching\', \'requests\', \'responses\', \'scripts.utils\', \'zest.releaser\', \'zestreleaser.towncrier\']\n+ignore-packages = [\'collective.folderishtypes\', \'plone.app.caching\', \'plone.app.multilingual\', \'requests\', \'responses\', \'scripts.utils\', \'zest.releaser\', \'zestreleaser.towncrier\']\n \n ##\n # Add extra configuration options in .meta.toml:\ndiff --git a/setup.py b/setup.py\nindex 8264775..d6a548d 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -44,7 +44,6 @@\n "collective.monkeypatcher",\n "plone.api",\n "plone.app.caching",\n- "plone.app.multilingual",\n "plone.distribution",\n "plone.restapi>=8.41.0",\n "Products.CMFPlone",\n@@ -55,6 +54,7 @@\n "responses",\n "plone.app.discussion",\n "plone.app.iterate",\n+ "plone.app.multilingual",\n "plone.app.robotframework",\n "plone.app.testing",\n "plone.app.upgrade",\n' | ||
| b'diff --git a/news/714.bugfix b/news/714.bugfix\nnew file mode 100644\nindex 000000000..aec0e46e8\n--- /dev/null\n+++ b/news/714.bugfix\n@@ -0,0 +1 @@\n+Fix migrate_base_class_to_new_class util to remove Acquisition wrappers. @davisagli\ndiff --git a/plone/app/contenttypes/utils.py b/plone/app/contenttypes/utils.py\nindex 1e4ccde0f..7c9aace2e 100644\n--- a/plone/app/contenttypes/utils.py\n+++ b/plone/app/contenttypes/utils.py\n@@ -1,3 +1,4 @@\n+from Acquisition import aq_base\n from plone.dexterity.interfaces import IDexterityContent\n from plone.dexterity.interfaces import IDexterityFTI\n from plone.folder.interfaces import IOrdering\n@@ -97,7 +98,7 @@ def migrate_base_class_to_new_class(\n parent = obj.__parent__\n parent._delOb(obj_id)\n obj.__class__ = new_class\n- parent._setOb(obj_id, obj)\n+ parent._setOb(obj_id, aq_base(obj))\n \n is_container = isinstance(obj, BTreeFolder2Base)\n \n' | ||
|
|