urlnormNormaliseUrl: make exception handling consistent

"raise urlnorm.InvalidUrl" was not catched because it was in an except clause.

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

product/ERP5Type/Utils.py

@@ -3310,14 +3310,12 @@ def legacyNormalizeUrl(url, base_url=None):
 def urlnormNormaliseUrl(url, base_url=None):
   """The normalisation up is delegated to urlnorm library.
   """
+  try:
     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):
+  except (AttributeError, UnicodeDecodeError, urlnorm.InvalidUrl):
     # This url is not valid, a better Exception will
     # be raised
     return