[CMF-checkins] CVS: CMF/CMFCore - DirectoryView.py:1.27.4.1 utils.py:1.28.4.1

Tres Seaver tseaver@zope.com
Mon, 12 Aug 2002 08:16:12 -0400


Update of /cvs-repository/CMF/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv24564

Modified Files:
      Tag: chrisw-dirview-branch
	DirectoryView.py utils.py 
Log Message:


  - Check in these attempted fixescomments on a new branch, so
    that work can continue on them (reverting the head until the branch
    is "clean").  Added 'XXX' comments in places where things seemed
    "dodgy".


=== CMF/CMFCore/DirectoryView.py 1.27 => 1.27.4.1 ===
--- CMF/CMFCore/DirectoryView.py:1.27	Mon Aug  5 10:23:41 2002
+++ CMF/CMFCore/DirectoryView.py	Mon Aug 12 08:16:11 2002
@@ -348,6 +348,9 @@
 
     def getDirectoryInfo(self, filepath):
         # Can return None.
+        # XXX: 2002/08/12  This "fix" is unacceptable;  it breaks existing
+        #      functionality (e.g., PRODUCTS_PATH), and adds a new requirement
+        #      (that 'p' include 'Products').  Reverting head to 1.26.
         return self._directories.get(minimalpath(filepath), None)
 
     def listDirectories(self):


=== CMF/CMFCore/utils.py 1.28 => 1.28.4.1 ===
--- CMF/CMFCore/utils.py:1.28	Tue Aug  6 20:56:28 2002
+++ CMF/CMFCore/utils.py	Mon Aug 12 08:16:11 2002
@@ -628,6 +628,10 @@
 security.declarePublic('minimalpath')
 def minimalpath(p):
     # Trims INSTANCE_HOME or SOFTWARE_HOME from a path.
+    #
+    # XXX: 2002/08/12  This "fix" is unacceptable;  it breaks existing
+    #      functionality (e.g., PRODUCTS_PATH), and adds a new requirement
+    #      (that 'p' include 'Products').  Reverting head to 1.26.
     p = os_path.abspath(p)
     #abs = normalize(p)
     p = p[p.index('Products'):]