commit c5634f7f3f4b5cabd67af4a04045250ad13a6416 Author: Arturo Filastò art@fuffa.org Date: Wed Jan 16 21:23:05 2013 +0100

Remove unused imports inside of ooni, oonicli and runner --- ooni/__init__.py | 2 -- ooni/oonicli.py | 12 ++---------- ooni/runner.py | 10 ++-------- 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/ooni/__init__.py b/ooni/__init__.py index 5261982..5405c17 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1,12 +1,10 @@ # -*- encoding: utf-8 -*-

from . import config -from . import inputunit from . import kit from . import nettest from . import oonicli from . import reporter -from . import runner from . import templates from . import utils

diff --git a/ooni/oonicli.py b/ooni/oonicli.py index 71de7e1..d11a9f7 100644 --- a/ooni/oonicli.py +++ b/ooni/oonicli.py @@ -2,25 +2,19 @@

import sys import os -import random import time import yaml

from twisted.internet import defer, reactor, task -from twisted.application import app -from twisted.python import usage, failure +from twisted.python import usage from twisted.python.util import spewer

-from ooni import nettest, runner, reporter, config +from ooni import config from ooni.director import Director from ooni.reporter import YAMLReporter, OONIBReporter

-from ooni.inputunit import InputUnitFactory - from ooni.nettest import NetTestLoader, MissingRequiredOption

-from ooni.utils import net -from ooni.utils import checkForRoot, NotRootError from ooni.utils import log

class Options(usage.Options): @@ -242,5 +236,3 @@ def run(): d.addErrback(errorRunningTests)

reactor.run() - - diff --git a/ooni/runner.py b/ooni/runner.py index 21c3e0e..d56dc26 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -1,19 +1,14 @@ import os import sys import time -import inspect -import traceback -import itertools import random

import yaml

-from twisted.python import reflect, usage from twisted.internet import defer -from twisted.trial.runner import filenameToModule -from twisted.internet import reactor, threads +from twisted.internet import reactor

-from txtorcon import TorProtocolFactory, TorConfig +from txtorcon import TorConfig from txtorcon import TorState, launch_tor

from ooni import config @@ -21,7 +16,6 @@ from ooni import config from ooni.reporter import OONIBReporter, YAMLReporter, OONIBReportError

from ooni.inputunit import InputUnitFactory -from ooni.nettest import NetTestCase, NoPostProcessor

from ooni.utils import log, checkForRoot, pushFilenameStack from ooni.utils import NotRootError, Storage