[Erp5-report] r33058 leonardo - /erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py

[nobody at svn.erp5.org]

Author: leonardo
Date: Tue Feb 23 21:45:52 2010
New Revision: 33058

URL: http://svn.erp5.org?rev=33058&view=rev
Log:
adjust to new Localizer

Modified:
    erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py

Modified: erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py?rev=33058&r1=33057&r2=33058&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py [utf8] Tue Feb 23 21:45:52 2010
@@ -131,14 +131,19 @@
   # Workaround Localizer >= 1.2 patch that doesn't work with
   # ZopeTestCase REQUESTs (it's the same as iHotFix
   from Products.Localizer import patches
-  from types import UnicodeType
-  # revert monkey patchs from Localizer
+  # revert monkey patches from Localizer
   patches.get_request = get_request
-
+except ImportError:
+  pass
+
+try:
+  from Products.Localizer import patches
+  # originalStringIO has been removed from recent Localizer versions
+  from Products.Localizer.patches import originalStringIO
   class UnicodeSafeStringIO(patches.originalStringIO):
     """StringIO like class which never fails with unicode."""
     def write(self, s):
-      if isinstance(s, UnicodeType):
+      if isinstance(s, unicode):
         s = s.encode('utf8', 'repr')
       patches.originalStringIO.write(self, s)
   # Localizer will patch PageTemplate StringIO with