diff --git a/last_commit.txt b/last_commit.txt index f7ffb2b37b..68a89b95de 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,28 +1,678 @@ -Repository: plone.formwidget.contenttree +Repository: plone.recipe.zope2instance Branch: refs/heads/master -Date: 2016-02-03T14:19:04+01:00 -Author: Patrick Gerken (do3cc) -Commit: https://github.com/plone/plone.formwidget.contenttree/commit/b928cfe930a28a5958adf075b2c63c7edcab68e9 +Date: 2016-02-02T21:20:09+01:00 +Author: Philip Bauer (pbauer) +Commit: https://github.com/plone/plone.recipe.zope2instance/commit/d4f24b30056fa172441f0785ea0fe7b7d376f80f -Fix incomplete renaming +Fix tests Files changed: -M plone/formwidget/contenttree/widget.py +M src/plone/recipe/zope2instance/tests/zope2instance.txt -diff --git a/plone/formwidget/contenttree/widget.py b/plone/formwidget/contenttree/widget.py -index e1de64a..06e9d20 100644 ---- a/plone/formwidget/contenttree/widget.py -+++ b/plone/formwidget/contenttree/widget.py -@@ -27,7 +27,7 @@ - from Products.Five.browser import BrowserView +diff --git a/src/plone/recipe/zope2instance/tests/zope2instance.txt b/src/plone/recipe/zope2instance/tests/zope2instance.txt +index 9d7cfe4..5eb1346 100644 +--- a/src/plone/recipe/zope2instance/tests/zope2instance.txt ++++ b/src/plone/recipe/zope2instance/tests/zope2instance.txt +@@ -31,9 +31,10 @@ plone.recipe.zope2instance:: + Let's run it:: - from plone.formwidget.contenttree.interfaces import IContentTreeWidget --from plone.formwidget.contenttree import MessageFactory as _ -+from plone.formwidget.contenttree import _ - from plone.formwidget.contenttree.utils import closest_content + >>> print system(join('bin', 'buildout')), +- Installing instance... ++ Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + We should have a zope instance, with a basic zope.conf:: +@@ -160,6 +161,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + Our FTP server should be set up now:: + +@@ -197,6 +199,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + Our WebDAV server should be set up now:: + +@@ -235,6 +238,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + Our WebDAV server should be set up now:: + +@@ -277,6 +281,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -328,9 +333,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. +- +- +- ++ ... + + We should have a zope instance, with a basic zope.conf without demostorage:: + +@@ -383,6 +386,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -443,6 +447,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -496,6 +501,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -557,6 +563,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -617,6 +624,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -680,6 +688,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -738,6 +747,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -803,6 +813,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -861,6 +872,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -911,6 +923,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -972,6 +985,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -1028,6 +1042,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -1084,6 +1099,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -1141,6 +1157,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -1210,6 +1227,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -1264,6 +1282,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -1332,6 +1351,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with the custom event log:: + +@@ -1389,6 +1409,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with the mailing logger:: + +@@ -1450,6 +1471,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with the custom event log:: + +@@ -1499,6 +1521,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with no access log:: + +@@ -1538,6 +1561,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with no access log:: + +@@ -1587,6 +1611,7 @@ Let's run the buildout:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + Now let's check that we have a zope instance, with the custom site.zcml:: + +@@ -1628,6 +1653,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + Our environment variables should be set now:: + +@@ -1667,6 +1693,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + Our environment variables should be set now:: + +@@ -1700,6 +1727,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + Our environment variables should be set now:: + +@@ -1736,6 +1764,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + And check it:: + +@@ -1780,6 +1809,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + Relative paths in scripts + ========================= +@@ -1803,6 +1833,7 @@ The recipe supports the generation of scripts with relative paths. + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + Our generated script now has a reference to the relative path. + +@@ -1840,6 +1871,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance script with the custom config file:: + +@@ -1876,6 +1908,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with custom imports:: + +@@ -1915,6 +1948,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + The directory should have been generated, and zope config created:: + +@@ -1957,6 +1991,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + The directory should have been generated, and zope config created:: + +@@ -1999,6 +2034,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should see the given initialization commands included in the instance + script:: + + +Repository: plone.recipe.zope2instance + + +Branch: refs/heads/master +Date: 2016-02-04T10:40:11+01:00 +Author: Jens W. Klein (jensens) +Commit: https://github.com/plone/plone.recipe.zope2instance/commit/6288eaca17d11a9a9a27a034729b0aecabe1690d + +Merge pull request #20 from plone/fix_tests + +Fix doctests + +Files changed: +M src/plone/recipe/zope2instance/tests/zope2instance.txt + +diff --git a/src/plone/recipe/zope2instance/tests/zope2instance.txt b/src/plone/recipe/zope2instance/tests/zope2instance.txt +index 9d7cfe4..5eb1346 100644 +--- a/src/plone/recipe/zope2instance/tests/zope2instance.txt ++++ b/src/plone/recipe/zope2instance/tests/zope2instance.txt +@@ -31,9 +31,10 @@ plone.recipe.zope2instance:: + Let's run it:: + + >>> print system(join('bin', 'buildout')), +- Installing instance... ++ Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -160,6 +161,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + Our FTP server should be set up now:: + +@@ -197,6 +199,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + Our WebDAV server should be set up now:: + +@@ -235,6 +238,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + Our WebDAV server should be set up now:: + +@@ -277,6 +281,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -328,9 +333,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. +- +- +- ++ ... + + We should have a zope instance, with a basic zope.conf without demostorage:: + +@@ -383,6 +386,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -443,6 +447,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -496,6 +501,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -557,6 +563,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -617,6 +624,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -680,6 +688,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -738,6 +747,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -803,6 +813,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -861,6 +872,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -911,6 +923,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -972,6 +985,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -1028,6 +1042,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -1084,6 +1099,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -1141,6 +1157,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -1210,6 +1227,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -1264,6 +1282,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with a basic zope.conf:: + +@@ -1332,6 +1351,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with the custom event log:: + +@@ -1389,6 +1409,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with the mailing logger:: + +@@ -1450,6 +1471,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with the custom event log:: + +@@ -1499,6 +1521,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with no access log:: + +@@ -1538,6 +1561,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with no access log:: + +@@ -1587,6 +1611,7 @@ Let's run the buildout:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + Now let's check that we have a zope instance, with the custom site.zcml:: + +@@ -1628,6 +1653,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + Our environment variables should be set now:: + +@@ -1667,6 +1693,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + Our environment variables should be set now:: + +@@ -1700,6 +1727,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + Our environment variables should be set now:: + +@@ -1736,6 +1764,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + And check it:: + +@@ -1780,6 +1809,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + Relative paths in scripts + ========================= +@@ -1803,6 +1833,7 @@ The recipe supports the generation of scripts with relative paths. + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + Our generated script now has a reference to the relative path. + +@@ -1840,6 +1871,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance script with the custom config file:: + +@@ -1876,6 +1908,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should have a zope instance, with custom imports:: + +@@ -1915,6 +1948,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + The directory should have been generated, and zope config created:: + +@@ -1957,6 +1991,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + The directory should have been generated, and zope config created:: + +@@ -1999,6 +2034,7 @@ Let's run it:: + Installing instance. + Generated script '...instance'. + Generated interpreter '.../parts/instance/bin/interpreter'. ++ ... + + We should see the given initialization commands included in the instance + script::