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

[Patrick Gerken]

Log message for revision 123460:
  Merge do3cc_gs17 branch
  

Changed:
  U   Products.PluggableAuthService/trunk/CHANGES.txt
  U   Products.PluggableAuthService/trunk/Products/PluggableAuthService/plugins/exportimport.py

-=-
Modified: Products.PluggableAuthService/trunk/CHANGES.txt
===================================================================
--- Products.PluggableAuthService/trunk/CHANGES.txt	2011-11-21 14:27:17 UTC (rev 123459)
+++ Products.PluggableAuthService/trunk/CHANGES.txt	2011-11-21 14:33:46 UTC (rev 123460)
@@ -4,7 +4,7 @@
 1.7.7 (unreleased)
 ------------------
 
-- TBD
+- Explicitly encode/decode data for GS
 
 1.7.6 (2011-10-31)
 ------------------

Modified: Products.PluggableAuthService/trunk/Products/PluggableAuthService/plugins/exportimport.py
===================================================================
--- Products.PluggableAuthService/trunk/Products/PluggableAuthService/plugins/exportimport.py	2011-11-21 14:27:17 UTC (rev 123459)
+++ Products.PluggableAuthService/trunk/Products/PluggableAuthService/plugins/exportimport.py	2011-11-21 14:33:46 UTC (rev 123460)
@@ -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: