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

[scoder at codespeak.net]

Author: scoder
Date: Mon Sep  3 16:02:36 2007
New Revision: 46276

Modified:
   lxml/trunk/src/lxml/tests/common_imports.py
   lxml/trunk/src/lxml/tests/test_objectify.py
   lxml/trunk/src/lxml/tests/test_pyclasslookup.py
Log:
more test case cleanup

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	Mon Sep  3 16:02:36 2007
@@ -31,12 +31,6 @@
     # 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):
         f = StringIO(text)

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 Sep  3 16:02:36 2007
@@ -9,7 +9,6 @@
 
 from common_imports import etree, StringIO, HelperTestCase, fileInTestDir
 from common_imports import SillyFileLike, canonicalize, doctest
-from common_imports import itemgetter
 
 from lxml import objectify
 
@@ -373,7 +372,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, itemgetter(3), root.c1.c2)
+        self.assertRaises(IndexError, operator.getitem, root.c1.c2, 3)
 
     def test_child_index_neg(self):
         root = self.XML(xml_str)
@@ -381,7 +380,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, itemgetter(-4), root.c1.c2)
+        self.assertRaises(IndexError, operator.getitem, root.c1.c2, -4)
 
     def test_child_len(self):
         root = self.XML(xml_str)

Modified: lxml/trunk/src/lxml/tests/test_pyclasslookup.py
==============================================================================
--- lxml/trunk/src/lxml/tests/test_pyclasslookup.py	(original)
+++ lxml/trunk/src/lxml/tests/test_pyclasslookup.py	Mon Sep  3 16:02:36 2007
@@ -9,7 +9,6 @@
 
 from common_imports import etree, StringIO, HelperTestCase, fileInTestDir
 from common_imports import SillyFileLike, canonicalize, doctest
-from common_imports import itemgetter
 
 from lxml.pyclasslookup import PythonElementClassLookup