[pypy-svn] r16093 - in pypy/dist/pypy/module: __builtin__ array

[tismer at codespeak.net]

Author: tismer
Date: Tue Aug 16 01:39:39 2005
New Revision: 16093

Modified:
   pypy/dist/pypy/module/__builtin__/app_buffer.py
   pypy/dist/pypy/module/__builtin__/app_help.py
   pypy/dist/pypy/module/array/app_array.py
Log:
enabled a few more things for geninterp,
with small or no changes

Modified: pypy/dist/pypy/module/__builtin__/app_buffer.py
==============================================================================
--- pypy/dist/pypy/module/__builtin__/app_buffer.py	(original)
+++ pypy/dist/pypy/module/__builtin__/app_buffer.py	Tue Aug 16 01:39:39 2005
@@ -1,8 +1,5 @@
-# NOT_RPYTHON (because of array import)
 # Might probably be deprecated in Python at some point.
 import sys
-from array import array
-from struct import pack, unpack
 
 class buffer(object):
     """buffer(object [, offset[, size]])
@@ -14,6 +11,7 @@
 """
 
     def __init__(self, object, offset=0, size=None):
+        import struct, array
         if isinstance(object, str):
             pass
         elif isinstance(object, unicode):
@@ -23,11 +21,11 @@
             else:
                 pack_code = "I"
             for char in object:
-                str_object += pack(pack_code, ord(char))
+                str_object += struct.pack(pack_code, ord(char))
             object = str_object
         elif isinstance(object, buffer):
             object = object.buf
-        elif isinstance(object, array):
+        elif isinstance(object, array.array):
             object = object.tostring()
         else:
             raise TypeError, "buffer object expected"

Modified: pypy/dist/pypy/module/__builtin__/app_help.py
==============================================================================
--- pypy/dist/pypy/module/__builtin__/app_help.py	(original)
+++ pypy/dist/pypy/module/__builtin__/app_help.py	Tue Aug 16 01:39:39 2005
@@ -1,5 +1,3 @@
-# NOT_RPYTHON    - because print is used
-# XXX work on enabling print for flow space
 """
 Plain Python definition of the builtin interactive help functions.
 """

Modified: pypy/dist/pypy/module/array/app_array.py
==============================================================================
--- pypy/dist/pypy/module/array/app_array.py	(original)
+++ pypy/dist/pypy/module/array/app_array.py	Tue Aug 16 01:39:39 2005
@@ -1,4 +1,3 @@
-# NOT_RPYTHON
 """This module defines an object type which can efficiently represent
 an array of basic values: characters, integers, floating point
 numbers.  Arrays are sequence types and behave very much like lists,