Clean up all the imports.

[quix0rs-apt-p2p.git] / test_khashmir.py

diff --git a/test_khashmir.py b/test_khashmir.py
index e9c426ad7fd5cd5586feefbd36d4d93dc9e3ee90..24a8760df054012fbf98dafb20d62ccaeafa5221 100644 (file)
--- a/test_khashmir.py
+++ b/test_khashmir.py
@@ -1,11 +1,12 @@
-from unittest import *
-from khashmir import *
-import khash
-from copy import copy
-
+from unittest import defaultTestLoader, TextTestRunner, TestCase
+from sha import sha
 from random import randrange
+import os, sys
+
+from twisted.internet import reactor
 
-import os
+from khashmir import Khashmir
+from khash import newID
 
 if __name__ =="__main__":
     tests = defaultTestLoader.loadTestsFromNames([sys.argv[0][:-3]])
@@ -113,8 +114,8 @@ class MultiTest(TestCase):
         
     def testStoreRetrieve(self):
         for i in range(10):
-            K = khash.newID()
-            V = khash.newID()
+            K = newID()
+            V = newID()
             
             for a in range(3):
                 self.done = 0