Author: Brian Kearns <bdkea...@gmail.com>
Branch:
Changeset: r71307:ad42ca1b0c3e
Date: 2014-05-05 22:09 -0400
http://bitbucket.org/pypy/pypy/changeset/ad42ca1b0c3e/
Log: merge heads
diff --git a/pypy/doc/release-2.3.0.rst b/pypy/doc/release-2.3.0.rst
--- a/pypy/doc/release-2.3.0.rst
+++ b/pypy/doc/release-2.3.0.rst
@@ -84,7 +84,7 @@
* Fix issues with reimporting builtin modules
-* Fix a RPython bug with loop-unrolling that appeared in the `HippyVM`_ PHP
port
+* Fix an RPython bug with loop-unrolling that appeared in the `HippyVM`_ PHP
port
* Support for corner cases on objects with __int__ and __float__ methods
@@ -125,7 +125,7 @@
and scalars were corrected. We are slowly approaching our goal of passing
the NumPy test suite. We still do not support object or unicode ndarrays.
-* speed of iteration in dot() is now within 1.5x of the NumPy c
+* Speed of iteration in dot() is now within 1.5x of the NumPy c
implementation (without BLAS acceleration). Since the same array
iterator is used throughout the ``_numpy`` module, speed increases should
be apparent in all NumPy functionality.
@@ -135,7 +135,7 @@
* A cffi-based ``numpy.random`` module is available as a branch;
it will be merged soon after this release.
-* enhancements to the PyPy JIT were made to support virtualizing the
raw_store/raw_load
+* Enhancements to the PyPy JIT were made to support virtualizing the
raw_store/raw_load
memory operations used in NumPy arrays. Further work remains here in
virtualizing the
alloc_raw_storage when possible. This will allow scalars to have storages
but still be
virtualized when possible in loops.
diff --git a/pypy/module/_cffi_backend/cdataobj.py
b/pypy/module/_cffi_backend/cdataobj.py
--- a/pypy/module/_cffi_backend/cdataobj.py
+++ b/pypy/module/_cffi_backend/cdataobj.py
@@ -442,7 +442,6 @@
W_CData.typedef = TypeDef(
'_cffi_backend.CData',
- __module__ = '_cffi_backend',
__name__ = '<cdata>',
__repr__ = interp2app(W_CData.repr),
__nonzero__ = interp2app(W_CData.nonzero),
diff --git a/pypy/module/_io/interp_bytesio.py
b/pypy/module/_io/interp_bytesio.py
--- a/pypy/module/_io/interp_bytesio.py
+++ b/pypy/module/_io/interp_bytesio.py
@@ -152,7 +152,7 @@
space.call_method(self.getdict(space), "update", w_dict)
W_BytesIO.typedef = TypeDef(
- 'BytesIO', W_BufferedIOBase.typedef,
+ '_io.BytesIO', W_BufferedIOBase.typedef,
__new__ = generic_new_descr(W_BytesIO),
__init__ = interp2app(W_BytesIO.descr_init),
diff --git a/pypy/module/_io/interp_fileio.py b/pypy/module/_io/interp_fileio.py
--- a/pypy/module/_io/interp_fileio.py
+++ b/pypy/module/_io/interp_fileio.py
@@ -429,7 +429,7 @@
return w_size
W_FileIO.typedef = TypeDef(
- 'FileIO', W_RawIOBase.typedef,
+ '_io.FileIO', W_RawIOBase.typedef,
__new__ = interp2app(W_FileIO.descr_new.im_func),
__init__ = interp2app(W_FileIO.descr_init),
__repr__ = interp2app(W_FileIO.repr_w),
diff --git a/pypy/module/_io/interp_io.py b/pypy/module/_io/interp_io.py
--- a/pypy/module/_io/interp_io.py
+++ b/pypy/module/_io/interp_io.py
@@ -27,9 +27,9 @@
self.written = written
W_BlockingIOError.typedef = TypeDef(
- 'BlockingIOError', W_IOError.typedef,
- __doc__ = ("Exception raised when I/O would block "
- "on a non-blocking I/O stream"),
+ '_io.BlockingIOError', W_IOError.typedef,
+ __doc__ = ("Exception raised when I/O would block on a non-blocking "
+ "I/O stream"),
__new__ = generic_new_descr(W_BlockingIOError),
__init__ = interp2app(W_BlockingIOError.descr_init),
characters_written = interp_attrproperty('written', W_BlockingIOError),
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
@@ -288,7 +288,7 @@
break
W_IOBase.typedef = TypeDef(
- '_IOBase',
+ '_io._IOBase',
__new__ = generic_new_descr(W_IOBase),
__enter__ = interp2app(W_IOBase.enter_w),
__exit__ = interp2app(W_IOBase.exit_w),
@@ -359,7 +359,7 @@
return space.wrap(builder.build())
W_RawIOBase.typedef = TypeDef(
- '_RawIOBase', W_IOBase.typedef,
+ '_io._RawIOBase', W_IOBase.typedef,
__new__ = generic_new_descr(W_RawIOBase),
read = interp2app(W_RawIOBase.read_w),
diff --git a/pypy/module/_io/interp_textio.py b/pypy/module/_io/interp_textio.py
--- a/pypy/module/_io/interp_textio.py
+++ b/pypy/module/_io/interp_textio.py
@@ -178,7 +178,7 @@
space.call_method(self.w_decoder, "setstate", w_state)
W_IncrementalNewlineDecoder.typedef = TypeDef(
- 'IncrementalNewlineDecoder',
+ '_io.IncrementalNewlineDecoder',
__new__ = generic_new_descr(W_IncrementalNewlineDecoder),
__init__ = interp2app(W_IncrementalNewlineDecoder.descr_init),
@@ -255,7 +255,7 @@
W_TextIOBase.typedef = TypeDef(
- '_TextIOBase', W_IOBase.typedef,
+ '_io._TextIOBase', W_IOBase.typedef,
__new__ = generic_new_descr(W_TextIOBase),
read = interp2app(W_TextIOBase.read_w),
diff --git a/pypy/module/_io/test/test_io.py b/pypy/module/_io/test/test_io.py
--- a/pypy/module/_io/test/test_io.py
+++ b/pypy/module/_io/test/test_io.py
@@ -340,3 +340,9 @@
assert res == "world\n"
assert f.newlines == "\n"
assert type(f.newlines) is unicode
+
+ def test_mod(self):
+ import _io
+ typemods = dict((t, t.__module__) for t in vars(_io).values()
+ if isinstance(t, type))
+ assert all(mod in ('io', '_io') for mod in typemods.values()), typemods
diff --git a/rpython/translator/platform/__init__.py
b/rpython/translator/platform/__init__.py
--- a/rpython/translator/platform/__init__.py
+++ b/rpython/translator/platform/__init__.py
@@ -267,7 +267,7 @@
# Only required on armhf and mips{,el}, not armel. But there's no way to
# detect armhf without shelling out
if (platform.architecture()[0] == '64bit'
- or platform.machine().startswith(('arm', 'mips'))):
+ or platform.machine().startswith(('arm', 'mips', 'ppc'))):
host_factory = LinuxPIC
else:
host_factory = Linux
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
