py2/py3: unicode() does not exist in Python 3.

product/ERP5Type/tests/testDynamicClassGeneration.py

@@ -1389,10 +1389,14 @@ class TestZodbPropertySheet(ERP5TypeTestCase):
     with self.assertRaises(TypeError):
       person.setSocialTitle(social_title_value)
 
-    # Passing a unicode object to a not-Value setter should raise
     with self.assertRaises(TypeError):
       organisation = self.portal.organisation_module.newContent()
-      person.setSubordination(unicode(organisation.getRelativeUrl()))
+      if six.PY2:
+        # Passing a unicode object to a not-Value setter should raise
+        person.setSubordination(six.text_type(organisation.getRelativeUrl()))
+      else:
+        # Passing a bytes object to a not-Value setter should raise
+        person.setSubordination(organisation.getRelativeUrl().encode())
 
 
 from Products.ERP5Type.Tool.ComponentTool import ComponentTool

product/PortalTransforms/transforms/safe_html.py

@@ -535,7 +535,7 @@ class SafeHTML:
                 # avoid breaking now.
                 # continue into the loop with repaired html
             else:
-                if isinstance(orig, unicode):
+                if isinstance(orig, six.text_type):
                   orig = orig.encode('utf-8')
                 data.setData(orig)
                 break