[pypy-commit] pypy release-1.9.x: hg merge default

arigo noreply at buildbot.pypy.org
Thu Jun 7 11:09:08 CEST 2012

Author: Armin Rigo <arigo at tunes.org>
Branch: release-1.9.x
Changeset: r55457:9809b97aa219
Date: 2012-06-07 11:08 +0200

Log:	hg merge default

diff --git a/pypy/doc/release-1.9.0.rst b/pypy/doc/release-1.9.0.rst
--- a/pypy/doc/release-1.9.0.rst
+++ b/pypy/doc/release-1.9.0.rst
@@ -3,11 +3,77 @@
 We're pleased to announce the 1.9 release of PyPy. This release brings mostly
-bugfixes, small improvements and overall progress on the `numpypy`_ effort.
+bugfixes, performance improvements, other small improvements and overall
+progress on the `numpypy`_ effort.
 It also brings an improved situation on windows and OS X.
-First of all we would like to thank you to all people who donated their money.
-Even though most of the work is not finished yet and in fact, didn't even
-make it to this release, we ...
+You can download the PyPy 1.9 release here:
+    http://pypy.org/download.html 
 .. _`numpypy`: http://pypy.org/numpydonate.html
+What is PyPy?
+PyPy is a very compliant Python interpreter, almost a drop-in replacement for
+CPython 2.7. It's fast (`pypy 1.9 and cpython 2.7.2`_ performance comparison)
+due to its integrated tracing JIT compiler.
+This release supports x86 machines running Linux 32/64, Mac OS X 64 or
+Windows 32.  Windows 64 work is still stalling, we would welcome a volunteer
+to handle that.
+.. _`pypy 1.9 and cpython 2.7.2`: http://speed.pypy.org
+Thanks to our donators
+But first of all, we would like to say thank you to all people who
+donated some money to one of our four calls:
+  * `NumPy in PyPy`_ (got so far $44502 out of $60000)
+  * `Py3k (Python 3)`_ (got so far $43563 out of $105000)
+  * `Software Transactional Memory`_ (got so far $21791 of $50400)
+  * as well as our general PyPy pot.
+Thank you all for proving that it is indeed possible for a small team of
+(inexpensive) programmers to get funded like that, at least for some
+time.  We want to include this thank you in the present release
+announcement even though most of the work is not finished yet.  More
+precisely, neither Py3k nor STM are ready to make it an official release
+yet: people interested in them need to grab and (attempt to) translate
+PyPy from the corresponding branches (respectively ``py3k`` and
+* This release still implements Python 2.7, using the standard library of
+  CPython 2.7.2.
+* Many bugs were corrected for Windows 32 bit.  This includes new
+  functionality to test the validity of file descriptors; and
+  correct handling of the calling convensions for ctypes.  (Still not
+  much progress on Win64.)
+* Improvements in ``cpyext``, our emulator for CPython C extension modules.
+  For example PyOpenSSL should now work.
+* Sets now have strategies just like dictionaries. This means for example
+  that a set containing only ints will be more compact (and faster).
+* A lot of progress on various aspects of ``numpypy``.
+* The non-x86 backends for the JIT are progressing but are still not
+  merged (ARMv7 and PPC64).
+XXX should we do something with whatsnew-1.9.txt?
diff --git a/pypy/rlib/test/test_rjvm.py b/pypy/rlib/test/test_rjvm.py
--- a/pypy/rlib/test/test_rjvm.py
+++ b/pypy/rlib/test/test_rjvm.py
@@ -1,4 +1,6 @@
 import py
+py.test.skip('this is outdated. Check the jvm-improvements branch')
     import jpype
 except ImportError:
diff --git a/pypy/translator/goal/app_main.py b/pypy/translator/goal/app_main.py
--- a/pypy/translator/goal/app_main.py
+++ b/pypy/translator/goal/app_main.py
@@ -513,8 +513,9 @@
             print >> sys.stderr, "'import site' failed"
     readenv = not ignore_environment
-    io_encoding = ((readenv and os.getenv("PYTHONIOENCODING"))
-                   or sys.getfilesystemencoding())
+    io_encoding = readenv and os.getenv("PYTHONIOENCODING")
+    if not io_encoding and not IS_WINDOWS:
+        io_encoding = sys.getfilesystemencoding()
     if io_encoding:

More information about the pypy-commit mailing list