py2/py3: use urlnorm in Python 3 as well.

59a7c56b · Kazuhiko Shiozaki · Jérome Perrin · 84476905 · 59a7c56b
Commit 59a7c56b authored Oct 21, 2022 by Kazuhiko Shiozaki Committed by Jérome Perrin May 08, 2024
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

product/ERP5Type/Utils.py product/ERP5Type/Utils.py +4 -6

No files found.
--- a/product/ERP5Type/Utils.py
+++ b/product/ERP5Type/Utils.py
@@ -1684,13 +1684,11 @@ class ScalarMaxConflictResolver(persistent.Persistent):
 #  URL Normaliser #
 ###################
 from Products.PythonScripts.standard import url_unquote
-# No new release of urlnorm since 2016 and no py3 support
 urlnorm = None
-if six.PY2:
+try:
-  try:
+  import urlnorm
-    import urlnorm
+except ImportError:
-  except ImportError:
+  warnings.warn("urlnorm lib is not installed", DeprecationWarning)
-    warnings.warn("urlnorm lib is not installed", DeprecationWarning)
 from six.moves.urllib.parse import urlsplit, urlunsplit, urljoin
 # Regular expressions