some minor tweaks; mainly for doctests
git-svn-id: svn://svn.cy55.de/Zope3/src/loops/trunk@2397 fd906abe-77d9-0310-91a1-e0d9ade77398
This commit is contained in:
		
							parent
							
								
									ca273f78bc
								
							
						
					
					
						commit
						13e1aa0a4b
					
				
					 5 changed files with 5 additions and 13 deletions
				
			
		|  | @ -336,9 +336,6 @@ or resources they are related to. | ||||||
| The view manager has already been created during setup. | The view manager has already been created during setup. | ||||||
| 
 | 
 | ||||||
|   >>> from loops.view import ViewManager, Node |   >>> from loops.view import ViewManager, Node | ||||||
|   >>> from zope.security.checker import NamesChecker, defineChecker |  | ||||||
|   >>> nodeChecker = NamesChecker(('body', 'title',)) |  | ||||||
|   >>> defineChecker(Node, nodeChecker) |  | ||||||
| 
 | 
 | ||||||
| The view space is typically built up with nodes; a node may be a top-level | The view space is typically built up with nodes; a node may be a top-level | ||||||
| menu that may contain other nodes as menu or content items: | menu that may contain other nodes as menu or content items: | ||||||
|  |  | ||||||
|  | @ -29,7 +29,7 @@ from zope.interface import Interface | ||||||
| from zope.lifecycleevent import ObjectCreatedEvent, ObjectModifiedEvent | from zope.lifecycleevent import ObjectCreatedEvent, ObjectModifiedEvent | ||||||
| 
 | 
 | ||||||
| from zope.app.container.interfaces import INameChooser | from zope.app.container.interfaces import INameChooser | ||||||
| from zope.app.container.contained import NameChooser | #from zope.app.container.contained import NameChooser | ||||||
| from zope.app.pagetemplate import ViewPageTemplateFile | from zope.app.pagetemplate import ViewPageTemplateFile | ||||||
| from zope.cachedescriptors.property import Lazy | from zope.cachedescriptors.property import Lazy | ||||||
| from zope.contenttype import guess_content_type | from zope.contenttype import guess_content_type | ||||||
|  | @ -246,7 +246,7 @@ class CreateObjectForm(ObjectForm): | ||||||
|     def adapted(self): |     def adapted(self): | ||||||
|         ad = self.typeInterface(Resource()) |         ad = self.typeInterface(Resource()) | ||||||
|         ad.storageName = 'unknown'  # hack for file objects: don't try to retrieve data |         ad.storageName = 'unknown'  # hack for file objects: don't try to retrieve data | ||||||
|         return (ad) |         return ad | ||||||
| 
 | 
 | ||||||
|     @Lazy |     @Lazy | ||||||
|     def instance(self): |     def instance(self): | ||||||
|  |  | ||||||
|  | @ -106,8 +106,6 @@ class NodeView(BaseView): | ||||||
|                         priority=10) |                         priority=10) | ||||||
|         # force early portlet registrations by target by setting up target view |         # force early portlet registrations by target by setting up target view | ||||||
|         self.virtualTarget |         self.virtualTarget | ||||||
|         # force early portlet registrations by target by setting up target view |  | ||||||
|         self.virtualTarget |  | ||||||
| 
 | 
 | ||||||
|     @Lazy |     @Lazy | ||||||
|     def view(self): |     def view(self): | ||||||
|  |  | ||||||
|  | @ -379,10 +379,6 @@ is used to retrieve a macro used by NodeView. | ||||||
| As the display of the standard macros is controlled by permissions we have | As the display of the standard macros is controlled by permissions we have | ||||||
| to install a checker first. | to install a checker first. | ||||||
| 
 | 
 | ||||||
|   >>> from zope.security.checker import NamesChecker, defineChecker |  | ||||||
|   >>> nodeChecker = NamesChecker(('body', 'title',)) |  | ||||||
|   >>> defineChecker(Node, nodeChecker) |  | ||||||
| 
 |  | ||||||
|   >>> from cybertools.browser.controller import Controller |   >>> from cybertools.browser.controller import Controller | ||||||
|   >>> from loops.browser.util import node_macros |   >>> from loops.browser.util import node_macros | ||||||
|   >>> from loops.browser.common import BaseView |   >>> from loops.browser.common import BaseView | ||||||
|  |  | ||||||
|  | @ -62,7 +62,7 @@ from loops.security.policy import LoopsSecurityPolicy | ||||||
| from loops.security.setter import BaseSecuritySetter | from loops.security.setter import BaseSecuritySetter | ||||||
| from loops.setup import SetupManager, addObject | from loops.setup import SetupManager, addObject | ||||||
| from loops.type import LoopsType, ConceptType, ResourceType, TypeConcept | from loops.type import LoopsType, ConceptType, ResourceType, TypeConcept | ||||||
| from loops.view import NodeAdapter | from loops.view import Node, NodeAdapter | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| class ClientIdManager(object): | class ClientIdManager(object): | ||||||
|  | @ -82,11 +82,12 @@ class TestSite(object): | ||||||
| 
 | 
 | ||||||
|         #oldPolicy = setSecurityPolicy(ZopeSecurityPolicy) |         #oldPolicy = setSecurityPolicy(ZopeSecurityPolicy) | ||||||
|         oldPolicy = setSecurityPolicy(LoopsSecurityPolicy) |         oldPolicy = setSecurityPolicy(LoopsSecurityPolicy) | ||||||
|         checker = Checker(dict(title='zope.View', data='zope.View'), |         checker = Checker(dict(title='zope.View', data='zope.View', body='zope.View'), | ||||||
|                           dict(title='zope.ManageContent')) |                           dict(title='zope.ManageContent')) | ||||||
|         defineChecker(Concept, checker) |         defineChecker(Concept, checker) | ||||||
|         defineChecker(Resource, checker) |         defineChecker(Resource, checker) | ||||||
|         defineChecker(Document, checker) |         defineChecker(Document, checker) | ||||||
|  |         defineChecker(Node, checker) | ||||||
| 
 | 
 | ||||||
|         component.provideUtility(IntIdsStub()) |         component.provideUtility(IntIdsStub()) | ||||||
|         relations = RelationRegistry() |         relations = RelationRegistry() | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 helmutm
						helmutm