[Zope-Checkins] CVS: Zope/lib/python/OFS - DTMLMethod.py:1.79.4.2 Image.py:1.141.2.1 PropertyManager.py:1.46.4.3 SimpleItem.py:1.102.4.4 Traversable.py:1.15.4.3

[Chris McDonough]

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

Modified Files:
      Tag: chrism-install-branch
	DTMLMethod.py Image.py PropertyManager.py SimpleItem.py 
	Traversable.py 
Log Message:
Merging HEAD into chrism-install-branch.


=== Zope/lib/python/OFS/DTMLMethod.py 1.79.4.1 => 1.79.4.2 ===


=== Zope/lib/python/OFS/Image.py 1.141 => 1.141.2.1 ===
--- Zope/lib/python/OFS/Image.py:1.141	Wed Aug 21 17:17:58 2002
+++ Zope/lib/python/OFS/Image.py	Tue Oct  8 14:41:07 2002
@@ -55,7 +55,8 @@
 
     # Now we "upload" the data.  By doing this in two steps, we
     # can use a database trick to make the upload more efficient.
-    self._getOb(id).manage_upload(file)
+    if file:
+        self._getOb(id).manage_upload(file)
     if content_type:
         self._getOb(id).content_type=content_type
 
@@ -574,7 +575,8 @@
 
     # Now we "upload" the data.  By doing this in two steps, we
     # can use a database trick to make the upload more efficient.
-    self._getOb(id).manage_upload(file)
+    if file:
+        self._getOb(id).manage_upload(file)
     if content_type:
         self._getOb(id).content_type=content_type
 


=== Zope/lib/python/OFS/PropertyManager.py 1.46.4.2 => 1.46.4.3 ===


=== Zope/lib/python/OFS/SimpleItem.py 1.102.4.3 => 1.102.4.4 ===


=== Zope/lib/python/OFS/Traversable.py 1.15.4.2 => 1.15.4.3 ===