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
c7cb731e
Commit
c7cb731e
authored
Oct 10, 2022
by
Kazuhiko Shiozaki
Committed by
Arnaud Fontaine
Jul 07, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
py2/py3: data property is for binary, thus getData() should return bytes.
parent
8c325d1d
Pipeline
#35833
failed with stage
in 0 seconds
Changes
12
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
81 additions
and
60 deletions
+81
-60
bt5/erp5_base/DocumentTemplateItem/portal_components/document.erp5.Image.py
...mentTemplateItem/portal_components/document.erp5.Image.py
+4
-5
bt5/erp5_base/DocumentTemplateItem/portal_components/document.erp5.OOoDocument.py
...mplateItem/portal_components/document.erp5.OOoDocument.py
+18
-17
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Presentation_viewAsSlideshow.py
...s/erp5_corporate_identity/Presentation_viewAsSlideshow.py
+5
-1
bt5/erp5_dms/DocumentTemplateItem/portal_components/document.erp5.PDFDocument.py
...mplateItem/portal_components/document.erp5.PDFDocument.py
+12
-9
bt5/erp5_officejs_appstore_base/SkinTemplateItem/portal_skins/erp5_officejs_appstore_base/SoftwarePublication_submitSoftwarePublication.py
...ore_base/SoftwarePublication_submitSoftwarePublication.py
+3
-3
product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.File.py
...umentTemplateItem/portal_components/document.erp5.File.py
+3
-2
product/ERP5/bootstrap/erp5_core/MixinTemplateItem/portal_components/mixin.erp5.CachedConvertableMixin.py
...em/portal_components/mixin.erp5.CachedConvertableMixin.py
+11
-7
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Data/data_property.xml
...emplateItem/portal_property_sheets/Data/data_property.xml
+1
-1
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Document/base_data_property.xml
...em/portal_property_sheets/Document/base_data_property.xml
+1
-1
product/ERP5OOo/FormPrintout.py
product/ERP5OOo/FormPrintout.py
+9
-7
product/ERP5OOo/OOoTemplate.py
product/ERP5OOo/OOoTemplate.py
+5
-4
product/ERP5Type/Accessor/TypeDefinition.py
product/ERP5Type/Accessor/TypeDefinition.py
+9
-3
No files found.
bt5/erp5_base/DocumentTemplateItem/portal_components/document.erp5.Image.py
View file @
c7cb731e
...
@@ -32,8 +32,7 @@
...
@@ -32,8 +32,7 @@
import
os
import
os
import
subprocess
import
subprocess
from
cStringIO
import
StringIO
from
io
import
BytesIO
from
AccessControl
import
ClassSecurityInfo
from
AccessControl
import
ClassSecurityInfo
from
Acquisition
import
aq_base
from
Acquisition
import
aq_base
...
@@ -117,7 +116,7 @@ class Image(TextConvertableMixin, File, OFSImage):
...
@@ -117,7 +116,7 @@ class Image(TextConvertableMixin, File, OFSImage):
content_type
,
width
,
height
=
getImageInfo
(
self
.
data
)
content_type
,
width
,
height
=
getImageInfo
(
self
.
data
)
if
not
content_type
:
if
not
content_type
:
try
:
try
:
image
=
PIL
.
Image
.
open
(
StringIO
(
str
(
self
.
data
)))
image
=
PIL
.
Image
.
open
(
BytesIO
(
bytes
(
self
.
data
)))
except
IOError
:
except
IOError
:
width
=
height
=
-
1
width
=
height
=
-
1
content_type
=
'application/unknown'
content_type
=
'application/unknown'
...
@@ -381,7 +380,7 @@ class Image(TextConvertableMixin, File, OFSImage):
...
@@ -381,7 +380,7 @@ class Image(TextConvertableMixin, File, OFSImage):
else
:
else
:
parameter_list
.
append
(
'-'
)
parameter_list
.
append
(
'-'
)
data
=
str
(
self
.
getData
())
data
=
bytes
(
self
.
getData
())
if
self
.
getContentType
()
==
"image/svg+xml"
:
if
self
.
getContentType
()
==
"image/svg+xml"
:
data
=
transformUrlToDataURI
(
data
)
data
=
transformUrlToDataURI
(
data
)
...
@@ -401,7 +400,7 @@ class Image(TextConvertableMixin, File, OFSImage):
...
@@ -401,7 +400,7 @@ class Image(TextConvertableMixin, File, OFSImage):
finally
:
finally
:
del
process
del
process
if
image
:
if
image
:
return
String
IO
(
image
)
return
Bytes
IO
(
image
)
raise
ConversionError
(
'Image conversion failed (%s).'
%
err
)
raise
ConversionError
(
'Image conversion failed (%s).'
%
err
)
def
_getContentTypeAndImageData
(
def
_getContentTypeAndImageData
(
...
...
bt5/erp5_base/DocumentTemplateItem/portal_components/document.erp5.OOoDocument.py
View file @
c7cb731e
...
@@ -27,7 +27,8 @@
...
@@ -27,7 +27,8 @@
#
#
##############################################################################
##############################################################################
import
re
,
zipfile
,
cStringIO
import
re
,
zipfile
from
io
import
BytesIO
from
warnings
import
warn
from
warnings
import
warn
from
AccessControl
import
ClassSecurityInfo
from
AccessControl
import
ClassSecurityInfo
from
OFS.Image
import
Pdata
from
OFS.Image
import
Pdata
...
@@ -38,7 +39,7 @@ from Products.ERP5Type.Cache import CachingMethod
...
@@ -38,7 +39,7 @@ from Products.ERP5Type.Cache import CachingMethod
from
erp5.component.document.File
import
File
from
erp5.component.document.File
import
File
from
erp5.component.document.Document
import
Document
,
\
from
erp5.component.document.Document
import
Document
,
\
VALID_IMAGE_FORMAT_LIST
,
ConversionError
,
NotConvertedError
VALID_IMAGE_FORMAT_LIST
,
ConversionError
,
NotConvertedError
from
Products.ERP5Type.Utils
import
fill_args_from_request
from
Products.ERP5Type.Utils
import
bytes2str
,
fill_args_from_request
,
str2bytes
# Mixin Import
# Mixin Import
from
erp5.component.mixin.BaseConvertableFileMixin
import
BaseConvertableFileMixin
from
erp5.component.mixin.BaseConvertableFileMixin
import
BaseConvertableFileMixin
...
@@ -198,10 +199,10 @@ class OOoDocument(OOoDocumentExtensibleTraversableMixin, BaseConvertableFileMixi
...
@@ -198,10 +199,10 @@ class OOoDocument(OOoDocumentExtensibleTraversableMixin, BaseConvertableFileMixi
raise NotConvertedError()
raise NotConvertedError()
if format == '
text
-
content
':
if format == '
text
-
content
':
# Extract text from the ODF file
# Extract text from the ODF file
cs =
cStringIO.String
IO()
cs =
Bytes
IO()
cs.write(s
tr(self.getBaseData()
))
cs.write(s
elf.getBaseData(
))
z = zipfile.ZipFile(cs)
z = zipfile.ZipFile(cs)
s =
z.read('
content
.
xml
'
)
s =
bytes2str(z.read('
content
.
xml
')
)
s = self.rx_strip.sub(" ", s) # strip xml
s = self.rx_strip.sub(" ", s) # strip xml
s = self.rx_compr.sub(" ", s) # compress multiple spaces
s = self.rx_compr.sub(" ", s) # compress multiple spaces
cs.close()
cs.close()
...
@@ -210,7 +211,7 @@ class OOoDocument(OOoDocumentExtensibleTraversableMixin, BaseConvertableFileMixi
...
@@ -210,7 +211,7 @@ class OOoDocument(OOoDocumentExtensibleTraversableMixin, BaseConvertableFileMixi
server_proxy = DocumentConversionServerProxy(self)
server_proxy = DocumentConversionServerProxy(self)
orig_format = self.getBaseContentType()
orig_format = self.getBaseContentType()
generate_result = server_proxy.run_generate(self.getId(),
generate_result = server_proxy.run_generate(self.getId(),
enc(str(self.getBaseData(
))),
bytes2str(enc(bytes(self.getBaseData()
))),
None,
None,
format,
format,
orig_format)
orig_format)
...
@@ -222,7 +223,7 @@ class OOoDocument(OOoDocumentExtensibleTraversableMixin, BaseConvertableFileMixi
...
@@ -222,7 +223,7 @@ class OOoDocument(OOoDocumentExtensibleTraversableMixin, BaseConvertableFileMixi
response_dict = generate_result
response_dict = generate_result
# XXX: handle possible OOOd server failure
# XXX: handle possible OOOd server failure
return response_dict['
mime
'], Pdata(dec(
response_dict['
data
']
))
return response_dict['
mime
'], Pdata(dec(
str2bytes(response_dict['
data
'])
))
# Conversion API
# Conversion API
def _convert(self, format, frame=0, **kw): # pylint: disable=redefined-builtin
def _convert(self, format, frame=0, **kw): # pylint: disable=redefined-builtin
...
@@ -258,7 +259,7 @@ class OOoDocument(OOoDocumentExtensibleTraversableMixin, BaseConvertableFileMixi
...
@@ -258,7 +259,7 @@ class OOoDocument(OOoDocumentExtensibleTraversableMixin, BaseConvertableFileMixi
original_format
=
format
original_format
=
format
allowed_format_list
=
self
.
getTargetFormatList
()
allowed_format_list
=
self
.
getTargetFormatList
()
if
format
==
'base-data'
:
if
format
==
'base-data'
:
return
self
.
getBaseContentType
(),
s
tr
(
self
.
getBaseData
()
)
return
self
.
getBaseContentType
(),
s
elf
.
getBaseData
(
)
if
format
==
'pdf'
:
if
format
==
'pdf'
:
format_list
=
[
x
for
x
in
allowed_format_list
format_list
=
[
x
for
x
in
allowed_format_list
if
x
.
endswith
(
'pdf'
)]
if
x
.
endswith
(
'pdf'
)]
...
@@ -301,8 +302,8 @@ class OOoDocument(OOoDocumentExtensibleTraversableMixin, BaseConvertableFileMixi
...
@@ -301,8 +302,8 @@ class OOoDocument(OOoDocumentExtensibleTraversableMixin, BaseConvertableFileMixi
if
is_html
:
if
is_html
:
# Extra processing required since
# Extra processing required since
# we receive a zip file
# we receive a zip file
cs
=
cStringIO
.
String
IO
()
cs
=
Bytes
IO
()
cs
.
write
(
str
(
data
))
cs
.
write
(
bytes
(
data
))
# Cast explicitly to bytes for possible Pdata
z
=
zipfile
.
ZipFile
(
cs
)
# A disk file would be more RAM efficient
z
=
zipfile
.
ZipFile
(
cs
)
# A disk file would be more RAM efficient
for
f
in
z
.
infolist
():
for
f
in
z
.
infolist
():
fn
=
f
.
filename
fn
=
f
.
filename
...
@@ -324,7 +325,7 @@ class OOoDocument(OOoDocumentExtensibleTraversableMixin, BaseConvertableFileMixi
...
@@ -324,7 +325,7 @@ class OOoDocument(OOoDocumentExtensibleTraversableMixin, BaseConvertableFileMixi
# create temporary image and use it to resize accordingly
# create temporary image and use it to resize accordingly
temp_image
=
self
.
portal_contributions
.
newContent
(
temp_image
=
self
.
portal_contributions
.
newContent
(
portal_type
=
'Image'
,
portal_type
=
'Image'
,
file
=
cStringIO
.
String
IO
(),
file
=
Bytes
IO
(),
filename
=
self
.
getId
(),
filename
=
self
.
getId
(),
temp_object
=
1
)
temp_object
=
1
)
temp_image
.
_setData
(
data
)
temp_image
.
_setData
(
data
)
...
@@ -346,8 +347,8 @@ class OOoDocument(OOoDocumentExtensibleTraversableMixin, BaseConvertableFileMixi
...
@@ -346,8 +347,8 @@ class OOoDocument(OOoDocumentExtensibleTraversableMixin, BaseConvertableFileMixi
format_list
=
[
x
for
x
in
self
.
getTargetFormatList
()
format_list
=
[
x
for
x
in
self
.
getTargetFormatList
()
if
x
.
startswith
(
'html'
)
or
x
.
endswith
(
'html'
)]
if
x
.
startswith
(
'html'
)
or
x
.
endswith
(
'html'
)]
mime
,
data
=
self
.
_getConversionFromProxyServer
(
format_list
[
0
])
mime
,
data
=
self
.
_getConversionFromProxyServer
(
format_list
[
0
])
archive_file
=
cStringIO
.
String
IO
()
archive_file
=
Bytes
IO
()
archive_file
.
write
(
str
(
data
)
)
archive_file
.
write
(
data
)
zip_file
=
zipfile
.
ZipFile
(
archive_file
)
zip_file
=
zipfile
.
ZipFile
(
archive_file
)
must_close
=
1
must_close
=
1
else
:
else
:
...
@@ -384,13 +385,13 @@ class OOoDocument(OOoDocumentExtensibleTraversableMixin, BaseConvertableFileMixi
...
@@ -384,13 +385,13 @@ class OOoDocument(OOoDocumentExtensibleTraversableMixin, BaseConvertableFileMixi
server_proxy
=
DocumentConversionServerProxy
(
self
)
server_proxy
=
DocumentConversionServerProxy
(
self
)
response_code
,
response_dict
,
response_message
=
server_proxy
.
run_convert
(
response_code
,
response_dict
,
response_message
=
server_proxy
.
run_convert
(
self
.
getFilename
()
or
self
.
getId
(),
self
.
getFilename
()
or
self
.
getId
(),
enc
(
str
(
self
.
getData
(
))),
bytes2str
(
enc
(
bytes
(
self
.
getData
()
))),
None
,
None
,
None
,
None
,
self
.
getContentType
())
self
.
getContentType
())
if
response_code
==
200
:
if
response_code
==
200
:
# sucessfully converted document
# sucessfully converted document
self
.
_setBaseData
(
dec
(
response_dict
[
'data'
]
))
self
.
_setBaseData
(
dec
(
str2bytes
(
response_dict
[
'data'
])
))
metadata
=
response_dict
[
'meta'
]
metadata
=
response_dict
[
'meta'
]
self
.
_base_metadata
=
metadata
self
.
_base_metadata
=
metadata
if
metadata
.
get
(
'MIMEType'
,
None
)
is
not
None
:
if
metadata
.
get
(
'MIMEType'
,
None
)
is
not
None
:
...
@@ -423,11 +424,11 @@ class OOoDocument(OOoDocumentExtensibleTraversableMixin, BaseConvertableFileMixi
...
@@ -423,11 +424,11 @@ class OOoDocument(OOoDocumentExtensibleTraversableMixin, BaseConvertableFileMixi
server_proxy
=
DocumentConversionServerProxy
(
self
)
server_proxy
=
DocumentConversionServerProxy
(
self
)
response_code
,
response_dict
,
response_message
=
\
response_code
,
response_dict
,
response_message
=
\
server_proxy
.
run_setmetadata
(
self
.
getId
(),
server_proxy
.
run_setmetadata
(
self
.
getId
(),
enc
(
str
(
self
.
getBaseData
(
))),
bytes2str
(
enc
(
bytes
(
self
.
getBaseData
()
))),
kw
)
kw
)
if
response_code
==
200
:
if
response_code
==
200
:
# successful meta data extraction
# successful meta data extraction
self
.
_setBaseData
(
dec
(
response_dict
[
'data'
]
))
self
.
_setBaseData
(
dec
(
str2bytes
(
response_dict
[
'data'
])
))
self
.
updateFileMetadata
()
# record in workflow history # XXX must put appropriate comments.
self
.
updateFileMetadata
()
# record in workflow history # XXX must put appropriate comments.
else
:
else
:
# Explicitly raise the exception!
# Explicitly raise the exception!
...
...
bt5/erp5_corporate_identity/SkinTemplateItem/portal_skins/erp5_corporate_identity/Presentation_viewAsSlideshow.py
View file @
c7cb731e
...
@@ -29,7 +29,11 @@ if context.getPortalType() in ["Presentation"]:
...
@@ -29,7 +29,11 @@ if context.getPortalType() in ["Presentation"]:
portal
=
context
.
getPortalObject
()
portal
=
context
.
getPortalObject
()
mimetype
=
'text/html'
mimetype
=
'text/html'
content_type
=
context
.
getContentType
()
content_type
=
context
.
getContentType
()
raw_data
=
portal
.
portal_transforms
.
convertToData
(
mimetype
,
str
(
context
.
getData
()
or
""
),
context
=
context
,
mimetype
=
content_type
)
raw_data
=
portal
.
portal_transforms
.
convertToData
(
mimetype
,
bytes
(
context
.
getData
()
or
b""
),
context
=
context
,
mimetype
=
content_type
)
if
raw_data
is
None
:
if
raw_data
is
None
:
raise
ValueError
(
"Failed to convert to %r"
%
mimetype
)
raise
ValueError
(
"Failed to convert to %r"
%
mimetype
)
if
context
.
REQUEST
is
not
None
:
if
context
.
REQUEST
is
not
None
:
...
...
bt5/erp5_dms/DocumentTemplateItem/portal_components/document.erp5.PDFDocument.py
View file @
c7cb731e
...
@@ -32,13 +32,16 @@ import zope.interface
...
@@ -32,13 +32,16 @@ import zope.interface
from
AccessControl
import
ClassSecurityInfo
from
AccessControl
import
ClassSecurityInfo
from
Products.ERP5Type
import
Permissions
,
PropertySheet
from
Products.ERP5Type
import
Permissions
,
PropertySheet
from
Products.ERP5Type.Utils
import
bytes2str
from
erp5.component.interface.IWatermarkable
import
IWatermarkable
from
erp5.component.interface.IWatermarkable
import
IWatermarkable
from
erp5.component.document.Image
import
Image
from
erp5.component.document.Image
import
Image
from
erp5.component.document.Document
import
ConversionError
from
erp5.component.document.Document
import
ConversionError
from
subprocess
import
Popen
,
PIPE
from
subprocess
import
Popen
,
PIPE
from
zLOG
import
LOG
,
INFO
,
PROBLEM
from
zLOG
import
LOG
,
INFO
,
PROBLEM
import
errno
import
errno
from
StringIO
import
StringIO
from
io
import
BytesIO
from
six.moves
import
range
import
six
@
zope
.
interface
.
implementer
(
IWatermarkable
)
@
zope
.
interface
.
implementer
(
IWatermarkable
)
class
PDFDocument
(
Image
):
class
PDFDocument
(
Image
):
...
@@ -90,8 +93,8 @@ class PDFDocument(Image):
...
@@ -90,8 +93,8 @@ class PDFDocument(Image):
raise
ValueError
(
"watermark_data cannot not be empty"
)
raise
ValueError
(
"watermark_data cannot not be empty"
)
if
not
self
.
hasData
():
if
not
self
.
hasData
():
raise
ValueError
(
"Cannot watermark an empty document"
)
raise
ValueError
(
"Cannot watermark an empty document"
)
self_reader
=
PdfFileReader
(
String
IO
(
self
.
getData
()))
self_reader
=
PdfFileReader
(
Bytes
IO
(
self
.
getData
()))
watermark_reader
=
PdfFileReader
(
String
IO
(
watermark_data
))
watermark_reader
=
PdfFileReader
(
Bytes
IO
(
watermark_data
))
watermark_page_count
=
watermark_reader
.
getNumPages
()
watermark_page_count
=
watermark_reader
.
getNumPages
()
output
=
PdfFileWriter
()
output
=
PdfFileWriter
()
...
@@ -109,7 +112,7 @@ class PDFDocument(Image):
...
@@ -109,7 +112,7 @@ class PDFDocument(Image):
self_page
.
mergePage
(
watermark_page
)
self_page
.
mergePage
(
watermark_page
)
output
.
addPage
(
self_page
)
output
.
addPage
(
self_page
)
outputStream
=
String
IO
()
outputStream
=
Bytes
IO
()
output
.
write
(
outputStream
)
output
.
write
(
outputStream
)
return
outputStream
.
getvalue
()
return
outputStream
.
getvalue
()
...
@@ -171,7 +174,7 @@ class PDFDocument(Image):
...
@@ -171,7 +174,7 @@ class PDFDocument(Image):
"""
"""
if
not
self
.
hasData
():
if
not
self
.
hasData
():
return
''
return
''
data
=
str
(
self
.
getData
())
data
=
bytes
(
self
.
getData
())
try
:
try
:
from
PyPDF2
import
PdfFileReader
from
PyPDF2
import
PdfFileReader
from
PyPDF2.utils
import
PdfReadError
from
PyPDF2.utils
import
PdfReadError
...
@@ -179,7 +182,7 @@ class PDFDocument(Image):
...
@@ -179,7 +182,7 @@ class PDFDocument(Image):
pass
pass
else
:
else
:
try
:
try
:
if
PdfFileReader
(
String
IO
(
data
)).
isEncrypted
:
if
PdfFileReader
(
Bytes
IO
(
data
)).
isEncrypted
:
return
''
return
''
except
PdfReadError
:
except
PdfReadError
:
return
''
return
''
...
@@ -344,7 +347,7 @@ class PDFDocument(Image):
...
@@ -344,7 +347,7 @@ class PDFDocument(Image):
raise
raise
result
=
{}
result
=
{}
for
line
in
command_result
.
splitlines
():
for
line
in
bytes2str
(
command_result
)
.
splitlines
():
item_list
=
line
.
split
(
':'
)
item_list
=
line
.
split
(
':'
)
key
=
item_list
[
0
].
strip
()
key
=
item_list
[
0
].
strip
()
value
=
':'
.
join
(
item_list
[
1
:]).
strip
()
value
=
':'
.
join
(
item_list
[
1
:]).
strip
()
...
@@ -360,9 +363,9 @@ class PDFDocument(Image):
...
@@ -360,9 +363,9 @@ class PDFDocument(Image):
else
:
else
:
try
:
try
:
pdf_file
=
PdfFileReader
(
tmp
)
pdf_file
=
PdfFileReader
(
tmp
)
for
info_key
,
info_value
in
(
pdf_file
.
getDocumentInfo
()
or
{}).
iteritems
(
):
for
info_key
,
info_value
in
six
.
iteritems
(
pdf_file
.
getDocumentInfo
()
or
{}
):
info_key
=
info_key
.
lstrip
(
"/"
)
info_key
=
info_key
.
lstrip
(
"/"
)
if
isinstance
(
info_value
,
unicod
e
):
if
six
.
PY2
and
isinstance
(
info_value
,
six
.
text_typ
e
):
info_value
=
info_value
.
encode
(
"utf-8"
)
info_value
=
info_value
.
encode
(
"utf-8"
)
# Ignore values that cannot be pickled ( such as AAPL:Keywords )
# Ignore values that cannot be pickled ( such as AAPL:Keywords )
...
...
bt5/erp5_officejs_appstore_base/SkinTemplateItem/portal_skins/erp5_officejs_appstore_base/SoftwarePublication_submitSoftwarePublication.py
View file @
c7cb731e
...
@@ -60,12 +60,12 @@ if not zip_file:
...
@@ -60,12 +60,12 @@ if not zip_file:
rejectSoftwarePublication
(
software_publication
)
rejectSoftwarePublication
(
software_publication
)
return
return
from
cStringIO
import
String
IO
from
io
import
Bytes
IO
import
zipfile
import
zipfile
from
zipfile
import
BadZipfile
from
zipfile
import
BadZipfile
zipbuffer
=
String
IO
()
zipbuffer
=
Bytes
IO
()
zipbuffer
.
write
(
str
(
zip_file
.
getData
()))
zipbuffer
.
write
(
bytes
(
zip_file
.
getData
()))
try
:
try
:
zip_reader
=
zipfile
.
ZipFile
(
zipbuffer
)
zip_reader
=
zipfile
.
ZipFile
(
zipbuffer
)
except
BadZipfile
:
except
BadZipfile
:
...
...
product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.File.py
View file @
c7cb731e
...
@@ -38,7 +38,6 @@ from Products.ERP5Type.Base import Base, removeIContentishInterface
...
@@ -38,7 +38,6 @@ from Products.ERP5Type.Base import Base, removeIContentishInterface
from
OFS.Image
import
File
as
OFS_File
from
OFS.Image
import
File
as
OFS_File
from
Products.ERP5Type.Utils
import
deprecated
from
Products.ERP5Type.Utils
import
deprecated
_MARKER
=
object
()
_MARKER
=
object
()
class
File
(
Document
,
OFS_File
):
class
File
(
Document
,
OFS_File
):
...
@@ -67,7 +66,7 @@ class File(Document, OFS_File):
...
@@ -67,7 +66,7 @@ class File(Document, OFS_File):
security
.
declareObjectProtected
(
Permissions
.
AccessContentsInformation
)
security
.
declareObjectProtected
(
Permissions
.
AccessContentsInformation
)
# Default global values
# Default global values
data
=
''
# A hack required to use OFS.Image.index_html without calling OFS.Image.__init__
data
=
b
''
# A hack required to use OFS.Image.index_html without calling OFS.Image.__init__
# Default Properties
# Default Properties
property_sheets
=
(
PropertySheet
.
Base
property_sheets
=
(
PropertySheet
.
Base
...
@@ -186,6 +185,8 @@ class File(Document, OFS_File):
...
@@ -186,6 +185,8 @@ class File(Document, OFS_File):
if
data
is
None
:
if
data
is
None
:
return
None
return
None
else
:
else
:
if
six
.
PY3
and
isinstance
(
data
,
str
):
return
bytes
(
data
,
self
.
_get_encoding
())
return
bytes
(
data
)
return
bytes
(
data
)
# DAV Support
# DAV Support
...
...
product/ERP5/bootstrap/erp5_core/MixinTemplateItem/portal_components/mixin.erp5.CachedConvertableMixin.py
View file @
c7cb731e
...
@@ -37,6 +37,7 @@ from AccessControl import ClassSecurityInfo
...
@@ -37,6 +37,7 @@ from AccessControl import ClassSecurityInfo
from
Products.ERP5Type.Globals
import
InitializeClass
from
Products.ERP5Type.Globals
import
InitializeClass
from
Products.ERP5Type
import
Permissions
from
Products.ERP5Type
import
Permissions
from
Products.ERP5Type.TransactionalVariable
import
getTransactionalVariable
from
Products.ERP5Type.TransactionalVariable
import
getTransactionalVariable
from
Products.ERP5Type.Utils
import
str2bytes
from
OFS.Image
import
Pdata
,
Image
as
OFSImage
from
OFS.Image
import
Pdata
,
Image
as
OFSImage
from
DateTime
import
DateTime
from
DateTime
import
DateTime
...
@@ -130,17 +131,20 @@ class CachedConvertableMixin:
...
@@ -130,17 +131,20 @@ class CachedConvertableMixin:
conversion_md5
=
None
conversion_md5
=
None
size
=
0
size
=
0
elif
isinstance
(
data
,
Pdata
):
elif
isinstance
(
data
,
Pdata
):
cached_value
=
aq_base
(
data
)
cached_value
=
bytes
(
aq_base
(
data
))
size
=
str
(
cached_value
)
# not a size but avoids a 'del' statement
conversion_md5
=
md5
(
cached_value
).
hexdigest
()
conversion_md5
=
md5
(
size
).
hexdigest
()
size
=
len
(
cached_value
)
size
=
len
(
size
)
elif
isinstance
(
data
,
OFSImage
):
elif
isinstance
(
data
,
OFSImage
):
warn
(
'Passing an OFS.Image to setConversion is deprecated'
,
stacklevel
=
1
)
warn
(
'Passing an OFS.Image to setConversion is deprecated'
,
stacklevel
=
1
)
cached_value
=
bytes
(
data
)
conversion_md5
=
md5
(
cached_value
).
hexdigest
()
size
=
len
(
cached_value
)
elif
isinstance
(
data
,
bytes
):
cached_value
=
data
cached_value
=
data
conversion_md5
=
md5
(
str
(
data
.
data
)
).
hexdigest
()
conversion_md5
=
md5
(
cached_value
).
hexdigest
()
size
=
len
(
data
.
data
)
size
=
len
(
cached_value
)
elif
isinstance
(
data
,
six
.
string_types
):
elif
isinstance
(
data
,
six
.
string_types
):
cached_value
=
data
cached_value
=
str2bytes
(
data
)
conversion_md5
=
md5
(
cached_value
).
hexdigest
()
conversion_md5
=
md5
(
cached_value
).
hexdigest
()
size
=
len
(
cached_value
)
size
=
len
(
cached_value
)
elif
isinstance
(
data
,
dict
):
elif
isinstance
(
data
,
dict
):
...
...
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Data/data_property.xml
View file @
c7cb731e
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
property_default
</string>
</key>
<key>
<string>
property_default
</string>
</key>
<value>
<string>
python: \'\'
</string>
</value>
<value>
<string>
python:
b
\'\'
</string>
</value>
</item>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
...
...
product/ERP5/bootstrap/erp5_property_sheets/PropertySheetTemplateItem/portal_property_sheets/Document/base_data_property.xml
View file @
c7cb731e
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
property_default
</string>
</key>
<key>
<string>
property_default
</string>
</key>
<value>
<string>
python: \'\'
</string>
</value>
<value>
<string>
python:
b
\'\'
</string>
</value>
</item>
</item>
</dictionary>
</dictionary>
</pickle>
</pickle>
...
...
product/ERP5OOo/FormPrintout.py
View file @
c7cb731e
...
@@ -37,6 +37,7 @@ from Products.ERP5OOo.OOoUtils import OOoBuilder
...
@@ -37,6 +37,7 @@ from Products.ERP5OOo.OOoUtils import OOoBuilder
from
Products.CMFCore.exceptions
import
AccessControl_Unauthorized
from
Products.CMFCore.exceptions
import
AccessControl_Unauthorized
from
Acquisition
import
Implicit
,
aq_base
from
Acquisition
import
Implicit
,
aq_base
from
Products.ERP5Type.Globals
import
InitializeClass
,
DTMLFile
,
Persistent
from
Products.ERP5Type.Globals
import
InitializeClass
,
DTMLFile
,
Persistent
from
Products.ERP5Type.Utils
import
bytes2str
,
str2bytes
from
AccessControl
import
ClassSecurityInfo
from
AccessControl
import
ClassSecurityInfo
from
OFS.role
import
RoleManager
from
OFS.role
import
RoleManager
from
OFS.SimpleItem
import
Item
from
OFS.SimpleItem
import
Item
...
@@ -290,11 +291,11 @@ class FormPrintout(Implicit, Persistent, RoleManager, Item, PropertyManager):
...
@@ -290,11 +291,11 @@ class FormPrintout(Implicit, Persistent, RoleManager, Item, PropertyManager):
from
erp5.component.document.Document
import
DocumentConversionServerProxy
,
enc
,
dec
from
erp5.component.document.Document
import
DocumentConversionServerProxy
,
enc
,
dec
server_proxy
=
DocumentConversionServerProxy
(
self
)
server_proxy
=
DocumentConversionServerProxy
(
self
)
extension
=
guess_extension
(
content_type
).
strip
(
'.'
)
extension
=
guess_extension
(
content_type
).
strip
(
'.'
)
printout
=
dec
(
s
erver_proxy
.
convertFile
(
enc
(
printout
),
printout
=
dec
(
s
tr2bytes
(
server_proxy
.
convertFile
(
bytes2str
(
enc
(
printout
)
),
extension
,
# source_format
extension
,
# source_format
extension
,
# destination_format
extension
,
# destination_format
False
,
# zip
False
,
# zip
True
))
# refresh
True
))
)
# refresh
# End of temporary implementation
# End of temporary implementation
if
not
format
:
if
not
format
:
if
REQUEST
is
not
None
and
not
batch_mode
:
if
REQUEST
is
not
None
and
not
batch_mode
:
...
@@ -317,7 +318,7 @@ class FormPrintout(Implicit, Persistent, RoleManager, Item, PropertyManager):
...
@@ -317,7 +318,7 @@ class FormPrintout(Implicit, Persistent, RoleManager, Item, PropertyManager):
REQUEST
.
RESPONSE
.
setHeader
(
'Content-type'
,
mime
)
REQUEST
.
RESPONSE
.
setHeader
(
'Content-type'
,
mime
)
REQUEST
.
RESPONSE
.
setHeader
(
'Content-disposition'
,
REQUEST
.
RESPONSE
.
setHeader
(
'Content-disposition'
,
'attachment;filename="%s.%s"'
%
(
filename
,
format
))
'attachment;filename="%s.%s"'
%
(
filename
,
format
))
return
str
(
data
)
return
bytes
(
data
)
InitializeClass
(
FormPrintout
)
InitializeClass
(
FormPrintout
)
...
@@ -574,7 +575,7 @@ class ODFStrategy(Implicit):
...
@@ -574,7 +575,7 @@ class ODFStrategy(Implicit):
path
=
image_field
.
get_value
(
'default'
)
path
=
image_field
.
get_value
(
'default'
)
image_node
=
image_list
[
0
]
image_node
=
image_list
[
0
]
image_frame
=
image_node
.
getparent
()
image_frame
=
image_node
.
getparent
()
if
path
is
not
None
:
if
six
.
PY2
and
path
is
not
None
:
path
=
path
.
encode
()
path
=
path
.
encode
()
picture
=
self
.
getPortalObject
().
restrictedTraverse
(
path
)
picture
=
self
.
getPortalObject
().
restrictedTraverse
(
path
)
picture_data
=
getattr
(
aq_base
(
picture
),
'data'
,
None
)
picture_data
=
getattr
(
aq_base
(
picture
),
'data'
,
None
)
...
@@ -816,19 +817,20 @@ class ODFStrategy(Implicit):
...
@@ -816,19 +817,20 @@ class ODFStrategy(Implicit):
\
n
-> line-breaks
\
n
-> line-breaks
DateTime -> Y-m-d
DateTime -> Y-m-d
"""
"""
assert six.PY2 # TODO-py3
if value is None:
if value is None:
value = ''
value = ''
translated_value = str(value)
if isinstance(value, DateTime):
if isinstance(value, DateTime):
translated_value = value.strftime('%Y-%m-%d')
translated_value = value.strftime('%Y-%m-%d')
elif isinstance(value, bytes):
translated_value = value.decode('utf-8')
else:
translated_value = str(value)
translated_value = escape(translated_value)
translated_value = escape(translated_value)
tab_element_str = '<text:tab xmlns:text="
%
s
"/>' % TEXT_URI
tab_element_str = '<text:tab xmlns:text="
%
s
"/>' % TEXT_URI
line_break_element_str ='<text:line-break xmlns:text="
%
s
"/>' % TEXT_URI
line_break_element_str ='<text:line-break xmlns:text="
%
s
"/>' % TEXT_URI
translated_value = translated_value.replace('
\
t
', tab_element_str)
translated_value = translated_value.replace('
\
t
', tab_element_str)
translated_value = translated_value.replace('
\
r
', '')
translated_value = translated_value.replace('
\
r
', '')
translated_value = translated_value.replace('
\
n
', line_break_element_str)
translated_value = translated_value.replace('
\
n
', line_break_element_str)
translated_value = unicode(str(translated_value),'utf-8')
# create a paragraph
# create a paragraph
template = '<text:p xmlns:text="
%
s
">%s</text:p>'
template = '<text:p xmlns:text="
%
s
">%s</text:p>'
fragment_element_tree = etree.XML(template % (TEXT_URI, translated_value))
fragment_element_tree = etree.XML(template % (TEXT_URI, translated_value))
...
...
product/ERP5OOo/OOoTemplate.py
View file @
c7cb731e
...
@@ -44,10 +44,11 @@ from Acquisition import aq_base
...
@@ -44,10 +44,11 @@ from Acquisition import aq_base
from
AccessControl
import
ClassSecurityInfo
from
AccessControl
import
ClassSecurityInfo
from
.OOoUtils
import
OOoBuilder
from
.OOoUtils
import
OOoBuilder
from
zipfile
import
ZipFile
,
ZIP_DEFLATED
from
zipfile
import
ZipFile
,
ZIP_DEFLATED
from
six.moves
import
cStringIO
as
String
IO
from
io
import
Bytes
IO
import
re
import
re
import
itertools
import
itertools
import
six
import
six
from
Products.ERP5Type.Utils
import
bytes2str
try
:
try
:
from
zExceptions
import
ResourceLockedError
from
zExceptions
import
ResourceLockedError
...
@@ -226,7 +227,7 @@ class OOoTemplate(ZopePageTemplate):
...
@@ -226,7 +227,7 @@ class OOoTemplate(ZopePageTemplate):
self
.
OLE_documents_zipstring
=
None
self
.
OLE_documents_zipstring
=
None
# create a zip archive and store it
# create a zip archive and store it
if
attached_files_list
:
if
attached_files_list
:
memory_file
=
String
IO
()
memory_file
=
Bytes
IO
()
try
:
try
:
zf
=
ZipFile
(
memory_file
,
mode
=
'w'
,
compression
=
ZIP_DEFLATED
)
zf
=
ZipFile
(
memory_file
,
mode
=
'w'
,
compression
=
ZIP_DEFLATED
)
except
RuntimeError
:
except
RuntimeError
:
...
@@ -436,8 +437,8 @@ class OOoTemplate(ZopePageTemplate):
...
@@ -436,8 +437,8 @@ class OOoTemplate(ZopePageTemplate):
draw_object.attrib.update({'{%s}href' % xml_doc.nsmap.get('xlink'): new_path})
draw_object.attrib.update({'{%s}href' % xml_doc.nsmap.get('xlink'): new_path})
draw_object.attrib.update(dict(office_include.attrib))
draw_object.attrib.update(dict(office_include.attrib))
office_include.getparent().replace(office_include, draw_object)
office_include.getparent().replace(office_include, draw_object)
text = etree.tostring(xml_doc, encoding='utf-8', xml_declaration=True,
text =
bytes2str(
etree.tostring(xml_doc, encoding='utf-8', xml_declaration=True,
pretty_print=False
)
pretty_print=False)
)
text = re.sub('<
\
s*o
f
fice:include_img
\
s+(.*?)
\
s*/
\
s*>(?s)
'
, replaceIncludesImg, text)
text = re.sub('<
\
s*o
f
fice:include_img
\
s+(.*?)
\
s*/
\
s*>(?s)
'
, replaceIncludesImg, text)
return (text, attached_files_dict)
return (text, attached_files_dict)
...
...
product/ERP5Type/Accessor/TypeDefinition.py
View file @
c7cb731e
...
@@ -44,6 +44,12 @@ ATTRIBUTE_PREFIX = ''
...
@@ -44,6 +44,12 @@ ATTRIBUTE_PREFIX = ''
def
identity
(
value
):
def
identity
(
value
):
return
value
return
value
def
asData
(
value
):
assert
not
isinstance
(
value
,
six
.
text_type
)
return
value
def
asFloat
(
value
):
def
asFloat
(
value
):
"""
"""
Return the value as a float or a type-specific default value if it fails.
Return the value as a float or a type-specific default value if it fails.
...
@@ -101,7 +107,7 @@ def asString(value):
...
@@ -101,7 +107,7 @@ def asString(value):
if
six
.
PY2
and
isinstance
(
value
,
unicode
):
if
six
.
PY2
and
isinstance
(
value
,
unicode
):
result
=
value
.
encode
(
'utf-8'
)
result
=
value
.
encode
(
'utf-8'
)
elif
six
.
PY3
and
isinstance
(
value
,
bytes
):
elif
six
.
PY3
and
isinstance
(
value
,
bytes
):
result
=
value
.
decode
(
'utf-8'
)
result
=
value
.
decode
(
'utf-8'
,
'surrogateescape'
)
else
:
else
:
result
=
str
(
value
)
result
=
str
(
value
)
except
TypeError
:
except
TypeError
:
...
@@ -195,8 +201,8 @@ type_definition = {
...
@@ -195,8 +201,8 @@ type_definition = {
# which intention is store large data
# which intention is store large data
# such as files of BLOBs. It uses pdata
# such as files of BLOBs. It uses pdata
# structure.
# structure.
'data'
:
{
'cast'
:
identity
,
'data'
:
{
'cast'
:
asData
,
'null'
:
(
''
,
'None'
,
None
,),
'null'
:
(
b''
,
b
'None'
,
None
,),
'default'
:
None
,
'default'
:
None
,
'isList'
:
0
,
'isList'
:
0
,
},
},
...
...
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