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
139
Merge Requests
139
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
2f5b9c1d
Commit
2f5b9c1d
authored
Oct 10, 2022
by
Kazuhiko Shiozaki
Committed by
Jérome Perrin
Aug 21, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
py2/py3: maketrans() is different.
parent
d96222bc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
3 deletions
+11
-3
product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/portal_components/extension.erp5.DocumentExtraction.py
...em/portal_components/extension.erp5.DocumentExtraction.py
+5
-1
product/ERP5/bootstrap/erp5_core/MixinTemplateItem/portal_components/mixin.erp5.CachedConvertableMixin.py
...em/portal_components/mixin.erp5.CachedConvertableMixin.py
+6
-2
No files found.
product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/portal_components/extension.erp5.DocumentExtraction.py
View file @
2f5b9c1d
...
...
@@ -26,9 +26,13 @@
##############################################################################
import
string
,
re
import
six
redundant_chars
=
'"
\
'
.:;,-+<>()*~'
# chars we need to strip from a word before we see if it matches, and from the searchwords to eliminate boolean mode chars
tr
=
string
.
maketrans
(
redundant_chars
,
' '
*
len
(
redundant_chars
))
if
six
.
PY2
:
tr
=
string
.
maketrans
(
redundant_chars
,
' '
*
len
(
redundant_chars
))
else
:
tr
=
str
.
maketrans
(
''
,
''
,
redundant_chars
)
class
Done
(
Exception
):
pass
...
...
product/ERP5/bootstrap/erp5_core/MixinTemplateItem/portal_components/mixin.erp5.CachedConvertableMixin.py
View file @
2f5b9c1d
...
...
@@ -103,8 +103,12 @@ class CachedConvertableMixin:
http://pypi.python.org/pypi/uuid/ to generate
a uuid stored as private property.
"""
format_cache_id
=
str
(
makeSortedTuple
(
kw
)).
\
translate
(
string
.
maketrans
(
''
,
''
),
'[]()<>
\
'
", '
)
if
six
.
PY2
:
format_cache_id
=
str
(
makeSortedTuple
(
kw
)).
\
translate
(
string
.
maketrans
(
''
,
''
),
'[]()<>
\
'
", '
)
else
:
format_cache_id
=
str
(
makeSortedTuple
(
kw
)).
\
translate
(
str
.
maketrans
(
''
,
''
,
'[]()<>
\
'
", '
))
return
'%s:%s:%s'
%
(
aq_base
(
self
).
getUid
(),
self
.
getRevision
(),
format_cache_id
)
...
...
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