[Zodb-checkins] CVS: Zope/lib/python/ZODB - BaseStorage.py:1.25.4.1 TimeStamp.c:1.16.10.1

[Andreas Jung]

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

Modified Files:
      Tag: ajung-restructuredtext-integration-branch
	BaseStorage.py TimeStamp.c 
Log Message:
merge from trunk

=== Zope/lib/python/ZODB/BaseStorage.py 1.25 => 1.25.4.1 ===
--- Zope/lib/python/ZODB/BaseStorage.py:1.25	Sun Oct 20 13:02:37 2002
+++ Zope/lib/python/ZODB/BaseStorage.py	Sat Nov 16 11:40:45 2002
@@ -231,6 +231,18 @@
         raise POSException.Unsupported, (
             "Retrieval of historical revisions is not supported")
 
+    def getExtensionMethods(self):
+        """getExtensionMethods
+
+        This returns a dictionary whose keys are names of extra methods
+        provided by this storage. Storage proxies (such as ZEO) should
+        call this method to determine the extra methods that they need
+        to proxy in addition to the standard storage methods.
+        Dictionary values should be None; this will be a handy place
+        for extra marshalling information, should we need it
+        """
+	return {}
+
     def copyTransactionsFrom(self, other, verbose=0):
         """Copy transactions from another storage.
 


=== Zope/lib/python/ZODB/TimeStamp.c 1.16 => 1.16.10.1 ===
--- Zope/lib/python/ZODB/TimeStamp.c:1.16	Mon Oct  7 13:54:27 2002
+++ Zope/lib/python/ZODB/TimeStamp.c	Sat Nov 16 11:40:45 2002
@@ -17,14 +17,12 @@
 "\n"
 "\n$Id$\n";
 
-#include <stdlib.h>
-#include <time.h>
 #ifdef USE_EXTENSION_CLASS
 #include "ExtensionClass.h"
 #else
 #include "Python.h"
 #endif
-
+#include <time.h>
 
 /* ----------------------------------------------------- */