Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r64566:55f0c664d6b0
Date: 2013-05-25 16:19 -0700
http://bitbucket.org/pypy/pypy/changeset/55f0c664d6b0/
Log: merge default
diff --git a/lib_pypy/_ctypes/structure.py b/lib_pypy/_ctypes/structure.py
--- a/lib_pypy/_ctypes/structure.py
+++ b/lib_pypy/_ctypes/structure.py
@@ -166,8 +166,7 @@
if self is StructOrUnion:
return
if '_fields_' not in self.__dict__:
- self._fields_ = []
- _set_shape(self, [], self._is_union)
+ self._fields_ = [] # As a side-effet, this also sets the ffishape.
__setattr__ = struct_setattr
diff --git a/pypy/module/_io/interp_iobase.py b/pypy/module/_io/interp_iobase.py
--- a/pypy/module/_io/interp_iobase.py
+++ b/pypy/module/_io/interp_iobase.py
@@ -136,7 +136,7 @@
def tell_w(self, space):
return space.call_method(self, "seek", space.wrap(0), space.wrap(1))
- def truncate_w(self, space):
+ def truncate_w(self, space, w_size=None):
self._unsupportedoperation(space, "truncate")
def fileno_w(self, space):
@@ -290,6 +290,7 @@
readable = interp2app(W_IOBase.readable_w),
writable = interp2app(W_IOBase.writable_w),
seekable = interp2app(W_IOBase.seekable_w),
+
_checkReadable = interp2app(check_readable_w),
_checkWritable = interp2app(check_writable_w),
_checkSeekable = interp2app(check_seekable_w),
diff --git a/pypy/module/_io/test/test_textio.py
b/pypy/module/_io/test/test_textio.py
--- a/pypy/module/_io/test/test_textio.py
+++ b/pypy/module/_io/test/test_textio.py
@@ -26,6 +26,14 @@
assert t.readable()
assert t.seekable()
+ def test_default_implementations(self):
+ import _io
+ file = _io._TextIOBase()
+ raises(_io.UnsupportedOperation, file.read)
+ raises(_io.UnsupportedOperation, file.seek, 0)
+ raises(_io.UnsupportedOperation, file.readline)
+ raises(_io.UnsupportedOperation, file.detach)
+
def test_isatty(self):
import _io
class Tty(_io.BytesIO):
diff --git a/pypy/module/micronumpy/compile.py
b/pypy/module/micronumpy/compile.py
--- a/pypy/module/micronumpy/compile.py
+++ b/pypy/module/micronumpy/compile.py
@@ -46,11 +46,11 @@
self.name = name
class FakeSpace(object):
- w_ValueError = "ValueError"
- w_TypeError = "TypeError"
- w_IndexError = "IndexError"
- w_OverflowError = "OverflowError"
- w_NotImplementedError = "NotImplementedError"
+ w_ValueError = W_TypeObject("ValueError")
+ w_TypeError = W_TypeObject("TypeError")
+ w_IndexError = W_TypeObject("IndexError")
+ w_OverflowError = W_TypeObject("OverflowError")
+ w_NotImplementedError = W_TypeObject("NotImplementedError")
w_None = None
w_bool = W_TypeObject("bool")
diff --git a/pypy/module/test_lib_pypy/ctypes_tests/test_structures.py
b/pypy/module/test_lib_pypy/ctypes_tests/test_structures.py
--- a/pypy/module/test_lib_pypy/ctypes_tests/test_structures.py
+++ b/pypy/module/test_lib_pypy/ctypes_tests/test_structures.py
@@ -239,6 +239,9 @@
pass
pos = POSITION(1, 2)
assert (pos.x, pos.y) == (1, 2)
+ # Try a second time, result may be different (cf. issue1498)
+ pos = POSITION(1, 2)
+ assert (pos.x, pos.y) == (1, 2)
def test_invalid_field_types(self):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
