[Lxml-checkins] r50851 - in lxml/trunk: . src/lxml/tests

[scoder at codespeak.net]

Author: scoder
Date: Mon Jan 21 19:39:59 2008
New Revision: 50851

Modified:
   lxml/trunk/   (props changed)
   lxml/trunk/CHANGES.txt
   lxml/trunk/src/lxml/tests/test_css.py
   lxml/trunk/src/lxml/tests/test_objectify.py
Log:
 r3277 at delle:  sbehnel | 2008-01-21 16:40:29 +0100
 switch off some more doctests under Python 2.3


Modified: lxml/trunk/CHANGES.txt
==============================================================================
--- lxml/trunk/CHANGES.txt	(original)
+++ lxml/trunk/CHANGES.txt	Mon Jan 21 19:39:59 2008
@@ -11,7 +11,8 @@
 Bugs fixed
 ----------
 
-* Some Python 2.4-isms slipped through in beta1.
+* Some Python 2.4-isms prevented lxml from building/running under
+  Python 2.3.
 
 Other changes
 -------------
@@ -19,6 +20,8 @@
 * ``make clean`` no longer removes the .c files (use ``make
   realclean`` instead)
 
+* The test suite now skips most doctests under Python 2.3.
+
 
 2.0beta1 (2008-01-11)
 =====================

Modified: lxml/trunk/src/lxml/tests/test_css.py
==============================================================================
--- lxml/trunk/src/lxml/tests/test_css.py	(original)
+++ lxml/trunk/src/lxml/tests/test_css.py	Mon Jan 21 19:39:59 2008
@@ -112,7 +112,8 @@
         
 def test_suite():
     suite = unittest.TestSuite()
-    for fn in 'test_css.txt', 'test_css_select.txt':
-        suite.addTests([doctest.DocFileSuite(fn)])
+    if sys.version_info >= (2,4):
+        suite.addTests([doctest.DocFileSuite('test_css_select.txt')])
+    suite.addTests([doctest.DocFileSuite('test_css.txt')])
     suite.addTests(list(CSSTestCase.all()))
     return suite

Modified: lxml/trunk/src/lxml/tests/test_objectify.py
==============================================================================
--- lxml/trunk/src/lxml/tests/test_objectify.py	(original)
+++ lxml/trunk/src/lxml/tests/test_objectify.py	Mon Jan 21 19:39:59 2008
@@ -5,7 +5,7 @@
 """
 
 
-import unittest, operator
+import unittest, operator, sys
 
 from common_imports import etree, StringIO, HelperTestCase, fileInTestDir
 from common_imports import SillyFileLike, canonicalize, doctest
@@ -2071,8 +2071,9 @@
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTests([unittest.makeSuite(ObjectifyTestCase)])
-    suite.addTests(
-        [doctest.DocFileSuite('../../../doc/objectify.txt')])
+    if sys.version_info >= (2,4):
+        suite.addTests(
+            [doctest.DocFileSuite('../../../doc/objectify.txt')])
     return suite
 
 if __name__ == '__main__':