[pypy-svn] r14053 - in pypy/branch/dist-2.4.1: lib-python/modified-2.4.1/test pypy/module/__builtin__

[nik at codespeak.net]

Author: nik
Date: Fri Jul  1 19:54:34 2005
New Revision: 14053

Added:
   pypy/branch/dist-2.4.1/lib-python/modified-2.4.1/test/
   pypy/branch/dist-2.4.1/lib-python/modified-2.4.1/test/__init__.py
      - copied, changed from r14039, pypy/branch/dist-2.4.1/lib-python/modified-2.3.4/test/__init__.py
Modified:
   pypy/branch/dist-2.4.1/pypy/module/__builtin__/app_buffer.py
Log:
* Added test/__init__.py
* Fixed buffer semantics to comply with CPython 2.4.1 (negative size argument)


Copied: pypy/branch/dist-2.4.1/lib-python/modified-2.4.1/test/__init__.py (from r14039, pypy/branch/dist-2.4.1/lib-python/modified-2.3.4/test/__init__.py)
==============================================================================
--- pypy/branch/dist-2.4.1/lib-python/modified-2.3.4/test/__init__.py	(original)
+++ pypy/branch/dist-2.4.1/lib-python/modified-2.4.1/test/__init__.py	Fri Jul  1 19:54:34 2005
@@ -4,7 +4,7 @@
 'test' package from CPython.
 
 This assumes that sys.path is configured to contain 
-'lib-python/modified-2.3.4' before 'lib-python/2.3.4'.
+'lib-python/modified-2.4.1' before 'lib-python/2.4.1'.
 """
 
 from pkgutil import extend_path

Modified: pypy/branch/dist-2.4.1/pypy/module/__builtin__/app_buffer.py
==============================================================================
--- pypy/branch/dist-2.4.1/pypy/module/__builtin__/app_buffer.py	(original)
+++ pypy/branch/dist-2.4.1/pypy/module/__builtin__/app_buffer.py	Fri Jul  1 19:54:34 2005
@@ -19,8 +19,11 @@
             raise TypeError, "buffer object expected"
         if offset < 0:
             raise ValueError, "offset must be zero or positive"
+        # XXX according to CPython 2.4.1. Broken?
+        if size is not None and size < -1:
+            raise ValueError, "size must be zero or positive"
             
-        if size is None:
+        if size is None or size == -1:
             self.buf = object[offset:]
         else:
             self.buf = object[offset:offset+size]