[pypy-commit] pypy py3k: we no longer have W_IntObject, but longs

[antocuni]

Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: py3k
Changeset: r54477:57c1bff7b005
Date: 2012-04-17 17:35 +0200
http://bitbucket.org/pypy/pypy/changeset/57c1bff7b005/

Log:	we no longer have W_IntObject, but longs

diff --git a/pypy/objspace/std/bytearrayobject.py b/pypy/objspace/std/bytearrayobject.py
--- a/pypy/objspace/std/bytearrayobject.py
+++ b/pypy/objspace/std/bytearrayobject.py
@@ -76,7 +76,7 @@
 def _getitem_slice_multistep(data, start, step, slicelength):
     return [data[start + i*step] for i in range(slicelength)]
 
-def contains__Bytearray_Int(space, w_bytearray, w_char):
+def contains__Bytearray_Long(space, w_bytearray, w_char):
     char = space.int_w(w_char)
     if not 0 <= char < 256:
         raise OperationError(space.w_ValueError,
@@ -229,7 +229,7 @@
 def _to_bytes(space, w_bytearray):
     return space.wrapbytes(''.join(w_bytearray.data))
 
-def str_count__Bytearray_Int_ANY_ANY(space, w_bytearray, w_char, w_start, w_stop):
+def str_count__Bytearray_Long_ANY_ANY(space, w_bytearray, w_char, w_start, w_stop):
     char = w_char.intval
     bytearray = w_bytearray.data
     length = len(bytearray)
@@ -358,7 +358,7 @@
     w_bytearray.data.insert(index, val)
     return space.w_None
 
-def bytearray_pop__Bytearray_Int(space, w_bytearray, w_idx):
+def bytearray_pop__Bytearray_Long(space, w_bytearray, w_idx):
     index = space.int_w(w_idx)
     try:
         result = w_bytearray.data.pop(index)