cleanup unuse code

Author: aagbsn

bwscanner/attacher.py

@@ -6,21 +6,6 @@
 from bwscanner.logger import log
 
 
-class StreamClosedListener(StreamListenerMixin):
-    """
-    Closes the contained circuit if the listened stream closes.
-
-    This StreamListener is used to instruct Tor to close circuits
-    immediately after a stream completes rather than wait for the
-    circuit to time out.
-    """
-    def __init__(self, circ):
-        self.circ = circ
-
-    def stream_closed(self, *args, **kw):
-        self.circ.close(ifUnused=True)
-
-
 def options_need_new_consensus(tor_config, new_options):
     """
     Check if we need to wait for a new consensus after updating

bwscanner/measurement.py

@@ -7,7 +7,7 @@
 
 from bwscanner.logger import log
 from bwscanner.circuit import TwoHop
-from bwscanner.fetcher import get_tor_socks_endpoint, hashingReadBody, fetch
+from bwscanner.fetcher import hashingReadBody, fetch
 from bwscanner.writer import ResultSink
 
 # defer.setDebugging(True)
@@ -193,10 +193,3 @@ def get_r_desc_bw(self, router):
         defer.returnValue((server_descriptor.average_bandwidth,
                            server_descriptor.burst_bandwidth,
                            server_descriptor.observed_bandwidth))
-
-    @property
-    @defer.inlineCallbacks
-    def socks(self):
-        if self._socks is None:
-            self._socks = yield get_tor_socks_endpoint(self.state)
-        defer.returnValue(self._socks)