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
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
36e72172
Commit
36e72172
authored
Aug 25, 2014
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modify import path of PIL.Image for pillow.
parent
1c9788f4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
8 deletions
+3
-8
bt5/erp5_safeimage/TestTemplateItem/portal_components/test.erp5.testSafeImage.py
...TemplateItem/portal_components/test.erp5.testSafeImage.py
+1
-1
bt5/erp5_safeimage/bt/revision
bt5/erp5_safeimage/bt/revision
+1
-1
product/ERP5/tests/testERP5WebWithDms.py
product/ERP5/tests/testERP5WebWithDms.py
+1
-6
No files found.
bt5/erp5_safeimage/TestTemplateItem/portal_components/test.erp5.testSafeImage.py
View file @
36e72172
import
Image
from
PIL
import
Image
from
Products.ERP5Type.tests.ERP5TypeTestCase
import
ERP5TypeTestCase
from
Products.ERP5Type.tests.ERP5TypeTestCase
import
ERP5TypeTestCase
import
transaction
import
transaction
from
zLOG
import
LOG
,
INFO
,
ERROR
from
zLOG
import
LOG
,
INFO
,
ERROR
...
...
bt5/erp5_safeimage/bt/revision
View file @
36e72172
16
17
\ No newline at end of file
\ No newline at end of file
product/ERP5/tests/testERP5WebWithDms.py
View file @
36e72172
...
@@ -40,12 +40,7 @@ from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase,\
...
@@ -40,12 +40,7 @@ from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase,\
from
Products.ERP5Type.tests.utils
import
FileUpload
,
createZODBPythonScript
from
Products.ERP5Type.tests.utils
import
FileUpload
,
createZODBPythonScript
from
Products.ERP5.Document.Document
import
ConversionError
from
Products.ERP5.Document.Document
import
ConversionError
try
:
from
PIL
import
Image
from
PIL
import
Image
except
ImportError
:
# When the PIL eggs is developed it seems to use an different
# way to import it.
import
Image
LANGUAGE_LIST
=
(
'en'
,
'fr'
,
'de'
,
'bg'
,)
LANGUAGE_LIST
=
(
'en'
,
'fr'
,
'de'
,
'bg'
,)
IMAGE_COMPARE_TOLERANCE
=
800
IMAGE_COMPARE_TOLERANCE
=
800
...
...
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