Commit 8a2715c7 authored by George Kadianakis's avatar George Kadianakis
Browse files

Fix various 'unused import' errors that were failing flake8. 

Most of them innocuous. Some shadowing stuff might cause bugs tho.
parent 3323ffa9

onionbalance/config_generator/config_generator.py

+1 −2
Original line number Diff line number Diff line
@@ -414,8 +414,7 @@ def main(): 
    # Crude check to see if any options beside --verbosity are set.

    verbose = True if '-v' in sys.argv else False



    if ((len(sys.argv) > 1 and not verbose) or len(sys.argv) > 3 or

            args.no_interactive):

    if ((len(sys.argv) > 1 and not verbose) or len(sys.argv) > 3 or args.no_interactive):

        interactive = False

        logger.info("Entering non-interactive mode.")

    else:

onionbalance/hs_v2/descriptor.py

+2 −4
Original line number Diff line number Diff line
@@ -31,8 +31,7 @@ def generate_service_descriptor(permanent_key, introduction_point_list=None, 
    # Calculate the current secret-id-part for this hidden service

    # Deviation allows the generation of a descriptor for a different time

    # period.

    time_period = (util.get_time_period(unix_timestamp, permanent_id) +

                   int(deviation))

    time_period = (util.get_time_period(unix_timestamp, permanent_id) + int(deviation))



    secret_id_part = util.calc_secret_id_part(time_period, None, replica)

    descriptor_id = util.calc_descriptor_id(permanent_id, secret_id_part)
@@ -159,8 +158,7 @@ def sign_descriptor(descriptor, service_key): 


    # Remove signature block if it exists

    if token_descriptor_signature in descriptor:

        descriptor = descriptor[:descriptor.find(token_descriptor_signature) +

                                len(token_descriptor_signature)]

        descriptor = descriptor[:descriptor.find(token_descriptor_signature) + len(token_descriptor_signature)]

    else:

        descriptor = descriptor.strip() + token_descriptor_signature

onionbalance/hs_v2/eventhandler.py

+0 −2
Original line number Diff line number Diff line 
# -*- coding: utf-8 -*-

from builtins import str, object



import stem



from onionbalance.common import log



from onionbalance.hs_v2 import descriptor

onionbalance/hs_v2/instance.py

+1 −5
Original line number Diff line number Diff line 
# -*- coding: utf-8 -*-

import datetime

import time



from onionbalance.common import log

from onionbalance.hs_v2 import config

import onionbalance.common.instance



from onionbalance.hs_v2 import util



logger = log.get_logger()
@@ -77,8 +74,7 @@ class InstanceV2(onionbalance.common.instance.Instance): 
        # If the new introduction points are different, flag this instance

        # as modified. Compare the set of introduction point identifiers

        # (fingerprint of the per IP circuit service key).

        if (set(ip.identifier for ip in introduction_points) !=

                set(ip.identifier for ip in self.introduction_points)):

        if (set(ip.identifier for ip in introduction_points) != set(ip.identifier for ip in self.introduction_points)):

            self.intro_set_changed_since_published = True

            self.introduction_points = introduction_points

            return True

onionbalance/hs_v2/manager.py

+1 −3
Original line number Diff line number Diff line
@@ -4,14 +4,12 @@ Load balance a hidden service across multiple (remote) Tor instances by 
create a hidden service descriptor containing introduction points from

each instance.

"""

import os

import sys

import logging



# import Crypto.PublicKey

import stem

from stem.control import Controller, EventType

from setproctitle import setproctitle  # pylint: disable=no-name-in-module

from stem.control import EventType



import onionbalance.common.util