[Lxml-checkins] r50850 - in lxml/trunk: . src/lxml/html src/lxml/html/tests src/lxml/tests
scoder at codespeak.net
scoder at codespeak.net
Mon Jan 21 19:39:45 CET 2008
Author: scoder
Date: Mon Jan 21 19:39:44 2008
New Revision: 50850
Modified:
lxml/trunk/ (props changed)
lxml/trunk/src/lxml/html/diff.py
lxml/trunk/src/lxml/html/tests/test_autolink.py
lxml/trunk/src/lxml/html/tests/test_basic.py
lxml/trunk/src/lxml/html/tests/test_clean.py
lxml/trunk/src/lxml/html/tests/test_diff.py
lxml/trunk/src/lxml/html/tests/test_elementsoup.py
lxml/trunk/src/lxml/html/tests/test_feedparser_data.py
lxml/trunk/src/lxml/html/tests/test_formfill.py
lxml/trunk/src/lxml/html/tests/test_forms.py
lxml/trunk/src/lxml/html/tests/test_rewritelinks.py
lxml/trunk/src/lxml/tests/test_css.py
lxml/trunk/src/lxml/tests/test_etree.py
lxml/trunk/src/lxml/tests/test_objectify.py
lxml/trunk/src/lxml/tests/test_xpathevaluator.py
Log:
r3276 at delle: sbehnel | 2008-01-21 14:51:38 +0100
run HTML doctests only under Python 2.4+, fix some 2.4-isms in the tests
Modified: lxml/trunk/src/lxml/html/diff.py
==============================================================================
--- lxml/trunk/src/lxml/html/diff.py (original)
+++ lxml/trunk/src/lxml/html/diff.py Mon Jan 21 19:39:44 2008
@@ -703,7 +703,7 @@
"""
return '<%s%s>' % (
el.tag, ''.join([' %s="%s"' % (name, cgi.escape(value, True))
- for name, value in el.attrib.items())])
+ for name, value in el.attrib.items()]))
def end_tag(el):
""" The text representation of an end tag for a tag. Includes
Modified: lxml/trunk/src/lxml/html/tests/test_autolink.py
==============================================================================
--- lxml/trunk/src/lxml/html/tests/test_autolink.py (original)
+++ lxml/trunk/src/lxml/html/tests/test_autolink.py Mon Jan 21 19:39:44 2008
@@ -1,9 +1,10 @@
-import unittest
+import unittest, sys
from lxml.tests.common_imports import doctest
def test_suite():
suite = unittest.TestSuite()
- suite.addTests([doctest.DocFileSuite('test_autolink.txt')])
+ if sys.version_info >= (2,4):
+ suite.addTests([doctest.DocFileSuite('test_autolink.txt')])
return suite
if __name__ == '__main__':
Modified: lxml/trunk/src/lxml/html/tests/test_basic.py
==============================================================================
--- lxml/trunk/src/lxml/html/tests/test_basic.py (original)
+++ lxml/trunk/src/lxml/html/tests/test_basic.py Mon Jan 21 19:39:44 2008
@@ -1,9 +1,10 @@
-import unittest
+import unittest, sys
from lxml.tests.common_imports import doctest
def test_suite():
suite = unittest.TestSuite()
- suite.addTests([doctest.DocFileSuite('test_basic.txt')])
+ if sys.version_info >= (2,4):
+ suite.addTests([doctest.DocFileSuite('test_basic.txt')])
return suite
if __name__ == '__main__':
Modified: lxml/trunk/src/lxml/html/tests/test_clean.py
==============================================================================
--- lxml/trunk/src/lxml/html/tests/test_clean.py (original)
+++ lxml/trunk/src/lxml/html/tests/test_clean.py Mon Jan 21 19:39:44 2008
@@ -1,10 +1,11 @@
-import unittest
+import unittest, sys
from lxml.tests.common_imports import doctest
from lxml.etree import LIBXML_VERSION
def test_suite():
suite = unittest.TestSuite()
- suite.addTests([doctest.DocFileSuite('test_clean.txt')])
- if LIBXML_VERSION <= (2,6,28) or LIBXML_VERSION >= (2,6,31):
- suite.addTests([doctest.DocFileSuite('test_clean_embed.txt')])
+ if sys.version_info >= (2,4):
+ suite.addTests([doctest.DocFileSuite('test_clean.txt')])
+ if LIBXML_VERSION <= (2,6,28) or LIBXML_VERSION >= (2,6,31):
+ suite.addTests([doctest.DocFileSuite('test_clean_embed.txt')])
return suite
Modified: lxml/trunk/src/lxml/html/tests/test_diff.py
==============================================================================
--- lxml/trunk/src/lxml/html/tests/test_diff.py (original)
+++ lxml/trunk/src/lxml/html/tests/test_diff.py Mon Jan 21 19:39:44 2008
@@ -1,12 +1,13 @@
-import unittest
+import unittest, sys
from lxml.tests.common_imports import doctest
from lxml.html import diff
def test_suite():
suite = unittest.TestSuite()
- suite.addTests([doctest.DocFileSuite('test_diff.txt'),
- doctest.DocTestSuite(diff)])
+ if sys.version_info >= (2,4):
+ suite.addTests([doctest.DocFileSuite('test_diff.txt'),
+ doctest.DocTestSuite(diff)])
return suite
if __name__ == '__main__':
Modified: lxml/trunk/src/lxml/html/tests/test_elementsoup.py
==============================================================================
--- lxml/trunk/src/lxml/html/tests/test_elementsoup.py (original)
+++ lxml/trunk/src/lxml/html/tests/test_elementsoup.py Mon Jan 21 19:39:44 2008
@@ -1,4 +1,4 @@
-import unittest
+import unittest, sys
from lxml.tests.common_imports import doctest
try:
@@ -10,8 +10,9 @@
def test_suite():
suite = unittest.TestSuite()
- if BS_INSTALLED:
- suite.addTests([doctest.DocFileSuite('../../../../doc/elementsoup.txt')])
+ if sys.version_info >= (2,4):
+ if BS_INSTALLED:
+ suite.addTests([doctest.DocFileSuite('../../../../doc/elementsoup.txt')])
return suite
if __name__ == '__main__':
Modified: lxml/trunk/src/lxml/html/tests/test_feedparser_data.py
==============================================================================
--- lxml/trunk/src/lxml/html/tests/test_feedparser_data.py (original)
+++ lxml/trunk/src/lxml/html/tests/test_feedparser_data.py Mon Jan 21 19:39:44 2008
@@ -1,9 +1,11 @@
+import sys
import os
import re
import rfc822
import unittest
from lxml.tests.common_imports import doctest
-from lxml.doctestcompare import LHTMLOutputChecker
+if sys.version_info >= (2,4):
+ from lxml.doctestcompare import LHTMLOutputChecker
from lxml.html.clean import clean, Cleaner
@@ -75,15 +77,16 @@
def test_suite():
suite = unittest.TestSuite()
- for dir in feed_dirs:
- for fn in os.listdir(dir):
- fn = os.path.join(dir, fn)
- if fn.endswith('.data'):
- case = FeedTestCase(fn)
- suite.addTests([case])
- # This is my lazy way of stopping on first error:
- try:
- case.runTest()
- except:
- break
+ if sys.version_info >= (2,4):
+ for dir in feed_dirs:
+ for fn in os.listdir(dir):
+ fn = os.path.join(dir, fn)
+ if fn.endswith('.data'):
+ case = FeedTestCase(fn)
+ suite.addTests([case])
+ # This is my lazy way of stopping on first error:
+ try:
+ case.runTest()
+ except:
+ break
return suite
Modified: lxml/trunk/src/lxml/html/tests/test_formfill.py
==============================================================================
--- lxml/trunk/src/lxml/html/tests/test_formfill.py (original)
+++ lxml/trunk/src/lxml/html/tests/test_formfill.py Mon Jan 21 19:39:44 2008
@@ -1,7 +1,8 @@
-import unittest
+import unittest, sys
from lxml.tests.common_imports import doctest
def test_suite():
suite = unittest.TestSuite()
- suite.addTests([doctest.DocFileSuite('test_formfill.txt')])
+ if sys.version_info >= (2,4):
+ suite.addTests([doctest.DocFileSuite('test_formfill.txt')])
return suite
Modified: lxml/trunk/src/lxml/html/tests/test_forms.py
==============================================================================
--- lxml/trunk/src/lxml/html/tests/test_forms.py (original)
+++ lxml/trunk/src/lxml/html/tests/test_forms.py Mon Jan 21 19:39:44 2008
@@ -1,9 +1,10 @@
-import unittest
+import unittest, sys
from lxml.tests.common_imports import doctest
def test_suite():
suite = unittest.TestSuite()
- suite.addTests([doctest.DocFileSuite('test_forms.txt')])
+ if sys.version_info >= (2,4):
+ suite.addTests([doctest.DocFileSuite('test_forms.txt')])
return suite
if __name__ == '__main__':
Modified: lxml/trunk/src/lxml/html/tests/test_rewritelinks.py
==============================================================================
--- lxml/trunk/src/lxml/html/tests/test_rewritelinks.py (original)
+++ lxml/trunk/src/lxml/html/tests/test_rewritelinks.py Mon Jan 21 19:39:44 2008
@@ -1,9 +1,10 @@
-import unittest
+import unittest, sys
from lxml.tests.common_imports import doctest
def test_suite():
suite = unittest.TestSuite()
- suite.addTests([doctest.DocFileSuite('test_rewritelinks.txt')])
+ if sys.version_info >= (2,4):
+ suite.addTests([doctest.DocFileSuite('test_rewritelinks.txt')])
return suite
if __name__ == '__main__':
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:44 2008
@@ -1,4 +1,4 @@
-import unittest
+import unittest, sys
from lxml.tests.common_imports import doctest
from lxml import html
from lxml import cssselect
@@ -61,10 +61,10 @@
self.index = index
unittest.TestCase.__init__(self)
- @classmethod
def all(cls):
for i in range(len(cls.selectors)):
yield cls(i)
+ all = classmethod(all)
def runTest(self):
f = open(doc_fn, 'rb')
Modified: lxml/trunk/src/lxml/tests/test_etree.py
==============================================================================
--- lxml/trunk/src/lxml/tests/test_etree.py (original)
+++ lxml/trunk/src/lxml/tests/test_etree.py Mon Jan 21 19:39:44 2008
@@ -1736,9 +1736,8 @@
def test_sourceline_iterparse_end(self):
iterparse = self.etree.iterparse
- lines = list(
- el.sourceline for (event, el) in
- iterparse(fileInTestDir('include/test_xinclude.xml')))
+ lines = [ el.sourceline for (event, el) in
+ iterparse(fileInTestDir('include/test_xinclude.xml')) ]
self.assertEquals(
[2, 3, 1],
@@ -1746,10 +1745,9 @@
def test_sourceline_iterparse_start(self):
iterparse = self.etree.iterparse
- lines = list(
- el.sourceline for (event, el) in
- iterparse(fileInTestDir('include/test_xinclude.xml'),
- events=("start",)))
+ lines = [ el.sourceline for (event, el) in
+ iterparse(fileInTestDir('include/test_xinclude.xml'),
+ events=("start",)) ]
self.assertEquals(
[1, 2, 3],
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:44 2008
@@ -37,8 +37,8 @@
# None: xsi:nil="true"
}
-xsitype2objclass = dict(( (v, k) for k in objectclass2xsitype
- for v in objectclass2xsitype[k] ))
+xsitype2objclass = dict([ (v, k) for k in objectclass2xsitype
+ for v in objectclass2xsitype[k] ])
objectclass2pytype = {
# objectify built-in
@@ -50,7 +50,8 @@
# None: xsi:nil="true"
}
-pytype2objclass = dict(( (objectclass2pytype[k], k) for k in objectclass2pytype))
+pytype2objclass = dict([ (objectclass2pytype[k], k)
+ for k in objectclass2pytype])
xml_str = '''\
<obj:root xmlns:obj="objectified" xmlns:other="otherNS">
Modified: lxml/trunk/src/lxml/tests/test_xpathevaluator.py
==============================================================================
--- lxml/trunk/src/lxml/tests/test_xpathevaluator.py (original)
+++ lxml/trunk/src/lxml/tests/test_xpathevaluator.py Mon Jan 21 19:39:44 2008
@@ -4,10 +4,10 @@
Test cases related to XPath evaluation and the XPath class
"""
-import unittest, doctest
+import unittest
from StringIO import StringIO
-from common_imports import etree, HelperTestCase
+from common_imports import etree, HelperTestCase, doctest
class ETreeXPathTestCase(HelperTestCase):
"""XPath tests etree"""
More information about the lxml-checkins
mailing list