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
42b5e0ca
Commit
42b5e0ca
authored
Jul 21, 2023
by
Emmy Vouriot
Committed by
Jérome Perrin
May 20, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WIP: Python 2 to 3 fixes - add py2 compatibility
parent
6da543eb
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
+9
-2
product/ERP5Form/ImageField.py
product/ERP5Form/ImageField.py
+3
-0
product/ERP5OOo/FormPrintout.py
product/ERP5OOo/FormPrintout.py
+6
-2
No files found.
product/ERP5Form/ImageField.py
View file @
42b5e0ca
...
@@ -34,6 +34,7 @@ from OFS.Image import Image as OFSImage
...
@@ -34,6 +34,7 @@ from OFS.Image import Image as OFSImage
from
lxml.etree
import
Element
from
lxml.etree
import
Element
from
lxml
import
etree
from
lxml
import
etree
import
re
import
re
import
six
DRAW_URI
=
'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0'
DRAW_URI
=
'urn:oasis:names:tc:opendocument:xmlns:drawing:1.0'
TEXT_URI
=
'urn:oasis:names:tc:opendocument:xmlns:text:1.0'
TEXT_URI
=
'urn:oasis:names:tc:opendocument:xmlns:text:1.0'
...
@@ -145,6 +146,8 @@ class ImageFieldWidget(Widget.TextWidget):
...
@@ -145,6 +146,8 @@ class ImageFieldWidget(Widget.TextWidget):
if
value
in
(
''
,
None
):
if
value
in
(
''
,
None
):
return
None
return
None
path
=
'/'
.
join
(
REQUEST
.
physicalPathFromURL
(
value
))
path
=
'/'
.
join
(
REQUEST
.
physicalPathFromURL
(
value
))
if
six
.
PY2
:
path
=
path
.
encode
()
image_object
=
field
.
getPortalObject
().
restrictedTraverse
(
path
)
image_object
=
field
.
getPortalObject
().
restrictedTraverse
(
path
)
display
=
field
.
get_value
(
'image_display'
)
display
=
field
.
get_value
(
'image_display'
)
format
=
field
.
get_value
(
'image_format'
)
format
=
field
.
get_value
(
'image_format'
)
...
...
product/ERP5OOo/FormPrintout.py
View file @
42b5e0ca
...
@@ -1107,6 +1107,10 @@ class ODGStrategy(ODFStrategy):
...
@@ -1107,6 +1107,10 @@ class ODGStrategy(ODFStrategy):
text_xpath = '//draw:frame[@draw:name="
%
s
"]' % field.id
text_xpath = '//draw:frame[@draw:name="
%
s
"]' % field.id
node_list = element_tree.xpath(text_xpath, namespaces=element_tree.nsmap)
node_list = element_tree.xpath(text_xpath, namespaces=element_tree.nsmap)
value = field.get_value('default')
value = field.get_value('default')
if six.PY2:
if isinstance(value, str):
value = value.decode('utf-8')
else:
if isinstance(value, bytes):
if isinstance(value, bytes):
value = value.decode('utf-8')
value = value.decode('utf-8')
for target_node in node_list:
for target_node in node_list:
...
...
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