Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Jérome Perrin
erp5
Commits
0c6dbb9c
Commit
0c6dbb9c
authored
2 years ago
by
Kazuhiko Shiozaki
Committed by
Jérome Perrin
10 months ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
py2/py3: use urlnorm in Python 3 as well.
parent
7f20a496
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
6 deletions
+4
-6
product/ERP5Type/Utils.py
product/ERP5Type/Utils.py
+4
-6
No files found.
product/ERP5Type/Utils.py
View file @
0c6dbb9c
...
...
@@ -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
:
import
urlnorm
except
ImportError
:
warnings
.
warn
(
"urlnorm lib is not installed"
,
DeprecationWarning
)
try
:
import
urlnorm
except
ImportError
:
warnings
.
warn
(
"urlnorm lib is not installed"
,
DeprecationWarning
)
from
six.moves.urllib.parse
import
urlsplit
,
urlunsplit
,
urljoin
# Regular expressions
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment