Author: Ronan Lamy <ronan.l...@gmail.com>
Branch: py3.5
Changeset: r86785:3d0c8318b98d
Date: 2016-08-31 16:26 +0100
http://bitbucket.org/pypy/pypy/changeset/3d0c8318b98d/
Log: hg merge py3k
diff --git a/pypy/module/__builtin__/descriptor.py
b/pypy/module/__builtin__/descriptor.py
--- a/pypy/module/__builtin__/descriptor.py
+++ b/pypy/module/__builtin__/descriptor.py
@@ -29,10 +29,10 @@
def descr_repr(self, space):
if self.w_objtype is not None:
- objtype_name = "<%s object>" % self.w_objtype.getname(space)
+ objtype_name = u"<%s object>" % self.w_objtype.getname(space)
else:
- objtype_name = 'NULL'
- return space.wrap("<super: <class '%s'>, %s>" % (
+ objtype_name = u'NULL'
+ return space.wrap(u"<super: <class '%s'>, %s>" % (
self.w_starttype.getname(space), objtype_name))
def get(self, space, w_obj, w_type=None):
diff --git a/pypy/module/array/interp_array.py
b/pypy/module/array/interp_array.py
--- a/pypy/module/array/interp_array.py
+++ b/pypy/module/array/interp_array.py
@@ -645,6 +645,9 @@
def getndim(self):
return 1
+ def getshape(self):
+ return [self.array.len]
+
def getstrides(self):
return [self.getitemsize()]
diff --git a/pypy/objspace/std/test/test_memoryobject.py
b/pypy/objspace/std/test/test_memoryobject.py
--- a/pypy/objspace/std/test/test_memoryobject.py
+++ b/pypy/objspace/std/test/test_memoryobject.py
@@ -37,7 +37,7 @@
v[0:3] = v[2:5]
assert data == bytearray(eval("b'23f3fg'"))
exc = raises(ValueError, "v[2:3] = b'spam'")
- assert str(exc.value) == "cannot modify size of memoryview object"
+ #assert str(exc.value) == "cannot modify size of memoryview object"
def test_extended_slice(self):
data = bytearray(b'abcefg')
@@ -153,6 +153,7 @@
assert m.format == 'i'
assert m.itemsize == 4
assert len(m) == 10
+ assert m.shape == (10,)
assert len(m.tobytes()) == 40
assert m[0] == 0
m[0] = 1
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
