Commit 9bf29f40 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

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

parent 4810bd1c
...@@ -1691,12 +1691,10 @@ class ScalarMaxConflictResolver(persistent.Persistent): ...@@ -1691,12 +1691,10 @@ class ScalarMaxConflictResolver(persistent.Persistent):
# URL Normaliser # # URL Normaliser #
################### ###################
from Products.PythonScripts.standard import url_unquote from Products.PythonScripts.standard import url_unquote
# No new release of urlnorm since 2016 and no py3 support
urlnorm = None 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 from six.moves.urllib.parse import urlsplit, urlunsplit, urljoin
......
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