[fc] Repository: plone.app.registry

Branch: refs/heads/master
Date: 2019-03-02T15:09:51+01:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.app.registry@94379ab

fix registry-export with Generic Setup

Files changed:
M plone/app/registry/exportimport/handler.py
Repository: plone.app.registry

Branch: refs/heads/master
Date: 2019-03-02T15:12:23+01:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.app.registry@72961ac

add changelog

Files changed:
A news/34.bugfix
Repository: plone.app.registry

Branch: refs/heads/master
Date: 2019-03-02T15:22:00+01:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.app.registry@69f2dba

fix export by interface or prefix

Files changed:
M plone/app/registry/browser/exportxml.py
Repository: plone.app.registry

Branch: refs/heads/master
Date: 2019-03-02T16:50:22+01:00
Author: Philip Bauer (pbauer) <bauer@starzel.de>
Commit: plone/plone.app.registry@7ca417f

Merge pull request #35 from plone/gix_gs_export

Fix Generic Setup Export

Files changed:
A news/34.bugfix
M plone/app/registry/browser/exportxml.py
M plone/app/registry/exportimport/handler.py

last_commit.txt

@@ -1,38 +1,64 @@
-Repository: plone.app.debugtoolbar
+Repository: plone.app.registry
 
 
 Branch: refs/heads/master
-Date: 2019-02-23T11:02:09+01:00
-Author: ale-rt (ale-rt) <alessandro.pisa@gmail.com>
-Commit: https://github.com/plone/plone.app.debugtoolbar/commit/4e1f73b97a97834398d802c3bd897ac57fba7454
+Date: 2019-03-02T15:09:51+01:00
+Author: Philip Bauer (pbauer) <bauer@starzel.de>
+Commit: https://github.com/plone/plone.app.registry/commit/94379ab861f3586982808cc772d70660f01d0216
 
-Do not break when portal_css or portal_javascript are missing
+fix registry-export with Generic Setup
 
-Fixes #23
+Files changed:
+M plone/app/registry/exportimport/handler.py
+
+b"diff --git a/plone/app/registry/exportimport/handler.py b/plone/app/registry/exportimport/handler.py\nindex 9c47bdc..f34cf5e 100644\n--- a/plone/app/registry/exportimport/handler.py\n+++ b/plone/app/registry/exportimport/handler.py\n@@ -14,14 +14,14 @@\n from plone.supermodel.utils import ns\n from plone.supermodel.utils import prettyXML\n from plone.supermodel.utils import valueToElement\n+from Products.CMFPlone.utils import safe_encode\n+from Products.CMFPlone.utils import safe_unicode\n from zope.component import queryUtility\n from zope.configuration import config\n from zope.configuration import xmlconfig\n from zope.dottedname.resolve import resolve\n from zope.schema import getFieldNames\n \n-import six\n-\n \n _marker = object()\n \n@@ -91,7 +91,7 @@ def exportRegistry(context):\n     exporter = RegistryExporter(registry, context)\n     body = exporter.exportDocument()\n     if body is not None:\n-        context.writeDataFile('registry.xml', body, 'text/xml')\n+        context.writeDataFile('registry.xml', safe_encode(body), 'text/xml')\n \n \n class RegistryImporter(object):\n@@ -370,7 +370,7 @@ def importRecords(self, node):\n                 continue\n             elif child.tag.lower() == 'omit':\n                 if child.text:\n-                    omit.append(six.text_type(child.text))\n+                    omit.append(safe_unicode(child.text))\n             elif child.tag.lower() == 'value':\n                 values.append(child)\n \n"
+
+Repository: plone.app.registry
+
+
+Branch: refs/heads/master
+Date: 2019-03-02T15:12:23+01:00
+Author: Philip Bauer (pbauer) <bauer@starzel.de>
+Commit: https://github.com/plone/plone.app.registry/commit/72961aca9beb0b3473700332532e6d1939406137
+
+add changelog
+
+Files changed:
+A news/34.bugfix
+
+b'diff --git a/news/34.bugfix b/news/34.bugfix\nnew file mode 100644\nindex 0000000..1d6810e\n--- /dev/null\n+++ b/news/34.bugfix\n@@ -0,0 +1,2 @@\n+Fix export of registry with Generic Setup.\n+[pbauer]\n\\ No newline at end of file\n'
+
+Repository: plone.app.registry
+
+
+Branch: refs/heads/master
+Date: 2019-03-02T15:22:00+01:00
+Author: Philip Bauer (pbauer) <bauer@starzel.de>
+Commit: https://github.com/plone/plone.app.registry/commit/69f2dbad62ea5245de7a7898686e6778a25f7c8b
+
+fix export by interface or prefix
 
 Files changed:
