fix tests in Py2.5 and Py3

2 files changed, 17 insertions, 4 deletions

diff --git a/src/lxml/tests/dummy_http_server.py b/src/lxml/tests/dummy_http_server.py
index 0faa6588..05e04a46 100644
--- a/src/lxml/tests/dummy_http_server.py
+++ b/src/lxml/tests/dummy_http_server.py
@@ -3,9 +3,15 @@ Simple HTTP request dumper for tests in Python 2.5+.
 """
 
 import sys
-import urlparse
 from contextlib import contextmanager
 
+try:
+    import urlparse
+except ImportError:
+    # Python 3
+    import urllib.parse as urlparse
+
+
 @contextmanager
 def webserver(app, port=0, host=None):
     """Context manager entry point for the 'with' statement.
@@ -31,7 +37,12 @@ def webserver(app, port=0, host=None):
         server.shutdown()
 
 
-from SocketServer import ThreadingMixIn
+try:
+    from SocketServer import ThreadingMixIn
+except ImportError:
+    # Python 3
+    from socketserver import ThreadingMixIn
+
 import wsgiref.simple_server as wsgiserver
 class WebServer(wsgiserver.WSGIServer, ThreadingMixIn):
     """A web server that starts a new thread for each request.
diff --git a/src/lxml/tests/test_http_io.py b/src/lxml/tests/test_http_io.py
index de141540..2e62626e 100644
--- a/src/lxml/tests/test_http_io.py
+++ b/src/lxml/tests/test_http_io.py
@@ -4,6 +4,8 @@
 Web IO test cases that need Python 2.5+ (wsgiref)
 """
 
+from __future__ import with_statement
+
 import unittest
 import textwrap
 import os
@@ -78,7 +80,7 @@ class HttpIOTestCase(HelperTestCase):
         self.assertEqual('a', root[0].tag)
 
     def test_network_dtd(self):
-        data = map(textwrap.dedent, [
+        data = [_bytes(textwrap.dedent(s)) for s in [
             # XML file
             '''\
             <?xml version="1.0"?>
@@ -87,7 +89,7 @@ class HttpIOTestCase(HelperTestCase):
             ''',
             # DTD
             '<!ENTITY myentity "DEFINED">',
-        ])
+        ]]
 
         responses = []
         def handler(environ, start_response):