commit 62956ebab7779c1b61ce3d6e8ac750552fd1c988 Merge: 9c5d5d4 df76264 Author: Isis Lovecruft <isis@torproject.org> Date: Thu Sep 13 13:01:44 2012 +0000 Merge branch 'bridget-twisted' ooni/assets/bridgetests.txt | 8 +- ooni/ooniprobe.py | 14 +- ooni/plugins/bridget.py | 465 +++++++++++++++++++++++++++++++++++++------ ooni/plugins/domclass.py | 3 +- ooni/plugoo/tests.py | 17 +- ooni/utils/log.py | 116 ++++++++--- 6 files changed, 522 insertions(+), 101 deletions(-) diff --cc ooni/plugoo/tests.py index 4be0b62,a827093..19d42b2 --- a/ooni/plugoo/tests.py +++ b/ooni/plugoo/tests.py @@@ -5,11 -5,14 +5,12 @@@ from zope.interface import Interface, A import logging import itertools from twisted.internet import reactor, defer, threads + ## XXX why is this imported and not used? from twisted.python import failure -from ooni.utils import log -from ooni.utils import date -from ooni.plugoo import assets, work -from ooni.plugoo.reports import Report -from ooni.plugoo.interface import ITest +from ooni import log +from plugoo import assets, work +from plugoo.reports import Report class OONITest(object):