[Checkins] SVN: zope.app.testing/tags/3.6.0/ oops. unmerging changes to this tag.

[Alex Smith]

Log message for revision 100247:
  
  oops.  unmerging changes to this tag.
  

Changed:
  U   zope.app.testing/tags/3.6.0/CHANGES.txt
  U   zope.app.testing/tags/3.6.0/setup.py
  U   zope.app.testing/tags/3.6.0/src/zope/app/testing/ztapi.py

-=-
Modified: zope.app.testing/tags/3.6.0/CHANGES.txt
===================================================================
--- zope.app.testing/tags/3.6.0/CHANGES.txt	2009-05-22 18:04:17 UTC (rev 100246)
+++ zope.app.testing/tags/3.6.0/CHANGES.txt	2009-05-22 18:11:21 UTC (rev 100247)
@@ -2,36 +2,6 @@
 CHANGES
 =======
 
-3.6.3 (unreleased)
-------------------
-
-- Fix broken import of `IDefaultViewName` to use its new location in
-  ``zope.publisher.interfaces``.
-
-3.6.2 (2009-04-26)
-------------------
-
-- Removed deprecated back35 module and loose the dependency on
-  ``zope.deferredimport``.
-
-- Adapt to ``zope.app.authentication`` refactoring. We depend on
-  ``zope.password`` now instead.
-
-- Adapt to latest ``zope.app.security`` refactoring. We don't need this
-  package anymore.
-
-3.6.1 (2009-03-12)
-------------------
-
-- Use ISkinnable.providedBy(request) instead of IBrowserRequest as condition
-  for calling setDefaultSkin in HTTPCaller. This at the same time removes
-  dependency to the browser part of zope.publisher.
-
-- Adapt to the move of IDefaultViewName from zope.component.interfaces
-  to zope.publisher.interfaces.
-
-- Remove the DEPENDENCIES.cfg file for zpkg.
-
 3.6.0 (2009-02-01)
 ------------------
 

Modified: zope.app.testing/tags/3.6.0/setup.py
===================================================================
--- zope.app.testing/tags/3.6.0/setup.py	2009-05-22 18:04:17 UTC (rev 100246)
+++ zope.app.testing/tags/3.6.0/setup.py	2009-05-22 18:11:21 UTC (rev 100247)
@@ -22,7 +22,7 @@
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
 setup(name='zope.app.testing',
-      version = '3.6.1dev',
+      version = '3.6.0',
       author='Zope Corporation and Contributors',
       author_email='zope-dev at zope.org',
       description='Zope Application Testing Support',
@@ -75,7 +75,7 @@
                         'zope.i18n',
                         'zope.interface',
                         'zope.location',
-                        'zope.publisher >=3.6.0',
+                        'zope.publisher',
                         'zope.schema',
                         'zope.security',
                         'zope.site',

Modified: zope.app.testing/tags/3.6.0/src/zope/app/testing/ztapi.py
===================================================================
--- zope.app.testing/tags/3.6.0/src/zope/app/testing/ztapi.py	2009-05-22 18:04:17 UTC (rev 100246)
+++ zope.app.testing/tags/3.6.0/src/zope/app/testing/ztapi.py	2009-05-22 18:11:21 UTC (rev 100247)
@@ -17,7 +17,7 @@
 """
 import zope.interface
 import zope.component
-from zope.publisher.interfaces import IDefaultViewName
+from zope.component.interfaces import IDefaultViewName
 from zope.publisher.browser import IBrowserRequest
 from zope.publisher.interfaces.browser import IDefaultBrowserLayer
 from zope.traversing.interfaces import ITraversable