Commit eef397c1 authored by Arnaud Fontaine's avatar Arnaud Fontaine

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

parent 00b1c64d
...@@ -1639,11 +1639,13 @@ class ScalarMaxConflictResolver(persistent.Persistent): ...@@ -1639,11 +1639,13 @@ class ScalarMaxConflictResolver(persistent.Persistent):
# URL Normaliser # # URL Normaliser #
################### ###################
from Products.PythonScripts.standard import url_unquote from Products.PythonScripts.standard import url_unquote
try: # No new release of urlnorm since 2016 and no py3 support
urlnorm = None
if six.PY2:
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)
urlnorm = None
import urllib.parse as urlparse import urllib.parse as urlparse
import urllib import urllib
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment