Changed special parameter timeout to _timeout so that it doesn't block any parameter...

[z_archive/twitter.git] / tests / test_util.py

diff --git a/tests/test_util.py b/tests/test_util.py
index 322d11bcd240bc14923416dbc5d8d3a8bf4eeaba..85800d14bb698069cf90d1aa2afc9ba2e080f3f0 100644 (file)
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -1,12 +1,17 @@
-import BaseHTTPServer
 from collections import namedtuple
 import contextlib
 import functools
 import socket
-import SocketServer
 import threading
 from twitter.util import find_links, follow_redirects, expand_line, parse_host_list
 
+try:
+    import http.server as BaseHTTPServer
+    import socketserver as SocketServer
+except ImportError:
+    import BaseHTTPServer
+    import SocketServer
+
 
 def test_find_links():
     assert find_links("nix") == ("nix", [])
@@ -35,7 +40,7 @@ def start_server(*resp):
             response = responses.pop()
             assert response.path == self.path
             self.send_response(response.code)
-            for header, value in response.headers.iteritems():
+            for header, value in list(response.headers.items()):
                 self.send_header(header, value)
             self.end_headers()