[Checkins] SVN: z3c.etestbrowser/trunk/ took zope.securitypolicy refactoring and zope.testing.doctest deprecation into account

[Thomas Lotze]

Log message for revision 114337:
  took zope.securitypolicy refactoring and zope.testing.doctest deprecation into account

Changed:
  U   z3c.etestbrowser/trunk/CHANGES.txt
  U   z3c.etestbrowser/trunk/src/z3c/etestbrowser/ftesting.zcml
  U   z3c.etestbrowser/trunk/src/z3c/etestbrowser/tests.py

-=-
Modified: z3c.etestbrowser/trunk/CHANGES.txt
===================================================================
--- z3c.etestbrowser/trunk/CHANGES.txt	2010-07-08 14:24:08 UTC (rev 114336)
+++ z3c.etestbrowser/trunk/CHANGES.txt	2010-07-08 16:19:29 UTC (rev 114337)
@@ -5,7 +5,8 @@
 1.3.2 (unreleased)
 ==================
 
-- Nothing changed yet.
+- Took zope.securitypolicy refactoring and zope.testing.doctest deprecation
+  into account.
 
 
 1.3.1 (2010-01-18)

Modified: z3c.etestbrowser/trunk/src/z3c/etestbrowser/ftesting.zcml
===================================================================
--- z3c.etestbrowser/trunk/src/z3c/etestbrowser/ftesting.zcml	2010-07-08 14:24:08 UTC (rev 114336)
+++ z3c.etestbrowser/trunk/src/z3c/etestbrowser/ftesting.zcml	2010-07-08 16:19:29 UTC (rev 114337)
@@ -11,8 +11,8 @@
   <include package="zope.traversing.browser"/>
   <include package="zope.app.server"/>
 
-  <include package="zope.app.securitypolicy" file="meta.zcml"/>
-  <include package="zope.app.securitypolicy" />
+  <include package="zope.securitypolicy" file="meta.zcml"/>
+  <include package="zope.securitypolicy" />
 
   <securityPolicy
       component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />

Modified: z3c.etestbrowser/trunk/src/z3c/etestbrowser/tests.py
===================================================================
--- z3c.etestbrowser/trunk/src/z3c/etestbrowser/tests.py	2010-07-08 14:24:08 UTC (rev 114336)
+++ z3c.etestbrowser/trunk/src/z3c/etestbrowser/tests.py	2010-07-08 16:19:29 UTC (rev 114337)
@@ -16,11 +16,11 @@
 $Id$
 """
 
+import doctest
 import os.path
 import unittest
 
 from zope.app.testing import functional
-from zope.testing import doctest
 
 
 layer = functional.ZCMLLayer(