py3 compat

buildout.cfg

@@ -24,12 +24,15 @@ collective.recipe.plonesite = 1.11.0
 
 [versions:os.environ.get('PLONE_VERSION', '4.3').startswith('4.')]
 collective.upgrade = 1.5
+zodbupdate = 0.5
 
 [versions:os.environ.get('PLONE_VERSION', '4.3') == '5.1']
 collective.upgrade = 1.5
+zodbupdate = 0.5
 
 [versions:os.environ.get('PLONE_VERSION', '4.3') == '5.2']
 collective.upgrade = 1.6
+zodbupdate = 1.4
 
 [instance]
 eggs += collective.upgrade

collective/searchandreplace/pytests/zope_instance.py

@@ -43,17 +43,17 @@ def __init__(
         output = subprocess.check_output(
             ["bin/buildout", "query", "buildout:develop"]
         )
-        assert str(package_path) in output
+        assert str(package_path).encode('utf8') in output
 
         output = subprocess.check_output(
             ["bin/buildout", "query", "instance:recipe"]
         )
-        assert 'plone.recipe.zope2instance' in output
+        assert b'plone.recipe.zope2instance' in output
 
         output = subprocess.check_output(
             ["bin/buildout", "query", "plonesite:recipe"]
         )
-        assert 'collective.recipe.plonesite' in output
+        assert b'collective.recipe.plonesite' in output
 
     def run_buildouts(self, from_version):
         retcode = subprocess.call(

collective/searchandreplace/tests/test_replacewhere.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 from collective.searchandreplace.interfaces import ISearchReplaceUtility
 from collective.searchandreplace.interfaces import ISearchReplaceSettings
 from collective.searchandreplace.testing import edit_content
@@ -11,6 +12,7 @@
 from plone.app.testing import TEST_USER_NAME
 from Products.CMFCore.utils import getToolByName
 from zope.component import getUtility
+import six
 
 import unittest
 
@@ -503,11 +505,14 @@ def testReplaceSubjectUnicode(self):
         )
         results = self.srutil.findObjects(**parameters)
         self.assertEqual(len(results), 1)
-        r_parameters = dict(replaceWith="Remplac\xc3\xa9".decode('utf8'),)
+        r_parameters = dict(replaceWith=u"Remplacé",)
         r_parameters.update(parameters)
         results = self.srutil.replaceAllMatches(**r_parameters)
         self.assertEqual(results, 1)
-        self.assertEqual(doc1.Subject(), ("Remplac\xc3\xa9", "Replaced"))
+        if six.PY3:
+            self.assertEqual(doc1.Subject(), (u"Remplacé", "Replaced"))
+        if six.PY2:
+            self.assertEqual(doc1.Subject(), (u"Remplacé".encode('utf8'), "Replaced"))
 
 class TestModified(unittest.TestCase):
     """Test update_modified setting"""