[Zope-Checkins] CVS: Zope/lib/python/OFS - DTMLMethod.py:1.79.4.4 Image.py:1.141.2.3 PropertyManager.py:1.46.4.5 PropertySheets.py:1.87.4.1 SimpleItem.py:1.102.4.6 Traversable.py:1.15.4.5

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/OFS
In directory cvs.zope.org:/tmp/cvs-serv31373/lib/python/OFS

Modified Files:
      Tag: chrism-install-branch
	DTMLMethod.py Image.py PropertyManager.py PropertySheets.py 
	SimpleItem.py Traversable.py 
Log Message:
Merge with HEAD.  Again, sorry for the spew (what's left of it... someone seems to have filtered some of this branch's checkins out).


=== Zope/lib/python/OFS/DTMLMethod.py 1.79.4.3 => 1.79.4.4 ===


=== Zope/lib/python/OFS/Image.py 1.141.2.2 => 1.141.2.3 ===


=== Zope/lib/python/OFS/PropertyManager.py 1.46.4.4 => 1.46.4.5 ===


=== Zope/lib/python/OFS/PropertySheets.py 1.87 => 1.87.4.1 ===
--- Zope/lib/python/OFS/PropertySheets.py:1.87	Wed Aug 14 17:42:56 2002
+++ Zope/lib/python/OFS/PropertySheets.py	Sat Oct 26 15:51:40 2002
@@ -558,7 +558,7 @@
 
     def dav__lockdiscovery(self):
         security = getSecurityManager()
-        user = security.getUser().getUserName()
+        user = security.getUser().getId()
 
 
         vself = self.v_self()


=== Zope/lib/python/OFS/SimpleItem.py 1.102.4.5 => 1.102.4.6 ===


=== Zope/lib/python/OFS/Traversable.py 1.15.4.4 => 1.15.4.5 ===