try to parse latin-1 encoded url (even though that is invalid according to RFC 3986).

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

product/ERP5Type/Utils.py

@@ -3187,6 +3187,7 @@ class ScalarMaxConflictResolver(persistent.Persistent):
 ###################
 #  URL Normaliser #
 ###################
+from Products.PythonScripts.standard import url_unquote
 try:
   import urlnorm
 except ImportError:
@@ -3258,6 +3259,11 @@ def urlnormNormaliseUrl(url, base_url=None):
   """
   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