Author: Manuel Jacob <m...@manueljacob.de>
Branch: py3k
Changeset: r77669:fd4c68713a10
Date: 2015-05-29 03:51 +0200
http://bitbucket.org/pypy/pypy/changeset/fd4c68713a10/
Log: 2to3: There is no space.w_long / space.w_memoryview in Py3k.
diff --git a/pypy/module/cpyext/longobject.py b/pypy/module/cpyext/longobject.py
--- a/pypy/module/cpyext/longobject.py
+++ b/pypy/module/cpyext/longobject.py
@@ -195,7 +195,7 @@
out of range, ValueError will be raised."""
w_value = space.wrap(rffi.wcharpsize2unicode(u, length))
w_base = space.wrap(rffi.cast(lltype.Signed, base))
- return space.call_function(space.w_long, w_value, w_base)
+ return space.call_function(space.w_int, w_value, w_base)
@cpython_api([rffi.VOIDP], PyObject)
def PyLong_FromVoidPtr(space, p):
diff --git a/pypy/module/micronumpy/descriptor.py
b/pypy/module/micronumpy/descriptor.py
--- a/pypy/module/micronumpy/descriptor.py
+++ b/pypy/module/micronumpy/descriptor.py
@@ -1031,5 +1031,4 @@
space.isinstance_w(w_arg, space.w_int) or
space.isinstance_w(w_arg, space.w_float) or
space.isinstance_w(w_arg, space.w_complex) or
- space.isinstance_w(w_arg, space.w_long) or
space.isinstance_w(w_arg, space.w_bool))
diff --git a/pypy/module/micronumpy/strides.py
b/pypy/module/micronumpy/strides.py
--- a/pypy/module/micronumpy/strides.py
+++ b/pypy/module/micronumpy/strides.py
@@ -186,7 +186,7 @@
def _find_shape_and_elems(space, w_iterable, is_rec_type):
shape = [space.len_w(w_iterable)]
- if space.isinstance_w(w_iterable, space.w_buffer):
+ if space.isinstance_w(w_iterable, space.w_memoryview):
batch = [space.wrap(0)] * shape[0]
for i in range(shape[0]):
batch[i] = space.ord(space.getitem(w_iterable, space.wrap(i)))
diff --git a/pypy/module/micronumpy/support.py
b/pypy/module/micronumpy/support.py
--- a/pypy/module/micronumpy/support.py
+++ b/pypy/module/micronumpy/support.py
@@ -8,7 +8,7 @@
from pypy.module.micronumpy.base import W_NDimArray
return (space.isinstance_w(w_obj, space.w_tuple) or
space.isinstance_w(w_obj, space.w_list) or
- space.isinstance_w(w_obj, space.w_buffer) or
+ space.isinstance_w(w_obj, space.w_memoryview) or
isinstance(w_obj, W_NDimArray))
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
