[Lxml-checkins] r35199 - lxml/trunk/src/lxml/tests

[faassen at codespeak.net]

Author: faassen
Date: Fri Dec  1 13:46:56 2006
New Revision: 35199

Modified:
   lxml/trunk/src/lxml/tests/common_imports.py
   lxml/trunk/src/lxml/tests/test_elementtree.py
   lxml/trunk/src/lxml/tests/test_nsclasses.py
   lxml/trunk/src/lxml/tests/test_objectify.py
Log:
Some backwards compatibility work for Python 2.3.

Modified: lxml/trunk/src/lxml/tests/common_imports.py
==============================================================================
--- lxml/trunk/src/lxml/tests/common_imports.py	(original)
+++ lxml/trunk/src/lxml/tests/common_imports.py	Fri Dec  1 13:46:56 2006
@@ -23,6 +23,11 @@
     # we need our own version to make it work (Python 2.3?)
     import local_doctest as doctest
 
+try:
+    from operator import itemgetter
+except ImportError:
+    def itemgetter(item):
+        return lambda obj: obj[item]
 
 class HelperTestCase(unittest.TestCase):
     def parse(self, text):
@@ -32,6 +37,12 @@
     def _rootstring(self, tree):
         return etree.tostring(tree.getroot()).replace(' ', '').replace('\n', '')
 
+    # assertFalse doesn't exist in Python 2.3
+    try:
+        unittest.TestCase.assertFalse
+    except AttributeError:
+        assertFalse = unittest.TestCase.failIf
+        
 class SillyFileLike:
     def __init__(self, xml_data='<foo><bar/></foo>'):
         self.xml_data = xml_data

Modified: lxml/trunk/src/lxml/tests/test_elementtree.py
==============================================================================
--- lxml/trunk/src/lxml/tests/test_elementtree.py	(original)
+++ lxml/trunk/src/lxml/tests/test_elementtree.py	Fri Dec  1 13:46:56 2006
@@ -11,9 +11,10 @@
 import unittest, doctest
 import os, re, shutil, tempfile, copy
 
-from common_imports import StringIO, etree, ElementTree, HelperTestCase, fileInTestDir, canonicalize
+from common_imports import StringIO, etree, ElementTree
+from common_imports import HelperTestCase, fileInTestDir, canonicalize
 
-class ETreeTestCaseBase(unittest.TestCase):
+class ETreeTestCaseBase(HelperTestCase):
     etree = None
     
     def setUp(self):

Modified: lxml/trunk/src/lxml/tests/test_nsclasses.py
==============================================================================
--- lxml/trunk/src/lxml/tests/test_nsclasses.py	(original)
+++ lxml/trunk/src/lxml/tests/test_nsclasses.py	Fri Dec  1 13:46:56 2006
@@ -10,7 +10,6 @@
 from common_imports import etree, HelperTestCase, doctest
 
 class ETreeNamespaceClassesTestCase(HelperTestCase):
-    assertFalse = HelperTestCase.failIf
     
     class default_class(etree.ElementBase):
         pass

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	Fri Dec  1 13:46:56 2006
@@ -12,6 +12,7 @@
 
 from common_imports import etree, StringIO, HelperTestCase, fileInTestDir
 from common_imports import SillyFileLike, canonicalize, doctest
+from common_imports import itemgetter
 
 from lxml import objectify
 
@@ -119,7 +120,7 @@
         self.assertEquals("0", root.c1.c2[0].text)
         self.assertEquals("1", root.c1.c2[1].text)
         self.assertEquals("2", root.c1.c2[2].text)
-        self.assertRaises(IndexError, operator.itemgetter(3), root.c1.c2)
+        self.assertRaises(IndexError, itemgetter(3), root.c1.c2)
 
     def test_child_index_neg(self):
         root = self.XML(xml_str)
@@ -127,7 +128,7 @@
         self.assertEquals("0", root.c1.c2[-3].text)
         self.assertEquals("1", root.c1.c2[-2].text)
         self.assertEquals("2", root.c1.c2[-1].text)
-        self.assertRaises(IndexError, operator.itemgetter(-4), root.c1.c2)
+        self.assertRaises(IndexError, itemgetter(-4), root.c1.c2)
 
     def test_child_len(self):
         root = self.XML(xml_str)