Make it also work from the command-line.

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

diff --git a/krpc.py b/krpc.py
index efdc29ffe47bc2c9ba9fd66528444b04f56256dc..8a6009250e619f88606629d21c1d142ce61bad31 100644 (file)
--- a/krpc.py
+++ b/krpc.py
@@ -1,19 +1,14 @@
 ## Copyright 2002-2003 Andrew Loewenstern, All Rights Reserved
 # see LICENSE.txt for license information
 
-import airhook
-from twisted.internet.defer import Deferred
-from twisted.protocols import basic
 from bencode import bencode, bdecode
-from twisted.internet import protocol
-
-from twisted.internet import reactor
-import time
-
+from time import asctime
 import sys
 from traceback import format_exception
 
-import khash as hash
+from twisted.internet.defer import Deferred
+from twisted.internet import protocol
+from twisted.internet import reactor
 
 KRPC_TIMEOUT = 20
 
@@ -76,7 +71,6 @@ class KRPC:
         except Exception, e:
             if self.noisy:
                 print "response decode error: " + `e`
-            self.d.errback()
         else:
             #if self.noisy:
             #    print msg
@@ -113,7 +107,7 @@ class KRPC:
                     olen = len(out)
                     self.transport.write(out, addr)
                 if self.noisy:
-                    print "%s %s >>> %s - %s %s %s" % (time.asctime(), addr, self.factory.node.port, 
+                    print "%s %s >>> %s - %s %s %s" % (asctime(), addr, self.factory.node.port, 
                                                     ilen, msg[REQ], olen)
             elif msg[TYP] == RSP:
                 # if response