[Zope-Checkins] CVS: Zope/lib/python/OFS - CopySupport.py:1.82.4.1 History.py:1.14.4.2

[Chris McDonough]

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

Modified Files:
      Tag: chrism-install-branch
	CopySupport.py History.py 
Log Message:
Merging chrism-install-branch with HEAD (hopefully for one of the last
times).



=== Zope/lib/python/OFS/CopySupport.py 1.82 => 1.82.4.1 ===
--- Zope/lib/python/OFS/CopySupport.py:1.82	Wed Aug 14 17:42:56 2002
+++ Zope/lib/python/OFS/CopySupport.py	Fri Jan  3 01:31:39 2003
@@ -275,7 +275,7 @@
         ob._setId(id)
         self._setObject(id, ob)
         ob=ob.__of__(self)
-        #ob._postCopy(self, op=0)
+        ob.manage_afterClone(ob)
         return ob
 
     def cb_dataValid(self):


=== Zope/lib/python/OFS/History.py 1.14.4.1 => 1.14.4.2 ===
--- Zope/lib/python/OFS/History.py:1.14.4.1	Sun Nov 24 18:42:25 2002
+++ Zope/lib/python/OFS/History.py	Fri Jan  3 01:31:39 2003
@@ -113,6 +113,9 @@
 
 
         r=self._p_jar.db().history(self._p_oid, None, last)
+        if r is None:
+            # storage doesn't support history
+            return ()
         r=r[first:]
 
         for d in r: