Author: David Schneider <david.schnei...@picle.org> Branch: Changeset: r64382:469d4ebafa75 Date: 2013-05-21 14:54 +0200 http://bitbucket.org/pypy/pypy/changeset/469d4ebafa75/
Log: merge heads diff --git a/lib-python/2.7/distutils/sysconfig.py b/lib-python/2.7/distutils/sysconfig.py --- a/lib-python/2.7/distutils/sysconfig.py +++ b/lib-python/2.7/distutils/sysconfig.py @@ -1,30 +1,16 @@ -"""Provide access to Python's configuration information. The specific -configuration variables available depend heavily on the platform and -configuration. The values may be retrieved using -get_config_var(name), and the list of variables is available via -get_config_vars().keys(). Additional convenience functions are also -available. - -Written by: Fred L. Drake, Jr. -Email: <fdr...@acm.org> -""" - -__revision__ = "$Id: sysconfig.py 85358 2010-10-10 09:54:59Z antoine.pitrou $" - -import sys - # The content of this file is redirected from # sysconfig_cpython or sysconfig_pypy. +# All underscore names are imported too, because +# people like to use undocumented sysconfig._xxx +# directly. +import sys if '__pypy__' in sys.builtin_module_names: - from distutils.sysconfig_pypy import * - from distutils.sysconfig_pypy import _config_vars # needed by setuptools - from distutils.sysconfig_pypy import _variable_rx # read_setup_file() + from distutils import sysconfig_pypy as _sysconfig_module else: - from distutils.sysconfig_cpython import * - from distutils.sysconfig_cpython import _config_vars # needed by setuptools - from distutils.sysconfig_cpython import _variable_rx # read_setup_file() + from distutils import sysconfig_cpython as _sysconfig_module +globals().update(_sysconfig_module.__dict__) _USE_CLANG = None diff --git a/lib-python/2.7/distutils/sysconfig_cpython.py b/lib-python/2.7/distutils/sysconfig_cpython.py --- a/lib-python/2.7/distutils/sysconfig_cpython.py +++ b/lib-python/2.7/distutils/sysconfig_cpython.py @@ -9,7 +9,7 @@ Email: <fdr...@acm.org> """ -__revision__ = "$Id$" +__revision__ = "$Id: sysconfig.py 85358 2010-10-10 09:54:59Z antoine.pitrou $" import os import re diff --git a/lib-python/2.7/distutils/sysconfig_pypy.py b/lib-python/2.7/distutils/sysconfig_pypy.py --- a/lib-python/2.7/distutils/sysconfig_pypy.py +++ b/lib-python/2.7/distutils/sysconfig_pypy.py @@ -1,6 +1,15 @@ -"""PyPy's minimal configuration information. +"""Provide access to Python's configuration information. +This is actually PyPy's minimal configuration information. + +The specific configuration variables available depend heavily on the +platform and configuration. The values may be retrieved using +get_config_var(name), and the list of variables is available via +get_config_vars().keys(). Additional convenience functions are also +available. """ +__revision__ = "$Id: sysconfig.py 85358 2010-10-10 09:54:59Z antoine.pitrou $" + import sys import os import imp diff --git a/pypy/doc/conf.py b/pypy/doc/conf.py --- a/pypy/doc/conf.py +++ b/pypy/doc/conf.py @@ -47,7 +47,7 @@ # The short X.Y version. version = '2.0' # The full version, including alpha/beta/rc tags. -release = '2.0.1' +release = '2.0.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/pypy/doc/index.rst b/pypy/doc/index.rst --- a/pypy/doc/index.rst +++ b/pypy/doc/index.rst @@ -40,7 +40,7 @@ * `FAQ`_: some frequently asked questions. -* `Release 2.0.1`_: the latest official release +* `Release 2.0.2`_: the latest official release * `PyPy Blog`_: news and status info about PyPy @@ -110,7 +110,7 @@ .. _`Getting Started`: getting-started.html .. _`Papers`: extradoc.html .. _`Videos`: video-index.html -.. _`Release 2.0.1`: http://pypy.org/download.html +.. _`Release 2.0.2`: http://pypy.org/download.html .. _`speed.pypy.org`: http://speed.pypy.org .. _`RPython toolchain`: translation.html .. _`potential project ideas`: project-ideas.html diff --git a/pypy/doc/release-2.0.2.rst b/pypy/doc/release-2.0.2.rst new file mode 100644 --- /dev/null +++ b/pypy/doc/release-2.0.2.rst @@ -0,0 +1,46 @@ +========================= +PyPy 2.0.2 - Fermi Panini +========================= + +We're pleased to announce PyPy 2.0.2. This is a stable bugfix release +over `2.0`_ and `2.0.1`_. You can download it here: + + http://pypy.org/download.html + +It fixes a crash in the JIT when calling external C functions (with +ctypes/cffi) in a multithreaded context. + +.. _2.0: release-2.0.0.html +.. _2.0.1: release-2.0.1.html + +What is PyPy? +============= + +PyPy is a very compliant Python interpreter, almost a drop-in replacement for +CPython 2.7. It's fast (`pypy 2.0 and cpython 2.7.3`_ 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. Support for ARM is progressing but not bug-free yet. + +.. _`pypy 2.0 and cpython 2.7.3`: http://speed.pypy.org + +Highlights +========== + +This release contains only the fix described above. A crash (or wrong +results) used to occur if all these conditions were true: + +- your program is multithreaded; + +- it runs on a single-core machine or a heavily-loaded multi-core one; + +- it uses ctypes or cffi to issue external calls to C functions. + +This was fixed in the branch `emit-call-x86`__ (see the example file +``bug1.py``). + +.. __: https://bitbucket.org/pypy/pypy/commits/7c80121abbf4 + +Cheers, +arigo et. al. for the PyPy team _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit
