Remove redundant code for Python <= 2.6

10 files changed, 25 insertions, 53 deletions

diff --git a/src/lxml/html/clean.py b/src/lxml/html/clean.py
index adc3f450..f9570449 100644
--- a/src/lxml/html/clean.py
+++ b/src/lxml/html/clean.py
@@ -27,11 +27,6 @@ except NameError:
     # Python 3
     unicode = str
 try:
-    bytes
-except NameError:
-    # Python < 2.6
-    bytes = str
-try:
     basestring
 except NameError:
     basestring = (str, bytes)
diff --git a/src/lxml/html/tests/test_autolink.py b/src/lxml/html/tests/test_autolink.py
index 61b474ce..77ba8ae1 100644
--- a/src/lxml/html/tests/test_autolink.py
+++ b/src/lxml/html/tests/test_autolink.py
@@ -3,8 +3,7 @@ from lxml.tests.common_imports import make_doctest
 
 def test_suite():
     suite = unittest.TestSuite()
-    if sys.version_info >= (2,4):
-        suite.addTests([make_doctest('test_autolink.txt')])
+    suite.addTests([make_doctest('test_autolink.txt')])
     return suite
 
 if __name__ == '__main__':
diff --git a/src/lxml/html/tests/test_basic.py b/src/lxml/html/tests/test_basic.py
index fd4896a7..4f8214f3 100644
--- a/src/lxml/html/tests/test_basic.py
+++ b/src/lxml/html/tests/test_basic.py
@@ -4,8 +4,7 @@ import lxml.html
 
 def test_suite():
     suite = unittest.TestSuite()
-    if sys.version_info >= (2,4):
-        suite.addTests([make_doctest('test_basic.txt')])
+    suite.addTests([make_doctest('test_basic.txt')])
     suite.addTests([doctest.DocTestSuite(lxml.html)])
     return suite
 
diff --git a/src/lxml/html/tests/test_clean.py b/src/lxml/html/tests/test_clean.py
index 3bcaaf5a..a8187219 100644
--- a/src/lxml/html/tests/test_clean.py
+++ b/src/lxml/html/tests/test_clean.py
@@ -72,9 +72,8 @@ class CleanerTest(unittest.TestCase):
 
 def test_suite():
     suite = unittest.TestSuite()
-    if sys.version_info >= (2,4):
-        suite.addTests([make_doctest('test_clean.txt')])
-        if LIBXML_VERSION >= (2,6,31):
-            suite.addTests([make_doctest('test_clean_embed.txt')])
+    suite.addTests([make_doctest('test_clean.txt')])
+    if LIBXML_VERSION >= (2,6,31):
+        suite.addTests([make_doctest('test_clean_embed.txt')])
     suite.addTests(unittest.makeSuite(CleanerTest))
     return suite
diff --git a/src/lxml/html/tests/test_diff.py b/src/lxml/html/tests/test_diff.py
index f1fba4bc..4b279e96 100644
--- a/src/lxml/html/tests/test_diff.py
+++ b/src/lxml/html/tests/test_diff.py
@@ -5,9 +5,8 @@ from lxml.html import diff
 
 def test_suite():
     suite = unittest.TestSuite()
-    if sys.version_info >= (2,4):
-        suite.addTests([make_doctest('test_diff.txt'),
-                        doctest.DocTestSuite(diff)])
+    suite.addTests([make_doctest('test_diff.txt'),
+                    doctest.DocTestSuite(diff)])
     return suite
 
 if __name__ == '__main__':
diff --git a/src/lxml/html/tests/test_feedparser_data.py b/src/lxml/html/tests/test_feedparser_data.py
index eaf8c29e..ebf3462d 100644
--- a/src/lxml/html/tests/test_feedparser_data.py
+++ b/src/lxml/html/tests/test_feedparser_data.py
@@ -8,8 +8,7 @@ except ImportError:
     from email import message_from_file as Message
 import unittest
 from lxml.tests.common_imports import doctest
-if sys.version_info >= (2,4):
-    from lxml.doctestcompare import LHTMLOutputChecker
+from lxml.doctestcompare import LHTMLOutputChecker
 
 from lxml.html.clean import clean, Cleaner
 
@@ -83,16 +82,15 @@ class FeedTestCase(unittest.TestCase):
 
 def test_suite():
     suite = unittest.TestSuite()
-    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
+    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
diff --git a/src/lxml/html/tests/test_formfill.py b/src/lxml/html/tests/test_formfill.py
index 7893c20b..8e7e9cfa 100644
--- a/src/lxml/html/tests/test_formfill.py
+++ b/src/lxml/html/tests/test_formfill.py
@@ -3,6 +3,5 @@ from lxml.tests.common_imports import make_doctest
 
 def test_suite():
     suite = unittest.TestSuite()
-    if sys.version_info >= (2,4):
-        suite.addTests([make_doctest('test_formfill.txt')])
+    suite.addTests([make_doctest('test_formfill.txt')])
     return suite
diff --git a/src/lxml/html/tests/test_forms.py b/src/lxml/html/tests/test_forms.py
index e8b00c4d..2ad107e2 100644
--- a/src/lxml/html/tests/test_forms.py
+++ b/src/lxml/html/tests/test_forms.py
@@ -3,8 +3,7 @@ from lxml.tests.common_imports import make_doctest
 
 def test_suite():
     suite = unittest.TestSuite()
-    if sys.version_info >= (2,4):
-        suite.addTests([make_doctest('test_forms.txt')])
+    suite.addTests([make_doctest('test_forms.txt')])
     return suite
 
 if __name__ == '__main__':
diff --git a/src/lxml/html/tests/test_html5parser.py b/src/lxml/html/tests/test_html5parser.py
index 6a4eba57..8d703a14 100644
--- a/src/lxml/html/tests/test_html5parser.py
+++ b/src/lxml/html/tests/test_html5parser.py
@@ -7,23 +7,9 @@ except ImportError:                     # python 3
 import sys
 import tempfile
 import unittest
-try:
-    from unittest import skipUnless
-except ImportError:
-    # sys.version < (2, 7)
-    def skipUnless(condition, reason):
-        return lambda f: condition and f or None
-
-if sys.version_info < (2,6):
-    class NamedTemporaryFile(object):
-        def __init__(self, delete=True, **kwargs):
-            self._tmpfile = tempfile.NamedTemporaryFile(**kwargs)
-        def close(self):
-            self._tmpfile.flush()
-        def __getattr__(self, name):
-            return getattr(self._tmpfile, name)
-else:
-    NamedTemporaryFile = tempfile.NamedTemporaryFile
+from unittest import skipUnless
+
+NamedTemporaryFile = tempfile.NamedTemporaryFile
 
 from lxml.builder import ElementMaker
 from lxml.etree import Element, ElementTree, ParserError
diff --git a/src/lxml/html/tests/test_rewritelinks.py b/src/lxml/html/tests/test_rewritelinks.py
index b4653234..c7b86257 100644
--- a/src/lxml/html/tests/test_rewritelinks.py
+++ b/src/lxml/html/tests/test_rewritelinks.py
@@ -3,8 +3,7 @@ from lxml.tests.common_imports import make_doctest
 
 def test_suite():
     suite = unittest.TestSuite()
-    if sys.version_info >= (2,4):
-        suite.addTests([make_doctest('test_rewritelinks.txt')])
+    suite.addTests([make_doctest('test_rewritelinks.txt')])
     return suite
 
 if __name__ == '__main__':