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
7251e5e9
Commit
7251e5e9
authored
2 years ago
by
Kazuhiko Shiozaki
Committed by
Jérome Perrin
8 months ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WIP: py2/py3: BusinessTemplate.py.
parent
6de16264
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
6 deletions
+9
-6
product/ERP5/Document/BusinessTemplate.py
product/ERP5/Document/BusinessTemplate.py
+9
-6
No files found.
product/ERP5/Document/BusinessTemplate.py
View file @
7251e5e9
...
...
@@ -93,6 +93,10 @@ from difflib import unified_diff
import
posixpath
import
transaction
import
inspect
if
six
.
PY2
:
BufferedReader
=
file
else
:
from
io
import
BufferedReader
import
threading
from
ZODB.broken
import
Broken
,
BrokenModified
...
...
@@ -343,9 +347,11 @@ class BusinessTemplateArchive(object):
try
:
write
=
self
.
_writeFile
except
AttributeError
:
if
not
isinstance
(
obj
,
str
):
if
not
isinstance
(
obj
,
(
bytes
,
str
)
):
obj
.
seek
(
0
)
obj
=
obj
.
read
()
elif
not
isinstance
(
obj
,
bytes
):
obj
=
obj
.
encode
(
'utf-8'
)
self
.
revision
.
hash
(
path
,
obj
)
self
.
_writeString
(
obj
,
path
)
else
:
...
...
@@ -373,11 +379,8 @@ class BusinessTemplateFolder(BusinessTemplateArchive):
object_path
=
os
.
path
.
join
(
self
.
path
,
path
)
path
=
os
.
path
.
dirname
(
object_path
)
os
.
path
.
exists
(
path
)
or
os
.
makedirs
(
path
)
f
=
open
(
object_path
,
'wb'
)
try
:
with
open
(
object_path
,
'wb'
)
as
f
:
f
.
write
(
obj
)
finally
:
f
.
close
()
def
importFiles
(
self
,
item
):
"""
...
...
@@ -918,7 +921,7 @@ class ObjectTemplateItem(BaseTemplateItem):
else
:
connection
=
self
.
getConnection
(
self
.
aq_parent
)
__traceback_info__
=
'Importing %s'
%
file_name
if
hasattr
(
cache_database
,
'db'
)
and
isinstance
(
file_obj
,
file
):
if
hasattr
(
cache_database
,
'db'
)
and
isinstance
(
file_obj
,
BufferedReader
):
obj
=
connection
.
importFile
(
self
.
_compileXML
(
file_obj
))
else
:
# FIXME: Why not use the importXML function directly? Are there any BT5s
...
...
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