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

[nobody at svn.erp5.org]

Author: alex
Date: Mon Dec 10 18:15:41 2007
New Revision: 18213

URL: http://svn.erp5.org?rev=18213&view=rev
Log:
iHotfix StringIO patch is now disabled by a ERP5Type patch

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=18213&r1=18212&r2=18213&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py (original)
+++ erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py Mon Dec 10 18:15:41 2007
@@ -75,26 +75,7 @@
 ZopeTestCase.installProduct('PageTemplates', quiet=install_product_quiet)
 ZopeTestCase.installProduct('PythonScripts', quiet=install_product_quiet)
 ZopeTestCase.installProduct('ExternalMethod', quiet=install_product_quiet)
-try:
-  # Workaround iHotFix patch that doesn't work with
-  # ZopeTestCase REQUESTs
-  ZopeTestCase.installProduct('iHotfix', quiet=install_product_quiet)
-  from Products import iHotfix
-  from types import UnicodeType
-  # revert monkey patchs from iHotfix
-  iHotfix.get_request = get_request
-
-  originalStringIO = iHotfix.originalStringIO
-  class UnicodeSafeStringIO(originalStringIO):
-    """StringIO like class which never fails with unicode."""
-    def write(self, s):
-      if isinstance(s, UnicodeType):
-        s = s.encode('utf8', 'repr')
-      originalStringIO.write(self, s)
-  # iHotFix will patch PageTemplate StringIO with
-  iHotfix.iHotfixStringIO = UnicodeSafeStringIO
-except ImportError:
-  pass
+ZopeTestCase.installProduct('iHotfix', quiet=install_product_quiet)
 ZopeTestCase.installProduct('Localizer', quiet=install_product_quiet)
 ZopeTestCase.installProduct('TimerService', quiet=install_product_quiet)