[Checkins] SVN: zc.table/trunk/ - Using Python's ``doctest`` module instead of deprecated
Michael Howitz
mh at gocept.com
Thu May 19 02:26:43 EDT 2011
Log message for revision 121724:
- Using Python's ``doctest`` module instead of deprecated
``zope.testing.doctest``.
- Removed deprecated slugs for ZPKG and ZCML.
Changed:
U zc.table/trunk/CHANGES.txt
D zc.table/trunk/src/zc/table/SETUP.cfg
U zc.table/trunk/src/zc/table/column.txt
U zc.table/trunk/src/zc/table/fieldcolumn.txt
U zc.table/trunk/src/zc/table/tests.py
D zc.table/trunk/src/zc/table/zc.table-configure.zcml
-=-
Modified: zc.table/trunk/CHANGES.txt
===================================================================
--- zc.table/trunk/CHANGES.txt 2011-05-19 06:23:51 UTC (rev 121723)
+++ zc.table/trunk/CHANGES.txt 2011-05-19 06:26:43 UTC (rev 121724)
@@ -1,6 +1,15 @@
CHANGES
=======
+0.8.2 (unreleased)
+------------------
+
+- Using Python's ``doctest`` module instead of deprecated
+ ``zope.testing.doctest``.
+
+- Removed deprecated slugs for ZPKG and ZCML.
+
+
0.8.1 (2010-05-25)
------------------
Deleted: zc.table/trunk/src/zc/table/SETUP.cfg
===================================================================
--- zc.table/trunk/src/zc/table/SETUP.cfg 2011-05-19 06:23:51 UTC (rev 121723)
+++ zc.table/trunk/src/zc/table/SETUP.cfg 2011-05-19 06:26:43 UTC (rev 121724)
@@ -1,3 +0,0 @@
-<data-files zopeskel/etc/package-includes>
- zc.table-*.zcml
-</data-files>
Modified: zc.table/trunk/src/zc/table/column.txt
===================================================================
--- zc.table/trunk/src/zc/table/column.txt 2011-05-19 06:23:51 UTC (rev 121723)
+++ zc.table/trunk/src/zc/table/column.txt 2011-05-19 06:26:43 UTC (rev 121724)
@@ -65,7 +65,7 @@
... ),
... )
-Now, with this, we can create a table with input widgets. The columns don't
+Now, with this, we can create a table with input widgets. The columns don't
need a context other than the items themselves, so we ignore that part of the
table formatter instantiation:
@@ -339,7 +339,7 @@
>>> request.form["test.MA==.1"] = "on"
>>> input = columns[1].input(data, request)
- >>> from zope.testing.doctestunit import pprint
+ >>> from pprint import pprint
>>> pprint(input)
{'MA==': True,
'Mw==': False}
Modified: zc.table/trunk/src/zc/table/fieldcolumn.txt
===================================================================
--- zc.table/trunk/src/zc/table/fieldcolumn.txt 2011-05-19 06:23:51 UTC (rev 121723)
+++ zc.table/trunk/src/zc/table/fieldcolumn.txt 2011-05-19 06:26:43 UTC (rev 121724)
@@ -55,7 +55,7 @@
... email = schema.TextLine(
... title=u'Email Address',
... constraint=re.compile('\w+@\w+([.]\w+)+$').match)
- ... salutation = schema.Choice(
+ ... salutation = schema.Choice(
... title=u'Salutation',
... values = ['Mr','Ms'],
... )
@@ -92,7 +92,7 @@
... BindingContactColumn(IContact["salutation"])
... )
-Now, with this, we can create a table with input widgets. The columns don't
+Now, with this, we can create a table with input widgets. The columns don't
need a context other than the items themselves, so we ignore that part of the
table formatter instantiation:
@@ -475,7 +475,7 @@
>>> request.form["test.0.1"] = "on"
>>> input = columns[1].input(data, formatter)
- >>> from zope.testing.doctestunit import pprint
+ >>> from pprint import pprint
>>> pprint(input)
{'0': True,
'3': False}
Modified: zc.table/trunk/src/zc/table/tests.py
===================================================================
--- zc.table/trunk/src/zc/table/tests.py 2011-05-19 06:23:51 UTC (rev 121723)
+++ zc.table/trunk/src/zc/table/tests.py 2011-05-19 06:26:43 UTC (rev 121724)
@@ -66,7 +66,7 @@
def test_suite():
- from zope.testing import doctest
+ import doctest
return unittest.TestSuite((
doctest.DocFileSuite('README.txt',
optionflags=doctest.NORMALIZE_WHITESPACE+doctest.ELLIPSIS,
@@ -82,6 +82,3 @@
optionflags=doctest.NORMALIZE_WHITESPACE+doctest.ELLIPSIS,
),
))
-
-if __name__ == '__main__':
- unittest.main(defaultTest='test_suite')
Deleted: zc.table/trunk/src/zc/table/zc.table-configure.zcml
===================================================================
--- zc.table/trunk/src/zc/table/zc.table-configure.zcml 2011-05-19 06:23:51 UTC (rev 121723)
+++ zc.table/trunk/src/zc/table/zc.table-configure.zcml 2011-05-19 06:26:43 UTC (rev 121724)
@@ -1 +0,0 @@
-<include package="zc.table"/>
\ No newline at end of file
More information about the checkins
mailing list