Moved the new traversal stuff into its own class. Some objects,

such as PropertySheets, are traversable but are not Items.

lib/python/OFS/SimpleItem.py

@@ -89,8 +89,8 @@ Aqueduct database adapters, etc.
 This module can also be used as a simple template for implementing new
 item types. 
 
-$Id: SimpleItem.py,v 1.76 2000/06/09 23:57:46 evan Exp $'''
-__version__='$Revision: 1.76 $'[11:-2]
+$Id: SimpleItem.py,v 1.77 2000/06/12 19:36:37 shane Exp $'''
+__version__='$Revision: 1.77 $'[11:-2]
 
 import regex, sys, Globals, App.Management, Acquisition, App.Undo
 import AccessControl.Role, AccessControl.Owned, App.Common
@@ -101,17 +101,17 @@ from CopySupport import CopySource
 from string import join, lower, find, split
 from types import InstanceType, StringType
 from ComputedAttribute import ComputedAttribute
-from urllib import quote, unquote
+from urllib import quote
 from AccessControl import getSecurityManager
+from Traversable import Traversable
 
 import marshal
 import ZDOM
 
 HTML=Globals.HTML
-_marker=[]
 StringType=type('')
 
-class Item(Base, Resource, CopySource, App.Management.Tabs,
+class Item(Base, Resource, CopySource, App.Management.Tabs, Traversable,
            ZDOM.Element,
            AccessControl.Owned.Owned,
            App.Undo.UndoSupport,
@@ -155,9 +155,6 @@ class Item(Base, Resource, CopySource, App.Management.Tabs,
     # Allow (reluctantly) access to unprotected attributes
     __allow_access_to_unprotected_subobjects__=1
 
-    getPhysicalRoot=Acquisition.Acquired
-    getPhysicalRoot__roles__=()
-    
 
     def title_or_id(self):
         """
@@ -352,99 +349,6 @@ class Item(Base, Resource, CopySource, App.Management.Tabs,
             return join(path, '/')
         return join([req['SERVER_URL']] + req._script + path, '/')
 
-    def getPhysicalPath(self):
-        '''Returns a path (an immutable sequence of strings)
-        that can be used to access this object again
-        later, for example in a copy/paste operation.  getPhysicalRoot()
-        and getPhysicalPath() are designed to operate together.
-        '''
-        path = (self.id,)
-        
-        p = getattr(self,'aq_inner', None)
-        if p is not None: 
-            path = p.aq_parent.getPhysicalPath() + path
-
-        return path
-
-    unrestrictedTraverse__roles__=()
-    def unrestrictedTraverse(self, path, default=_marker, restricted=0):
-
-        if not path: return self
-
-        get=getattr
-        N=None
-        M=_marker
-
-        if type(path) is StringType: path = split(path,'/')
-        else: path=list(path)
-
-        REQUEST={'TraversalRequestNameStack': path}
-        path.reverse()
-        pop=path.pop
-
-        if not path[-1]:
-            # If the path starts with an empty string, go to the root first.
-            pop()
-            self=self.getPhysicalRoot()
-                    
-        try:
-            object = self
-            while path:
-                name=pop()
-
-                if name[0] == '_':
-                    # Never allowed in a URL.
-                    raise 'NotFound', name
-
-                if name=='..':
-                    o=getattr(object, 'aq_parent', M)
-                    if o is not M:
-                        if (restricted and
-                            not getSecurityManager().validate(object, object, name, o)):
-                            raise 'Unauthorized', name
-                        object=o
-                        continue
-
-                t=get(object, '__bobo_traverse__', N)
-                if t is not N:
-                    o=t(REQUEST, name)
-                    
-                    # Note we pass no container, because we have no
-                    # way of knowing what it is
-                    if (restricted and not getSecurityManager().validate(object, None, name, o)):
-                        raise 'Unauthorized', name
-                      
-                else:
-                    o=get(object, name, M)
-                    if o is not M:
-                        if restricted:
-                            # waaaa
-                            if hasattr(get(object,'aq_base',object), name):
-                                # value wasn't acquired
-                                if not getSecurityManager().validate(object, object, name, o):
-                                    raise 'Unauthorized', name
-                            else:
-                                if not getSecurityManager().validate(object, None, name, o):
-                                    raise 'Unauthorized', name
-                        
-                    else:
-                        o=object[name]
-                        if (restricted and not getSecurityManager().validate(object, object, None, o)):
-                            raise 'Unauthorized', name
-
-                object=o
-
-            return object
-
-        except:
-            if default==_marker: raise
-            return default
-
-    restrictedTraverse__roles__=()
-    def restrictedTraverse(self, path, default=_marker, restricted=0):
-        return self.unrestrictedTraverse(path, default, restricted=1)
-
-
 
 Globals.default__class_init__(Item)
 

lib/python/OFS/Traversable.py

+##############################################################################
+# 
+# Zope Public License (ZPL) Version 1.0
+# -------------------------------------
+# 
+# Copyright (c) Digital Creations.  All rights reserved.
+# 
+# This license has been certified as Open Source(tm).
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+# 
+# 1. Redistributions in source code must retain the above copyright
+#    notice, this list of conditions, and the following disclaimer.
+# 
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions, and the following disclaimer in
+#    the documentation and/or other materials provided with the
+#    distribution.
+# 
+# 3. Digital Creations requests that attribution be given to Zope
+#    in any manner possible. Zope includes a "Powered by Zope"
+#    button that is installed by default. While it is not a license
+#    violation to remove this button, it is requested that the
+#    attribution remain. A significant investment has been put
+#    into Zope, and this effort will continue if the Zope community
+#    continues to grow. This is one way to assure that growth.
+# 
+# 4. All advertising materials and documentation mentioning
+#    features derived from or use of this software must display
+#    the following acknowledgement:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    In the event that the product being advertised includes an
+#    intact Zope distribution (with copyright and license included)
+#    then this clause is waived.
+# 
+# 5. Names associated with Zope or Digital Creations must not be used to
+#    endorse or promote products derived from this software without
+#    prior written permission from Digital Creations.
+# 
+# 6. Modified redistributions of any form whatsoever must retain
+#    the following acknowledgment:
+# 
+#      "This product includes software developed by Digital Creations
+#      for use in the Z Object Publishing Environment
+#      (http://www.zope.org/)."
+# 
+#    Intact (re-)distributions of any official Zope release do not
+#    require an external acknowledgement.
+# 
+# 7. Modifications are encouraged but must be packaged separately as
+#    patches to official Zope releases.  Distributions that do not
+#    clearly separate the patches from the original work must be clearly
+#    labeled as unofficial distributions.  Modifications which do not
+#    carry the name Zope may be packaged in any form, as long as they
+#    conform to all of the clauses above.
+# 
+# 
+# Disclaimer
+# 
+#   THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS ``AS IS'' AND ANY
+#   EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#   IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+#   PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL DIGITAL CREATIONS OR ITS
+#   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+#   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+#   USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+#   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+#   OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+#   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+#   SUCH DAMAGE.
+# 
+# 
+# This software consists of contributions made by Digital Creations and
+# many individuals on behalf of Digital Creations.  Specific
+# attributions are listed in the accompanying credits file.
+# 
+##############################################################################
+'''This module implements a mix-in for traversable objects.
+
+$Id: Traversable.py,v 1.1 2000/06/12 19:36:37 shane Exp $'''
+__version__='$Revision: 1.1 $'[11:-2]
+
+
+import Acquisition
+from AccessControl import getSecurityManager
+from string import split
+
+_marker=[]
+StringType=type('')
+
+class Traversable:
+
+    getPhysicalRoot=Acquisition.Acquired
+    getPhysicalRoot__roles__=()
+    
+    def getPhysicalPath(self):
+        '''Returns a path (an immutable sequence of strings)
+        that can be used to access this object again
+        later, for example in a copy/paste operation.  getPhysicalRoot()
+        and getPhysicalPath() are designed to operate together.
+        '''
+        path = (self.id,)
+        
+        p = getattr(self,'aq_inner', None)
+        if p is not None: 
+            path = p.aq_parent.getPhysicalPath() + path
+
+        return path
+
+    unrestrictedTraverse__roles__=()
+    def unrestrictedTraverse(self, path, default=_marker, restricted=0):
+
+        if not path: return self
+
+        get=getattr
+        N=None
+        M=_marker
+
+        if type(path) is StringType: path = split(path,'/')
+        else: path=list(path)
+
+        REQUEST={'TraversalRequestNameStack': path}
+        path.reverse()
+        pop=path.pop
+
+        if not path[-1]:
+            # If the path starts with an empty string, go to the root first.
+            pop()
+            self=self.getPhysicalRoot()
+                    
+        try:
+            object = self
+            while path:
+                name=pop()
+
+                if name[0] == '_':
+                    # Never allowed in a URL.
+                    raise 'NotFound', name
+
+                if name=='..':
+                    o=getattr(object, 'aq_parent', M)
+                    if o is not M:
+                        if (restricted and
+                            not getSecurityManager().validate(
+                            object, object,name, o)):
+                            raise 'Unauthorized', name
+                        object=o
+                        continue
+
+                t=get(object, '__bobo_traverse__', N)
+                if t is not N:
+                    o=t(REQUEST, name)
+                    
+                    # Note we pass no container, because we have no
+                    # way of knowing what it is
+                    if (restricted and not getSecurityManager().validate(
+                        object, None, name, o)):
+                        raise 'Unauthorized', name
+                      
+                else:
+                    o=get(object, name, M)
+                    if o is not M:
+                        if restricted:
+                            # waaaa
+                            if hasattr(get(object,'aq_base',object), name):
+                                # value wasn't acquired
+                                if not getSecurityManager().validate(
+                                    object, object, name, o):
+                                    raise 'Unauthorized', name
+                            else:
+                                if not getSecurityManager().validate(
+                                    object, None, name, o):
+                                    raise 'Unauthorized', name
+                        
+                    else:
+                        o=object[name]
+                        if (restricted and not getSecurityManager().validate(
+                            object, object, None, o)):
+                            raise 'Unauthorized', name
+
+                object=o
+
+            return object
+
+        except:
+            if default==_marker: raise
+            return default
+
+    restrictedTraverse__roles__=()
+    def restrictedTraverse(self, path, default=_marker, restricted=0):
+        return self.unrestrictedTraverse(path, default, restricted=1)