Revert the patch.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@4867 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Type/Utils.py

@@ -237,7 +237,7 @@ def getModuleIdList(product_path, module_id):
           module_name = file_name[0:-3]
           module_name_list += [module_name]
   except:
-      LOG('ERP5Type:',0,'No PropertySheet directory in %s' % product_path)
+    LOG('ERP5Type:',0,'No PropertySheet directory in %s' % product_path)
   return path, module_name_list
 
 # EPR5Type global modules update

product/ERP5Type/ZopePatch.py

@@ -41,7 +41,6 @@ from Products.ERP5Type.patches import FSZSQLMethod
 from Products.ERP5Type.patches import ActionInformation
 from Products.ERP5Type.patches import ActionProviderBase
 from Products.ERP5Type.patches import CookieCrumbler
-from Products.ERP5Type.patches import URLTool
 
 # These symbols are required for backward compatibility
 from Products.ERP5Type.patches.PropertyManager import ERP5PropertyManager

product/ERP5Type/patches/URLTool.py

-##############################################################################
-#
-# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
-# Copyright (c) 2005 Nexedi SARL. All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-
-from Products.CMFCore.URLTool import URLTool
-from urllib import quote
-
-def URLTool_quote(self, string, **kw):
-  """Quote a string according to RFC 2396.
-  """
-  return quote(string, **kw) 
-
-URLTool.quote = URLTool_quote

product/ERP5Type/tests/runUnitTest.py

@@ -29,7 +29,7 @@ def initializeInstanceHome(tests_framework_home, real_instance_home, instance_ho
 if os.path.isdir('/usr/lib64/zope/lib/python'):
   software_home = '/usr/lib64/zope/lib/python'
 else:
-  software_home = '/usr/lib/zope/lib/python'
+  software_home = '/home/yo/tmp/zope-2.8/lib/python'
 
 tests_framework_home = os.path.dirname(os.path.abspath(__file__))
 # handle 'system global' instance