pypy/module/sys/version.py | 1 1 + 0 - 0 !
rpython/tool/version.py | 10 10 + 0 - 0 !
2 files changed, 11 insertions(+)

 get version details from the debian source package, rather than vcs
 Return the Debian package version in sys.version.
 Return null strings in sys._mercurial.

pypy/config/pypyoption.py | 5 5 + 0 - 0 !
pypy/doc/interpreter.rst | 1 1 + 0 - 0 !
pypy/interpreter/app_main.py | 1 1 + 0 - 0 !
pypy/interpreter/main.py | 1 1 + 0 - 0 !
pypy/interpreter/test/test_main.py | 11 11 + 0 - 0 !
pypy/module/imp/__init__.py | 3 3 + 0 - 0 !
pypy/module/imp/importing.py | 81 78 + 3 - 0 !
pypy/module/imp/interp_imp.py | 12 12 + 0 - 0 !
pypy/module/imp/test/test_app.py | 7 5 + 2 - 0 !
pypy/module/imp/test/test_import.py | 323 298 + 25 - 0 !
pypy/module/zipimport/test/test_undocumented.py | 23 15 + 8 - 0 !
11 files changed, 430 insertions(+), 38 deletions(-)

 pep3147 support.
 Tests modified from Barry Warsaw's PEP3147 cpython support

lib-python/2.7/compileall.py | 67 44 + 23 - 0 !
lib-python/2.7/inspect.py | 1 1 + 0 - 0 !
lib-python/2.7/py_compile.py | 35 20 + 15 - 0 !
lib-python/2.7/pydoc.py | 3 2 + 1 - 0 !
lib-python/2.7/runpy.py | 2 2 + 0 - 0 !
lib-python/2.7/site.py | 13 10 + 3 - 0 !
lib-python/2.7/test/script_helper.py | 23 12 + 11 - 0 !
lib-python/2.7/test/test_cmd_line_script.py | 20 12 + 8 - 0 !
lib-python/2.7/test/test_compileall.py | 61 58 + 3 - 0 !
lib-python/2.7/test/test_imp.py | 142 142 + 0 - 0 !
lib-python/2.7/test/test_import.py | 65 38 + 27 - 0 !
lib-python/2.7/test/test_pkg.py | 20 10 + 10 - 0 !
lib-python/2.7/test/test_pkgimport.py | 20 8 + 12 - 0 !
lib-python/2.7/test/test_py_compile.py | 5 3 + 2 - 0 !
lib-python/2.7/test/test_pydoc.py | 3 2 + 1 - 0 !
lib-python/2.7/test/test_runpy.py | 23 16 + 7 - 0 !
lib-python/2.7/test/test_site.py | 47 34 + 13 - 0 !
lib-python/2.7/test/test_support.py | 48 40 + 8 - 0 !
lib-python/2.7/test/test_traceback.py | 5 2 + 3 - 0 !
lib-python/2.7/test/test_zipfile.py | 9 8 + 1 - 0 !
lib-python/2.7/test/test_zipimport.py | 9 3 + 6 - 0 !
lib-python/2.7/zipfile.py | 43 32 + 11 - 0 !
22 files changed, 499 insertions(+), 165 deletions(-)

 pep3147 changes to lib-python
 Backported from cpython's PEP3147 commit

lib-python/2.7/distutils/command/build_py.py | 7 5 + 2 - 0 !
lib-python/2.7/distutils/command/install_lib.py | 7 5 + 2 - 0 !
lib-python/2.7/distutils/tests/test_build_py.py | 76 50 + 26 - 0 !
lib-python/2.7/distutils/tests/test_install_lib.py | 60 37 + 23 - 0 !
lib-python/2.7/distutils/util.py | 17 12 + 5 - 0 !
5 files changed, 109 insertions(+), 58 deletions(-)

 pep3147 distutils patches
 Backported from cpython

lib-python/2.7/test/test_os.py | 2 2 + 0 - 0 !
1 file changed, 2 insertions(+)

 skip fsync tests when building with eatmydata

