From 81d2092e0a03e666ec186138d1433fdd3487cb36 Mon Sep 17 00:00:00 2001 From: helmutm Date: Thu, 9 Aug 2007 14:32:00 +0000 Subject: [PATCH] removed 'from base import Loops' from __init__.py git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@1892 fd906abe-77d9-0310-91a1-e0d9ade77398 --- README.txt | 2 +- __init__.py | 2 +- browser/manager.py | 2 +- expert/testsetup.py | 2 +- helpers.txt | 2 +- knowledge/README.txt | 14 +++++++------- organize/README.txt | 2 +- process/README.txt | 2 +- rest/README.txt | 2 +- search/README.txt | 2 +- tests/setup.py | 2 +- tests/test_loops.py | 3 +-- versioning/testsetup.py | 2 +- xmlrpc/README.txt | 2 +- 14 files changed, 20 insertions(+), 21 deletions(-) diff --git a/README.txt b/README.txt index d5d7597..d9d095a 100755 --- a/README.txt +++ b/README.txt @@ -30,7 +30,7 @@ Concepts and Relations Let's start with creating a few example concepts, putting them in a top-level loops container and a concept manager: - >>> from loops import Loops + >>> from loops.base import Loops >>> from loops.tests.setup import TestSite >>> t = TestSite(site) >>> concepts, resources, views = t.setup() diff --git a/__init__.py b/__init__.py index fec71a7..24953e8 100644 --- a/__init__.py +++ b/__init__.py @@ -23,4 +23,4 @@ $Id$ """ -from loops.base import Loops +#from loops.base import Loops diff --git a/browser/manager.py b/browser/manager.py index 75ac1ad..a7f4aeb 100644 --- a/browser/manager.py +++ b/browser/manager.py @@ -26,7 +26,7 @@ from zope.app import zapi from zope.lifecycleevent import ObjectCreatedEvent, ObjectModifiedEvent from zope.event import notify from zope.formlib.form import FormFields -from loops import Loops +from loops.base import Loops from loops.interfaces import ILoops from loops.browser.common import AddForm, EditForm, BaseView from loops.setup import ISetupManager diff --git a/expert/testsetup.py b/expert/testsetup.py index 990ba79..a6efd3f 100644 --- a/expert/testsetup.py +++ b/expert/testsetup.py @@ -16,7 +16,7 @@ from cybertools.relation.interfaces import IRelationRegistry from cybertools.relation.registry import IndexableRelationAdapter from cybertools.typology.interfaces import IType -from loops import Loops +from loops.base import Loops from loops import util from loops.interfaces import IIndexAttributes from loops.concept import Concept diff --git a/helpers.txt b/helpers.txt index 144b8f4..91e9fcc 100755 --- a/helpers.txt +++ b/helpers.txt @@ -34,7 +34,7 @@ and care for some type adapter machinery: Now we can setup a simple loops site with its manager objects, using a loops setup manager: - >>> from loops import Loops + >>> from loops.base import Loops >>> loopsRoot = site['loops'] = Loops() >>> from loops.setup import SetupManager diff --git a/knowledge/README.txt b/knowledge/README.txt index ee773ca..714f137 100644 --- a/knowledge/README.txt +++ b/knowledge/README.txt @@ -10,14 +10,14 @@ Let's do some basic set up >>> from zope.app.testing.setup import placefulSetUp, placefulTearDown >>> site = placefulSetUp(True) - + >>> from zope import component, interface >>> from zope.app import zapi and setup a simple loops site with a concept manager and some concepts (with all the type machinery, what in real life is done via standard ZCML setup): - + >>> from cybertools.relation.interfaces import IRelationRegistry >>> from cybertools.relation.registry import DummyRelationRegistry >>> relations = DummyRelationRegistry() @@ -34,14 +34,14 @@ ZCML setup): >>> from loops.knowledge.setup import SetupManager >>> component.provideAdapter(SetupManager, (ILoops,), ISetupManager, ... name='knowledge') - - >>> from loops import Loops + + >>> from loops.base import Loops >>> loopsRoot = site['loops'] = Loops() >>> from loops.setup import SetupManager >>> setup = SetupManager(loopsRoot) >>> concepts, resources, views = setup.setup() - + We need some type concepts for controlling the meaning of the concepts objects, these have already been created during setup: @@ -77,7 +77,7 @@ the variables: >>> pySpecialsC = concepts['pySpecials'] = Concept(u'Python Specials') >>> topicConcepts = (progLangC, ooProgC, pythonC, pyBasicsC, pyOoC, pySpecialsC) - + >>> for c in topicConcepts: c.conceptType = topic >>> progLang, ooProg, python, pyBasics, pyOo, pySpecials = (IKnowledgeElement(c) @@ -160,7 +160,7 @@ For testing, we first have to provide the needed utilities and settings >>> from zope.app.security.principalregistry import PrincipalRegistry >>> auth = PrincipalRegistry() >>> component.provideUtility(auth, IAuthentication) - + >>> from zope.app.principalannotation.interfaces import IPrincipalAnnotationUtility >>> from zope.app.principalannotation import PrincipalAnnotationUtility >>> principalAnnotations = PrincipalAnnotationUtility() diff --git a/organize/README.txt b/organize/README.txt index d085f2a..dc71710 100644 --- a/organize/README.txt +++ b/organize/README.txt @@ -35,7 +35,7 @@ ZCML setup): >>> component.provideAdapter(SetupManager, (ILoops,), ISetupManager, ... name='organize') - >>> from loops import Loops + >>> from loops.base import Loops >>> loopsRoot = site['loops'] = Loops() >>> loopsId = relations.getUniqueIdForObject(loopsRoot) diff --git a/process/README.txt b/process/README.txt index 9542dc5..dd1bf66 100644 --- a/process/README.txt +++ b/process/README.txt @@ -35,7 +35,7 @@ ZCML setup): >>> component.provideAdapter(SetupManager, (ILoops,), ISetupManager, ... name='process') - >>> from loops import Loops + >>> from loops.base import Loops >>> loopsRoot = site['loops'] = Loops() >>> from loops.setup import SetupManager diff --git a/rest/README.txt b/rest/README.txt index ec7b5ca..83b9e91 100755 --- a/rest/README.txt +++ b/rest/README.txt @@ -25,7 +25,7 @@ ZCML setup): >>> component.provideAdapter(ConceptType) >>> component.provideAdapter(TypeConcept) - >>> from loops import Loops + >>> from loops.base import Loops >>> loopsRoot = site['loops'] = Loops() >>> from loops.setup import SetupManager diff --git a/search/README.txt b/search/README.txt index e60d56f..97491e7 100755 --- a/search/README.txt +++ b/search/README.txt @@ -28,7 +28,7 @@ ZCML setup): >>> component.provideAdapter(ConceptType) >>> component.provideAdapter(TypeConcept) - >>> from loops import Loops + >>> from loops.base import Loops >>> loopsRoot = site['loops'] = Loops() >>> from loops.setup import SetupManager diff --git a/tests/setup.py b/tests/setup.py index c50c05c..74efc15 100644 --- a/tests/setup.py +++ b/tests/setup.py @@ -24,7 +24,7 @@ from cybertools.relation.registry import IndexableRelationAdapter from cybertools.relation.registry import invalidateRelations, removeRelation from cybertools.typology.interfaces import IType -from loops import Loops +from loops.base import Loops from loops import util from loops.common import NameChooser from loops.interfaces import ILoopsObject, IIndexAttributes, IDocument, IFile diff --git a/tests/test_loops.py b/tests/test_loops.py index cc6a8f3..8c41a97 100755 --- a/tests/test_loops.py +++ b/tests/test_loops.py @@ -2,14 +2,13 @@ import unittest, doctest from zope.testing.doctestunit import DocFileSuite -from zope.app.testing import ztapi from zope.interface.verify import verifyClass from zope.interface import implements from zope.app import zapi from zope.app.intid.interfaces import IIntIds from loops.interfaces import ILoops -from loops import Loops +from loops.base import Loops from loops.interfaces import IConcept, IConceptManager from loops.interfaces import IDocument, IMediaAsset, IResourceManager from loops.interfaces import INode, IViewManager diff --git a/versioning/testsetup.py b/versioning/testsetup.py index 4f7b302..f3ac1e0 100644 --- a/versioning/testsetup.py +++ b/versioning/testsetup.py @@ -17,7 +17,7 @@ from cybertools.relation.interfaces import IRelationRegistry from cybertools.relation.registry import IndexableRelationAdapter from cybertools.typology.interfaces import IType -from loops import Loops +from loops.base import Loops from loops import util from loops.interfaces import IResource, IIndexAttributes from loops.concept import Concept diff --git a/xmlrpc/README.txt b/xmlrpc/README.txt index 8086e60..a68a8a8 100755 --- a/xmlrpc/README.txt +++ b/xmlrpc/README.txt @@ -31,7 +31,7 @@ ZCML setup): >>> from loops.common import NameChooser >>> component.provideAdapter(NameChooser) - >>> from loops import Loops + >>> from loops.base import Loops >>> loopsRoot = site['loops'] = Loops() >>> from loops.setup import SetupManager