[fc] Repository: plone.app.upgrade

Branch: refs/heads/master
Date: 2020-09-11T14:47:17+02:00
Author: Maurits van Rees (mauritsvanrees) <[email protected]>
Commit: plone/plone.app.upgrade@358e5e8

Replaced import of plone.api, which should not be used by core.

Fixes plone/plone.app.upgrade#241

Files changed:
A news/241.bugfix
M plone/app/upgrade/v52/final.py
Repository: plone.app.upgrade

Branch: refs/heads/master
Date: 2020-09-12T20:01:20+02:00
Author: Gil Forcada Codinachs (gforcada) <[email protected]>
Commit: plone/plone.app.upgrade@a867e20

Merge pull request #242 from plone/maurits/no-plone-api

Replaced import of plone.api, which should not be used by core.

Files changed:
A news/241.bugfix
M plone/app/upgrade/v52/final.py

last_commit.txt

@@ -2,33 +2,35 @@ Repository: plone.app.upgrade
 
 
 Branch: refs/heads/master
-Date: 2020-09-11T18:20:47+02:00
+Date: 2020-09-11T14:47:17+02:00
 Author: Maurits van Rees (mauritsvanrees) <[email protected]>
-Commit: https://github.com/plone/plone.app.upgrade/commit/611bc5b89b11dcfeb1115204d50730a1146e2f13
+Commit: https://github.com/plone/plone.app.upgrade/commit/358e5e861fd7fa84b2180116f536652bf4acb339
 
-Fixed invalid escape sequence.
+Replaced import of plone.api, which should not be used by core.
+
+Fixes https://github.com/plone/plone.app.upgrade/issues/241
 
 Files changed:
-M news/3130.bugfix
-M plone/app/upgrade/v43/alphas.py
+A news/241.bugfix
+M plone/app/upgrade/v52/final.py
 
-b"diff --git a/news/3130.bugfix b/news/3130.bugfix\nindex 13403ac3..a29259a0 100644\n--- a/news/3130.bugfix\n+++ b/news/3130.bugfix\n@@ -2,4 +2,5 @@ Catch deprecation warnings for ``webdav.LockItem.LockItem`` and ``CMFPlone.inter\n The first has been moved to ``OFS.LockItem``, the second to ``plone.i18n.interfaces``.\n In older upgrade code, we should still try the old import first.\n Fixed deprecation warning for zope.site.hooks.\n+Fixed invalid escape sequence.\n [maurits]\ndiff --git a/plone/app/upgrade/v43/alphas.py b/plone/app/upgrade/v43/alphas.py\nindex fd49a34c..b5db7f51 100644\n--- a/plone/app/upgrade/v43/alphas.py\n+++ b/plone/app/upgrade/v43/alphas.py\n@@ -11,7 +11,7 @@\n \n \n logger = logging.getLogger('plone.app.upgrade')\n-num_sort_regex = re.compile('\\d+')\n+num_sort_regex = re.compile(r'\\d+')\n \n \n def reindex_sortable_title(context):\n"
+b'diff --git a/news/241.bugfix b/news/241.bugfix\nnew file mode 100644\nindex 00000000..5ed2fa92\n--- /dev/null\n+++ b/news/241.bugfix\n@@ -0,0 +1,2 @@\n+Replaced import of plone.api, which should not be used by core.\n+[maurits]\ndiff --git a/plone/app/upgrade/v52/final.py b/plone/app/upgrade/v52/final.py\nindex c5bbf979..a923b131 100644\n--- a/plone/app/upgrade/v52/final.py\n+++ b/plone/app/upgrade/v52/final.py\n@@ -36,11 +36,10 @@ def rebuild_redirections(context):\n \n def move_dotted_to_named_behaviors(context):\n     """named behaviors are better then dotted behaviors > let\'s move them."""\n-    from plone import api\n     from plone.behavior.registration import lookup_behavior_registration\n     from plone.dexterity.interfaces import IDexterityFTI\n \n-    ptt = api.portal.get_tool(\'portal_types\')\n+    ptt = getToolByName(context, \'portal_types\')\n \n     ftis = [fti for fti in ptt.objectValues() if IDexterityFTI.providedBy(fti)]\n \n'
 
 Repository: plone.app.upgrade
 
 
 Branch: refs/heads/master
-Date: 2020-09-12T19:59:49+02:00
+Date: 2020-09-12T20:01:20+02:00
 Author: Gil Forcada Codinachs (gforcada) <[email protected]>
-Commit: https://github.com/plone/plone.app.upgrade/commit/d61e82be18e08628c7eb4b57cbc67eb859004c44
+Commit: https://github.com/plone/plone.app.upgrade/commit/a867e20ba2ecc574116accc589a22706f6fd7d94
 
-Merge pull request #243 from plone/maurits/fix-warnings-3
+Merge pull request #242 from plone/maurits/no-plone-api
 
-Fixed invalid escape sequence.
+Replaced import of plone.api, which should not be used by core.
 
 Files changed:
-M news/3130.bugfix
-M plone/app/upgrade/v43/alphas.py
+A news/241.bugfix
+M plone/app/upgrade/v52/final.py
 
-b"diff --git a/news/3130.bugfix b/news/3130.bugfix\nindex 13403ac3..a29259a0 100644\n--- a/news/3130.bugfix\n+++ b/news/3130.bugfix\n@@ -2,4 +2,5 @@ Catch deprecation warnings for ``webdav.LockItem.LockItem`` and ``CMFPlone.inter\n The first has been moved to ``OFS.LockItem``, the second to ``plone.i18n.interfaces``.\n In older upgrade code, we should still try the old import first.\n Fixed deprecation warning for zope.site.hooks.\n+Fixed invalid escape sequence.\n [maurits]\ndiff --git a/plone/app/upgrade/v43/alphas.py b/plone/app/upgrade/v43/alphas.py\nindex fd49a34c..b5db7f51 100644\n--- a/plone/app/upgrade/v43/alphas.py\n+++ b/plone/app/upgrade/v43/alphas.py\n@@ -11,7 +11,7 @@\n \n \n logger = logging.getLogger('plone.app.upgrade')\n-num_sort_regex = re.compile('\\d+')\n+num_sort_regex = re.compile(r'\\d+')\n \n \n def reindex_sortable_title(context):\n"
+b'diff --git a/news/241.bugfix b/news/241.bugfix\nnew file mode 100644\nindex 00000000..5ed2fa92\n--- /dev/null\n+++ b/news/241.bugfix\n@@ -0,0 +1,2 @@\n+Replaced import of plone.api, which should not be used by core.\n+[maurits]\ndiff --git a/plone/app/upgrade/v52/final.py b/plone/app/upgrade/v52/final.py\nindex 76f64fc8..c9da7075 100644\n--- a/plone/app/upgrade/v52/final.py\n+++ b/plone/app/upgrade/v52/final.py\n@@ -39,11 +39,10 @@ def rebuild_redirections(context):\n \n def move_dotted_to_named_behaviors(context):\n     """named behaviors are better then dotted behaviors > let\'s move them."""\n-    from plone import api\n     from plone.behavior.registration import lookup_behavior_registration\n     from plone.dexterity.interfaces import IDexterityFTI\n \n-    ptt = api.portal.get_tool(\'portal_types\')\n+    ptt = getToolByName(context, \'portal_types\')\n \n     ftis = [fti for fti in ptt.objectValues() if IDexterityFTI.providedBy(fti)]\n \n'