pypy/module/termios/test/test_termios.py | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 support bulds on older aufs
 Under aufs on squeeze, tcgetattr can return EINVAL instead of ENOTTY
 See https://lsbbugs.linuxfoundation.org/show_bug.cgi?id=2771

rpython/translator/platform/__init__.py | 5 4 + 1 - 0 !
1 file changed, 4 insertions(+), 1 deletion(-)

 x32 and hppa require -fpic
 x32 detection is currently Debian-specific.

lib-python/2.7/test/test_multiprocessing.py | 3 3 + 0 - 0 !
1 file changed, 3 insertions(+)

 disable test_multiprocessing - it leaves stray processes

lib-python/2.7/test/test_pyexpat.py | 6 2 + 4 - 0 !
1 file changed, 2 insertions(+), 4 deletions(-)

 dont test error message detail that changed in expat 2.2.0

pypy/goal/targetpypystandalone.py | 3 2 + 1 - 0 !
1 file changed, 2 insertions(+), 1 deletion(-)

 respect --no-profopt, so you can do -o3 --shared

rpython/translator/c/gcc/trackgcroot.py | 7 7 + 0 - 0 !
1 file changed, 7 insertions(+)

 fix for calls to '__x86.get_pc_thunk'

rpython/tool/algo/graphlib.py | 52 37 + 15 - 0 !
rpython/tool/algo/test/test_graphlib.py | 16 16 + 0 - 0 !
2 files changed, 53 insertions(+), 15 deletions(-)

 make graphlib less recursive
 Fixes FTBFS on armel, mipsel, mips64el

lib-python/2.7/ctypes/util.py | 15 13 + 2 - 0 !
1 file changed, 13 insertions(+), 2 deletions(-)

 armhf support
 Workaround the presentce of hard-float in ldconfig -p output
 Also, handle the wide variety of ARM unames

lib-python/2.7/distutils/unixccompiler.py | 7 6 + 1 - 0 !
1 file changed, 6 insertions(+), 1 deletion(-)

 don't add standard library dirs to library_dirs and runtime_library_dirs.

lib-python/2.7/locale.py | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 don't map 'utf8', 'utf-8' to 'utf', which is not a known encoding for glibc.

lib-python/2.7/platform.py | 23 23 + 0 - 0 !
1 file changed, 23 insertions(+)

 use /etc/lsb-release to identify the platform.

lib-python/2.7/webbrowser.py | 8 8 + 0 - 0 !
1 file changed, 8 insertions(+)

 use xdg-open/gvfs-open in webbrowser
Bug-cpython: http://bugs.python.org/issue14493
Bug-Ubuntu: https://bugs.launchpad.net/bugs/971311

lib-python/2.7/plat-gnukfreebsd10/DLFCN.py | 118 118 + 0 - 0 !
lib-python/2.7/plat-gnukfreebsd10/IN.py | 809 809 + 0 - 0 !
lib-python/2.7/plat-gnukfreebsd10/TYPES.py | 303 303 + 0 - 0 !
lib-python/2.7/plat-gnukfreebsd11/DLFCN.py | 118 118 + 0 - 0 !
lib-python/2.7/plat-gnukfreebsd11/IN.py | 809 809 + 0 - 0 !
lib-python/2.7/plat-gnukfreebsd11/TYPES.py | 303 303 + 0 - 0 !
lib-python/2.7/plat-gnukfreebsd8/DLFCN.py | 118 118 + 0 - 0 !
lib-python/2.7/plat-gnukfreebsd8/IN.py | 809 809 + 0 - 0 !
lib-python/2.7/plat-gnukfreebsd8/TYPES.py | 303 303 + 0 - 0 !
lib-python/2.7/plat-gnukfreebsd9/DLFCN.py | 118 118 + 0 - 0 !
lib-python/2.7/plat-gnukfreebsd9/IN.py | 809 809 + 0 - 0 !
lib-python/2.7/plat-gnukfreebsd9/TYPES.py | 303 303 + 0 - 0 !
12 files changed, 4920 insertions(+)

 dlfcn.py for kfreebsd

