[Checkins] SVN: z3c.reference/trunk/ - Using Python's ``doctest`` module instead of depreacted

[Michael Howitz]

Log message for revision 117043:
  - Using Python's ``doctest`` module instead of depreacted
    ``zope.testing.doctest``.
  
  - Updated to run with ZTK 1.0.
  

Changed:
  U   z3c.reference/trunk/CHANGES.txt
  U   z3c.reference/trunk/src/z3c/reference/README.txt
  U   z3c.reference/trunk/src/z3c/reference/browser/tests.py
  U   z3c.reference/trunk/src/z3c/reference/demo/browser/configure.zcml
  U   z3c.reference/trunk/src/z3c/reference/demo/browser/ftesting.zcml
  U   z3c.reference/trunk/src/z3c/reference/demo/tests.py
  U   z3c.reference/trunk/src/z3c/reference/tests.py

-=-
Modified: z3c.reference/trunk/CHANGES.txt
===================================================================
--- z3c.reference/trunk/CHANGES.txt	2010-09-29 06:44:47 UTC (rev 117042)
+++ z3c.reference/trunk/CHANGES.txt	2010-09-29 06:46:17 UTC (rev 117043)
@@ -2,6 +2,14 @@
 Changes for z3c.reference
 =========================
 
+unreleased 1.0.4:
+=================
+
+- Using Python's ``doctest`` module instead of depreacted
+  ``zope.testing.doctest``.
+
+- Updated to run with ZTK 1.0.
+
 2008/03/17 1.0.3:
 =================
 

Modified: z3c.reference/trunk/src/z3c/reference/README.txt
===================================================================
--- z3c.reference/trunk/src/z3c/reference/README.txt	2010-09-29 06:44:47 UTC (rev 117042)
+++ z3c.reference/trunk/src/z3c/reference/README.txt	2010-09-29 06:46:17 UTC (rev 117043)
@@ -22,7 +22,7 @@
   >>> viewRef.view = u'@resize?w=50&h=100'
   Traceback (most recent call last):
   ...
-  WrongType: (u'@resize?w=50&h=100', <type 'str'>)
+  WrongType: (u'@resize?w=50&h=100', <type 'str'>, 'view')
   >>> viewRef.view = '@resize?w=50&h=100'
   >>> viewRef.view
   '@resize?w=50&h=100'

Modified: z3c.reference/trunk/src/z3c/reference/browser/tests.py
===================================================================
--- z3c.reference/trunk/src/z3c/reference/browser/tests.py	2010-09-29 06:44:47 UTC (rev 117042)
+++ z3c.reference/trunk/src/z3c/reference/browser/tests.py	2010-09-29 06:46:17 UTC (rev 117043)
@@ -22,7 +22,7 @@
 import zope
 from zope.traversing.interfaces import ITraverser, ITraversable
 
-from zope.testing.doctestunit import DocFileSuite, DocTestSuite
+from doctest import DocFileSuite, DocTestSuite
 from zope.app.testing import setup
 from zope.app.intid import IntIds
 from zope.app.intid.interfaces import IIntIds

Modified: z3c.reference/trunk/src/z3c/reference/demo/browser/configure.zcml
===================================================================
--- z3c.reference/trunk/src/z3c/reference/demo/browser/configure.zcml	2010-09-29 06:44:47 UTC (rev 117042)
+++ z3c.reference/trunk/src/z3c/reference/demo/browser/configure.zcml	2010-09-29 06:46:17 UTC (rev 117043)
@@ -37,7 +37,7 @@
   <!-- test -->
   <pages
       for="zope.annotation.interfaces.IAnnotatable"
-      permission="zope.app.dublincore.change"
+      permission="zope.dublincore.change"
       class=".views.Meta">
     <page name="change.html" template="change.pt"
           menu="zmi_views" title="Metadata" />
@@ -82,6 +82,6 @@
   <editform schema="z3c.reference.demo.interfaces.IDemoFolder"
   label="Edit" name="editdemofolder.html" menu="zmi_views"
   title="Edit" permission="zope.ManageContent" />
- -->  
+ -->
 
 </configure>

Modified: z3c.reference/trunk/src/z3c/reference/demo/browser/ftesting.zcml
===================================================================
--- z3c.reference/trunk/src/z3c/reference/demo/browser/ftesting.zcml	2010-09-29 06:44:47 UTC (rev 117042)
+++ z3c.reference/trunk/src/z3c/reference/demo/browser/ftesting.zcml	2010-09-29 06:46:17 UTC (rev 117043)
@@ -5,8 +5,8 @@
     xmlns:zcml="http://namespaces.zope.org/zcml"
     i18n_domain="zope">
 
-  
-  <include package="zope.app.securitypolicy" file="meta.zcml" />
+
+  <include package="zope.securitypolicy" file="meta.zcml" />
   <include
       zcml:condition="installed zope.app.zcmlfiles"
       package="zope.app.zcmlfiles"
@@ -19,10 +19,10 @@
 
   <include package="zope.app.authentication" />
   <securityPolicy
-    component="zope.app.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
+    component="zope.securitypolicy.zopepolicy.ZopeSecurityPolicy" />
 
-  <include package="zope.app.securitypolicy" />
   <include package="zope.app.server" />
+  <include package="zope.login" />
 
   <role id="zope.Anonymous" title="Everybody"
         description="All users have this role implicitly" />
@@ -64,14 +64,14 @@
   <include package="zope.formlib"/>
   <include package="zope.app.file"/>
   <include package="zc.resourcelibrary" />
-  <include package="z3c.javascript.jquery"/>  
-  <include package="z3c.javascript.swfobject"/>  
+  <include package="z3c.javascript.jquery"/>
+  <include package="z3c.javascript.swfobject"/>
 
   <include package="lovely.relation" />
   <include package="lovely.relation" file="o2o.zcml" />
   <include package="z3c.reference" />
   <include package="z3c.reference.demo" />
-    
+
   <grant permission="zope.View"
          role="zope.Anonymous" />
 

Modified: z3c.reference/trunk/src/z3c/reference/demo/tests.py
===================================================================
--- z3c.reference/trunk/src/z3c/reference/demo/tests.py	2010-09-29 06:44:47 UTC (rev 117042)
+++ z3c.reference/trunk/src/z3c/reference/demo/tests.py	2010-09-29 06:46:17 UTC (rev 117043)
@@ -21,7 +21,7 @@
 from zope import component
 from zope.dublincore.annotatableadapter import ZDCAnnotatableAdapter
 from zope.dublincore.interfaces import IWriteZopeDublinCore
-from zope.testing.doctestunit import DocFileSuite, DocTestSuite
+from doctest import DocFileSuite, DocTestSuite
 from zope.app.testing import setup
 from zope.app.intid import IntIds
 from zope.app.intid.interfaces import IIntIds

Modified: z3c.reference/trunk/src/z3c/reference/tests.py
===================================================================
--- z3c.reference/trunk/src/z3c/reference/tests.py	2010-09-29 06:44:47 UTC (rev 117042)
+++ z3c.reference/trunk/src/z3c/reference/tests.py	2010-09-29 06:46:17 UTC (rev 117043)
@@ -18,7 +18,7 @@
 
 import doctest
 import unittest
-from zope.testing.doctestunit import DocFileSuite, DocTestSuite
+from doctest import DocFileSuite, DocTestSuite
 from zope.app.testing import setup
 from zope.app.intid import IntIds
 from zope.app.intid.interfaces import IIntIds