commit 9c5d5d4b39babb714df86089e87db36af6562085 Author: Isis Lovecruft <isis@torproject.org> Date: Thu Aug 30 01:04:53 2012 +0000 Actually, everything is not working. I started to fix it, but I need to work on bridget, so I'm going to clone tpo:ooni-probe.git into a new branch now. --- ooni/ooniprobe.py | 6 +++--- ooni/plugoo/tests.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ooni/ooniprobe.py b/ooni/ooniprobe.py index 7e9eecc..e60b956 100755 --- a/ooni/ooniprobe.py +++ b/ooni/ooniprobe.py @@ -27,9 +27,9 @@ from zope.interface.verify import verifyObject from zope.interface.exceptions import BrokenImplementation from zope.interface.exceptions import BrokenMethodImplementation -from plugoo import tests, work, assets, reports -from logo import getlogo -import plugins, log +from ooni.plugoo import tests, work, assets, reports +from ooni.logo import getlogo +from ooni import plugins, log __version__ = "0.0.1-prealpha" diff --git a/ooni/plugoo/tests.py b/ooni/plugoo/tests.py index 544d82d..4be0b62 100644 --- a/ooni/plugoo/tests.py +++ b/ooni/plugoo/tests.py @@ -7,7 +7,7 @@ import itertools from twisted.internet import reactor, defer, threads from twisted.python import failure -import log +from ooni import log from plugoo import assets, work from plugoo.reports import Report