[pypy-svn] r76540 - in pypy/branch/interplevel-array/pypy: jit/tl module/array module/array/benchmark

[hakanardo at codespeak.net]

Author: hakanardo
Date: Mon Aug  9 09:49:25 2010
New Revision: 76540

Modified:
   pypy/branch/interplevel-array/pypy/jit/tl/pypyjit_demo.py
   pypy/branch/interplevel-array/pypy/module/array/benchmark/sumtst.py
   pypy/branch/interplevel-array/pypy/module/array/interp_array.py
Log:
Somewhat nicer?

Modified: pypy/branch/interplevel-array/pypy/jit/tl/pypyjit_demo.py
==============================================================================
--- pypy/branch/interplevel-array/pypy/jit/tl/pypyjit_demo.py	(original)
+++ pypy/branch/interplevel-array/pypy/jit/tl/pypyjit_demo.py	Mon Aug  9 09:49:25 2010
@@ -42,7 +42,7 @@
     def f(img):
         i=0
         sa=0
-        while i<4:
+        while i < img.__len__():
             sa+=img[i]
             i+=1
         return sa

Modified: pypy/branch/interplevel-array/pypy/module/array/benchmark/sumtst.py
==============================================================================
--- pypy/branch/interplevel-array/pypy/module/array/benchmark/sumtst.py	(original)
+++ pypy/branch/interplevel-array/pypy/module/array/benchmark/sumtst.py	Mon Aug  9 09:49:25 2010
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-from array import array, simple_array
+from array import array
 
 #img=array('d',(0,)*640*480);
 def f(img):
@@ -10,12 +10,9 @@
         i+=1
     return l
 
-if True:
-    img=array('d', '\x00'*640*480)
-    #img=array('d', [0]*640*480)
-    #img=array('d', (0,))*(640*480)
-else:
-    img=simple_array(640*480)
+img=array('d', (0,)) * (640*480)
+#img=array('d', [0]*640*480)
+#img=array('d', (0,))*(640*480)
     
 for l in range(500): f(img)
 #print f(img)

Modified: pypy/branch/interplevel-array/pypy/module/array/interp_array.py
==============================================================================
--- pypy/branch/interplevel-array/pypy/module/array/interp_array.py	(original)
+++ pypy/branch/interplevel-array/pypy/module/array/interp_array.py	Mon Aug  9 09:49:25 2010
@@ -13,7 +13,7 @@
 from pypy.objspace.std.register_all import register_all
 from pypy.objspace.std.model import W_Object
 from pypy.interpreter.argument import Arguments, Signature
-
+from pypy.module._file.interp_file import W_File
 
 def w_array(space, w_cls, typecode, w_initializer=None, w_args=None):
     if len(w_args.arguments_w) > 0:
@@ -502,7 +502,7 @@
         return self.space.wrap(s)
 
     def array_fromfile__Array_ANY_ANY(space, self, w_f, w_n):
-        if space.type(w_f).name != 'file':
+        if not isinstance(w_f, W_File):
             msg = "arg1 must be open file"
             raise OperationError(space.w_TypeError, space.wrap(msg))
         n = space.int_w(w_n)
@@ -522,7 +522,7 @@
         array_fromstring__Array_ANY(space, self, w_item)
 
     def array_tofile__Array_ANY(space, self, w_f):
-        if space.type(w_f).name != 'file':
+        if not isinstance(w_f, W_File):
             msg = "arg1 must be open file"
             raise OperationError(space.w_TypeError, space.wrap(msg))
         w_s = array_tostring__Array(space, self)