[gentoo-commits] proj/g-sorcery:master commit in: tests/

[Jauhien Piatlicki]

commit:     ab7e4b9f72ac3fcf90a04d1743a2823e431ed0ef
Author:     Jauhien Piatlicki (jauhien) <piatlicki <AT> gmail <DOT> com>
AuthorDate: Tue Jul  2 14:49:51 2013 +0000
Commit:     Jauhien Piatlicki <piatlicki <AT> gmail <DOT> com>
CommitDate: Tue Jul  2 14:49:51 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/g-sorcery.git;a=commit;h=ab7e4b9f

py2k: tests/server

---
 tests/server.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tests/server.py b/tests/server.py
index ef17849..41767fc 100644
--- a/tests/server.py
+++ b/tests/server.py
@@ -11,13 +11,23 @@
     :license: GPL-2, see LICENSE for more details.
 """
 
-import http.server, threading
+import threading
+
+from g_sorcery.compatibility import py2k
+
+if py2k:
+    from SocketServer import TCPServer as HTTPServer 
+    from SimpleHTTPServer import SimpleHTTPRequestHandler
+else:
+    from http.server import HTTPServer
+    from http.server import SimpleHTTPRequestHandler
 
 class Server(threading.Thread):
     def __init__(self):
         super(Server, self).__init__()
+        HTTPServer.allow_reuse_address = True
         server_address = ('127.0.0.1', 8080)
-        self.httpd = http.server.HTTPServer(server_address, http.server.SimpleHTTPRequestHandler)
+        self.httpd = HTTPServer(server_address, SimpleHTTPRequestHandler)
     
     def run(self):
         self.httpd.serve_forever()