[Zope-Checkins] CVS: Zope/lib/python/OFS - History.py:1.16

[Chris McDonough]

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

Modified Files:
	History.py 
Log Message:
Merge from 2.6 branch (collector #700).


=== Zope/lib/python/OFS/History.py 1.15 => 1.16 ===
--- Zope/lib/python/OFS/History.py:1.15	Tue Nov 12 16:17:03 2002
+++ Zope/lib/python/OFS/History.py	Mon Dec 16 12:29:43 2002
@@ -36,7 +36,7 @@
 
     def commit(self, object, transaction):
         if object._p_changed:
-            raise TemporalParadox, "You can't change history!"
+            raise TemporalParadox, "You can\'t change history!"
 
     def abort(*args, **kw): pass
 
@@ -53,7 +53,7 @@
     return rev
 
 class Historian(Implicit):
-    """An Historian's job is to find hysterical revisions of
+    """An Historian\'s job is to find hysterical revisions of
     objects, given a time."""
 
     def __getitem__(self, key):
@@ -68,7 +68,7 @@
         return rev.__of__(self.aq_parent)
 
     def manage_workspace(self, REQUEST):
-        "We aren't real, so we delegate to that that spawned us!"
+        "We aren\'t real, so we delegate to that that spawned us!"
         raise 'Redirect', REQUEST['URL2']+'/manage_change_history_page'
 
 class Historical(ExtensionClass.Base):
@@ -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: