zope4py3: urlnorm not maintained upstream and only available for python2.

eef397c1 · Arnaud Fontaine · 00b1c64d · eef397c1
Commit eef397c1 authored Mar 14, 2022 by Arnaud Fontaine
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

product/ERP5Type/Utils.py product/ERP5Type/Utils.py +7 -5

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