[Checkins] SVN: Products.PluginRegistry/trunk/ Merge do3cc_gs17 branch into trunk

[Patrick Gerken]

Log message for revision 123461:
  Merge do3cc_gs17 branch into trunk
  

Changed:
  U   Products.PluginRegistry/trunk/CHANGES.txt
  U   Products.PluginRegistry/trunk/Products/PluginRegistry/exportimport.py
  U   Products.PluginRegistry/trunk/setup.py

-=-
Modified: Products.PluginRegistry/trunk/CHANGES.txt
===================================================================
--- Products.PluginRegistry/trunk/CHANGES.txt	2011-11-21 14:33:46 UTC (rev 123460)
+++ Products.PluginRegistry/trunk/CHANGES.txt	2011-11-21 14:46:55 UTC (rev 123461)
@@ -4,7 +4,7 @@
 1.3 (unreleased)
 ----------------
 
-- TBD
+- Change default encoding for importexport from None to utf-8.
 
 
 1.3b1 (2010-07-01)

Modified: Products.PluginRegistry/trunk/Products/PluginRegistry/exportimport.py
===================================================================
--- Products.PluginRegistry/trunk/Products/PluginRegistry/exportimport.py	2011-11-21 14:33:46 UTC (rev 123460)
+++ Products.PluginRegistry/trunk/Products/PluginRegistry/exportimport.py	2011-11-21 14:46:55 UTC (rev 123461)
@@ -65,7 +65,7 @@
 
     return 'Plugin registry exported.'
 
-def _updatePluginRegistry(registry, xml, should_purge, encoding=None):
+def _updatePluginRegistry(registry, xml, should_purge, encoding='utf-8'):
 
     if should_purge:
         registry._plugin_types = []
@@ -112,7 +112,7 @@
 
 class PluginRegistryExporter(ExportConfiguratorBase):
 
-    def __init__(self, context, encoding=None):
+    def __init__(self, context, encoding='utf-8'):
         ExportConfiguratorBase.__init__(self, None, encoding)
         self.context = context
 
@@ -128,7 +128,7 @@
 
 class PluginRegistryImporter(ImportConfiguratorBase):
 
-    def __init__(self, context, encoding=None):
+    def __init__(self, context, encoding='utf-8'):
         ImportConfiguratorBase.__init__(self, None, encoding)
         self.context = context
 

Modified: Products.PluginRegistry/trunk/setup.py
===================================================================
--- Products.PluginRegistry/trunk/setup.py	2011-11-21 14:33:46 UTC (rev 123460)
+++ Products.PluginRegistry/trunk/setup.py	2011-11-21 14:46:55 UTC (rev 123461)
@@ -46,7 +46,8 @@
       zip_safe=False,
       install_requires=[
           'setuptools',
-          'Zope2 >= 2.12'
+          'Zope2 >= 2.12',
+          'Products.GenericSetup'
           ],
       entry_points="""
       [zope2.initialize]