[pypy-svn] r79708 - pypy/trunk/lib_pypy

[arigo at codespeak.net]

Author: arigo
Date: Wed Dec  1 14:30:19 2010
New Revision: 79708

Modified:
   pypy/trunk/lib_pypy/_marshal.py
Log:
Revert changes here.  The _marshal module is also used by
translation.sandbox.


Modified: pypy/trunk/lib_pypy/_marshal.py
==============================================================================
--- pypy/trunk/lib_pypy/_marshal.py	(original)
+++ pypy/trunk/lib_pypy/_marshal.py	Wed Dec  1 14:30:19 2010
@@ -3,7 +3,7 @@
 This module contains functions that can read and write Python values in a binary format. The format is specific to Python, but independent of machine architecture issues (e.g., you can write a Python value to a file on a PC, transport the file to a Sun, and read it back there). Details of the format may change between Python versions.
 """
 
-import types, __pypy__
+import types
 from _codecs import utf_8_decode, utf_8_encode
 
 TYPE_NULL     = '0'
@@ -645,18 +645,15 @@
 
 version = 1
 
- at __pypy__.builtinify
 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)
 
- at __pypy__.builtinify
 def load(f):
     um = _Unmarshaller(f.read)
     return um.load()
 
- at __pypy__.builtinify
 def dumps(x, version=version):
     # XXX 'version' is ignored, we always dump in a version-0-compatible format
     buffer = []
@@ -664,7 +661,6 @@
     m.dump(x)
     return ''.join(buffer)
 
- at __pypy__.builtinify
 def loads(s):
     um = _FastUnmarshaller(s)
     return um.load()