lib-python/2.7/plat-linux2/DLFCN.py | 88 7 + 81 - 0 !
lib-python/2.7/plat-linux2/DLFCN_default.py | 83 83 + 0 - 0 !
lib-python/2.7/plat-linux2/DLFCN_mips.py | 83 83 + 0 - 0 !
lib-python/2.7/plat-linux2/IN.py | 626 13 + 613 - 0 !
lib-python/2.7/plat-linux2/IN_alpha.py | 615 615 + 0 - 0 !
lib-python/2.7/plat-linux2/IN_default.py | 615 615 + 0 - 0 !
lib-python/2.7/plat-linux2/IN_hppa.py | 615 615 + 0 - 0 !
lib-python/2.7/plat-linux2/IN_mips.py | 615 615 + 0 - 0 !
lib-python/2.7/plat-linux2/IN_sparc.py | 615 615 + 0 - 0 !
9 files changed, 3261 insertions(+), 694 deletions(-)

 plat-linux2's constants vary
 Break the affected files up, and import based on platform.machine()
Bug-cpython: http://bugs.python.org/issue3990

lib-python/2.7/ensurepip/__init__.py | 76 55 + 21 - 0 !
1 file changed, 55 insertions(+), 21 deletions(-)

 let ensurepip use the system wheels
 Not the ones from the python source.

lib-python/2.7/ensurepip/__init__.py | 17 17 + 0 - 0 !
lib-python/2.7/test/test_ensurepip.py | 1 1 + 0 - 0 !
2 files changed, 18 insertions(+)

 disable ensurepip in debian for now

lib-python/2.7/sysconfig.py | 7 7 + 0 - 0 !
lib-python/2.7/test/test_sysconfig.py | 5 5 + 0 - 0 !
pypy/module/imp/importing.py | 5 4 + 1 - 0 !
pypy/module/imp/interp_imp.py | 7 5 + 2 - 0 !
pypy/module/imp/test/test_import.py | 3 2 + 1 - 0 !
pypy/module/sys/__init__.py | 3 3 + 0 - 0 !
pypy/module/sys/debian.py | 12 12 + 0 - 0 !
pypy/module/sys/test/test_sysmodule.py | 5 5 + 0 - 0 !
8 files changed, 43 insertions(+), 4 deletions(-)

 add multiarch tag to c extension file names
 Add _multiarch variable to sys, and MULTIARCH to sysconfig variables, exposing
 the multiarch tag.
 Add the multiarch tag to C extension file names, by default, while still
 supporting bare suffixes.

lib-python/2.7/distutils/command/install.py | 44 42 + 2 - 0 !
lib-python/2.7/distutils/command/install_egg_info.py | 30 25 + 5 - 0 !
lib-python/2.7/distutils/sysconfig_pypy.py | 6 5 + 1 - 0 !
lib-python/2.7/pydoc.py | 1 1 + 0 - 0 !
lib-python/2.7/site.py | 18 16 + 2 - 0 !
lib-python/2.7/sysconfig.py | 29 27 + 2 - 0 !
lib-python/2.7/test/test_site.py | 2 1 + 1 - 0 !
lib-python/2.7/test/test_sysconfig.py | 3 2 + 1 - 0 !
8 files changed, 119 insertions(+), 14 deletions(-)

 distutils: add an option --install-layout=deb
 This option:
  - installs into $prefix/dist-packages instead of $prefix/site-packages.
  - doesn't encode the python version into the egg name.
 Based on cpython Debian packaging

lib-python/2.7/gettext.py | 15 15 + 0 - 0 !
1 file changed, 15 insertions(+)

 support ubuntu langpacks
 Support alternative gettext tree in /usr/share/locale-langpack; if a file is
 present in both trees, prefer the newer one

lib-python/2.7/lib-tk/Tkinter.py | 5 4 + 1 - 0 !
1 file changed, 4 insertions(+), 1 deletion(-)

 suggest installation of pypy-tk package on failing _tkinter import

rpython/tool/ansi_print.py | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 always output the mandelbrot
 So that our buildds see progress