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

@@ -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()

__init__.py

@@ -23,4 +23,4 @@
 $Id$
 """
 
-from loops.base import Loops
+#from loops.base import Loops

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

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

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

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()

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)
 

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

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

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

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

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

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

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