[Checkins] SVN: z3c.jsonrpc/trunk/ import doctest from python

[Roger Ineichen]

Log message for revision 112717:
  import doctest from python

Changed:
  U   z3c.jsonrpc/trunk/CHANGES.txt
  U   z3c.jsonrpc/trunk/src/z3c/jsonrpc/testing.py
  U   z3c.jsonrpc/trunk/src/z3c/jsonrpc/tests/__init__.py
  U   z3c.jsonrpc/trunk/src/z3c/jsonrpc/tests/test_doc.py

-=-
Modified: z3c.jsonrpc/trunk/CHANGES.txt
===================================================================
--- z3c.jsonrpc/trunk/CHANGES.txt	2010-05-25 19:19:09 UTC (rev 112716)
+++ z3c.jsonrpc/trunk/CHANGES.txt	2010-05-26 03:25:34 UTC (rev 112717)
@@ -5,8 +5,9 @@
 0.7.0 (unreleased)
 ------------------
 
-- ...
+- import doctest from python
 
+
 0.6.0 (2010-01-27)
 ------------------
 

Modified: z3c.jsonrpc/trunk/src/z3c/jsonrpc/testing.py
===================================================================
--- z3c.jsonrpc/trunk/src/z3c/jsonrpc/testing.py	2010-05-25 19:19:09 UTC (rev 112716)
+++ z3c.jsonrpc/trunk/src/z3c/jsonrpc/testing.py	2010-05-26 03:25:34 UTC (rev 112717)
@@ -17,11 +17,10 @@
 __docformat__ = "reStructuredText"
 
 import StringIO
-
+import doctest
 import persistent
 import zope.interface
 import zope.testing.cleanup
-from zope.testing import doctest
 from zope.app.testing import functional
 
 from z3c.json.interfaces import IJSONReader

Modified: z3c.jsonrpc/trunk/src/z3c/jsonrpc/tests/__init__.py
===================================================================
--- z3c.jsonrpc/trunk/src/z3c/jsonrpc/tests/__init__.py	2010-05-25 19:19:09 UTC (rev 112716)
+++ z3c.jsonrpc/trunk/src/z3c/jsonrpc/tests/__init__.py	2010-05-26 03:25:34 UTC (rev 112717)
@@ -1,16 +1 @@
-##############################################################################
-#
-# Copyright (c) 2007 Zope Foundation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL).  A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""
-$Id:$
-"""
+# make a package
\ No newline at end of file

Modified: z3c.jsonrpc/trunk/src/z3c/jsonrpc/tests/test_doc.py
===================================================================
--- z3c.jsonrpc/trunk/src/z3c/jsonrpc/tests/test_doc.py	2010-05-25 19:19:09 UTC (rev 112716)
+++ z3c.jsonrpc/trunk/src/z3c/jsonrpc/tests/test_doc.py	2010-05-26 03:25:34 UTC (rev 112717)
@@ -17,7 +17,7 @@
 __docformat__ = "reStructuredText"
 
 import unittest
-from zope.testing import doctest
+import doctest
 from z3c.jsonrpc import testing