commit 2c7552e3da6e72b1d55b9599dc3e7281a5ee266e Author: Isis Lovecruft isis@patternsinthevoid.net Date: Thu May 31 12:36:50 2012 -0300

Fixed module import issues with directory structure. --- ooni/__init__.py | 2 +- ooni/example_plugins/skel.py | 4 ++-- ooni/ooniprobe.py | 7 +++---- ooni/plugins/blocking.py | 4 ++-- ooni/plugins/httphost.py | 4 ++-- ooni/plugoo/reports.py | 2 +- ooni/plugoo/tests.py | 8 +++----- ooni/plugoo/work.py | 2 ++ 8 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/ooni/__init__.py b/ooni/__init__.py index dbb3824..a03c856 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1 +1 @@ -__all__ = ['plugoo', 'utils', 'config', 'logo', 'lib'] +__all__ = ['plugoo', 'utils', 'config', 'logo', 'lib', 'log'] diff --git a/ooni/example_plugins/skel.py b/ooni/example_plugins/skel.py index 52c7d4f..5f46620 100644 --- a/ooni/example_plugins/skel.py +++ b/ooni/example_plugins/skel.py @@ -1,8 +1,8 @@ from zope.interface import implements from twisted.python import usage from twisted.plugin import IPlugin -from plugoo.tests import ITest, OONITest -from ooni.utils import log +from plugoo.tests import ITest, TwistedTest +import log

class SkelArgs(usage.Options): optParameters = [['asset', 'a', None, 'Asset file'], diff --git a/ooni/ooniprobe.py b/ooni/ooniprobe.py index 4b5c086..3b48339 100755 --- a/ooni/ooniprobe.py +++ b/ooni/ooniprobe.py @@ -27,10 +27,9 @@ from zope.interface.verify import verifyObject from zope.interface.exceptions import BrokenImplementation from zope.interface.exceptions import BrokenMethodImplementation

-from ooni.plugoo import tests, work, assets, reports -from ooni.utils.logo import getlogo -from ooni.utils import log -from ooni import plugins +from plugoo import tests, work, assets, reports +from logo import getlogo +import plugins, log

__version__ = "0.0.1-prealpha"

diff --git a/ooni/plugins/blocking.py b/ooni/plugins/blocking.py index 6ddb5a4..72fd49f 100644 --- a/ooni/plugins/blocking.py +++ b/ooni/plugins/blocking.py @@ -2,8 +2,8 @@ from zope.interface import implements from twisted.python import usage from twisted.plugin import IPlugin

-from ooni.plugoo.assets import Asset -from ooni.plugoo.tests import ITest, OONITest +from plugoo.assets import Asset +from plugoo.tests import ITest, TwistedTest

class BlockingArgs(usage.Options): optParameters = [['asset', 'a', None, 'Asset file'], diff --git a/ooni/plugins/httphost.py b/ooni/plugins/httphost.py index b57a50d..e8808bd 100644 --- a/ooni/plugins/httphost.py +++ b/ooni/plugins/httphost.py @@ -20,8 +20,8 @@ from zope.interface import implements from twisted.python import usage from twisted.plugin import IPlugin

-from ooni.plugoo.assets import Asset -from ooni.plugoo.tests import ITest, OONITest +from plugoo.assets import Asset +from plugoo.tests import ITest, TwistedTest

class HTTPHostArgs(usage.Options): optParameters = [['asset', 'a', None, 'Asset file'], diff --git a/ooni/plugoo/reports.py b/ooni/plugoo/reports.py index a543151..ef15a04 100644 --- a/ooni/plugoo/reports.py +++ b/ooni/plugoo/reports.py @@ -4,7 +4,7 @@ import os import yaml

import itertools -from ooni.utils import log, date, net +import log

class Report: """This is the ooni-probe reporting mechanism. It allows diff --git a/ooni/plugoo/tests.py b/ooni/plugoo/tests.py index 7c190eb..544d82d 100644 --- a/ooni/plugoo/tests.py +++ b/ooni/plugoo/tests.py @@ -7,11 +7,9 @@ import itertools from twisted.internet import reactor, defer, threads 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 +import log +from plugoo import assets, work +from plugoo.reports import Report

class OONITest(object): diff --git a/ooni/plugoo/work.py b/ooni/plugoo/work.py index db88fbf..e32d76d 100644 --- a/ooni/plugoo/work.py +++ b/ooni/plugoo/work.py @@ -19,6 +19,8 @@ from zope.interface import Interface, Attribute from twisted.python import failure from twisted.internet import reactor, defer

+from plugoo.nodes import LocalNode + class Worker(object): """ This is the core of OONI. It takes as input Work Units and