Merge branch 'SyZn-master'

plone · Jun 22, 2016 · ea5e032 · ea5e032
2 parents 055bee1 + 2c7893a
commit ea5e032
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -16,6 +16,8 @@ New features:
 - Upgrade news portlet to use the new select widget;
   Add dependency on plone.app.z3cform
   [datakurre]
+- Tracebak info on importing ``portlets.xml`` to show better error location in the xml
+  [SyZn]
 
 Bug fixes:
 

diff --git a/plone/app/portlets/exportimport/portlets.py b/plone/app/portlets/exportimport/portlets.py
@@ -183,6 +183,8 @@ def import_node(self, interface, child):
         """Import a single <property /> node
         """
         property_name = child.getAttribute('name')
+
+        __traceback_info__ = "Property name: " + property_name
 
         field = interface.get(property_name, None)
         if field is None:
@@ -491,6 +493,8 @@ def _initAssignmentNode(self, node):
         if name:
             name = str(name)
             assignment = mapping.get(name, None)
+
+        __traceback_info__ = "Assignment name: " + name
 
         if node.hasAttribute('remove'):
             if assignment is not None: