This makes the tests run for Plone 4.0 too.

The tests currently fail for Plone 4.0, but I'm not game to fix this atm.
collective · Apr 9, 2013 · c09d009 · c09d009 · miohtama · Apr 9, 2013
1 parent cda6761
commit c09d009
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -37,4 +37,4 @@ dist
 venv
 bin
 src
-
+buildout-cache
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,6 @@ python:
   - 2.6
   - 2.7
 env:
-  - PLONE=4.0
   - PLONE=4.1
   - PLONE=4.2
   - PLONE=4.3

diff --git a/collective/z3cform/datagridfield/blockdatagridfield.py b/collective/z3cform/datagridfield/blockdatagridfield.py
@@ -2,7 +2,10 @@
 import zope.component
 import zope.schema.interfaces
 from zope.schema.interfaces import IObject
-from zope.browserpage.viewpagetemplatefile import ViewPageTemplateFile
+try:
+    from zope.browserpage.viewpagetemplatefile import ViewPageTemplateFile
+except ImportError:
+    from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
 
 from z3c.form import interfaces
 from z3c.form.widget import FieldWidget

diff --git a/travis-4.0.x.cfg b/travis-4.0.x.cfg
@@ -1,2 +1,11 @@
 [buildout]
-extends = https://raw.github.com/collective/buildout.plonetest/master/travis-4.0.x.cfg base.cfg
+extends =
+    https://raw.github.com/collective/buildout.plonetest/master/travis-4.0.x.cfg
+    http://good-py.appspot.com/release/dexterity/1.0-next?plone=4.0
+    base.cfg
+
+test-eggs = Pillow
+
+[versions]
+zope.schema = 3.6.0
+Plone = 4.0.9