-A news/23.bugfix
-M src/plone/app/debugtoolbar/browser/theme.pt
-M src/plone/app/debugtoolbar/browser/theme.py
+M plone/app/registry/browser/exportxml.py
 
-b'diff --git a/news/23.bugfix b/news/23.bugfix\nnew file mode 100644\nindex 0000000..0a5e0f8\n--- /dev/null\n+++ b/news/23.bugfix\n@@ -0,0 +1,2 @@\n+Do not break when portal_css or portal_javascript are missing\n+[ale-rt]\ndiff --git a/src/plone/app/debugtoolbar/browser/theme.pt b/src/plone/app/debugtoolbar/browser/theme.pt\nindex 9f2a59c..1083fa0 100644\n--- a/src/plone/app/debugtoolbar/browser/theme.pt\n+++ b/src/plone/app/debugtoolbar/browser/theme.pt\n@@ -40,7 +40,7 @@\n                     <div tal:repeat="layer view/layers"><code tal:content="layer/__identifier__" /></div>\n                 </td>\n             </tr>\n-            <tr>\n+            <tr tal:condition="nocall:view/css">\n                 <td tal:define="debugMode view/css/getDebugMode">\n                     <span i18n:translate="">CSS composition</span>\n                     <span class="label warning" tal:condition="debugMode" i18n:translate="">Debug mode</span>\n@@ -85,7 +85,7 @@\n                     </ul>\n                 </td>\n             </tr>\n-            <tr>\n+            <tr tal:condition="nocall:view/js">\n                 <td tal:define="debugMode view/js/getDebugMode">\n                     <span i18n:translate="">JavaScript composition</span>\n                     <span class="label warning" tal:condition="debugMode" i18n:translate="">Debug mode</span>\n@@ -131,7 +131,7 @@\n                 </td>\n             </tr>\n         </tbody>\n-    </table>    \n+    </table>\n \n </div>\n </html>\ndiff --git a/src/plone/app/debugtoolbar/browser/theme.py b/src/plone/app/debugtoolbar/browser/theme.py\nindex cc9b0d2..d2614da 100644\n--- a/src/plone/app/debugtoolbar/browser/theme.py\n+++ b/src/plone/app/debugtoolbar/browser/theme.py\n@@ -1,5 +1,4 @@\n # -*- coding: utf-8 -*-\n-from zope.interface import Interface\n from zope.interface import directlyProvidedBy\n from zope.component import queryUtility\n from zope.viewlet.viewlet import ViewletBase\n@@ -11,7 +10,7 @@\n class ThemeViewlet(ViewletBase):\n \n     def update(self):\n-        \n+\n         skins = getToolByName(self.context, \'portal_skins\')\n         url = getToolByName(self.context, \'portal_url\')\n \n@@ -23,12 +22,12 @@ def update(self):\n \n         # CMF skin\n         self.themeName = self.request.get(requestVariable, defaultSkin)\n-        self.skinPaths = dict(skins.getSkinPaths()).get(self.themeName, \'\').split(\',\')\n+        self.skinPaths = dict(skins.getSkinPaths()).get(self.themeName, \'\').split(\',\')  # noqa: E501\n \n         # Browser layers\n         self.themeLayer = queryUtility(IBrowserSkinType, name=self.themeName)\n         self.layers = list(directlyProvidedBy(self.request).flattened())\n \n         # CSS/JS composition\n-        self.css = getToolByName(self.context, \'portal_css\')\n-        self.js = getToolByName(self.context, \'portal_javascripts\')\n\\ No newline at end of file\n+        self.css = getToolByName(self.context, \'portal_css\', None)\n+        self.js = getToolByName(self.context, \'portal_javascripts\', None)\n'
+b"diff --git a/plone/app/registry/browser/exportxml.py b/plone/app/registry/browser/exportxml.py\nindex 4fccfd4..60e9cdd 100644\n--- a/plone/app/registry/browser/exportxml.py\n+++ b/plone/app/registry/browser/exportxml.py\n@@ -6,6 +6,7 @@\n from zope.component import getUtility\n \n import os\n+import six\n \n _current_dir = os.path.dirname(__file__)\n \n@@ -95,7 +96,7 @@ def export(self, sinterface=None, sname=None):\n                     xmlel.text = element\n             elif isinstance(record.value, bool):\n                 xmlvalue.text = 'True' if record.value else 'False'\n-            elif isinstance(record.value, basestring):\n+            elif isinstance(record.value, six.string_types):\n                 xmlvalue.text = record.value\n             else:\n                 xmlvalue.text = str(record.value)\n"
 
