[Testbot] Plone 5.0 - Python 2.7 - Build # 1327 - Still failing! - 2 failure(s)
jenkins at plone.org
jenkins at plone.org
Wed Jan 29 21:27:00 UTC 2014
This commit violated the Plone Continous Integration rule "Don’t Check In on a Broken Build": https://buildoutcoredev.readthedocs.org/en/latest/continous-integration.html#dont-check-in-on-a-broken-build
-------------------------------------------------------------------------------
-------------------------------------------------------------------------------
Plone 5.0 - Python 2.7 - Build # 1327 - Still Failing!
-------------------------------------------------------------------------------
http://jenkins.plone.org/job/plone-5.0-python-2.7/1327/
-------------------------------------------------------------------------------
CHANGES
-------------------------------------------------------------------------------
Repository: plone.namedfile
Branch: refs/heads/master
Date: 2014-01-29T12:30:44-08:00
Author: Thomas Desvenain (tdesvenain) <thomas.desvenain at gmail.com>
Commit: https://github.com/plone/plone.namedfile/commit/8743a59403bed018bd8b3f778e0d414a909308c4
ensure zope.app.file.file module alias is created before its use in file
package
Files changed:
M plone/namedfile/__init__.py
M plone/namedfile/file.py
diff --git a/plone/namedfile/__init__.py b/plone/namedfile/__init__.py
index d968232..44de100 100644
--- a/plone/namedfile/__init__.py
+++ b/plone/namedfile/__init__.py
@@ -1,9 +1,12 @@
-from plone.namedfile.file import NamedFile, NamedImage
-from plone.namedfile.file import NamedBlobFile, NamedBlobImage
-
# BBB alias for zope.app.file.file.FileChunk
try:
- import zope.app.file
+ import zope.app.file
except ImportError:
- import sys
- sys.modules['zope.app.file'] = sys.modules['plone.namedfile']
+ import sys
+ sys.modules['zope.app.file'] = sys.modules['plone.namedfile']
+
+from zope.app.file.file import FileChunk as zafFileChunk
+
+from plone.namedfile.file import NamedFile, NamedImage
+from plone.namedfile.file import NamedBlobFile, NamedBlobImage
+
diff --git a/plone/namedfile/file.py b/plone/namedfile/file.py
index 1a479b0..d4de32d 100644
--- a/plone/namedfile/file.py
+++ b/plone/namedfile/file.py
@@ -57,7 +57,7 @@ def __str__(self):
try:
from zope.app.file.file import FileChunk as zafFileChunk
FILECHUNK_CLASSES.append(zafFileChunk)
-except:
+except ImportError:
pass
-------------------------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: CHANGES.log
Type: application/octet-stream
Size: 1527 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140129/e8f0ca94/attachment-0002.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: build.log
Type: application/octet-stream
Size: 132757 bytes
Desc: not available
URL: <http://lists.plone.org/pipermail/plone-testbot/attachments/20140129/e8f0ca94/attachment-0003.obj>
More information about the Testbot
mailing list