[Checkins] SVN: Products.PluginRegistry/branches/do3cc_gs17/ Compatibility with proposed GS1.7

Patrick Gerken do3ccqrv at gmail.com
Mon Nov 21 09:18:11 UTC 2011


Log message for revision 123452:
  Compatibility with proposed GS1.7
  

Changed:
  A   Products.PluginRegistry/branches/do3cc_gs17/
  U   Products.PluginRegistry/branches/do3cc_gs17/Products/PluginRegistry/exportimport.py
  U   Products.PluginRegistry/branches/do3cc_gs17/setup.py

-=-
Modified: Products.PluginRegistry/branches/do3cc_gs17/Products/PluginRegistry/exportimport.py
===================================================================
--- Products.PluginRegistry/trunk/Products/PluginRegistry/exportimport.py	2011-11-21 09:16:07 UTC (rev 123451)
+++ Products.PluginRegistry/branches/do3cc_gs17/Products/PluginRegistry/exportimport.py	2011-11-21 09:18:10 UTC (rev 123452)
@@ -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/branches/do3cc_gs17/setup.py
===================================================================
--- Products.PluginRegistry/trunk/setup.py	2011-11-21 09:16:07 UTC (rev 123451)
+++ Products.PluginRegistry/branches/do3cc_gs17/setup.py	2011-11-21 09:18:10 UTC (rev 123452)
@@ -46,7 +46,8 @@
       zip_safe=False,
       install_requires=[
           'setuptools',
-          'Zope2 >= 2.12'
+          'Zope2 >= 2.12',
+          'Products.GenericSetup >= 1.7.0dev'
           ],
       entry_points="""
       [zope2.initialize]



More information about the checkins mailing list