[Erp5-report] r42320 jm - /erp5/trunk/products/ERP5Type/Utils.py

[nobody at svn.erp5.org]

Author: jm
Date: Fri Jan 14 00:03:01 2011
New Revision: 42320

URL: http://svn.erp5.org?rev=42320&view=rev
Log:
Revert "try to parse latin-1 encoded url (even though that is invalid according to RFC 3986)."

This reverts commit 42160 because it breaks
testWebCrawler.TestWebCrawler.test_01_check_URLTransformations

Modified:
    erp5/trunk/products/ERP5Type/Utils.py

Modified: erp5/trunk/products/ERP5Type/Utils.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/Utils.py?rev=42320&r1=42319&r2=42320&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/Utils.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/Utils.py [utf8] Fri Jan 14 00:03:01 2011
@@ -3187,7 +3187,6 @@ class ScalarMaxConflictResolver(persiste
 ###################
 #  URL Normaliser #
 ###################
-from Products.PythonScripts.standard import url_unquote
 try:
   import urlnorm
 except ImportError:
@@ -3259,11 +3258,6 @@ def urlnormNormaliseUrl(url, base_url=No
   """
   try:
     url = urlnorm.norm(url)
-  except UnicodeDecodeError:
-    try:
-      url = urlnorm.norm(url_unquote(url).decode('latin1'))
-    except UnicodeDecodeError:
-      raise urlnorm.InvalidUrl
   except (AttributeError, urlnorm.InvalidUrl):
     # This url is not valid, a better Exception will
     # be raised