Hey,
The newest PyPy.
The meat of the interpreter now lives in a shared object, so PyPy can be
embedded into C programs. This library is unversioned. I suppose this is
OK in the short term, but should another port ever depend upon libpypy-c,
we should push for a versioned shared object.
Sounds reasonable?
Stuart has hosted the new bootstrap. Thanks muchly.
OK?
Index: Makefile
===================================================================
RCS file: /home/edd/cvsync/ports/lang/pypy/Makefile,v
retrieving revision 1.12
diff -u -p -u -r1.12 Makefile
--- Makefile 13 Dec 2014 13:53:18 -0000 1.12
+++ Makefile 3 Apr 2015 15:47:43 -0000
@@ -12,7 +12,7 @@ COMMENT = fast implementation of the Py
# * Set BOOTSTRAP_V back to ${V} in the port Makefile
# * make bootstrap && make makesum (note, FLAVOR no longer set)
# * Try the build using the bootstrap
-V = 2.4.0
+V = 2.5.1
BOOTSTRAP_V = ${V}
DISTNAME = pypy-${V}-src
PKGNAME = pypy-${V}
@@ -65,7 +65,7 @@ post-extract:
exit 1; fi
.if !${FLAVOR:Mno_bootstrap}
echo '#!/bin/sh' > ${WRKDIR}/bin/pypy
- echo 'LD_LIBRARY_PATH=${WRKDIR}/bootstrap/system-libs exec
${WRKDIR}/bootstrap/bin/pypy "$$@"' >> ${WRKDIR}/bin/pypy
+ echo
'LD_LIBRARY_PATH=${WRKDIR}/bootstrap/system-libs:${WRKDIR}/bootstrap/pypy/lib
exec ${WRKDIR}/bootstrap/bin/pypy "$$@"' >> ${WRKDIR}/bin/pypy
chmod +x ${WRKDIR}/bin/pypy
.endif
@@ -78,7 +78,7 @@ pre-configure:
# When updating the port, see pypy/tool/release/package.py and check for
# new modules which require a cffi cache.
-CFFI_CACHES = _sqlite3, _curses, syslog, _tkinter, gdbm
+CFFI_CACHES = _sqlite3, audioop, _curses, syslog, gdbm, _tkinter
do-build:
.if ${FLAVOR:Mno_bootstrap}
@@ -96,9 +96,15 @@ do-build:
.endif
cd ${WRKDIR}/usession/testing_1 && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM}
+PYPY_INST_LIB_DIR = ${PREFIX}/pypy/lib
+PYPY_LD_LIBRARY_PATH = LD_LIBRARY_PATH=${PYPY_INST_LIB_DIR}
do-install:
mkdir -p ${PREFIX}/pypy/bin
- ${INSTALL_PROGRAM} ${WRKDIR}/usession/testing_1/pypy-c
${PREFIX}/pypy/bin/pypy
+ mkdir -p ${PYPY_INST_LIB_DIR}
+ ${INSTALL_PROGRAM} ${WRKDIR}/usession/testing_1/pypy-c \
+ ${PREFIX}/pypy/bin/pypy
+ ${INSTALL_PROGRAM} ${WRKDIR}/usession/testing_1/libpypy-c.so \
+ ${PYPY_INST_LIB_DIR}
${INSTALL_DATA_DIR} ${PREFIX}/pypy/include
cp -rp ${WRKSRC}/include/* ${PREFIX}/pypy/include
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/pypy/include
@@ -106,15 +112,17 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/pypy/lib-python/2.7
cp -rp ${WRKSRC}/lib_pypy/* ${PREFIX}/pypy/lib_pypy
cp -rp ${WRKSRC}/lib-python/2.7/* ${PREFIX}/pypy/lib-python/2.7
- ${PREFIX}/pypy/bin/pypy -m compileall ${PREFIX}/pypy/lib_pypy
- find ${PREFIX}/pypy/lib-python/2.7 -name "*.py" | grep -v test \
- | xargs ${PREFIX}/pypy/bin/pypy -m compileall
+ ${PYPY_LD_LIBRARY_PATH} ${PREFIX}/pypy/bin/pypy \
+ -m compileall ${PREFIX}/pypy/lib_pypy
+ ${PYPY_LD_LIBRARY_PATH} sh -c \
+ 'find ${PREFIX}/pypy/lib-python/2.7 -name "*.py" | grep -v test
\
+ | xargs ${PREFIX}/pypy/bin/pypy -m compileall'
# make cffi cache
# this will generate various __pycache__ directories in lib_pypy.
# and it puts absolute paths in there too, yay...
- LDFLAGS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include \
+ ${PYPY_LD_LIBRARY_PATH} LDFLAGS=-L${LOCALBASE}/lib \
+ CPPFLAGS=-I${LOCALBASE}/include \
${PREFIX}/pypy/bin/pypy -c 'import ${CFFI_CACHES}'
- # but it contains absolute paths, so we fix that:
${INSTALL_DATA_DIR}
${PREFIX}/pypy/lib_pypy/__pycache__/${TRUEPREFIX}/pypy/
mv ${PREFIX}/pypy/lib_pypy/__pycache__/${PREFIX}/pypy/* \
${PREFIX}/pypy/lib_pypy/__pycache__/${TRUEPREFIX}/pypy/
@@ -126,6 +134,7 @@ do-install:
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/pypy/lib_pypy
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/pypy/lib-python/2.7
cd ${PREFIX}/bin && ln -s ../pypy/bin/pypy
+ cd ${PREFIX}/lib && ln -s ../pypy/lib/libpypy-c.so
# remove patch orig files so they dont appear in the plist
find ${PREFIX} -name '*.py.orig' | xargs rm
@@ -141,8 +150,8 @@ bootstrap: ${PYPY_PKG}
mkdir -p ${WRKDIR}/prepare/bootstrap/system-libs
cd ${WRKDIR}/prepare/bootstrap && tar zxf ${PYPY_PKG}
rm -rf ${WRKDIR}/prepare/bootstrap/{+*,info,man}
- for i in `ldd ${WRKDIR}/prepare/bootstrap/bin/pypy | grep 'lib/' | \
- awk '{ print $$7 }'` ; do \
+ for i in `LD_LIBRARY_PATH=${WRKDIR}/prepare/bootstrap/pypy/lib ldd
${WRKDIR}/prepare/bootstrap/bin/pypy | grep 'lib/' | grep -v 'libpypy-c' | \
+ awk '{ print $$7 }'` ; do \
cp $$i ${WRKDIR}/prepare/bootstrap/system-libs; done
cd ${WRKDIR}/prepare && tar cf - bootstrap | \
xz > ${FULLDISTDIR}/${BOOTSTRAP-${MACHINE_ARCH}}
Index: distinfo
===================================================================
RCS file: /home/edd/cvsync/ports/lang/pypy/distinfo,v
retrieving revision 1.7
diff -u -p -u -r1.7 distinfo
--- distinfo 13 Dec 2014 13:53:18 -0000 1.7
+++ distinfo 3 Apr 2015 15:47:43 -0000
@@ -1,4 +1,4 @@
-SHA256 (pypy/pypy-2.4.0-src.tar.bz2) =
OIEAB67kiFygcDtWbbZZTddkmtqqKH33oQEvEOBndA8=
-SHA256 (pypy/pypy-bootstrap-amd64-2.4.0.tar.xz) =
Hzi2ooL2gMqg4S+DfKXnrFO8ULYiYZaxf79VyzimflE=
-SIZE (pypy/pypy-2.4.0-src.tar.bz2) = 15495214
-SIZE (pypy/pypy-bootstrap-amd64-2.4.0.tar.xz) = 18457460
+SHA256 (pypy/pypy-2.5.1-src.tar.bz2) =
3bOlgLHumcWmmRctdL6Rw23amjiUbUcx2MamMSCjuio=
+SHA256 (pypy/pypy-bootstrap-amd64-2.5.1.tar.xz) =
NXLoZe2X8R2K1FlT3mMu3axLdLf8xSb7KVIZhTuwiKs=
+SIZE (pypy/pypy-2.5.1-src.tar.bz2) = 16740876
+SIZE (pypy/pypy-bootstrap-amd64-2.5.1.tar.xz) = 21646652
Index: patches/patch-lib-python_2_7_ssl_py
===================================================================
RCS file: /home/edd/cvsync/ports/lang/pypy/patches/patch-lib-python_2_7_ssl_py,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-lib-python_2_7_ssl_py
--- patches/patch-lib-python_2_7_ssl_py 24 Apr 2014 21:44:07 -0000 1.1
+++ patches/patch-lib-python_2_7_ssl_py 3 Apr 2015 15:47:43 -0000
@@ -1,12 +1,12 @@
-$OpenBSD: patch-lib-python_2_7_ssl_py,v 1.1 2014/04/24 21:44:07 sthen Exp $
---- lib-python/2.7/ssl.py.orig Thu Apr 24 16:23:04 2014
-+++ lib-python/2.7/ssl.py Thu Apr 24 16:23:40 2014
-@@ -62,7 +62,7 @@ import _ssl # if we can't import it, let t
- from _ssl import OPENSSL_VERSION_NUMBER, OPENSSL_VERSION_INFO, OPENSSL_VERSION
- from _ssl import SSLError
- from _ssl import CERT_NONE, CERT_OPTIONAL, CERT_REQUIRED
+$OpenBSD$
+--- lib-python/2.7/ssl.py.orig Thu Apr 2 19:27:20 2015
++++ lib-python/2.7/ssl.py Thu Apr 2 19:27:45 2015
+@@ -106,7 +106,7 @@ from _ssl import CERT_NONE, CERT_OPTIONAL, CERT_REQUIR
+ from _ssl import (VERIFY_DEFAULT, VERIFY_CRL_CHECK_LEAF,
VERIFY_CRL_CHECK_CHAIN,
+ VERIFY_X509_STRICT)
+ from _ssl import txt2obj as _txt2obj, nid2obj as _nid2obj
-from _ssl import RAND_status, RAND_egd, RAND_add
+from _ssl import RAND_status, RAND_add
- from _ssl import \
- SSL_ERROR_ZERO_RETURN, \
- SSL_ERROR_WANT_READ, \
+
+ def _import_symbols(prefix):
+ for n in dir(_ssl):
Index: patches/patch-lib_pypy__tkinter_tklib_py
===================================================================
RCS file:
/home/edd/cvsync/ports/lang/pypy/patches/patch-lib_pypy__tkinter_tklib_py,v
retrieving revision 1.3
diff -u -p -u -r1.3 patch-lib_pypy__tkinter_tklib_py
--- patches/patch-lib_pypy__tkinter_tklib_py 13 Dec 2014 13:53:18 -0000
1.3
+++ patches/patch-lib_pypy__tkinter_tklib_py 3 Apr 2015 15:47:43 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-lib_pypy__tkinter_tklib_py,v 1.3 2014/12/13 13:53:18 edd Exp $
---- lib_pypy/_tkinter/tklib.py.orig Mon Sep 22 18:34:11 2014
-+++ lib_pypy/_tkinter/tklib.py Fri Oct 10 13:16:29 2014
-@@ -118,9 +118,9 @@ void Tcl_FindExecutable(char *argv0);
+--- lib_pypy/_tkinter/tklib.py.orig Mon Mar 23 16:17:54 2015
++++ lib_pypy/_tkinter/tklib.py Thu Apr 2 19:25:50 2015
+@@ -119,9 +119,9 @@ void Tcl_FindExecutable(char *argv0);
# XXX find a better way to detect paths
# XXX pick up CPPFLAGS and LDFLAGS and add to these paths?
if sys.platform.startswith("openbsd"):
Index: patches/patch-pypy_module__ssl___init___py
===================================================================
RCS file:
/home/edd/cvsync/ports/lang/pypy/patches/patch-pypy_module__ssl___init___py,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-pypy_module__ssl___init___py
--- patches/patch-pypy_module__ssl___init___py 24 Apr 2014 21:44:07 -0000
1.1
+++ patches/patch-pypy_module__ssl___init___py 3 Apr 2015 15:47:43 -0000
@@ -1,11 +1,11 @@
$OpenBSD: patch-pypy_module__ssl___init___py,v 1.1 2014/04/24 21:44:07 sthen
Exp $
---- pypy/module/_ssl/__init__.py.orig Thu Apr 24 16:24:13 2014
-+++ pypy/module/_ssl/__init__.py Thu Apr 24 16:24:19 2014
-@@ -24,7 +24,6 @@ class Module(MixedModule):
+--- pypy/module/_ssl/__init__.py.orig Mon Mar 23 16:17:54 2015
++++ pypy/module/_ssl/__init__.py Thu Apr 2 19:25:50 2015
+@@ -44,7 +44,6 @@ class Module(MixedModule):
if HAVE_OPENSSL_RAND:
Module.interpleveldefs['RAND_add'] = "interp_ssl.RAND_add"
Module.interpleveldefs['RAND_status'] = "interp_ssl.RAND_status"
- Module.interpleveldefs['RAND_egd'] = "interp_ssl.RAND_egd"
- super(Module, cls).buildloaders()
-
+ for name, value in ssl_data.ALERT_DESCRIPTION_CODES.items():
+ Module.interpleveldefs[name] = "space.wrap(%r)" % value
Index: patches/patch-pypy_module__ssl_interp_ssl_py
===================================================================
RCS file:
/home/edd/cvsync/ports/lang/pypy/patches/patch-pypy_module__ssl_interp_ssl_py,v
retrieving revision 1.2
diff -u -p -u -r1.2 patch-pypy_module__ssl_interp_ssl_py
--- patches/patch-pypy_module__ssl_interp_ssl_py 13 Dec 2014 13:53:18
-0000 1.2
+++ patches/patch-pypy_module__ssl_interp_ssl_py 3 Apr 2015 15:47:43
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-pypy_module__ssl_interp_ssl_py,v 1.2 2014/12/13 13:53:18 edd
Exp $
---- pypy/module/_ssl/interp_ssl.py.orig Mon Sep 22 18:34:11 2014
-+++ pypy/module/_ssl/interp_ssl.py Fri Oct 10 13:20:39 2014
-@@ -101,14 +101,7 @@ if HAVE_OPENSSL_RAND:
+--- pypy/module/_ssl/interp_ssl.py.orig Mon Mar 23 16:17:54 2015
++++ pypy/module/_ssl/interp_ssl.py Thu Apr 2 19:25:50 2015
+@@ -203,14 +203,7 @@ if HAVE_OPENSSL_RAND:
Queries the entropy gather daemon (EGD) on socket path. Returns
number
of bytes read. Raises socket.sslerror if connection to EGD fails or
if it does provide enough data to seed PRNG."""
@@ -15,5 +15,5 @@ $OpenBSD: patch-pypy_module__ssl_interp_
-
+ raise ssl_error(space, "EGD disabled")
- class SSLObject(W_Root):
- def __init__(self, space):
+ class _SSLSocket(W_Root):
+ @staticmethod
Index: patches/patch-rpython_rlib_ropenssl_py
===================================================================
RCS file:
/home/edd/cvsync/ports/lang/pypy/patches/patch-rpython_rlib_ropenssl_py,v
retrieving revision 1.3
diff -u -p -u -r1.3 patch-rpython_rlib_ropenssl_py
--- patches/patch-rpython_rlib_ropenssl_py 13 Dec 2014 13:53:18 -0000
1.3
+++ patches/patch-rpython_rlib_ropenssl_py 3 Apr 2015 15:47:43 -0000
@@ -1,11 +1,21 @@
$OpenBSD: patch-rpython_rlib_ropenssl_py,v 1.3 2014/12/13 13:53:18 edd Exp $
---- rpython/rlib/ropenssl.py.orig Mon Sep 22 18:34:11 2014
-+++ rpython/rlib/ropenssl.py Fri Oct 10 13:16:29 2014
-@@ -194,7 +194,6 @@ ssl_external('CRYPTO_set_id_callback',
+--- rpython/rlib/ropenssl.py.orig Mon Mar 23 16:17:54 2015
++++ rpython/rlib/ropenssl.py Thu Apr 2 20:03:48 2015
+@@ -29,7 +29,8 @@ includes += [
+ 'openssl/rand.h',
+ 'openssl/evp.h',
+ 'openssl/ossl_typ.h',
+- 'openssl/x509v3.h']
++ 'openssl/x509v3.h',
++ 'openssl/comp.h']
+
+ eci = ExternalCompilationInfo(
+ libraries = libraries,
+@@ -279,7 +280,6 @@ ssl_external('CRYPTO_set_id_callback',
if HAVE_OPENSSL_RAND:
ssl_external('RAND_add', [rffi.CCHARP, rffi.INT, rffi.DOUBLE],
lltype.Void)
ssl_external('RAND_status', [], rffi.INT)
- ssl_external('RAND_egd', [rffi.CCHARP], rffi.INT)
ssl_external('SSL_CTX_new', [SSL_METHOD], SSL_CTX)
ssl_external('SSL_get_SSL_CTX', [SSL], SSL_CTX)
- ssl_external('TLSv1_method', [], SSL_METHOD)
+ ssl_external('SSL_set_SSL_CTX', [SSL, SSL_CTX], SSL_CTX)
Index: pkg/PLIST
===================================================================
RCS file: /home/edd/cvsync/ports/lang/pypy/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -r1.6 PLIST
--- pkg/PLIST 13 Dec 2014 13:53:18 -0000 1.6
+++ pkg/PLIST 3 Apr 2015 15:47:43 -0000
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.6 2014/12/13 13:53:18 edd Exp $
bin/pypy
+lib/libpypy-c.so
pypy/
pypy/bin/
@bin pypy/bin/pypy
@@ -31,8 +32,11 @@ pypy/include/methodobject.h
pypy/include/missing.h
pypy/include/modsupport.h
pypy/include/numpy/
+pypy/include/numpy/__multiarray_api.h
pypy/include/numpy/arrayobject.h
+pypy/include/numpy/ndarraytypes.h
pypy/include/numpy/npy_3kcompat.h
+pypy/include/numpy/npy_common.h
pypy/include/numpy/old_defines.h
pypy/include/object.h
pypy/include/patchlevel.h
@@ -58,6 +62,7 @@ pypy/include/traceback.h
pypy/include/tupleobject.h
pypy/include/unicodeobject.h
pypy/include/warnings.h
+pypy/lib/
pypy/lib-python/
pypy/lib-python/2.7/
pypy/lib-python/2.7/BaseHTTPServer.py
@@ -850,6 +855,16 @@ pypy/lib-python/2.7/encodings/uu_codec.p
pypy/lib-python/2.7/encodings/uu_codec.pyc
pypy/lib-python/2.7/encodings/zlib_codec.py
pypy/lib-python/2.7/encodings/zlib_codec.pyc
+pypy/lib-python/2.7/ensurepip/
+pypy/lib-python/2.7/ensurepip/__init__.py
+pypy/lib-python/2.7/ensurepip/__init__.pyc
+pypy/lib-python/2.7/ensurepip/__main__.py
+pypy/lib-python/2.7/ensurepip/__main__.pyc
+pypy/lib-python/2.7/ensurepip/_bundled/
+pypy/lib-python/2.7/ensurepip/_bundled/pip-1.5.6-py2.py3-none-any.whl
+pypy/lib-python/2.7/ensurepip/_bundled/setuptools-7.0-py2.py3-none-any.whl
+pypy/lib-python/2.7/ensurepip/_uninstall.py
+pypy/lib-python/2.7/ensurepip/_uninstall.pyc
pypy/lib-python/2.7/filecmp.py
pypy/lib-python/2.7/filecmp.pyc
pypy/lib-python/2.7/fileinput.py
@@ -1041,6 +1056,7 @@ pypy/lib-python/2.7/idlelib/idle_test/te
pypy/lib-python/2.7/idlelib/idle_test/test_autoexpand.py
pypy/lib-python/2.7/idlelib/idle_test/test_calltips.py
pypy/lib-python/2.7/idlelib/idle_test/test_config_name.py
+pypy/lib-python/2.7/idlelib/idle_test/test_configdialog.py
pypy/lib-python/2.7/idlelib/idle_test/test_delegator.py
pypy/lib-python/2.7/idlelib/idle_test/test_formatparagraph.py
pypy/lib-python/2.7/idlelib/idle_test/test_grep.py
@@ -1049,10 +1065,12 @@ pypy/lib-python/2.7/idlelib/idle_test/te
pypy/lib-python/2.7/idlelib/idle_test/test_parenmatch.py
pypy/lib-python/2.7/idlelib/idle_test/test_pathbrowser.py
pypy/lib-python/2.7/idlelib/idle_test/test_rstrip.py
+pypy/lib-python/2.7/idlelib/idle_test/test_searchdialogbase.py
pypy/lib-python/2.7/idlelib/idle_test/test_searchengine.py
pypy/lib-python/2.7/idlelib/idle_test/test_text.py
pypy/lib-python/2.7/idlelib/idle_test/test_textview.py
pypy/lib-python/2.7/idlelib/idle_test/test_warning.py
+pypy/lib-python/2.7/idlelib/idle_test/test_widgetredir.py
pypy/lib-python/2.7/idlelib/idlever.py
pypy/lib-python/2.7/idlelib/idlever.pyc
pypy/lib-python/2.7/idlelib/keybindingDialog.py
@@ -1141,6 +1159,7 @@ pypy/lib-python/2.7/lib-tk/test/README
pypy/lib-python/2.7/lib-tk/test/runtktests.py
pypy/lib-python/2.7/lib-tk/test/test_tkinter/
pypy/lib-python/2.7/lib-tk/test/test_tkinter/__init__.py
+pypy/lib-python/2.7/lib-tk/test/test_tkinter/test_font.py
pypy/lib-python/2.7/lib-tk/test/test_tkinter/test_geometry_managers.py
pypy/lib-python/2.7/lib-tk/test/test_tkinter/test_images.py
pypy/lib-python/2.7/lib-tk/test/test_tkinter/test_loadtk.py
@@ -1191,6 +1210,8 @@ pypy/lib-python/2.7/lib2to3/fixes/__init
pypy/lib-python/2.7/lib2to3/fixes/__init__.pyc
pypy/lib-python/2.7/lib2to3/fixes/fix_apply.py
pypy/lib-python/2.7/lib2to3/fixes/fix_apply.pyc
+pypy/lib-python/2.7/lib2to3/fixes/fix_asserts.py
+pypy/lib-python/2.7/lib2to3/fixes/fix_asserts.pyc
pypy/lib-python/2.7/lib2to3/fixes/fix_basestring.py
pypy/lib-python/2.7/lib2to3/fixes/fix_basestring.pyc
pypy/lib-python/2.7/lib2to3/fixes/fix_buffer.py
@@ -2101,6 +2122,7 @@ pypy/lib-python/2.7/test/
pypy/lib-python/2.7/test/185test.db
pypy/lib-python/2.7/test/Sine-1000Hz-300ms.aif
pypy/lib-python/2.7/test/__init__.py
+pypy/lib-python/2.7/test/_mock_backport.py
pypy/lib-python/2.7/test/audiodata/
pypy/lib-python/2.7/test/audiodata/pluck-pcm16.aiff
pypy/lib-python/2.7/test/audiodata/pluck-pcm16.au
@@ -2132,6 +2154,11 @@ pypy/lib-python/2.7/test/badsyntax_futur
pypy/lib-python/2.7/test/badsyntax_future9.py
pypy/lib-python/2.7/test/badsyntax_nocaret.py
pypy/lib-python/2.7/test/buffer_tests.py
+pypy/lib-python/2.7/test/capath/
+pypy/lib-python/2.7/test/capath/4e1295a3.0
+pypy/lib-python/2.7/test/capath/5ed36f99.0
+pypy/lib-python/2.7/test/capath/6e88d7b8.0
+pypy/lib-python/2.7/test/capath/99d0fa06.0
pypy/lib-python/2.7/test/cfgparser.1
pypy/lib-python/2.7/test/check_soundcard.vbs
pypy/lib-python/2.7/test/cjkencodings/
@@ -2329,6 +2356,7 @@ pypy/lib-python/2.7/test/decimaltestdata
pypy/lib-python/2.7/test/decimaltestdata/tointegral.decTest
pypy/lib-python/2.7/test/decimaltestdata/tointegralx.decTest
pypy/lib-python/2.7/test/decimaltestdata/xor.decTest
+pypy/lib-python/2.7/test/dh512.pem
pypy/lib-python/2.7/test/doctest_aliases.py
pypy/lib-python/2.7/test/double_const.py
pypy/lib-python/2.7/test/empty.vbs
@@ -2355,7 +2383,11 @@ pypy/lib-python/2.7/test/imghdrdata/pyth
pypy/lib-python/2.7/test/infinite_reload.py
pypy/lib-python/2.7/test/inspect_fodder.py
pypy/lib-python/2.7/test/inspect_fodder2.py
+pypy/lib-python/2.7/test/keycert.passwd.pem
pypy/lib-python/2.7/test/keycert.pem
+pypy/lib-python/2.7/test/keycert2.pem
+pypy/lib-python/2.7/test/keycert3.pem
+pypy/lib-python/2.7/test/keycert4.pem
pypy/lib-python/2.7/test/leakers/
pypy/lib-python/2.7/test/leakers/README.txt
pypy/lib-python/2.7/test/leakers/__init__.py
@@ -2365,6 +2397,7 @@ pypy/lib-python/2.7/test/leakers/test_ge
pypy/lib-python/2.7/test/leakers/test_selftype.py
pypy/lib-python/2.7/test/list_tests.py
pypy/lib-python/2.7/test/lock_tests.py
+pypy/lib-python/2.7/test/make_ssl_certs.py
pypy/lib-python/2.7/test/mapping_tests.py
pypy/lib-python/2.7/test/math_testcases.txt
pypy/lib-python/2.7/test/mp_fork_bomb.py
@@ -2374,6 +2407,7 @@ pypy/lib-python/2.7/test/nullcert.pem
pypy/lib-python/2.7/test/outstanding_bugs.py
pypy/lib-python/2.7/test/pickletester.py
pypy/lib-python/2.7/test/profilee.py
+pypy/lib-python/2.7/test/pycacert.pem
pypy/lib-python/2.7/test/pyclbr_input.py
pypy/lib-python/2.7/test/pydoc_mod.py
pypy/lib-python/2.7/test/pydocfodder.py
@@ -2385,14 +2419,20 @@ pypy/lib-python/2.7/test/re_tests.py
pypy/lib-python/2.7/test/regrtest.py
pypy/lib-python/2.7/test/relimport.py
pypy/lib-python/2.7/test/reperf.py
+pypy/lib-python/2.7/test/revocation.crl
pypy/lib-python/2.7/test/sample_doctest.py
pypy/lib-python/2.7/test/sample_doctest_no_docstrings.py
pypy/lib-python/2.7/test/sample_doctest_no_doctests.py
pypy/lib-python/2.7/test/script_helper.py
+pypy/lib-python/2.7/test/selfsigned_pythontestdotnet.pem
pypy/lib-python/2.7/test/seq_tests.py
pypy/lib-python/2.7/test/sgml_input.html
pypy/lib-python/2.7/test/sha256.pem
pypy/lib-python/2.7/test/sortperf.py
+pypy/lib-python/2.7/test/ssl_cert.pem
+pypy/lib-python/2.7/test/ssl_key.passwd.pem
+pypy/lib-python/2.7/test/ssl_key.pem
+pypy/lib-python/2.7/test/ssl_servers.py
pypy/lib-python/2.7/test/string_tests.py
pypy/lib-python/2.7/test/subprocessdata/
pypy/lib-python/2.7/test/subprocessdata/sigchild_ignore.py
@@ -2518,6 +2558,7 @@ pypy/lib-python/2.7/test/test_dummy_thre
pypy/lib-python/2.7/test/test_email.py
pypy/lib-python/2.7/test/test_email_codecs.py
pypy/lib-python/2.7/test/test_email_renamed.py
+pypy/lib-python/2.7/test/test_ensurepip.py
pypy/lib-python/2.7/test/test_enumerate.py
pypy/lib-python/2.7/test/test_eof.py
pypy/lib-python/2.7/test/test_epoll.py
@@ -2969,27 +3010,31 @@ pypy/lib-python/2.7/xmlrpclib.py
pypy/lib-python/2.7/xmlrpclib.pyc
pypy/lib-python/2.7/zipfile.py
pypy/lib-python/2.7/zipfile.pyc
+pypy/lib/libpypy-c.so
pypy/lib_pypy/
pypy/lib_pypy/__init__.py
pypy/lib_pypy/__init__.pyc
pypy/lib_pypy/__pycache__/
-pypy/lib_pypy/__pycache__/_cffi__g224bc031xf13cf229.c
-pypy/lib_pypy/__pycache__/_cffi__g224bc031xf13cf229.py${MODPY_PY_PREFIX}24.so
pypy/lib_pypy/__pycache__/_cffi__g29b85a97xace1544d.c
-pypy/lib_pypy/__pycache__/_cffi__g29b85a97xace1544d.py${MODPY_PY_PREFIX}24.so
+pypy/lib_pypy/__pycache__/_cffi__g29b85a97xace1544d.pypy-25.so
pypy/lib_pypy/__pycache__/_cffi__g5ebcbb41x576c1bb2.c
-pypy/lib_pypy/__pycache__/_cffi__g5ebcbb41x576c1bb2.py${MODPY_PY_PREFIX}24.so
+pypy/lib_pypy/__pycache__/_cffi__g5ebcbb41x576c1bb2.pypy-25.so
pypy/lib_pypy/__pycache__/_cffi__g9dbb764dx1211b795.c
-pypy/lib_pypy/__pycache__/_cffi__g9dbb764dx1211b795.py${MODPY_PY_PREFIX}24.so
+pypy/lib_pypy/__pycache__/_cffi__g9dbb764dx1211b795.pypy-25.so
+pypy/lib_pypy/__pycache__/_cffi__gb047760cx97c3a5f3.c
+pypy/lib_pypy/__pycache__/_cffi__gb047760cx97c3a5f3.pypy-25.so
+pypy/lib_pypy/__pycache__/_cffi__gc4433c0bxb981b228.c
+pypy/lib_pypy/__pycache__/_cffi__gc4433c0bxb981b228.pypy-25.so
pypy/lib_pypy/__pycache__/usr/
pypy/lib_pypy/__pycache__/usr/local/
pypy/lib_pypy/__pycache__/usr/local/pypy/
pypy/lib_pypy/__pycache__/usr/local/pypy/lib_pypy/
pypy/lib_pypy/__pycache__/usr/local/pypy/lib_pypy/__pycache__/
-pypy/lib_pypy/__pycache__/usr/local/pypy/lib_pypy/__pycache__/_cffi__g224bc031xf13cf229.o
pypy/lib_pypy/__pycache__/usr/local/pypy/lib_pypy/__pycache__/_cffi__g29b85a97xace1544d.o
pypy/lib_pypy/__pycache__/usr/local/pypy/lib_pypy/__pycache__/_cffi__g5ebcbb41x576c1bb2.o
pypy/lib_pypy/__pycache__/usr/local/pypy/lib_pypy/__pycache__/_cffi__g9dbb764dx1211b795.o
+pypy/lib_pypy/__pycache__/usr/local/pypy/lib_pypy/__pycache__/_cffi__gb047760cx97c3a5f3.o
+pypy/lib_pypy/__pycache__/usr/local/pypy/lib_pypy/__pycache__/_cffi__gc4433c0bxb981b228.o
pypy/lib_pypy/_codecs_cn.py
pypy/lib_pypy/_codecs_cn.pyc
pypy/lib_pypy/_codecs_hk.py
@@ -3076,15 +3121,15 @@ pypy/lib_pypy/_tkinter/
pypy/lib_pypy/_tkinter/__init__.py
pypy/lib_pypy/_tkinter/__init__.pyc
pypy/lib_pypy/_tkinter/__pycache__/
-pypy/lib_pypy/_tkinter/__pycache__/_cffi__g2c14af5exd02b450a.c
-pypy/lib_pypy/_tkinter/__pycache__/_cffi__g2c14af5exd02b450a.py${MODPY_PY_PREFIX}24.so
+pypy/lib_pypy/_tkinter/__pycache__/_cffi__gf4a2ac9dxda2676c7.c
+pypy/lib_pypy/_tkinter/__pycache__/_cffi__gf4a2ac9dxda2676c7.pypy-25.so
pypy/lib_pypy/_tkinter/__pycache__/usr/
pypy/lib_pypy/_tkinter/__pycache__/usr/local/
pypy/lib_pypy/_tkinter/__pycache__/usr/local/pypy/
pypy/lib_pypy/_tkinter/__pycache__/usr/local/pypy/lib_pypy/
pypy/lib_pypy/_tkinter/__pycache__/usr/local/pypy/lib_pypy/_tkinter/
pypy/lib_pypy/_tkinter/__pycache__/usr/local/pypy/lib_pypy/_tkinter/__pycache__/
-pypy/lib_pypy/_tkinter/__pycache__/usr/local/pypy/lib_pypy/_tkinter/__pycache__/_cffi__g2c14af5exd02b450a.o
+pypy/lib_pypy/_tkinter/__pycache__/usr/local/pypy/lib_pypy/_tkinter/__pycache__/_cffi__gf4a2ac9dxda2676c7.o
pypy/lib_pypy/_tkinter/app.py
pypy/lib_pypy/_tkinter/app.pyc
pypy/lib_pypy/_tkinter/license.terms
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
