[Checkins] SVN: Products.PluggableAuthService/branches/do3cc_gs17/ Compatibility with proposed GS 1.7

[Patrick Gerken]

Log message for revision 123451:
  Compatibility with proposed GS 1.7
  

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

-=-
Modified: Products.PluggableAuthService/branches/do3cc_gs17/Products/PluggableAuthService/plugins/exportimport.py
===================================================================
--- Products.PluggableAuthService/trunk/Products/PluggableAuthService/plugins/exportimport.py	2011-11-21 09:13:20 UTC (rev 123450)
+++ Products.PluggableAuthService/branches/do3cc_gs17/Products/PluggableAuthService/plugins/exportimport.py	2011-11-21 09:16:07 UTC (rev 123451)
@@ -105,7 +105,7 @@
                                         package_path).__of__(self.context)
         info = self._getExportInfo()
         export_context.writeDataFile('%s.xml' % self.context.getId(),
-                                     template(info=info),
+                                     template(info=info).encode('utf-8'),
                                      'text/xml',
                                      subdir,
                                     )
@@ -124,7 +124,7 @@
             self._purgeContext()
 
         data = import_context.readDataFile('%s.xml' % self.context.getId(),
-                                           subdir)
+                                           subdir).decode('utf-8')
 
         if data is not None:
 

Modified: Products.PluggableAuthService/branches/do3cc_gs17/setup.py
===================================================================
--- Products.PluggableAuthService/trunk/setup.py	2011-11-21 09:13:20 UTC (rev 123450)
+++ Products.PluggableAuthService/branches/do3cc_gs17/setup.py	2011-11-21 09:16:07 UTC (rev 123451)
@@ -44,7 +44,7 @@
       install_requires=[
           'setuptools',
           'Products.PluginRegistry',
-          'Products.GenericSetup',
+          'Products.GenericSetup >= 1.7.0dev',
           'Zope2 >= 2.12',
           ],
       extras_require={'ip_range': ['IPy'],