Merge 8f3ddeb into 69c43ad

zopefoundation · Mar 19, 2019 · c41bb93 · c41bb93
2 parents 69c43ad + 8f3ddeb
commit c41bb93
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -8,6 +8,9 @@ Change Log
 
 - Added support for Python 3.7 and 3.8
 
+- Fix relative import that broke import/export.
+  [pbauer]
+
 
 1.6.1 (2018-11-08)
 ------------------

diff --git a/Products/PluginRegistry/PluginRegistry.py b/Products/PluginRegistry/PluginRegistry.py
@@ -34,6 +34,7 @@
 
 try:
     from Products.PluginRegistry.exportimport import _updatePluginRegistry
+    from Products.PluginRegistry.exportimport import PluginRegistryExporter
 except ImportError:
     _HAS_GENERIC_SETUP = False
 else:
@@ -309,7 +310,6 @@ def removePluginById(self, plugin_id):
         def getConfigAsXML(self):
             """ Return XML representing the registry's configuration.
             """
-            from exportimport import PluginRegistryExporter
             pre = PluginRegistryExporter(self).__of__(self)
             return pre.generateXML()