[pypy-svn] r46390 - pypy/dist/pypy/lib

[arigo at codespeak.net]

Author: arigo
Date: Fri Sep  7 13:28:04 2007
New Revision: 46390

Modified:
   pypy/dist/pypy/lib/_marshal.py
Log:
Accept a 'version' argument in marshal.dump() and dumps().
It is ignored at the moment because we always dump in the
format version 0 (but we can always load version 1 too).


Modified: pypy/dist/pypy/lib/_marshal.py
==============================================================================
--- pypy/dist/pypy/lib/_marshal.py	(original)
+++ pypy/dist/pypy/lib/_marshal.py	Fri Sep  7 13:28:04 2007
@@ -663,7 +663,10 @@
 #
 # user interface
 
-def dump(x, f):
+version = 1
+
+def dump(x, f, version=version):
+    # XXX 'version' is ignored, we always dump in a version-0-compatible format
     m = _Marshaller(f.write)
     m.dump(x)
 
@@ -671,7 +674,8 @@
     um = _Unmarshaller(f.read)
     return um.load()
 
-def dumps(x):
+def dumps(x, version=version):
+    # XXX 'version' is ignored, we always dump in a version-0-compatible format
     buffer = []
     m = _Marshaller(buffer.append)
     m.dump(x)