From 6212b69fb4f137db0c72bb8f3126f530c3f0daee Mon Sep 17 00:00:00 2001
From: Rouli <rouli.net@gmail.com>
Date: Thu, 17 Jan 2013 17:36:18 +0200
Subject: fixes due to merge with master

---
 test/test_server.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/test_server.py b/test/test_server.py
index 76f24743..ee6873c7 100644
--- a/test/test_server.py
+++ b/test/test_server.py
@@ -1,5 +1,6 @@
 from netlib import tcp
-import tutils
+from time import sleep
+import tutils, socket
 
 """
     Note that the choice of response code in these tests matters more than you
-- 
cgit v1.2.3