-
-
Notifications
You must be signed in to change notification settings - Fork 76
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.multilingual
Branch: refs/heads/master Date: 2025-01-20T18:26:23+01:00 Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org> Commit: plone/plone.app.multilingual@03870ff Fix DeprecationWarnings. Files changed: A news/4090.bugfix M src/plone/app/multilingual/browser/configure.zcml M src/plone/app/multilingual/browser/helper_views.py M src/plone/app/multilingual/browser/setup.py M src/plone/app/multilingual/content/lrf.py M src/plone/app/multilingual/factory.py M src/plone/app/multilingual/tests/test_helper_views.py M src/plone/app/multilingual/tests/test_selector.py M src/plone/app/multilingual/tests/test_switcher.py Repository: plone.app.multilingual Branch: refs/heads/master Date: 2025-01-21T18:05:37-08:00 Author: David Glick (davisagli) <david@glicksoftware.com> Commit: plone/plone.app.multilingual@0e534d0 Merge pull request #480 from plone/maurits-warnings Fix DeprecationWarnings. Files changed: A news/4090.bugfix M src/plone/app/multilingual/browser/configure.zcml M src/plone/app/multilingual/browser/helper_views.py M src/plone/app/multilingual/browser/setup.py M src/plone/app/multilingual/content/lrf.py M src/plone/app/multilingual/factory.py M src/plone/app/multilingual/tests/test_helper_views.py M src/plone/app/multilingual/tests/test_selector.py M src/plone/app/multilingual/tests/test_switcher.py
- Loading branch information
Showing
1 changed file
with
26 additions
and
12 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,34 +1,48 @@ | ||
| Repository: plone.app.iterate | ||
| Repository: plone.app.multilingual | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2025-01-20T18:23:00+01:00 | ||
| Date: 2025-01-20T18:26:23+01:00 | ||
| Author: Maurits van Rees (mauritsvanrees) <maurits@vanrees.org> | ||
| Commit: https://github.com/plone/plone.app.iterate/commit/6f0ffaccb12874e67a630fae3aafa234435b3f28 | ||
| Commit: https://github.com/plone/plone.app.multilingual/commit/03870ff99021390aaf7a9e0368224d9d8ed54522 | ||
|
|
||
| Fix DeprecationWarnings. | ||
|
|
||
| Files changed: | ||
| A news/4090.bugfix | ||
| M plone/app/iterate/util.py | ||
| M src/plone/app/multilingual/browser/configure.zcml | ||
| M src/plone/app/multilingual/browser/helper_views.py | ||
| M src/plone/app/multilingual/browser/setup.py | ||
| M src/plone/app/multilingual/content/lrf.py | ||
| M src/plone/app/multilingual/factory.py | ||
| M src/plone/app/multilingual/tests/test_helper_views.py | ||
| M src/plone/app/multilingual/tests/test_selector.py | ||
| M src/plone/app/multilingual/tests/test_switcher.py | ||
|
|
||
| b'diff --git a/news/4090.bugfix b/news/4090.bugfix\nnew file mode 100644\nindex 0000000..8528aef\n--- /dev/null\n+++ b/news/4090.bugfix\n@@ -0,0 +1 @@\n+Fix DeprecationWarnings. [maurits]\ndiff --git a/plone/app/iterate/util.py b/plone/app/iterate/util.py\nindex 6a8af6f..3f689b3 100644\n--- a/plone/app/iterate/util.py\n+++ b/plone/app/iterate/util.py\n@@ -21,7 +21,7 @@\n ##################################################################\n \n from .interfaces import annotation_key\n-from persistent.dict import PersistentDict\n+from persistent.mapping import PersistentMapping\n from zope.annotation import IAnnotations\n \n \n@@ -30,5 +30,5 @@ def get_storage(context, default=None):\n if annotation_key not in annotations:\n if default is not None:\n return default\n- annotations[annotation_key] = PersistentDict()\n+ annotations[annotation_key] = PersistentMapping()\n return annotations[annotation_key]\n' | ||
| b'diff --git a/news/4090.bugfix b/news/4090.bugfix\nnew file mode 100644\nindex 000000000..8528aefbe\n--- /dev/null\n+++ b/news/4090.bugfix\n@@ -0,0 +1 @@\n+Fix DeprecationWarnings. [maurits]\ndiff --git a/src/plone/app/multilingual/browser/configure.zcml b/src/plone/app/multilingual/browser/configure.zcml\nindex b27c1f003..0decf19b1 100644\n--- a/src/plone/app/multilingual/browser/configure.zcml\n+++ b/src/plone/app/multilingual/browser/configure.zcml\n@@ -186,7 +186,7 @@\n <!-- Selector -->\n <browser:page\n name="multilingual-selector"\n- for="plone.app.layout.navigation.interfaces.INavigationRoot"\n+ for="plone.base.interfaces.INavigationRoot"\n class=".helper_views.selector_view"\n permission="zope.Public"\n layer="..interfaces.IPloneAppMultilingualInstalled"\ndiff --git a/src/plone/app/multilingual/browser/helper_views.py b/src/plone/app/multilingual/browser/helper_views.py\nindex fb7b32a3d..32ac1d0ee 100644\n--- a/src/plone/app/multilingual/browser/helper_views.py\n+++ b/src/plone/app/multilingual/browser/helper_views.py\n@@ -1,6 +1,5 @@\n from AccessControl.SecurityManagement import getSecurityManager\n from Acquisition import aq_chain\n-from plone.app.layout.navigation.interfaces import INavigationRoot\n from plone.app.multilingual.browser.selector import addQuery\n from plone.app.multilingual.browser.selector import NOT_TRANSLATED_YET_TEMPLATE\n from plone.app.multilingual.interfaces import ILanguageRootFolder\n@@ -9,6 +8,7 @@\n from plone.app.multilingual.interfaces import ITranslatable\n from plone.app.multilingual.interfaces import ITranslationManager\n from plone.app.multilingual.manager import TranslationManager\n+from plone.base.interfaces import INavigationRoot\n from plone.i18n.interfaces import INegotiateLanguage\n from plone.i18n.locales.interfaces import IContentLanguageAvailability\n from plone.registry.interfaces import IRegistry\ndiff --git a/src/plone/app/multilingual/browser/setup.py b/src/plone/app/multilingual/browser/setup.py\nindex 05e5172ae..e1ce0dc9f 100644\n--- a/src/plone/app/multilingual/browser/setup.py\n+++ b/src/plone/app/multilingual/browser/setup.py\n@@ -1,12 +1,12 @@\n from logging import getLogger\n from plone.app.dexterity.behaviors.exclfromnav import IExcludeFromNavigation\n-from plone.app.layout.navigation.interfaces import INavigationRoot\n from plone.app.multilingual import _\n from plone.app.multilingual.interfaces import ITranslatable\n from plone.app.multilingual.interfaces import ITranslationManager\n from plone.app.multilingual.interfaces import LANGUAGE_INDEPENDENT\n from plone.app.multilingual.subscriber import set_recursive_language\n from plone.base.interfaces import ILanguage\n+from plone.base.interfaces import INavigationRoot\n from plone.base.utils import unrestricted_construct_instance\n from plone.dexterity.interfaces import IDexterityFTI\n from plone.i18n.locales.languages import _combinedlanguagelist\ndiff --git a/src/plone/app/multilingual/content/lrf.py b/src/plone/app/multilingual/content/lrf.py\nindex 0368b133e..a94e2ebc9 100644\n--- a/src/plone/app/multilingual/content/lrf.py\n+++ b/src/plone/app/multilingual/content/lrf.py\n@@ -1,7 +1,7 @@\n from plone.app.content.namechooser import NormalizingNameChooser\n-from plone.app.layout.navigation.interfaces import INavigationRoot\n from plone.app.multilingual.interfaces import ILanguageRootFolder\n from plone.app.multilingual.interfaces import ITranslationIdChooser\n+from plone.base.interfaces import INavigationRoot\n from plone.dexterity.content import Container\n from zope.component import adapter\n from zope.container.interfaces import INameChooser\ndiff --git a/src/plone/app/multilingual/factory.py b/src/plone/app/multilingual/factory.py\nindex ef5c5a18a..2fee362ea 100644\n--- a/src/plone/app/multilingual/factory.py\n+++ b/src/plone/app/multilingual/factory.py\n@@ -6,7 +6,7 @@\n from plone.app.multilingual.interfaces import ITranslationIdChooser\n from plone.app.multilingual.interfaces import ITranslationLocator\n from plone.app.multilingual.interfaces import ITranslationManager\n-from plone.base.interfaces.siteroot import IPloneSiteRoot\n+from plone.base.interfaces import IPloneSiteRoot\n from zope.interface import implementer\n \n \ndiff --git a/src/plone/app/multilingual/tests/test_helper_views.py b/src/plone/app/multilingual/tests/test_helper_views.py\nindex a85447b4a..e7314ec72 100644\n--- a/src/plone/app/multilingual/tests/test_helper_views.py\n+++ b/src/plone/app/multilingual/tests/test_helper_views.py\n@@ -9,7 +9,7 @@\n from plone.dexterity.utils import createContentInContainer\n from plone.i18n.interfaces import ILanguageSchema\n from plone.registry.interfaces import IRegistry\n-from plone.testing.z2 import Browser\n+from plone.testing.zope import Browser\n from zope.component import getUtility\n from zope.interface import alsoProvides\n \ndiff --git a/src/plone/app/multilingual/tests/test_selector.py b/src/plone/app/multilingual/tests/test_selector.py\nindex 712019e4e..e368c4cbf 100644\n--- a/src/plone/app/multilingual/tests/test_selector.py\n+++ b/src/plone/app/multilingual/tests/test_selector.py\n@@ -15,7 +15,7 @@\n from plone.dexterity.utils import createContentInContainer\n from plone.i18n.interfaces import ILanguageSchema\n from plone.registry.interfaces import IRegistry\n-from plone.testing.z2 import Browser\n+from plone.testing.zope import Browser\n from Products.CMFCore.utils import getToolByName\n from urllib.parse import parse_qs\n from urllib.parse import urlparse\ndiff --git a/src/plone/app/multilingual/tests/test_switcher.py b/src/plone/app/multilingual/tests/test_switcher.py\nindex b145f5ba9..1443b8b16 100644\n--- a/src/plone/app/multilingual/tests/test_switcher.py\n+++ b/src/plone/app/multilingual/tests/test_switcher.py\n@@ -1,7 +1,7 @@\n from plone.app.multilingual.browser.setup import SetupMultilingualSite\n from plone.app.multilingual.interfaces import IPloneAppMultilingualInstalled\n from plone.app.multilingual.testing import PAM_FUNCTIONAL_TESTING\n-from plone.testing.z2 import Browser\n+from plone.testing.zope import Browser\n from Products.CMFCore.utils import getToolByName\n from zope.interface import alsoProvides\n \n' | ||
|
|
||
| Repository: plone.app.iterate | ||
| Repository: plone.app.multilingual | ||
|
|
||
|
|
||
| Branch: refs/heads/master | ||
| Date: 2025-01-21T18:05:10-08:00 | ||
| Date: 2025-01-21T18:05:37-08:00 | ||
| Author: David Glick (davisagli) <david@glicksoftware.com> | ||
| Commit: https://github.com/plone/plone.app.iterate/commit/f901d13433c567ebe481927758798bb63c788ce4 | ||
| Commit: https://github.com/plone/plone.app.multilingual/commit/0e534d07ed7b6fdeda8729a8c4bc94c68006c431 | ||
|
|
||
| Merge pull request #134 from plone/maurits-warnings | ||
| Merge pull request #480 from plone/maurits-warnings | ||
|
|
||
| Fix DeprecationWarnings. | ||
|
|
||
| Files changed: | ||
| A news/4090.bugfix | ||
| M plone/app/iterate/util.py | ||
|
|
||
| b'diff --git a/news/4090.bugfix b/news/4090.bugfix\nnew file mode 100644\nindex 0000000..8528aef\n--- /dev/null\n+++ b/news/4090.bugfix\n@@ -0,0 +1 @@\n+Fix DeprecationWarnings. [maurits]\ndiff --git a/plone/app/iterate/util.py b/plone/app/iterate/util.py\nindex 6a8af6f..3f689b3 100644\n--- a/plone/app/iterate/util.py\n+++ b/plone/app/iterate/util.py\n@@ -21,7 +21,7 @@\n ##################################################################\n \n from .interfaces import annotation_key\n-from persistent.dict import PersistentDict\n+from persistent.mapping import PersistentMapping\n from zope.annotation import IAnnotations\n \n \n@@ -30,5 +30,5 @@ def get_storage(context, default=None):\n if annotation_key not in annotations:\n if default is not None:\n return default\n- annotations[annotation_key] = PersistentDict()\n+ annotations[annotation_key] = PersistentMapping()\n return annotations[annotation_key]\n' | ||
| M src/plone/app/multilingual/browser/configure.zcml | ||
| M src/plone/app/multilingual/browser/helper_views.py | ||
| M src/plone/app/multilingual/browser/setup.py | ||
| M src/plone/app/multilingual/content/lrf.py | ||
| M src/plone/app/multilingual/factory.py | ||
| M src/plone/app/multilingual/tests/test_helper_views.py | ||
| M src/plone/app/multilingual/tests/test_selector.py | ||
| M src/plone/app/multilingual/tests/test_switcher.py | ||
|
|
||
| b'diff --git a/news/4090.bugfix b/news/4090.bugfix\nnew file mode 100644\nindex 000000000..8528aefbe\n--- /dev/null\n+++ b/news/4090.bugfix\n@@ -0,0 +1 @@\n+Fix DeprecationWarnings. [maurits]\ndiff --git a/src/plone/app/multilingual/browser/configure.zcml b/src/plone/app/multilingual/browser/configure.zcml\nindex b27c1f003..0decf19b1 100644\n--- a/src/plone/app/multilingual/browser/configure.zcml\n+++ b/src/plone/app/multilingual/browser/configure.zcml\n@@ -186,7 +186,7 @@\n <!-- Selector -->\n <browser:page\n name="multilingual-selector"\n- for="plone.app.layout.navigation.interfaces.INavigationRoot"\n+ for="plone.base.interfaces.INavigationRoot"\n class=".helper_views.selector_view"\n permission="zope.Public"\n layer="..interfaces.IPloneAppMultilingualInstalled"\ndiff --git a/src/plone/app/multilingual/browser/helper_views.py b/src/plone/app/multilingual/browser/helper_views.py\nindex fb7b32a3d..32ac1d0ee 100644\n--- a/src/plone/app/multilingual/browser/helper_views.py\n+++ b/src/plone/app/multilingual/browser/helper_views.py\n@@ -1,6 +1,5 @@\n from AccessControl.SecurityManagement import getSecurityManager\n from Acquisition import aq_chain\n-from plone.app.layout.navigation.interfaces import INavigationRoot\n from plone.app.multilingual.browser.selector import addQuery\n from plone.app.multilingual.browser.selector import NOT_TRANSLATED_YET_TEMPLATE\n from plone.app.multilingual.interfaces import ILanguageRootFolder\n@@ -9,6 +8,7 @@\n from plone.app.multilingual.interfaces import ITranslatable\n from plone.app.multilingual.interfaces import ITranslationManager\n from plone.app.multilingual.manager import TranslationManager\n+from plone.base.interfaces import INavigationRoot\n from plone.i18n.interfaces import INegotiateLanguage\n from plone.i18n.locales.interfaces import IContentLanguageAvailability\n from plone.registry.interfaces import IRegistry\ndiff --git a/src/plone/app/multilingual/browser/setup.py b/src/plone/app/multilingual/browser/setup.py\nindex 05e5172ae..e1ce0dc9f 100644\n--- a/src/plone/app/multilingual/browser/setup.py\n+++ b/src/plone/app/multilingual/browser/setup.py\n@@ -1,12 +1,12 @@\n from logging import getLogger\n from plone.app.dexterity.behaviors.exclfromnav import IExcludeFromNavigation\n-from plone.app.layout.navigation.interfaces import INavigationRoot\n from plone.app.multilingual import _\n from plone.app.multilingual.interfaces import ITranslatable\n from plone.app.multilingual.interfaces import ITranslationManager\n from plone.app.multilingual.interfaces import LANGUAGE_INDEPENDENT\n from plone.app.multilingual.subscriber import set_recursive_language\n from plone.base.interfaces import ILanguage\n+from plone.base.interfaces import INavigationRoot\n from plone.base.utils import unrestricted_construct_instance\n from plone.dexterity.interfaces import IDexterityFTI\n from plone.i18n.locales.languages import _combinedlanguagelist\ndiff --git a/src/plone/app/multilingual/content/lrf.py b/src/plone/app/multilingual/content/lrf.py\nindex 0368b133e..a94e2ebc9 100644\n--- a/src/plone/app/multilingual/content/lrf.py\n+++ b/src/plone/app/multilingual/content/lrf.py\n@@ -1,7 +1,7 @@\n from plone.app.content.namechooser import NormalizingNameChooser\n-from plone.app.layout.navigation.interfaces import INavigationRoot\n from plone.app.multilingual.interfaces import ILanguageRootFolder\n from plone.app.multilingual.interfaces import ITranslationIdChooser\n+from plone.base.interfaces import INavigationRoot\n from plone.dexterity.content import Container\n from zope.component import adapter\n from zope.container.interfaces import INameChooser\ndiff --git a/src/plone/app/multilingual/factory.py b/src/plone/app/multilingual/factory.py\nindex ef5c5a18a..2fee362ea 100644\n--- a/src/plone/app/multilingual/factory.py\n+++ b/src/plone/app/multilingual/factory.py\n@@ -6,7 +6,7 @@\n from plone.app.multilingual.interfaces import ITranslationIdChooser\n from plone.app.multilingual.interfaces import ITranslationLocator\n from plone.app.multilingual.interfaces import ITranslationManager\n-from plone.base.interfaces.siteroot import IPloneSiteRoot\n+from plone.base.interfaces import IPloneSiteRoot\n from zope.interface import implementer\n \n \ndiff --git a/src/plone/app/multilingual/tests/test_helper_views.py b/src/plone/app/multilingual/tests/test_helper_views.py\nindex a85447b4a..e7314ec72 100644\n--- a/src/plone/app/multilingual/tests/test_helper_views.py\n+++ b/src/plone/app/multilingual/tests/test_helper_views.py\n@@ -9,7 +9,7 @@\n from plone.dexterity.utils import createContentInContainer\n from plone.i18n.interfaces import ILanguageSchema\n from plone.registry.interfaces import IRegistry\n-from plone.testing.z2 import Browser\n+from plone.testing.zope import Browser\n from zope.component import getUtility\n from zope.interface import alsoProvides\n \ndiff --git a/src/plone/app/multilingual/tests/test_selector.py b/src/plone/app/multilingual/tests/test_selector.py\nindex 712019e4e..e368c4cbf 100644\n--- a/src/plone/app/multilingual/tests/test_selector.py\n+++ b/src/plone/app/multilingual/tests/test_selector.py\n@@ -15,7 +15,7 @@\n from plone.dexterity.utils import createContentInContainer\n from plone.i18n.interfaces import ILanguageSchema\n from plone.registry.interfaces import IRegistry\n-from plone.testing.z2 import Browser\n+from plone.testing.zope import Browser\n from Products.CMFCore.utils import getToolByName\n from urllib.parse import parse_qs\n from urllib.parse import urlparse\ndiff --git a/src/plone/app/multilingual/tests/test_switcher.py b/src/plone/app/multilingual/tests/test_switcher.py\nindex b145f5ba9..1443b8b16 100644\n--- a/src/plone/app/multilingual/tests/test_switcher.py\n+++ b/src/plone/app/multilingual/tests/test_switcher.py\n@@ -1,7 +1,7 @@\n from plone.app.multilingual.browser.setup import SetupMultilingualSite\n from plone.app.multilingual.interfaces import IPloneAppMultilingualInstalled\n from plone.app.multilingual.testing import PAM_FUNCTIONAL_TESTING\n-from plone.testing.z2 import Browser\n+from plone.testing.zope import Browser\n from Products.CMFCore.utils import getToolByName\n from zope.interface import alsoProvides\n \n' | ||
|
|