[Checkins] SVN: zope.app.appsetup/branches/3.14/ reverted r116888 and r116890 as this sould have been done on the trunk

[Michael Howitz]

Log message for revision 116896:
  reverted r116888 and r116890 as this sould have been done on the trunk
  

Changed:
  U   zope.app.appsetup/branches/3.14/CHANGES.txt
  U   zope.app.appsetup/branches/3.14/setup.py
  U   zope.app.appsetup/branches/3.14/src/zope/app/appsetup/testlayer.txt
  U   zope.app.appsetup/branches/3.14/src/zope/app/appsetup/tests.py

-=-
Modified: zope.app.appsetup/branches/3.14/CHANGES.txt
===================================================================
--- zope.app.appsetup/branches/3.14/CHANGES.txt	2010-09-25 13:05:44 UTC (rev 116895)
+++ zope.app.appsetup/branches/3.14/CHANGES.txt	2010-09-25 13:07:15 UTC (rev 116896)
@@ -1,22 +1,16 @@
 Changelog
 =========
 
-3.15.0 (2010-09-25)
+3.14.1 (unreleased)
 -------------------
 
-- Updated tests to run with `zope.testing >= 3.10`, requiring at least this
-  version and `zope.testrunner`.
 
-- Using Python's ``doctest`` module instead of depreacted
-  ``zope.testing.doctest``.
-
-
 3.14.0 (2010-04-13)
 -------------------
 
-- Made `zope.testing` an optional (test) dependency.
+- make zope.testing an optional (test) dependency.
 
-- Removed test dependency on `zope.app.testing`.
+- remove test dependency zope.app.testing. 
 
 
 3.13.0 (2009-12-24)

Modified: zope.app.appsetup/branches/3.14/setup.py
===================================================================
--- zope.app.appsetup/branches/3.14/setup.py	2010-09-25 13:05:44 UTC (rev 116895)
+++ zope.app.appsetup/branches/3.14/setup.py	2010-09-25 13:07:15 UTC (rev 116896)
@@ -30,7 +30,7 @@
 
 setup(
     name='zope.app.appsetup',
-    version='3.15.0',
+    version = '3.14.1dev',
     author='Zope Corporation and Contributors',
     author_email='zope-dev at zope.org',
     description="Zope app setup helper",
@@ -66,8 +66,7 @@
         test=[
             'zope.componentvocabulary',
             'zope.principalregistry',
-            'zope.testing >= 3.10',
-            'zope.testrunner',
+            'zope.testing',
             ]
         ),
     namespace_packages=['zope', 'zope.app'],

Modified: zope.app.appsetup/branches/3.14/src/zope/app/appsetup/testlayer.txt
===================================================================
--- zope.app.appsetup/branches/3.14/src/zope/app/appsetup/testlayer.txt	2010-09-25 13:05:44 UTC (rev 116895)
+++ zope.app.appsetup/branches/3.14/src/zope/app/appsetup/testlayer.txt	2010-09-25 13:07:15 UTC (rev 116896)
@@ -52,7 +52,7 @@
 
 And run that suite:
 
-  >>> from zope.testrunner.runner import Runner
+  >>> from zope.testing.testrunner.runner import Runner
   >>> runner = Runner(args=[], found_suites=[suite])
   >>> succeeded = runner.run()
   Running zope.app.appsetup.testpackage.ZODBLayer tests:

Modified: zope.app.appsetup/branches/3.14/src/zope/app/appsetup/tests.py
===================================================================
--- zope.app.appsetup/branches/3.14/src/zope/app/appsetup/tests.py	2010-09-25 13:05:44 UTC (rev 116895)
+++ zope.app.appsetup/branches/3.14/src/zope/app/appsetup/tests.py	2010-09-25 13:07:15 UTC (rev 116896)
@@ -16,16 +16,16 @@
 $Id$
 """
 import ZConfig
-import doctest
 import os
 import sys
-import transaction
 import unittest
 import urllib
+import transaction
 
 import zope.component
 
 from ZODB.tests.util import DB
+from zope.testing import doctest
 from zope.traversing.api import traverse, getPath
 from zope.error.interfaces import IErrorReportingUtility
 from zope.error.error import ErrorReportingUtility