-Repository: plone.app.debugtoolbar
+Repository: plone.app.registry
 
 
 Branch: refs/heads/master
-Date: 2019-03-01T01:29:41+01:00
-Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
-Commit: https://github.com/plone/plone.app.debugtoolbar/commit/e19f451252664b2d55fbd54511fbe72a2ce74475
+Date: 2019-03-02T16:50:22+01:00
+Author: Philip Bauer (pbauer) <bauer@starzel.de>
+Commit: https://github.com/plone/plone.app.registry/commit/7ca417ff63837febed30c259df705baf5edfb334
 
-Merge pull request #24 from plone/23-fix-debugtoolbar
+Merge pull request #35 from plone/gix_gs_export
 
-Do not break when portal_css or portal_javascript are missing
+Fix Generic Setup Export
 
 Files changed:
-A news/23.bugfix
-M src/plone/app/debugtoolbar/browser/theme.pt
-M src/plone/app/debugtoolbar/browser/theme.py
+A news/34.bugfix
+M plone/app/registry/browser/exportxml.py
+M plone/app/registry/exportimport/handler.py
 
-b'diff --git a/news/23.bugfix b/news/23.bugfix\nnew file mode 100644\nindex 0000000..0a5e0f8\n--- /dev/null\n+++ b/news/23.bugfix\n@@ -0,0 +1,2 @@\n+Do not break when portal_css or portal_javascript are missing\n+[ale-rt]\ndiff --git a/src/plone/app/debugtoolbar/browser/theme.pt b/src/plone/app/debugtoolbar/browser/theme.pt\nindex 9f2a59c..1083fa0 100644\n--- a/src/plone/app/debugtoolbar/browser/theme.pt\n+++ b/src/plone/app/debugtoolbar/browser/theme.pt\n@@ -40,7 +40,7 @@\n                     <div tal:repeat="layer view/layers"><code tal:content="layer/__identifier__" /></div>\n                 </td>\n             </tr>\n-            <tr>\n+            <tr tal:condition="nocall:view/css">\n                 <td tal:define="debugMode view/css/getDebugMode">\n                     <span i18n:translate="">CSS composition</span>\n                     <span class="label warning" tal:condition="debugMode" i18n:translate="">Debug mode</span>\n@@ -85,7 +85,7 @@\n                     </ul>\n                 </td>\n             </tr>\n-            <tr>\n+            <tr tal:condition="nocall:view/js">\n                 <td tal:define="debugMode view/js/getDebugMode">\n                     <span i18n:translate="">JavaScript composition</span>\n                     <span class="label warning" tal:condition="debugMode" i18n:translate="">Debug mode</span>\n@@ -131,7 +131,7 @@\n                 </td>\n             </tr>\n         </tbody>\n-    </table>    \n+    </table>\n \n </div>\n </html>\ndiff --git a/src/plone/app/debugtoolbar/browser/theme.py b/src/plone/app/debugtoolbar/browser/theme.py\nindex cc9b0d2..d2614da 100644\n--- a/src/plone/app/debugtoolbar/browser/theme.py\n+++ b/src/plone/app/debugtoolbar/browser/theme.py\n@@ -1,5 +1,4 @@\n # -*- coding: utf-8 -*-\n-from zope.interface import Interface\n from zope.interface import directlyProvidedBy\n from zope.component import queryUtility\n from zope.viewlet.viewlet import ViewletBase\n@@ -11,7 +10,7 @@\n class ThemeViewlet(ViewletBase):\n \n     def update(self):\n-        \n+\n         skins = getToolByName(self.context, \'portal_skins\')\n         url = getToolByName(self.context, \'portal_url\')\n \n@@ -23,12 +22,12 @@ def update(self):\n \n         # CMF skin\n         self.themeName = self.request.get(requestVariable, defaultSkin)\n-        self.skinPaths = dict(skins.getSkinPaths()).get(self.themeName, \'\').split(\',\')\n+        self.skinPaths = dict(skins.getSkinPaths()).get(self.themeName, \'\').split(\',\')  # noqa: E501\n \n         # Browser layers\n         self.themeLayer = queryUtility(IBrowserSkinType, name=self.themeName)\n         self.layers = list(directlyProvidedBy(self.request).flattened())\n \n         # CSS/JS composition\n-        self.css = getToolByName(self.context, \'portal_css\')\n-        self.js = getToolByName(self.context, \'portal_javascripts\')\n\\ No newline at end of file\n+        self.css = getToolByName(self.context, \'portal_css\', None)\n+        self.js = getToolByName(self.context, \'portal_javascripts\', None)\n'
+b"diff --git a/news/34.bugfix b/news/34.bugfix\nnew file mode 100644\nindex 0000000..1d6810e\n--- /dev/null\n+++ b/news/34.bugfix\n@@ -0,0 +1,2 @@\n+Fix export of registry with Generic Setup.\n+[pbauer]\n\\ No newline at end of file\ndiff --git a/plone/app/registry/browser/exportxml.py b/plone/app/registry/browser/exportxml.py\nindex 4fccfd4..60e9cdd 100644\n--- a/plone/app/registry/browser/exportxml.py\n+++ b/plone/app/registry/browser/exportxml.py\n@@ -6,6 +6,7 @@\n from zope.component import getUtility\n \n import os\n+import six\n \n _current_dir = os.path.dirname(__file__)\n \n@@ -95,7 +96,7 @@ def export(self, sinterface=None, sname=None):\n                     xmlel.text = element\n             elif isinstance(record.value, bool):\n                 xmlvalue.text = 'True' if record.value else 'False'\n-            elif isinstance(record.value, basestring):\n+            elif isinstance(record.value, six.string_types):\n                 xmlvalue.text = record.value\n             else:\n                 xmlvalue.text = str(record.value)\ndiff --git a/plone/app/registry/exportimport/handler.py b/plone/app/registry/exportimport/handler.py\nindex 9c47bdc..f34cf5e 100644\n--- a/plone/app/registry/exportimport/handler.py\n+++ b/plone/app/registry/exportimport/handler.py\n@@ -14,14 +14,14 @@\n from plone.supermodel.utils import ns\n from plone.supermodel.utils import prettyXML\n from plone.supermodel.utils import valueToElement\n+from Products.CMFPlone.utils import safe_encode\n+from Products.CMFPlone.utils import safe_unicode\n from zope.component import queryUtility\n from zope.configuration import config\n from zope.configuration import xmlconfig\n from zope.dottedname.resolve import resolve\n from zope.schema import getFieldNames\n \n-import six\n-\n \n _marker = object()\n \n@@ -91,7 +91,7 @@ def exportRegistry(context):\n     exporter = RegistryExporter(registry, context)\n     body = exporter.exportDocument()\n     if body is not None:\n-        context.writeDataFile('registry.xml', body, 'text/xml')\n+        context.writeDataFile('registry.xml', safe_encode(body), 'text/xml')\n \n \n class RegistryImporter(object):\n@@ -370,7 +370,7 @@ def importRecords(self, node):\n                 continue\n             elif child.tag.lower() == 'omit':\n                 if child.text:\n-                    omit.append(six.text_type(child.text))\n+                    omit.append(safe_unicode(child.text))\n             elif child.tag.lower() == 'value':\n                 values.append(child)\n \n"