[Zope-Checkins] SVN: Zope/branches/2.10/lib/python/App/ Merged trunk r94458 and r94532 into 2.10 branch.

Log message for revision 94534: Merged trunk r94458 and r94532 into 2.10 branch. Replace messy tests with cleaned-up versions from trunk. Changed: U Zope/branches/2.10/lib/python/App/tests/test_version_txt.py U Zope/branches/2.10/lib/python/App/version_txt.py -=- Modified:

[Zope-Checkins] SVN: Zope/trunk/lib/python/App/ Make the 'Cannot open version.txt' case testable.

Log message for revision 94532: Make the 'Cannot open version.txt' case testable. Changed: U Zope/trunk/lib/python/App/tests/test_version_txt.py U Zope/trunk/lib/python/App/version_txt.py -=- Modified: Zope/trunk/lib/python/App/tests/test_version_txt.py

[Zope-Checkins] SVN: Zope/branches/2.11/lib/python/App/ Backport version_txt import tidying from trunk.

Log message for revision 94539: Backport version_txt import tidying from trunk. Changed: U Zope/branches/2.11/lib/python/App/tests/test_version_txt.py U Zope/branches/2.11/lib/python/App/version_txt.py -=- Modified: Zope/branches/2.11/lib/python/App/tests/test_version_txt.py

[Zope-Checkins] SVN: Zope/branches/2.11/lib/python/App/ Merged trunk r94458 and r94532 into 2.11 branch.

Log message for revision 94533: Merged trunk r94458 and r94532 into 2.11 branch. Replace messy tests with cleaned-up versions from trunk. The old tests deleted 'Zope2/version.txt' - WTFBBQ? Changed: U Zope/branches/2.11/lib/python/App/tests/test_version_txt.py U

[Zope-Checkins] SVN: Zope/branches/2.10/lib/python/App/ Backport version_txt import tidying from trunk.

Log message for revision 94538: Backport version_txt import tidying from trunk. Changed: U Zope/branches/2.10/lib/python/App/tests/test_version_txt.py U Zope/branches/2.10/lib/python/App/version_txt.py -=- Modified: Zope/branches/2.10/lib/python/App/tests/test_version_txt.py

[Zope-Checkins] SVN: Zope/trunk/lib/python/App/ App.version_txt: avoid possible import cycle by deferring import of Zope2.

Log message for revision 94537: App.version_txt: avoid possible import cycle by deferring import of Zope2. o Also, weak without_version_txt test to use non-existing filename, rather than the (existing) Zope2 directory. Changed: U