lang/pypy(3): update to 5.7.1

 - add MIT/PSFL multi license
 - pass LDSHARED to make environment (work-around assumption around 'gcc')
 - add new dependency: pycparser (only required if python is translating)
 - removed patches merged upstream
 - add patch to remove '-flto' from cflags (base ld doesn't support LTO)
 - pypy:
   - add patch to fix bad assumption about 'gcc' (instead of 'cc')
 - pypy3:
   - update BUILD_WRKSRC and PYPY_CFFI_VER
   - only supports AMD64

ChangeLog:
 - PyPy2 updated to Python 2.7.13
 - PyPy3 updated to Python 3.5.3 (beta):
   - Not all tests pass
   - Asyncio does work
 - PyPy2 supports C-extensions: NumPy, Cython and Pandas (amongst others)
 - CFFI updated to 1.10
 - Many bug-fixes

10 files changed, 361 insertions, 146 deletions

diff --git a/lang/pypy3/Makefile b/lang/pypy3/Makefile
index e631cc647b2c..d84007dcabde 100644
--- a/lang/pypy3/Makefile
+++ b/lang/pypy3/Makefile
@@ -2,17 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	pypy3
-PORTREVISION=	1
-DISTVERSION=	5.5.0-alpha
-DISTNAME=	${PORTNAME}.3-v${DISTVERSION}-src
+DISTVERSION=	5.7.1
+DISTNAME=	${PORTNAME}-v${DISTVERSION}-src
 
 MASTERDIR=	${.CURDIR}/../pypy
 
+ONLY_FOR_ARCHS=	amd64
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-v${DISTVERSION:C/-.*//}-src
-BUILD_WRKSRC?=	${WRKDIR}/build/usession-release-${PORTNAME}.3-${DISTVERSION:C/-.*//}-0/testing_1
+BUILD_WRKSRC?=	${WRKDIR}/build/usession-release-${PORTNAME}.5-v${DISTVERSION:C/-.*//}-0/testing_1
 
 PACKAGE_ARGS=	--without-_gdbm --without-sqlite3 --without-tk
 
-PYPY_CFFI_VER=	pypy3-55
+PYPY_CFFI_VER=	${PORTNAME}-${DISTVERSION:C/.[^.]+$//:S/.//}-${ARCH}-${OPSYS:tl}${OSREL:C/\..*//}
+
+pre-install:
+	${FIND} ${WRKSRC} -name '*.pyc' -delete
+	#${CHMOD} -R a-w ${WRKSRC}
+	#${CHMOD} -R u+w ${WRKSRC}/lib_pypy
 
 .include "${MASTERDIR}/Makefile"
diff --git a/lang/pypy3/distinfo b/lang/pypy3/distinfo
index 8ec97b35252c..ad2e5764da74 100644
--- a/lang/pypy3/distinfo
+++ b/lang/pypy3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476288077
-SHA256 (pypy3.3-v5.5.0-alpha-src.tar.bz2) = d5591c34d77253e9ed57d182b6f49585b95f7c09c3e121f0e8630e5a7e75ab5f
-SIZE (pypy3.3-v5.5.0-alpha-src.tar.bz2) = 25122033
+TIMESTAMP = 1491510361
+SHA256 (pypy3-v5.7.1-src.tar.bz2) = 40ece0145282980ac121390f13709404c0532896507d5767496381180b631bd0
+SIZE (pypy3-v5.7.1-src.tar.bz2) = 28811162
diff --git a/lang/pypy3/files/patch-pypy_module_time_interp__time.py b/lang/pypy3/files/patch-pypy_module_time_interp__time.py
deleted file mode 100644
index b7098d6a584e..000000000000
--- a/lang/pypy3/files/patch-pypy_module_time_interp__time.py
+++ /dev/null
@@ -1,22 +0,0 @@
---- pypy/module/time/interp_time.py.orig	2016-10-12 19:05:22 UTC
-+++ pypy/module/time/interp_time.py
-@@ -4,8 +4,7 @@ from pypy.interpreter.error import Opera
- from pypy.interpreter.gateway import unwrap_spec
- from rpython.rtyper.lltypesystem import lltype
- from rpython.rlib.rarithmetic import intmask, r_ulonglong, r_longfloat, widen
--from rpython.rlib.rtime import (TIMEB, c_ftime,
--                                GETTIMEOFDAY_NO_TZ, TIMEVAL,
-+from rpython.rlib.rtime import (GETTIMEOFDAY_NO_TZ, TIMEVAL,
-                                 HAVE_GETTIMEOFDAY, HAVE_FTIME)
- from rpython.rlib import rposix, rtime
- from rpython.translator.tool.cbuild import ExternalCompilationInfo
-@@ -14,6 +13,9 @@ import os
- import sys
- import time as pytime
- 
-+if HAVE_FTIME:
-+    from rpython.rlib.rtime import TIMEB, c_ftime
-+
- _POSIX = os.name == "posix"
- _WIN = os.name == "nt"
- _MACOSX = sys.platform == "darwin"
diff --git a/lang/pypy3/files/patch-rpython_jit_backend_detect__cpu.py b/lang/pypy3/files/patch-rpython_jit_backend_detect__cpu.py
deleted file mode 100644
index 26dd2cb4238e..000000000000
--- a/lang/pypy3/files/patch-rpython_jit_backend_detect__cpu.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- rpython/jit/backend/detect_cpu.py.orig	2016-06-14 07:46:04 UTC
-+++ rpython/jit/backend/detect_cpu.py
-@@ -61,6 +61,7 @@ def detect_model_from_host_platform():
-             'i86pc': MODEL_X86,    # Solaris/Intel
-             'x86': MODEL_X86,      # Apple
-             'Power Macintosh': MODEL_PPC_64,
-+            'powerpc': MODEL_PPC_64, # freebsd
-             'ppc64': MODEL_PPC_64,
-             'ppc64le': MODEL_PPC_64,
-             'x86_64': MODEL_X86,
diff --git a/lang/pypy3/files/patch-rpython_rlib_rposix.py b/lang/pypy3/files/patch-rpython_rlib_rposix.py
deleted file mode 100644
index ee2e807ef3ef..000000000000
--- a/lang/pypy3/files/patch-rpython_rlib_rposix.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- rpython/rlib/rposix.py.orig	2016-10-08 20:52:00 UTC
-+++ rpython/rlib/rposix.py
-@@ -233,7 +233,7 @@ else:
-     else:
-         _ptyh = 'pty.h'
-     includes = ['unistd.h',  'sys/types.h', 'sys/wait.h',
--                'utime.h', 'sys/time.h', 'sys/times.h',
-+                'utime.h', 'sys/time.h', 'sys/times.h', 'sys/ttycom.h',
-                 'grp.h', 'dirent.h', 'sys/stat.h', 'fcntl.h',
-                 'signal.h', 'sys/utsname.h', _ptyh]
-     libraries = ['util']
diff --git a/lang/pypy3/files/patch-rpython_rlib_rtime.py b/lang/pypy3/files/patch-rpython_rlib_rtime.py
deleted file mode 100644
index f477345e9918..000000000000
--- a/lang/pypy3/files/patch-rpython_rlib_rtime.py
+++ /dev/null
@@ -1,12 +0,0 @@
---- rpython/rlib/rtime.py.orig	2016-05-29 20:38:19 UTC
-+++ rpython/rlib/rtime.py
-@@ -29,7 +29,8 @@ else:
-                 'sys/types.h', 'unistd.h',
-                 'sys/time.h', 'sys/resource.h']
- 
--    if not sys.platform.startswith("openbsd"):
-+    if not sys.platform.startswith("openbsd") and \
-+       not sys.platform.startswith("freebsd"):
-         includes.append('sys/timeb.h')
- 
-     need_rusage = True
diff --git a/lang/pypy3/files/patch-rpython_translator_c_src_asm.c b/lang/pypy3/files/patch-rpython_translator_c_src_asm.c
deleted file mode 100644
index 50d2c7102882..000000000000
--- a/lang/pypy3/files/patch-rpython_translator_c_src_asm.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- rpython/translator/c/src/asm.c.orig	2016-06-14 07:46:04 UTC
-+++ rpython/translator/c/src/asm.c
-@@ -8,10 +8,6 @@
- /* #  include "src/asm_gcc_x86_64.c" */
- #endif
- 
--#if defined(__GNUC__) && defined(__ppc__)
--#  include "src/asm_ppc.c"
--#endif
--
- #if defined(_MSC_VER)
- #  include "src/asm_msvc.c"
- #endif
diff --git a/lang/pypy3/files/patch-rpython_translator_c_src_asm.h b/lang/pypy3/files/patch-rpython_translator_c_src_asm.h
deleted file mode 100644
index 352938fe7b2f..000000000000
--- a/lang/pypy3/files/patch-rpython_translator_c_src_asm.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- rpython/translator/c/src/asm.h.orig	2016-06-14 07:46:04 UTC
-+++ rpython/translator/c/src/asm.h
-@@ -10,10 +10,6 @@
- #  include "src/asm_gcc_x86_64.h"
- #endif
- 
--#if defined(__GNUC__) && defined(__ppc__)
--#  include "src/asm_ppc.h"
--#endif
--
- #if defined(MS_WINDOWS) && defined(_MSC_VER)
- #  include "src/asm_msvc.h"
- #endif
diff --git a/lang/pypy3/files/patch-rpython_translator_platform_posix.py b/lang/pypy3/files/patch-rpython_translator_platform_posix.py
new file mode 100644
index 000000000000..9d202772422e
--- /dev/null
+++ b/lang/pypy3/files/patch-rpython_translator_platform_posix.py
@@ -0,0 +1,13 @@
+FreeBSD's base ld(1) does not currently support plugins and is not compatible
+with clang's link-time optimisation.
+--- rpython/translator/platform/posix.py.orig	2017-04-03 06:36:13 UTC
++++ rpython/translator/platform/posix.py
+@@ -132,7 +132,7 @@ class BasePosix(Platform):
+ 
+         # xxx check which compilers accept this option or not
+         if not config or config.translation.gcrootfinder != 'asmgcc':
+-            cflags = ('-flto',) + cflags
++            pass
+ 
+         m = GnuMakefile(path)
+         m.exe_name = path.join(exe_name.basename)
diff --git a/lang/pypy3/pkg-plist b/lang/pypy3/pkg-plist
index bfc57892e3d2..d957603af966 100644
--- a/lang/pypy3/pkg-plist
+++ b/lang/pypy3/pkg-plist
@@ -1,9 +1,8 @@
 bin/pypy3
 %%PYPY_DIR%%/LICENSE
 %%PYPY_DIR%%/README.rst
-%%PYPY_DIR%%/bin/libpypy-c.so
+%%PYPY_DIR%%/bin/libpypy3-c.so
 %%PYPY_DIR%%/bin/pypy3
-%%PYPY_DIR%%/bin/pypy3.3
 %%PYPY_DIR%%/include/PyPy.h
 %%PYPY_DIR%%/include/Python.h
 %%PYPY_DIR%%/include/README
@@ -16,6 +15,9 @@ bin/pypy3
 %%PYPY_DIR%%/include/code.h
 %%PYPY_DIR%%/include/compile.h
 %%PYPY_DIR%%/include/complexobject.h
+%%PYPY_DIR%%/include/cpyext_moduleobject.h
+%%PYPY_DIR%%/include/cpyext_object.h
+%%PYPY_DIR%%/include/cpyext_unicodeobject.h
 %%PYPY_DIR%%/include/datetime.h
 %%PYPY_DIR%%/include/descrobject.h
 %%PYPY_DIR%%/include/dictobject.h
@@ -40,6 +42,7 @@ bin/pypy3
 %%PYPY_DIR%%/include/pycobject.h
 %%PYPY_DIR%%/include/pyconfig.h
 %%PYPY_DIR%%/include/pyerrors.h
+%%PYPY_DIR%%/include/pylifecycle.h
 %%PYPY_DIR%%/include/pymacro.h
 %%PYPY_DIR%%/include/pymath.h
 %%PYPY_DIR%%/include/pymem.h
@@ -61,11 +64,16 @@ bin/pypy3
 %%PYPY_DIR%%/include/warnings.h
 %%PYPY_DIR%%/lib-python/3/__future__.py
 %%PYPY_DIR%%/lib-python/3/__phello__.foo.py
+%%PYPY_DIR%%/lib-python/3/_bootlocale.py
+%%PYPY_DIR%%/lib-python/3/_collections_abc.py
 %%PYPY_DIR%%/lib-python/3/_compat_pickle.py
+%%PYPY_DIR%%/lib-python/3/_compression.py
 %%PYPY_DIR%%/lib-python/3/_dummy_thread.py
 %%PYPY_DIR%%/lib-python/3/_markupbase.py
 %%PYPY_DIR%%/lib-python/3/_osx_support.py
+%%PYPY_DIR%%/lib-python/3/_pydecimal.py
 %%PYPY_DIR%%/lib-python/3/_pyio.py
+%%PYPY_DIR%%/lib-python/3/_sitebuiltins.py
 %%PYPY_DIR%%/lib-python/3/_strptime.py
 %%PYPY_DIR%%/lib-python/3/_threading_local.py
 %%PYPY_DIR%%/lib-python/3/_weakrefset.py
@@ -75,6 +83,29 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/argparse.py
 %%PYPY_DIR%%/lib-python/3/ast.py
 %%PYPY_DIR%%/lib-python/3/asynchat.py
+%%PYPY_DIR%%/lib-python/3/asyncio/__init__.py
+%%PYPY_DIR%%/lib-python/3/asyncio/base_events.py
+%%PYPY_DIR%%/lib-python/3/asyncio/base_subprocess.py
+%%PYPY_DIR%%/lib-python/3/asyncio/compat.py
+%%PYPY_DIR%%/lib-python/3/asyncio/constants.py
+%%PYPY_DIR%%/lib-python/3/asyncio/coroutines.py
+%%PYPY_DIR%%/lib-python/3/asyncio/events.py
+%%PYPY_DIR%%/lib-python/3/asyncio/futures.py
+%%PYPY_DIR%%/lib-python/3/asyncio/locks.py
+%%PYPY_DIR%%/lib-python/3/asyncio/log.py
+%%PYPY_DIR%%/lib-python/3/asyncio/proactor_events.py
+%%PYPY_DIR%%/lib-python/3/asyncio/protocols.py
+%%PYPY_DIR%%/lib-python/3/asyncio/queues.py
+%%PYPY_DIR%%/lib-python/3/asyncio/selector_events.py
+%%PYPY_DIR%%/lib-python/3/asyncio/sslproto.py
+%%PYPY_DIR%%/lib-python/3/asyncio/streams.py
+%%PYPY_DIR%%/lib-python/3/asyncio/subprocess.py
+%%PYPY_DIR%%/lib-python/3/asyncio/tasks.py
+%%PYPY_DIR%%/lib-python/3/asyncio/test_utils.py
+%%PYPY_DIR%%/lib-python/3/asyncio/transports.py
+%%PYPY_DIR%%/lib-python/3/asyncio/unix_events.py
+%%PYPY_DIR%%/lib-python/3/asyncio/windows_events.py
+%%PYPY_DIR%%/lib-python/3/asyncio/windows_utils.py
 %%PYPY_DIR%%/lib-python/3/asyncore.py
 %%PYPY_DIR%%/lib-python/3/base64.py
 %%PYPY_DIR%%/lib-python/3/bdb.py
@@ -116,7 +147,7 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/ctypes/macholib/fetch_macholib.bat
 %%PYPY_DIR%%/lib-python/3/ctypes/macholib/framework.py
 %%PYPY_DIR%%/lib-python/3/ctypes/test/__init__.py
-%%PYPY_DIR%%/lib-python/3/ctypes/test/runtests.py
+%%PYPY_DIR%%/lib-python/3/ctypes/test/__main__.py
 %%PYPY_DIR%%/lib-python/3/ctypes/test/test_anon.py
 %%PYPY_DIR%%/lib-python/3/ctypes/test/test_array_in_pointer.py
 %%PYPY_DIR%%/lib-python/3/ctypes/test/test_arrays.py
@@ -130,7 +161,6 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/ctypes/test/test_cfuncs.py
 %%PYPY_DIR%%/lib-python/3/ctypes/test/test_checkretval.py
 %%PYPY_DIR%%/lib-python/3/ctypes/test/test_delattr.py
-%%PYPY_DIR%%/lib-python/3/ctypes/test/test_errcheck.py
 %%PYPY_DIR%%/lib-python/3/ctypes/test/test_errno.py
 %%PYPY_DIR%%/lib-python/3/ctypes/test/test_find.py
 %%PYPY_DIR%%/lib-python/3/ctypes/test/test_frombuffer.py
@@ -138,7 +168,6 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/ctypes/test/test_functions.py
 %%PYPY_DIR%%/lib-python/3/ctypes/test/test_incomplete.py
 %%PYPY_DIR%%/lib-python/3/ctypes/test/test_init.py
-%%PYPY_DIR%%/lib-python/3/ctypes/test/test_integers.py
 %%PYPY_DIR%%/lib-python/3/ctypes/test/test_internals.py
 %%PYPY_DIR%%/lib-python/3/ctypes/test/test_keeprefs.py
 %%PYPY_DIR%%/lib-python/3/ctypes/test/test_libc.py
@@ -187,6 +216,7 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/dis.py
 %%PYPY_DIR%%/lib-python/3/distutils/README
 %%PYPY_DIR%%/lib-python/3/distutils/__init__.py
+%%PYPY_DIR%%/lib-python/3/distutils/_msvccompiler.py
 %%PYPY_DIR%%/lib-python/3/distutils/archive_util.py
 %%PYPY_DIR%%/lib-python/3/distutils/bcppcompiler.py
 %%PYPY_DIR%%/lib-python/3/distutils/ccompiler.py
@@ -217,6 +247,8 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/distutils/command/upload.py
 %%PYPY_DIR%%/lib-python/3/distutils/command/wininst-10.0-amd64.exe
 %%PYPY_DIR%%/lib-python/3/distutils/command/wininst-10.0.exe
+%%PYPY_DIR%%/lib-python/3/distutils/command/wininst-14.0-amd64.exe
+%%PYPY_DIR%%/lib-python/3/distutils/command/wininst-14.0.exe
 %%PYPY_DIR%%/lib-python/3/distutils/command/wininst-6.0.exe
 %%PYPY_DIR%%/lib-python/3/distutils/command/wininst-7.1.exe
 %%PYPY_DIR%%/lib-python/3/distutils/command/wininst-8.0.exe
@@ -229,7 +261,6 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/distutils/dep_util.py
 %%PYPY_DIR%%/lib-python/3/distutils/dir_util.py
 %%PYPY_DIR%%/lib-python/3/distutils/dist.py
-%%PYPY_DIR%%/lib-python/3/distutils/emxccompiler.py
 %%PYPY_DIR%%/lib-python/3/distutils/errors.py
 %%PYPY_DIR%%/lib-python/3/distutils/extension.py
 %%PYPY_DIR%%/lib-python/3/distutils/fancy_getopt.py
@@ -276,6 +307,7 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/distutils/tests/test_install_scripts.py
 %%PYPY_DIR%%/lib-python/3/distutils/tests/test_log.py
 %%PYPY_DIR%%/lib-python/3/distutils/tests/test_msvc9compiler.py
+%%PYPY_DIR%%/lib-python/3/distutils/tests/test_msvccompiler.py
 %%PYPY_DIR%%/lib-python/3/distutils/tests/test_register.py
 %%PYPY_DIR%%/lib-python/3/distutils/tests/test_sdist.py
 %%PYPY_DIR%%/lib-python/3/distutils/tests/test_spawn.py
@@ -301,6 +333,7 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/email/architecture.rst
 %%PYPY_DIR%%/lib-python/3/email/base64mime.py
 %%PYPY_DIR%%/lib-python/3/email/charset.py
+%%PYPY_DIR%%/lib-python/3/email/contentmanager.py
 %%PYPY_DIR%%/lib-python/3/email/encoders.py
 %%PYPY_DIR%%/lib-python/3/email/errors.py
 %%PYPY_DIR%%/lib-python/3/email/feedparser.py
@@ -333,6 +366,7 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/encodings/cp037.py
 %%PYPY_DIR%%/lib-python/3/encodings/cp1006.py
 %%PYPY_DIR%%/lib-python/3/encodings/cp1026.py
+%%PYPY_DIR%%/lib-python/3/encodings/cp1125.py
 %%PYPY_DIR%%/lib-python/3/encodings/cp1140.py
 %%PYPY_DIR%%/lib-python/3/encodings/cp1250.py
 %%PYPY_DIR%%/lib-python/3/encodings/cp1251.py
@@ -343,6 +377,7 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/encodings/cp1256.py
 %%PYPY_DIR%%/lib-python/3/encodings/cp1257.py
 %%PYPY_DIR%%/lib-python/3/encodings/cp1258.py
+%%PYPY_DIR%%/lib-python/3/encodings/cp273.py
 %%PYPY_DIR%%/lib-python/3/encodings/cp424.py
 %%PYPY_DIR%%/lib-python/3/encodings/cp437.py
 %%PYPY_DIR%%/lib-python/3/encodings/cp500.py
@@ -404,7 +439,9 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/encodings/iso8859_9.py
 %%PYPY_DIR%%/lib-python/3/encodings/johab.py
 %%PYPY_DIR%%/lib-python/3/encodings/koi8_r.py
+%%PYPY_DIR%%/lib-python/3/encodings/koi8_t.py
 %%PYPY_DIR%%/lib-python/3/encodings/koi8_u.py
+%%PYPY_DIR%%/lib-python/3/encodings/kz1048.py
 %%PYPY_DIR%%/lib-python/3/encodings/latin_1.py
 %%PYPY_DIR%%/lib-python/3/encodings/mac_arabic.py
 %%PYPY_DIR%%/lib-python/3/encodings/mac_centeuro.py
@@ -445,8 +482,11 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/ensurepip/__init__.py
 %%PYPY_DIR%%/lib-python/3/ensurepip/__main__.py
 %%PYPY_DIR%%/lib-python/3/ensurepip/_bundled/pip-8.1.2-py2.py3-none-any.whl
+%%PYPY_DIR%%/lib-python/3/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl
 %%PYPY_DIR%%/lib-python/3/ensurepip/_bundled/setuptools-21.2.1-py2.py3-none-any.whl
+%%PYPY_DIR%%/lib-python/3/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl
 %%PYPY_DIR%%/lib-python/3/ensurepip/_uninstall.py
+%%PYPY_DIR%%/lib-python/3/enum.py
 %%PYPY_DIR%%/lib-python/3/filecmp.py
 %%PYPY_DIR%%/lib-python/3/fileinput.py
 %%PYPY_DIR%%/lib-python/3/fnmatch.py
@@ -509,6 +549,7 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/idlelib/MultiCall.py
 %%PYPY_DIR%%/lib-python/3/idlelib/MultiStatusBar.py
 %%PYPY_DIR%%/lib-python/3/idlelib/NEWS.txt
+%%PYPY_DIR%%/lib-python/3/idlelib/NEWS2x.txt
 %%PYPY_DIR%%/lib-python/3/idlelib/ObjectBrowser.py
 %%PYPY_DIR%%/lib-python/3/idlelib/OutputWindow.py
 %%PYPY_DIR%%/lib-python/3/idlelib/ParenMatch.py
@@ -547,38 +588,58 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/idlelib/configSectionNameDialog.py
 %%PYPY_DIR%%/lib-python/3/idlelib/dynOptionMenuWidget.py
 %%PYPY_DIR%%/lib-python/3/idlelib/extend.txt
+%%PYPY_DIR%%/lib-python/3/idlelib/help.html
+%%PYPY_DIR%%/lib-python/3/idlelib/help.py
 %%PYPY_DIR%%/lib-python/3/idlelib/help.txt
 %%PYPY_DIR%%/lib-python/3/idlelib/idle.bat
 %%PYPY_DIR%%/lib-python/3/idlelib/idle.py
 %%PYPY_DIR%%/lib-python/3/idlelib/idle.pyw
 %%PYPY_DIR%%/lib-python/3/idlelib/idle_test/README.txt
 %%PYPY_DIR%%/lib-python/3/idlelib/idle_test/__init__.py
+%%PYPY_DIR%%/lib-python/3/idlelib/idle_test/htest.py
 %%PYPY_DIR%%/lib-python/3/idlelib/idle_test/mock_idle.py
 %%PYPY_DIR%%/lib-python/3/idlelib/idle_test/mock_tk.py
+%%PYPY_DIR%%/lib-python/3/idlelib/idle_test/test_autocomplete.py
+%%PYPY_DIR%%/lib-python/3/idlelib/idle_test/test_autoexpand.py
 %%PYPY_DIR%%/lib-python/3/idlelib/idle_test/test_calltips.py
+%%PYPY_DIR%%/lib-python/3/idlelib/idle_test/test_config_help.py
 %%PYPY_DIR%%/lib-python/3/idlelib/idle_test/test_config_name.py
+%%PYPY_DIR%%/lib-python/3/idlelib/idle_test/test_configdialog.py
 %%PYPY_DIR%%/lib-python/3/idlelib/idle_test/test_delegator.py
+%%PYPY_DIR%%/lib-python/3/idlelib/idle_test/test_editmenu.py
+%%PYPY_DIR%%/lib-python/3/idlelib/idle_test/test_editor.py
 %%PYPY_DIR%%/lib-python/3/idlelib/idle_test/test_formatparagraph.py
 %%PYPY_DIR%%/lib-python/3/idlelib/idle_test/test_grep.py
+%%PYPY_DIR%%/lib-python/3/idlelib/idle_test/test_help_about.py
+%%PYPY_DIR%%/lib-python/3/idlelib/idle_test/test_hyperparser.py
 %%PYPY_DIR%%/lib-python/3/idlelib/idle_test/test_idlehistory.py
+%%PYPY_DIR%%/lib-python/3/idlelib/idle_test/test_io.py
+%%PYPY_DIR%%/lib-python/3/idlelib/idle_test/test_parenmatch.py
 %%PYPY_DIR%%/lib-python/3/idlelib/idle_test/test_pathbrowser.py
+%%PYPY_DIR%%/lib-python/3/idlelib/idle_test/test_percolator.py
+%%PYPY_DIR%%/lib-python/3/idlelib/idle_test/test_replacedialog.py
 %%PYPY_DIR%%/lib-python/3/idlelib/idle_test/test_rstrip.py
+%%PYPY_DIR%%/lib-python/3/idlelib/idle_test/test_searchdialog.py
+%%PYPY_DIR%%/lib-python/3/idlelib/idle_test/test_searchdialogbase.py
 %%PYPY_DIR%%/lib-python/3/idlelib/idle_test/test_searchengine.py
 %%PYPY_DIR%%/lib-python/3/idlelib/idle_test/test_text.py
+%%PYPY_DIR%%/lib-python/3/idlelib/idle_test/test_textview.py
+%%PYPY_DIR%%/lib-python/3/idlelib/idle_test/test_undodelegator.py
 %%PYPY_DIR%%/lib-python/3/idlelib/idle_test/test_warning.py
+%%PYPY_DIR%%/lib-python/3/idlelib/idle_test/test_widgetredir.py
 %%PYPY_DIR%%/lib-python/3/idlelib/idlever.py
 %%PYPY_DIR%%/lib-python/3/idlelib/keybindingDialog.py
 %%PYPY_DIR%%/lib-python/3/idlelib/macosxSupport.py
 %%PYPY_DIR%%/lib-python/3/idlelib/rpc.py
 %%PYPY_DIR%%/lib-python/3/idlelib/run.py
 %%PYPY_DIR%%/lib-python/3/idlelib/tabbedpages.py
-%%PYPY_DIR%%/lib-python/3/idlelib/testcode.py
 %%PYPY_DIR%%/lib-python/3/idlelib/textView.py
 %%PYPY_DIR%%/lib-python/3/imaplib.py
 %%PYPY_DIR%%/lib-python/3/imghdr.py
 %%PYPY_DIR%%/lib-python/3/imp.py
 %%PYPY_DIR%%/lib-python/3/importlib/__init__.py
 %%PYPY_DIR%%/lib-python/3/importlib/_bootstrap.py
+%%PYPY_DIR%%/lib-python/3/importlib/_bootstrap_external.py
 %%PYPY_DIR%%/lib-python/3/importlib/abc.py
 %%PYPY_DIR%%/lib-python/3/importlib/machinery.py
 %%PYPY_DIR%%/lib-python/3/importlib/util.py
@@ -601,9 +662,9 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/lib2to3/fixer_util.py
 %%PYPY_DIR%%/lib-python/3/lib2to3/fixes/__init__.py
 %%PYPY_DIR%%/lib-python/3/lib2to3/fixes/fix_apply.py
+%%PYPY_DIR%%/lib-python/3/lib2to3/fixes/fix_asserts.py
 %%PYPY_DIR%%/lib-python/3/lib2to3/fixes/fix_basestring.py
 %%PYPY_DIR%%/lib-python/3/lib2to3/fixes/fix_buffer.py
-%%PYPY_DIR%%/lib-python/3/lib2to3/fixes/fix_callable.py
 %%PYPY_DIR%%/lib-python/3/lib2to3/fixes/fix_dict.py
 %%PYPY_DIR%%/lib-python/3/lib2to3/fixes/fix_except.py
 %%PYPY_DIR%%/lib-python/3/lib2to3/fixes/fix_exec.py
@@ -637,6 +698,7 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/lib2to3/fixes/fix_raise.py
 %%PYPY_DIR%%/lib-python/3/lib2to3/fixes/fix_raw_input.py
 %%PYPY_DIR%%/lib-python/3/lib2to3/fixes/fix_reduce.py
+%%PYPY_DIR%%/lib-python/3/lib2to3/fixes/fix_reload.py
 %%PYPY_DIR%%/lib-python/3/lib2to3/fixes/fix_renames.py
 %%PYPY_DIR%%/lib-python/3/lib2to3/fixes/fix_repr.py
 %%PYPY_DIR%%/lib-python/3/lib2to3/fixes/fix_set_literal.py
@@ -666,6 +728,7 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/lib2to3/pytree.py
 %%PYPY_DIR%%/lib-python/3/lib2to3/refactor.py
 %%PYPY_DIR%%/lib-python/3/lib2to3/tests/__init__.py
+%%PYPY_DIR%%/lib-python/3/lib2to3/tests/__main__.py
 %%PYPY_DIR%%/lib-python/3/lib2to3/tests/data/README
 %%PYPY_DIR%%/lib-python/3/lib2to3/tests/data/bom.py
 %%PYPY_DIR%%/lib-python/3/lib2to3/tests/data/crlf.py
@@ -710,16 +773,24 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/msilib/text.py
 %%PYPY_DIR%%/lib-python/3/multiprocessing/__init__.py
 %%PYPY_DIR%%/lib-python/3/multiprocessing/connection.py
+%%PYPY_DIR%%/lib-python/3/multiprocessing/context.py
 %%PYPY_DIR%%/lib-python/3/multiprocessing/dummy/__init__.py
 %%PYPY_DIR%%/lib-python/3/multiprocessing/dummy/connection.py
-%%PYPY_DIR%%/lib-python/3/multiprocessing/forking.py
+%%PYPY_DIR%%/lib-python/3/multiprocessing/forkserver.py
 %%PYPY_DIR%%/lib-python/3/multiprocessing/heap.py
 %%PYPY_DIR%%/lib-python/3/multiprocessing/managers.py
 %%PYPY_DIR%%/lib-python/3/multiprocessing/pool.py
+%%PYPY_DIR%%/lib-python/3/multiprocessing/popen_fork.py
+%%PYPY_DIR%%/lib-python/3/multiprocessing/popen_forkserver.py
+%%PYPY_DIR%%/lib-python/3/multiprocessing/popen_spawn_posix.py
+%%PYPY_DIR%%/lib-python/3/multiprocessing/popen_spawn_win32.py
 %%PYPY_DIR%%/lib-python/3/multiprocessing/process.py
 %%PYPY_DIR%%/lib-python/3/multiprocessing/queues.py
 %%PYPY_DIR%%/lib-python/3/multiprocessing/reduction.py
+%%PYPY_DIR%%/lib-python/3/multiprocessing/resource_sharer.py
+%%PYPY_DIR%%/lib-python/3/multiprocessing/semaphore_tracker.py
 %%PYPY_DIR%%/lib-python/3/multiprocessing/sharedctypes.py
+%%PYPY_DIR%%/lib-python/3/multiprocessing/spawn.py
 %%PYPY_DIR%%/lib-python/3/multiprocessing/synchronize.py
 %%PYPY_DIR%%/lib-python/3/multiprocessing/util.py
 %%PYPY_DIR%%/lib-python/3/netrc.py
@@ -728,9 +799,10 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/nturl2path.py
 %%PYPY_DIR%%/lib-python/3/numbers.py
 %%PYPY_DIR%%/lib-python/3/opcode.py
+%%PYPY_DIR%%/lib-python/3/operator.py
 %%PYPY_DIR%%/lib-python/3/optparse.py
 %%PYPY_DIR%%/lib-python/3/os.py
-%%PYPY_DIR%%/lib-python/3/os2emxpath.py
+%%PYPY_DIR%%/lib-python/3/pathlib.py
 %%PYPY_DIR%%/lib-python/3/pdb.py
 %%PYPY_DIR%%/lib-python/3/pickle.py
 %%PYPY_DIR%%/lib-python/3/pickletools.py
@@ -759,12 +831,6 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/plat-netbsd1/IN.py
 %%PYPY_DIR%%/lib-python/3/plat-netbsd1/regen
 %%PYPY_DIR%%/lib-python/3/plat-next3/regen
-%%PYPY_DIR%%/lib-python/3/plat-os2emx/IN.py
-%%PYPY_DIR%%/lib-python/3/plat-os2emx/SOCKET.py
-%%PYPY_DIR%%/lib-python/3/plat-os2emx/_emx_link.py
-%%PYPY_DIR%%/lib-python/3/plat-os2emx/grp.py
-%%PYPY_DIR%%/lib-python/3/plat-os2emx/pwd.py
-%%PYPY_DIR%%/lib-python/3/plat-os2emx/regen
 %%PYPY_DIR%%/lib-python/3/plat-sunos5/CDIO.py
 %%PYPY_DIR%%/lib-python/3/plat-sunos5/DLFCN.py
 %%PYPY_DIR%%/lib-python/3/plat-sunos5/IN.py
@@ -796,9 +862,11 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/rlcompleter.py
 %%PYPY_DIR%%/lib-python/3/runpy.py
 %%PYPY_DIR%%/lib-python/3/sched.py
+%%PYPY_DIR%%/lib-python/3/selectors.py
 %%PYPY_DIR%%/lib-python/3/shelve.py
 %%PYPY_DIR%%/lib-python/3/shlex.py
 %%PYPY_DIR%%/lib-python/3/shutil.py
+%%PYPY_DIR%%/lib-python/3/signal.py
 %%PYPY_DIR%%/lib-python/3/site-packages/README
 %%PYPY_DIR%%/lib-python/3/site.py
 %%PYPY_DIR%%/lib-python/3/smtpd.py
@@ -823,6 +891,7 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/sre_parse.py
 %%PYPY_DIR%%/lib-python/3/ssl.py
 %%PYPY_DIR%%/lib-python/3/stat.py
+%%PYPY_DIR%%/lib-python/3/statistics.py
 %%PYPY_DIR%%/lib-python/3/string.py
 %%PYPY_DIR%%/lib-python/3/stringprep.py
 %%PYPY_DIR%%/lib-python/3/struct.py
@@ -839,11 +908,14 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/test/Sine-1000Hz-300ms.aif
 %%PYPY_DIR%%/lib-python/3/test/__init__.py
 %%PYPY_DIR%%/lib-python/3/test/__main__.py
+%%PYPY_DIR%%/lib-python/3/test/_test_multiprocessing.py
+%%PYPY_DIR%%/lib-python/3/test/allsans.pem
 %%PYPY_DIR%%/lib-python/3/test/audiodata/pluck-alaw.aifc
 %%PYPY_DIR%%/lib-python/3/test/audiodata/pluck-pcm16.aiff
 %%PYPY_DIR%%/lib-python/3/test/audiodata/pluck-pcm16.au
 %%PYPY_DIR%%/lib-python/3/test/audiodata/pluck-pcm16.wav
 %%PYPY_DIR%%/lib-python/3/test/audiodata/pluck-pcm24.aiff
+%%PYPY_DIR%%/lib-python/3/test/audiodata/pluck-pcm24.au
 %%PYPY_DIR%%/lib-python/3/test/audiodata/pluck-pcm24.wav
 %%PYPY_DIR%%/lib-python/3/test/audiodata/pluck-pcm32.aiff
 %%PYPY_DIR%%/lib-python/3/test/audiodata/pluck-pcm32.au
@@ -861,6 +933,15 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/test/badcert.pem
 %%PYPY_DIR%%/lib-python/3/test/badkey.pem
 %%PYPY_DIR%%/lib-python/3/test/badsyntax_3131.py
+%%PYPY_DIR%%/lib-python/3/test/badsyntax_async1.py
+%%PYPY_DIR%%/lib-python/3/test/badsyntax_async2.py
+%%PYPY_DIR%%/lib-python/3/test/badsyntax_async3.py
+%%PYPY_DIR%%/lib-python/3/test/badsyntax_async4.py
+%%PYPY_DIR%%/lib-python/3/test/badsyntax_async5.py
+%%PYPY_DIR%%/lib-python/3/test/badsyntax_async6.py
+%%PYPY_DIR%%/lib-python/3/test/badsyntax_async7.py
+%%PYPY_DIR%%/lib-python/3/test/badsyntax_async8.py
+%%PYPY_DIR%%/lib-python/3/test/badsyntax_future10.py
 %%PYPY_DIR%%/lib-python/3/test/badsyntax_future3.py
 %%PYPY_DIR%%/lib-python/3/test/badsyntax_future4.py
 %%PYPY_DIR%%/lib-python/3/test/badsyntax_future5.py
@@ -869,15 +950,16 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/test/badsyntax_future8.py
 %%PYPY_DIR%%/lib-python/3/test/badsyntax_future9.py
 %%PYPY_DIR%%/lib-python/3/test/badsyntax_pep3120.py
-%%PYPY_DIR%%/lib-python/3/test/buffer_tests.py
+%%PYPY_DIR%%/lib-python/3/test/bytecode_helper.py
+%%PYPY_DIR%%/lib-python/3/test/capath/0e4015b9.0
 %%PYPY_DIR%%/lib-python/3/test/capath/4e1295a3.0
 %%PYPY_DIR%%/lib-python/3/test/capath/5ed36f99.0
 %%PYPY_DIR%%/lib-python/3/test/capath/6e88d7b8.0
 %%PYPY_DIR%%/lib-python/3/test/capath/99d0fa06.0
+%%PYPY_DIR%%/lib-python/3/test/capath/ce7b8643.0
 %%PYPY_DIR%%/lib-python/3/test/cfgparser.1
 %%PYPY_DIR%%/lib-python/3/test/cfgparser.2
 %%PYPY_DIR%%/lib-python/3/test/cfgparser.3
-%%PYPY_DIR%%/lib-python/3/test/check_soundcard.vbs
 %%PYPY_DIR%%/lib-python/3/test/cjkencodings/big5-utf8.txt
 %%PYPY_DIR%%/lib-python/3/test/cjkencodings/big5.txt
 %%PYPY_DIR%%/lib-python/3/test/cjkencodings/big5hkscs-utf8.txt
@@ -1064,24 +1146,27 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/test/decimaltestdata/tointegral.decTest
 %%PYPY_DIR%%/lib-python/3/test/decimaltestdata/tointegralx.decTest
 %%PYPY_DIR%%/lib-python/3/test/decimaltestdata/xor.decTest
-%%PYPY_DIR%%/lib-python/3/test/dh512.pem
+%%PYPY_DIR%%/lib-python/3/test/dh1024.pem
 %%PYPY_DIR%%/lib-python/3/test/dis_module.py
 %%PYPY_DIR%%/lib-python/3/test/doctest_aliases.py
 %%PYPY_DIR%%/lib-python/3/test/double_const.py
+%%PYPY_DIR%%/lib-python/3/test/eintrdata/eintr_tester.py
 %%PYPY_DIR%%/lib-python/3/test/empty.vbs
 %%PYPY_DIR%%/lib-python/3/test/encoded_modules/__init__.py
 %%PYPY_DIR%%/lib-python/3/test/encoded_modules/module_iso_8859_1.py
 %%PYPY_DIR%%/lib-python/3/test/encoded_modules/module_koi8_r.py
 %%PYPY_DIR%%/lib-python/3/test/exception_hierarchy.txt
+%%PYPY_DIR%%/lib-python/3/test/final_a.py
+%%PYPY_DIR%%/lib-python/3/test/final_b.py
 %%PYPY_DIR%%/lib-python/3/test/floating_points.txt
 %%PYPY_DIR%%/lib-python/3/test/fork_wait.py
 %%PYPY_DIR%%/lib-python/3/test/formatfloat_testcases.txt
 %%PYPY_DIR%%/lib-python/3/test/future_test1.py
 %%PYPY_DIR%%/lib-python/3/test/future_test2.py
 %%PYPY_DIR%%/lib-python/3/test/gdb_sample.py
-%%PYPY_DIR%%/lib-python/3/test/https_svn_python_org_root.pem
 %%PYPY_DIR%%/lib-python/3/test/ieee754.txt
 %%PYPY_DIR%%/lib-python/3/test/imghdrdata/python.bmp
+%%PYPY_DIR%%/lib-python/3/test/imghdrdata/python.exr
 %%PYPY_DIR%%/lib-python/3/test/imghdrdata/python.gif
 %%PYPY_DIR%%/lib-python/3/test/imghdrdata/python.jpg
 %%PYPY_DIR%%/lib-python/3/test/imghdrdata/python.pbm
@@ -1091,17 +1176,20 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/test/imghdrdata/python.ras
 %%PYPY_DIR%%/lib-python/3/test/imghdrdata/python.sgi
 %%PYPY_DIR%%/lib-python/3/test/imghdrdata/python.tiff
+%%PYPY_DIR%%/lib-python/3/test/imghdrdata/python.webp
 %%PYPY_DIR%%/lib-python/3/test/imghdrdata/python.xbm
+%%PYPY_DIR%%/lib-python/3/test/imp_dummy.py
 %%PYPY_DIR%%/lib-python/3/test/inspect_fodder.py
 %%PYPY_DIR%%/lib-python/3/test/inspect_fodder2.py
 %%PYPY_DIR%%/lib-python/3/test/json_tests/test_tool.py
 %%PYPY_DIR%%/lib-python/3/test/keycert.passwd.pem
 %%PYPY_DIR%%/lib-python/3/test/keycert.pem
 %%PYPY_DIR%%/lib-python/3/test/keycert2.pem
+%%PYPY_DIR%%/lib-python/3/test/keycert3.pem
+%%PYPY_DIR%%/lib-python/3/test/keycert4.pem
 %%PYPY_DIR%%/lib-python/3/test/leakers/README.txt
 %%PYPY_DIR%%/lib-python/3/test/leakers/__init__.py
 %%PYPY_DIR%%/lib-python/3/test/leakers/test_ctypes.py
-%%PYPY_DIR%%/lib-python/3/test/leakers/test_gestalt.py
 %%PYPY_DIR%%/lib-python/3/test/leakers/test_selftype.py
 %%PYPY_DIR%%/lib-python/3/test/list_tests.py
 %%PYPY_DIR%%/lib-python/3/test/lock_tests.py
@@ -1113,21 +1201,8 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/test/mime.types
 %%PYPY_DIR%%/lib-python/3/test/mock_socket.py
 %%PYPY_DIR%%/lib-python/3/test/mp_fork_bomb.py
+%%PYPY_DIR%%/lib-python/3/test/mp_preload.py
 %%PYPY_DIR%%/lib-python/3/test/multibytecodec_support.py
-%%PYPY_DIR%%/lib-python/3/test/namespace_pkgs/both_portions/foo/one.py
-%%PYPY_DIR%%/lib-python/3/test/namespace_pkgs/both_portions/foo/two.py
-%%PYPY_DIR%%/lib-python/3/test/namespace_pkgs/missing_directory.zip
-%%PYPY_DIR%%/lib-python/3/test/namespace_pkgs/module_and_namespace_package/a_test.py
-%%PYPY_DIR%%/lib-python/3/test/namespace_pkgs/module_and_namespace_package/a_test/empty
-%%PYPY_DIR%%/lib-python/3/test/namespace_pkgs/nested_portion1.zip
-%%PYPY_DIR%%/lib-python/3/test/namespace_pkgs/not_a_namespace_pkg/foo/__init__.py
-%%PYPY_DIR%%/lib-python/3/test/namespace_pkgs/not_a_namespace_pkg/foo/one.py
-%%PYPY_DIR%%/lib-python/3/test/namespace_pkgs/portion1/foo/one.py
-%%PYPY_DIR%%/lib-python/3/test/namespace_pkgs/portion2/foo/two.py
-%%PYPY_DIR%%/lib-python/3/test/namespace_pkgs/project1/parent/child/one.py
-%%PYPY_DIR%%/lib-python/3/test/namespace_pkgs/project2/parent/child/two.py
-%%PYPY_DIR%%/lib-python/3/test/namespace_pkgs/project3/parent/child/three.py
-%%PYPY_DIR%%/lib-python/3/test/namespace_pkgs/top_level_portion1.zip
 %%PYPY_DIR%%/lib-python/3/test/nokia.pem
 %%PYPY_DIR%%/lib-python/3/test/nullbytecert.pem
 %%PYPY_DIR%%/lib-python/3/test/nullcert.pem
@@ -1135,6 +1210,8 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/test/pickletester.py
 %%PYPY_DIR%%/lib-python/3/test/profilee.py
 %%PYPY_DIR%%/lib-python/3/test/pstats.pck
+%%PYPY_DIR%%/lib-python/3/test/pycacert.pem
+%%PYPY_DIR%%/lib-python/3/test/pycakey.pem
 %%PYPY_DIR%%/lib-python/3/test/pyclbr_input.py
 %%PYPY_DIR%%/lib-python/3/test/pydoc_mod.py
 %%PYPY_DIR%%/lib-python/3/test/pydocfodder.py
@@ -1146,10 +1223,11 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/test/regrtest.py
 %%PYPY_DIR%%/lib-python/3/test/relimport.py
 %%PYPY_DIR%%/lib-python/3/test/reperf.py
+%%PYPY_DIR%%/lib-python/3/test/revocation.crl
 %%PYPY_DIR%%/lib-python/3/test/sample_doctest.py
 %%PYPY_DIR%%/lib-python/3/test/sample_doctest_no_docstrings.py
 %%PYPY_DIR%%/lib-python/3/test/sample_doctest_no_doctests.py
-%%PYPY_DIR%%/lib-python/3/test/script_helper.py
+%%PYPY_DIR%%/lib-python/3/test/selfsigned_pythontestdotnet.pem
 %%PYPY_DIR%%/lib-python/3/test/seq_tests.py
 %%PYPY_DIR%%/lib-python/3/test/sgml_input.html
 %%PYPY_DIR%%/lib-python/3/test/sha256.pem
@@ -1167,6 +1245,7 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/test/ssl_key.passwd.pem
 %%PYPY_DIR%%/lib-python/3/test/ssl_key.pem
 %%PYPY_DIR%%/lib-python/3/test/ssl_servers.py
+%%PYPY_DIR%%/lib-python/3/test/ssltests.py
 %%PYPY_DIR%%/lib-python/3/test/string_tests.py
 %%PYPY_DIR%%/lib-python/3/test/subprocessdata/fd_status.py
 %%PYPY_DIR%%/lib-python/3/test/subprocessdata/input_reader.py
@@ -1174,17 +1253,45 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/test/subprocessdata/qgrep.py
 %%PYPY_DIR%%/lib-python/3/test/subprocessdata/sigchild_ignore.py
 %%PYPY_DIR%%/lib-python/3/test/support/__init__.py
+%%PYPY_DIR%%/lib-python/3/test/support/script_helper.py
 %%PYPY_DIR%%/lib-python/3/test/test___all__.py
 %%PYPY_DIR%%/lib-python/3/test/test___future__.py
 %%PYPY_DIR%%/lib-python/3/test/test__locale.py
+%%PYPY_DIR%%/lib-python/3/test/test__opcode.py
 %%PYPY_DIR%%/lib-python/3/test/test__osx_support.py
 %%PYPY_DIR%%/lib-python/3/test/test_abc.py
 %%PYPY_DIR%%/lib-python/3/test/test_abstract_numbers.py
 %%PYPY_DIR%%/lib-python/3/test/test_aifc.py
 %%PYPY_DIR%%/lib-python/3/test/test_argparse.py
 %%PYPY_DIR%%/lib-python/3/test/test_array.py
+%%PYPY_DIR%%/lib-python/3/test/test_asdl_parser.py
 %%PYPY_DIR%%/lib-python/3/test/test_ast.py
 %%PYPY_DIR%%/lib-python/3/test/test_asynchat.py
+%%PYPY_DIR%%/lib-python/3/test/test_asyncio/__init__.py
+%%PYPY_DIR%%/lib-python/3/test/test_asyncio/__main__.py
+%%PYPY_DIR%%/lib-python/3/test/test_asyncio/echo.py
+%%PYPY_DIR%%/lib-python/3/test/test_asyncio/echo2.py
+%%PYPY_DIR%%/lib-python/3/test/test_asyncio/echo3.py
+%%PYPY_DIR%%/lib-python/3/test/test_asyncio/keycert3.pem
+%%PYPY_DIR%%/lib-python/3/test/test_asyncio/pycacert.pem
+%%PYPY_DIR%%/lib-python/3/test/test_asyncio/ssl_cert.pem
+%%PYPY_DIR%%/lib-python/3/test/test_asyncio/ssl_key.pem
+%%PYPY_DIR%%/lib-python/3/test/test_asyncio/test_base_events.py
+%%PYPY_DIR%%/lib-python/3/test/test_asyncio/test_events.py
+%%PYPY_DIR%%/lib-python/3/test/test_asyncio/test_futures.py
+%%PYPY_DIR%%/lib-python/3/test/test_asyncio/test_locks.py
+%%PYPY_DIR%%/lib-python/3/test/test_asyncio/test_pep492.py
+%%PYPY_DIR%%/lib-python/3/test/test_asyncio/test_proactor_events.py
+%%PYPY_DIR%%/lib-python/3/test/test_asyncio/test_queues.py
+%%PYPY_DIR%%/lib-python/3/test/test_asyncio/test_selector_events.py
+%%PYPY_DIR%%/lib-python/3/test/test_asyncio/test_sslproto.py
+%%PYPY_DIR%%/lib-python/3/test/test_asyncio/test_streams.py
+%%PYPY_DIR%%/lib-python/3/test/test_asyncio/test_subprocess.py
+%%PYPY_DIR%%/lib-python/3/test/test_asyncio/test_tasks.py
+%%PYPY_DIR%%/lib-python/3/test/test_asyncio/test_transports.py
+%%PYPY_DIR%%/lib-python/3/test/test_asyncio/test_unix_events.py
+%%PYPY_DIR%%/lib-python/3/test/test_asyncio/test_windows_events.py
+%%PYPY_DIR%%/lib-python/3/test/test_asyncio/test_windows_utils.py
 %%PYPY_DIR%%/lib-python/3/test/test_asyncore.py
 %%PYPY_DIR%%/lib-python/3/test/test_atexit.py
 %%PYPY_DIR%%/lib-python/3/test/test_audioop.py
@@ -1229,7 +1336,6 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/test/test_codecmaps_tw.py
 %%PYPY_DIR%%/lib-python/3/test/test_codecs.py
 %%PYPY_DIR%%/lib-python/3/test/test_codeop.py
-%%PYPY_DIR%%/lib-python/3/test/test_coding.py
 %%PYPY_DIR%%/lib-python/3/test/test_collections.py
 %%PYPY_DIR%%/lib-python/3/test/test_colorsys.py
 %%PYPY_DIR%%/lib-python/3/test/test_compare.py
@@ -1242,6 +1348,7 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/test/test_contextlib.py
 %%PYPY_DIR%%/lib-python/3/test/test_copy.py
 %%PYPY_DIR%%/lib-python/3/test/test_copyreg.py
+%%PYPY_DIR%%/lib-python/3/test/test_coroutines.py
 %%PYPY_DIR%%/lib-python/3/test/test_cprofile.py
 %%PYPY_DIR%%/lib-python/3/test/test_crashers.py
 %%PYPY_DIR%%/lib-python/3/test/test_crypt.py
@@ -1277,6 +1384,8 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/test/test_dummy_thread.py
 %%PYPY_DIR%%/lib-python/3/test/test_dummy_threading.py
 %%PYPY_DIR%%/lib-python/3/test/test_dynamic.py
+%%PYPY_DIR%%/lib-python/3/test/test_dynamicclassattribute.py
+%%PYPY_DIR%%/lib-python/3/test/test_eintr.py
 %%PYPY_DIR%%/lib-python/3/test/test_email/__init__.py
 %%PYPY_DIR%%/lib-python/3/test/test_email/__main__.py
 %%PYPY_DIR%%/lib-python/3/test/test_email/data/PyBanner048.gif
@@ -1331,6 +1440,7 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/test/test_email/test__encoded_words.py
 %%PYPY_DIR%%/lib-python/3/test/test_email/test__header_value_parser.py
 %%PYPY_DIR%%/lib-python/3/test/test_email/test_asian_codecs.py
+%%PYPY_DIR%%/lib-python/3/test/test_email/test_contentmanager.py
 %%PYPY_DIR%%/lib-python/3/test/test_email/test_defect_handling.py
 %%PYPY_DIR%%/lib-python/3/test/test_email/test_email.py
 %%PYPY_DIR%%/lib-python/3/test/test_email/test_generator.py
@@ -1343,6 +1453,7 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/test/test_email/test_utils.py
 %%PYPY_DIR%%/lib-python/3/test/test_email/torture_test.py
 %%PYPY_DIR%%/lib-python/3/test/test_ensurepip.py
+%%PYPY_DIR%%/lib-python/3/test/test_enum.py
 %%PYPY_DIR%%/lib-python/3/test/test_enumerate.py
 %%PYPY_DIR%%/lib-python/3/test/test_eof.py
 %%PYPY_DIR%%/lib-python/3/test/test_epoll.py
@@ -1357,13 +1468,15 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/test/test_filecmp.py
 %%PYPY_DIR%%/lib-python/3/test/test_fileinput.py
 %%PYPY_DIR%%/lib-python/3/test/test_fileio.py
+%%PYPY_DIR%%/lib-python/3/test/test_finalization.py
 %%PYPY_DIR%%/lib-python/3/test/test_float.py
 %%PYPY_DIR%%/lib-python/3/test/test_flufl.py
 %%PYPY_DIR%%/lib-python/3/test/test_fnmatch.py
 %%PYPY_DIR%%/lib-python/3/test/test_fork1.py
 %%PYPY_DIR%%/lib-python/3/test/test_format.py
 %%PYPY_DIR%%/lib-python/3/test/test_fractions.py
-%%PYPY_DIR%%/lib-python/3/test/test_frozen.py
+%%PYPY_DIR%%/lib-python/3/test/test_frame.py
+%%PYPY_DIR%%/lib-python/3/test/test_fstring.py
 %%PYPY_DIR%%/lib-python/3/test/test_ftplib.py
 %%PYPY_DIR%%/lib-python/3/test/test_funcattrs.py
 %%PYPY_DIR%%/lib-python/3/test/test_functools.py
@@ -1399,25 +1512,37 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/test/test_imaplib.py
 %%PYPY_DIR%%/lib-python/3/test/test_imghdr.py
 %%PYPY_DIR%%/lib-python/3/test/test_imp.py
-%%PYPY_DIR%%/lib-python/3/test/test_import.py
-%%PYPY_DIR%%/lib-python/3/test/test_importhooks.py
+%%PYPY_DIR%%/lib-python/3/test/test_import/__init__.py
+%%PYPY_DIR%%/lib-python/3/test/test_import/__main__.py
+%%PYPY_DIR%%/lib-python/3/test/test_import/data/circular_imports/basic.py
+%%PYPY_DIR%%/lib-python/3/test/test_import/data/circular_imports/basic2.py
+%%PYPY_DIR%%/lib-python/3/test/test_import/data/circular_imports/indirect.py
+%%PYPY_DIR%%/lib-python/3/test/test_import/data/circular_imports/rebinding.py
+%%PYPY_DIR%%/lib-python/3/test/test_import/data/circular_imports/rebinding2.py
+%%PYPY_DIR%%/lib-python/3/test/test_import/data/circular_imports/subpackage.py
+%%PYPY_DIR%%/lib-python/3/test/test_import/data/circular_imports/subpkg/subpackage2.py
+%%PYPY_DIR%%/lib-python/3/test/test_import/data/circular_imports/subpkg/util.py
+%%PYPY_DIR%%/lib-python/3/test/test_import/data/circular_imports/util.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/__init__.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/__main__.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/abc.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/builtin/__init__.py
+%%PYPY_DIR%%/lib-python/3/test/test_importlib/builtin/__main__.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/builtin/test_finder.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/builtin/test_loader.py
-%%PYPY_DIR%%/lib-python/3/test/test_importlib/builtin/util.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/extension/__init__.py
+%%PYPY_DIR%%/lib-python/3/test/test_importlib/extension/__main__.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/extension/test_case_sensitivity.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/extension/test_finder.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/extension/test_loader.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/extension/test_path_hook.py
-%%PYPY_DIR%%/lib-python/3/test/test_importlib/extension/util.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/frozen/__init__.py
+%%PYPY_DIR%%/lib-python/3/test/test_importlib/frozen/__main__.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/frozen/test_finder.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/frozen/test_loader.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/import_/__init__.py
+%%PYPY_DIR%%/lib-python/3/test/test_importlib/import_/__main__.py
+%%PYPY_DIR%%/lib-python/3/test/test_importlib/import_/test___loader__.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/import_/test___package__.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/import_/test_api.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/import_/test_caching.py
@@ -1426,20 +1551,36 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/import_/test_packages.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/import_/test_path.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/import_/test_relative_imports.py
-%%PYPY_DIR%%/lib-python/3/test/test_importlib/import_/util.py
+%%PYPY_DIR%%/lib-python/3/test/test_importlib/namespace_pkgs/both_portions/foo/one.py
+%%PYPY_DIR%%/lib-python/3/test/test_importlib/namespace_pkgs/both_portions/foo/two.py
+%%PYPY_DIR%%/lib-python/3/test/test_importlib/namespace_pkgs/missing_directory.zip
+%%PYPY_DIR%%/lib-python/3/test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test.py
+%%PYPY_DIR%%/lib-python/3/test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test/empty
+%%PYPY_DIR%%/lib-python/3/test/test_importlib/namespace_pkgs/nested_portion1.zip
+%%PYPY_DIR%%/lib-python/3/test/test_importlib/namespace_pkgs/not_a_namespace_pkg/foo/__init__.py
+%%PYPY_DIR%%/lib-python/3/test/test_importlib/namespace_pkgs/not_a_namespace_pkg/foo/one.py
+%%PYPY_DIR%%/lib-python/3/test/test_importlib/namespace_pkgs/portion1/foo/one.py
+%%PYPY_DIR%%/lib-python/3/test/test_importlib/namespace_pkgs/portion2/foo/two.py
+%%PYPY_DIR%%/lib-python/3/test/test_importlib/namespace_pkgs/project1/parent/child/one.py
+%%PYPY_DIR%%/lib-python/3/test/test_importlib/namespace_pkgs/project2/parent/child/two.py
+%%PYPY_DIR%%/lib-python/3/test/test_importlib/namespace_pkgs/project3/parent/child/three.py
+%%PYPY_DIR%%/lib-python/3/test/test_importlib/namespace_pkgs/top_level_portion1.zip
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/regrtest.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/source/__init__.py
-%%PYPY_DIR%%/lib-python/3/test/test_importlib/source/test_abc_loader.py
+%%PYPY_DIR%%/lib-python/3/test/test_importlib/source/__main__.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/source/test_case_sensitivity.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/source/test_file_loader.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/source/test_finder.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/source/test_path_hook.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/source/test_source_encoding.py
-%%PYPY_DIR%%/lib-python/3/test/test_importlib/source/util.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/test_abc.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/test_api.py
+%%PYPY_DIR%%/lib-python/3/test/test_importlib/test_lazy.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/test_locks.py
+%%PYPY_DIR%%/lib-python/3/test/test_importlib/test_namespace_pkgs.py
+%%PYPY_DIR%%/lib-python/3/test/test_importlib/test_spec.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/test_util.py
+%%PYPY_DIR%%/lib-python/3/test/test_importlib/test_windows.py
 %%PYPY_DIR%%/lib-python/3/test/test_importlib/util.py
 %%PYPY_DIR%%/lib-python/3/test/test_index.py
 %%PYPY_DIR%%/lib-python/3/test/test_inspect.py
@@ -1458,6 +1599,7 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/test/test_json/test_default.py
 %%PYPY_DIR%%/lib-python/3/test/test_json/test_dump.py
 %%PYPY_DIR%%/lib-python/3/test/test_json/test_encode_basestring_ascii.py
+%%PYPY_DIR%%/lib-python/3/test/test_json/test_enum.py
 %%PYPY_DIR%%/lib-python/3/test/test_json/test_fail.py
 %%PYPY_DIR%%/lib-python/3/test/test_json/test_float.py
 %%PYPY_DIR%%/lib-python/3/test/test_json/test_indent.py
@@ -1470,6 +1612,7 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/test/test_json/test_speedups.py
 %%PYPY_DIR%%/lib-python/3/test/test_json/test_tool.py
 %%PYPY_DIR%%/lib-python/3/test/test_json/test_unicode.py
+%%PYPY_DIR%%/lib-python/3/test/test_keyword.py
 %%PYPY_DIR%%/lib-python/3/test/test_keywordonlyarg.py
 %%PYPY_DIR%%/lib-python/3/test/test_kqueue.py
 %%PYPY_DIR%%/lib-python/3/test/test_largefile.py
@@ -1498,8 +1641,10 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/test/test_modulefinder.py
 %%PYPY_DIR%%/lib-python/3/test/test_msilib.py
 %%PYPY_DIR%%/lib-python/3/test/test_multibytecodec.py
-%%PYPY_DIR%%/lib-python/3/test/test_multiprocessing.py
-%%PYPY_DIR%%/lib-python/3/test/test_namespace_pkgs.py
+%%PYPY_DIR%%/lib-python/3/test/test_multiprocessing_fork.py
+%%PYPY_DIR%%/lib-python/3/test/test_multiprocessing_forkserver.py
+%%PYPY_DIR%%/lib-python/3/test/test_multiprocessing_main_handling.py
+%%PYPY_DIR%%/lib-python/3/test/test_multiprocessing_spawn.py
 %%PYPY_DIR%%/lib-python/3/test/test_netrc.py
 %%PYPY_DIR%%/lib-python/3/test/test_nis.py
 %%PYPY_DIR%%/lib-python/3/test/test_nntplib.py
@@ -1510,21 +1655,22 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/test/test_openpty.py
 %%PYPY_DIR%%/lib-python/3/test/test_operator.py
 %%PYPY_DIR%%/lib-python/3/test/test_optparse.py
+%%PYPY_DIR%%/lib-python/3/test/test_ordered_dict.py
 %%PYPY_DIR%%/lib-python/3/test/test_os.py
 %%PYPY_DIR%%/lib-python/3/test/test_ossaudiodev.py
 %%PYPY_DIR%%/lib-python/3/test/test_osx_env.py
 %%PYPY_DIR%%/lib-python/3/test/test_parser.py
+%%PYPY_DIR%%/lib-python/3/test/test_pathlib.py
 %%PYPY_DIR%%/lib-python/3/test/test_pdb.py
 %%PYPY_DIR%%/lib-python/3/test/test_peepholer.py
 %%PYPY_DIR%%/lib-python/3/test/test_pep247.py
-%%PYPY_DIR%%/lib-python/3/test/test_pep263.py
 %%PYPY_DIR%%/lib-python/3/test/test_pep277.py
-%%PYPY_DIR%%/lib-python/3/test/test_pep292.py
 %%PYPY_DIR%%/lib-python/3/test/test_pep3120.py
 %%PYPY_DIR%%/lib-python/3/test/test_pep3131.py
 %%PYPY_DIR%%/lib-python/3/test/test_pep3151.py
 %%PYPY_DIR%%/lib-python/3/test/test_pep352.py
 %%PYPY_DIR%%/lib-python/3/test/test_pep380.py
+%%PYPY_DIR%%/lib-python/3/test/test_pep479.py
 %%PYPY_DIR%%/lib-python/3/test/test_pickle.py
 %%PYPY_DIR%%/lib-python/3/test/test_pickletools.py
 %%PYPY_DIR%%/lib-python/3/test/test_pipes.py
@@ -1558,6 +1704,7 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/test/test_range.py
 %%PYPY_DIR%%/lib-python/3/test/test_re.py
 %%PYPY_DIR%%/lib-python/3/test/test_readline.py
+%%PYPY_DIR%%/lib-python/3/test/test_regrtest.py
 %%PYPY_DIR%%/lib-python/3/test/test_reprlib.py
 %%PYPY_DIR%%/lib-python/3/test/test_resource.py
 %%PYPY_DIR%%/lib-python/3/test/test_richcmp.py
@@ -1567,7 +1714,9 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/test/test_sax.py
 %%PYPY_DIR%%/lib-python/3/test/test_sched.py
 %%PYPY_DIR%%/lib-python/3/test/test_scope.py
+%%PYPY_DIR%%/lib-python/3/test/test_script_helper.py
 %%PYPY_DIR%%/lib-python/3/test/test_select.py
+%%PYPY_DIR%%/lib-python/3/test/test_selectors.py
 %%PYPY_DIR%%/lib-python/3/test/test_set.py
 %%PYPY_DIR%%/lib-python/3/test/test_setcomps.py
 %%PYPY_DIR%%/lib-python/3/test/test_shelve.py
@@ -1583,10 +1732,13 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/test/test_socket.py
 %%PYPY_DIR%%/lib-python/3/test/test_socketserver.py
 %%PYPY_DIR%%/lib-python/3/test/test_sort.py
+%%PYPY_DIR%%/lib-python/3/test/test_source_encoding.py
+%%PYPY_DIR%%/lib-python/3/test/test_spwd.py
 %%PYPY_DIR%%/lib-python/3/test/test_sqlite.py
 %%PYPY_DIR%%/lib-python/3/test/test_ssl.py
 %%PYPY_DIR%%/lib-python/3/test/test_startfile.py
 %%PYPY_DIR%%/lib-python/3/test/test_stat.py
+%%PYPY_DIR%%/lib-python/3/test/test_statistics.py
 %%PYPY_DIR%%/lib-python/3/test/test_strftime.py
 %%PYPY_DIR%%/lib-python/3/test/test_string.py
 %%PYPY_DIR%%/lib-python/3/test/test_stringprep.py
@@ -1622,16 +1774,30 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/test/test_time.py
 %%PYPY_DIR%%/lib-python/3/test/test_timeit.py
 %%PYPY_DIR%%/lib-python/3/test/test_timeout.py
+%%PYPY_DIR%%/lib-python/3/test/test_tix.py
 %%PYPY_DIR%%/lib-python/3/test/test_tk.py
 %%PYPY_DIR%%/lib-python/3/test/test_tokenize.py
-%%PYPY_DIR%%/lib-python/3/test/test_tools.py
+%%PYPY_DIR%%/lib-python/3/test/test_tools/__init__.py
+%%PYPY_DIR%%/lib-python/3/test/test_tools/__main__.py
+%%PYPY_DIR%%/lib-python/3/test/test_tools/test_fixcid.py
+%%PYPY_DIR%%/lib-python/3/test/test_tools/test_gprof2html.py
+%%PYPY_DIR%%/lib-python/3/test/test_tools/test_i18n.py
+%%PYPY_DIR%%/lib-python/3/test/test_tools/test_md5sum.py
+%%PYPY_DIR%%/lib-python/3/test/test_tools/test_pdeps.py
+%%PYPY_DIR%%/lib-python/3/test/test_tools/test_pindent.py
+%%PYPY_DIR%%/lib-python/3/test/test_tools/test_reindent.py
+%%PYPY_DIR%%/lib-python/3/test/test_tools/test_sundry.py
+%%PYPY_DIR%%/lib-python/3/test/test_tools/test_unparse.py
 %%PYPY_DIR%%/lib-python/3/test/test_trace.py
 %%PYPY_DIR%%/lib-python/3/test/test_traceback.py
+%%PYPY_DIR%%/lib-python/3/test/test_tracemalloc.py
 %%PYPY_DIR%%/lib-python/3/test/test_ttk_guionly.py
 %%PYPY_DIR%%/lib-python/3/test/test_ttk_textonly.py
 %%PYPY_DIR%%/lib-python/3/test/test_tuple.py
+%%PYPY_DIR%%/lib-python/3/test/test_turtle.py
 %%PYPY_DIR%%/lib-python/3/test/test_typechecks.py
 %%PYPY_DIR%%/lib-python/3/test/test_types.py
+%%PYPY_DIR%%/lib-python/3/test/test_typing.py
 %%PYPY_DIR%%/lib-python/3/test/test_ucn.py
 %%PYPY_DIR%%/lib-python/3/test/test_unary.py
 %%PYPY_DIR%%/lib-python/3/test/test_unicode.py
@@ -1656,7 +1822,10 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/test/test_venv.py
 %%PYPY_DIR%%/lib-python/3/test/test_wait3.py
 %%PYPY_DIR%%/lib-python/3/test/test_wait4.py
-%%PYPY_DIR%%/lib-python/3/test/test_warnings.py
+%%PYPY_DIR%%/lib-python/3/test/test_warnings/__init__.py
+%%PYPY_DIR%%/lib-python/3/test/test_warnings/__main__.py
+%%PYPY_DIR%%/lib-python/3/test/test_warnings/data/import_warning.py
+%%PYPY_DIR%%/lib-python/3/test/test_warnings/data/stacklevel.py
 %%PYPY_DIR%%/lib-python/3/test/test_wave.py
 %%PYPY_DIR%%/lib-python/3/test/test_weakref.py
 %%PYPY_DIR%%/lib-python/3/test/test_weakset.py
@@ -1671,6 +1840,7 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/test/test_xml_etree_c.py
 %%PYPY_DIR%%/lib-python/3/test/test_xmlrpc.py
 %%PYPY_DIR%%/lib-python/3/test/test_xmlrpc_net.py
+%%PYPY_DIR%%/lib-python/3/test/test_zipapp.py
 %%PYPY_DIR%%/lib-python/3/test/test_zipfile.py
 %%PYPY_DIR%%/lib-python/3/test/test_zipfile64.py
 %%PYPY_DIR%%/lib-python/3/test/test_zipimport.py
@@ -1688,8 +1858,8 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/test/tokenize_tests.txt
 %%PYPY_DIR%%/lib-python/3/test/tracedmodules/__init__.py
 %%PYPY_DIR%%/lib-python/3/test/tracedmodules/testmod.py
-%%PYPY_DIR%%/lib-python/3/test/warning_tests.py
 %%PYPY_DIR%%/lib-python/3/test/win_console_handler.py
+%%PYPY_DIR%%/lib-python/3/test/wrongcert.pem
 %%PYPY_DIR%%/lib-python/3/test/xmltestdata/simple-ns.xml
 %%PYPY_DIR%%/lib-python/3/test/xmltestdata/simple.xml
 %%PYPY_DIR%%/lib-python/3/test/xmltestdata/test.xml
@@ -1703,7 +1873,6 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/timeit.py
 %%PYPY_DIR%%/lib-python/3/tkinter/__init__.py
 %%PYPY_DIR%%/lib-python/3/tkinter/__main__.py
-%%PYPY_DIR%%/lib-python/3/tkinter/_fix.py
 %%PYPY_DIR%%/lib-python/3/tkinter/colorchooser.py
 %%PYPY_DIR%%/lib-python/3/tkinter/commondialog.py
 %%PYPY_DIR%%/lib-python/3/tkinter/constants.py
@@ -1720,6 +1889,8 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/tkinter/test/support.py
 %%PYPY_DIR%%/lib-python/3/tkinter/test/test_tkinter/__init__.py
 %%PYPY_DIR%%/lib-python/3/tkinter/test/test_tkinter/test_font.py
+%%PYPY_DIR%%/lib-python/3/tkinter/test/test_tkinter/test_geometry_managers.py
+%%PYPY_DIR%%/lib-python/3/tkinter/test/test_tkinter/test_images.py
 %%PYPY_DIR%%/lib-python/3/tkinter/test/test_tkinter/test_loadtk.py
 %%PYPY_DIR%%/lib-python/3/tkinter/test/test_tkinter/test_misc.py
 %%PYPY_DIR%%/lib-python/3/tkinter/test/test_tkinter/test_text.py
@@ -1737,17 +1908,15 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/tokenize.py
 %%PYPY_DIR%%/lib-python/3/trace.py
 %%PYPY_DIR%%/lib-python/3/traceback.py
+%%PYPY_DIR%%/lib-python/3/tracemalloc.py
 %%PYPY_DIR%%/lib-python/3/tty.py
 %%PYPY_DIR%%/lib-python/3/turtle.py
 %%PYPY_DIR%%/lib-python/3/turtledemo/__init__.py
 %%PYPY_DIR%%/lib-python/3/turtledemo/__main__.py
-%%PYPY_DIR%%/lib-python/3/turtledemo/about_turtle.txt
-%%PYPY_DIR%%/lib-python/3/turtledemo/about_turtledemo.txt
 %%PYPY_DIR%%/lib-python/3/turtledemo/bytedesign.py
 %%PYPY_DIR%%/lib-python/3/turtledemo/chaos.py
 %%PYPY_DIR%%/lib-python/3/turtledemo/clock.py
 %%PYPY_DIR%%/lib-python/3/turtledemo/colormixer.py
-%%PYPY_DIR%%/lib-python/3/turtledemo/demohelp.txt
 %%PYPY_DIR%%/lib-python/3/turtledemo/forest.py
 %%PYPY_DIR%%/lib-python/3/turtledemo/fractalcurves.py
 %%PYPY_DIR%%/lib-python/3/turtledemo/lindenmayer.py
@@ -1758,12 +1927,14 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/turtledemo/penrose.py
 %%PYPY_DIR%%/lib-python/3/turtledemo/planet_and_moon.py
 %%PYPY_DIR%%/lib-python/3/turtledemo/round_dance.py
+%%PYPY_DIR%%/lib-python/3/turtledemo/sorting_animate.py
 %%PYPY_DIR%%/lib-python/3/turtledemo/tree.py
 %%PYPY_DIR%%/lib-python/3/turtledemo/turtle.cfg
 %%PYPY_DIR%%/lib-python/3/turtledemo/two_canvases.py
 %%PYPY_DIR%%/lib-python/3/turtledemo/wikipedia.py
 %%PYPY_DIR%%/lib-python/3/turtledemo/yinyang.py
 %%PYPY_DIR%%/lib-python/3/types.py
+%%PYPY_DIR%%/lib-python/3/typing.py
 %%PYPY_DIR%%/lib-python/3/unittest/__init__.py
 %%PYPY_DIR%%/lib-python/3/unittest/__main__.py
 %%PYPY_DIR%%/lib-python/3/unittest/case.py
@@ -1775,6 +1946,7 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/unittest/signals.py
 %%PYPY_DIR%%/lib-python/3/unittest/suite.py
 %%PYPY_DIR%%/lib-python/3/unittest/test/__init__.py
+%%PYPY_DIR%%/lib-python/3/unittest/test/__main__.py
 %%PYPY_DIR%%/lib-python/3/unittest/test/_test_warnings.py
 %%PYPY_DIR%%/lib-python/3/unittest/test/dummy.py
 %%PYPY_DIR%%/lib-python/3/unittest/test/support.py
@@ -1791,6 +1963,7 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/unittest/test/test_skipping.py
 %%PYPY_DIR%%/lib-python/3/unittest/test/test_suite.py
 %%PYPY_DIR%%/lib-python/3/unittest/test/testmock/__init__.py
+%%PYPY_DIR%%/lib-python/3/unittest/test/testmock/__main__.py
 %%PYPY_DIR%%/lib-python/3/unittest/test/testmock/support.py
 %%PYPY_DIR%%/lib-python/3/unittest/test/testmock/testcallable.py
 %%PYPY_DIR%%/lib-python/3/unittest/test/testmock/testhelpers.py
@@ -1811,10 +1984,11 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/venv/__init__.py
 %%PYPY_DIR%%/lib-python/3/venv/__main__.py
 %%PYPY_DIR%%/lib-python/3/venv/scripts/nt/Activate.ps1
-%%PYPY_DIR%%/lib-python/3/venv/scripts/nt/Deactivate.ps1
 %%PYPY_DIR%%/lib-python/3/venv/scripts/nt/activate.bat
 %%PYPY_DIR%%/lib-python/3/venv/scripts/nt/deactivate.bat
 %%PYPY_DIR%%/lib-python/3/venv/scripts/posix/activate
+%%PYPY_DIR%%/lib-python/3/venv/scripts/posix/activate.csh
+%%PYPY_DIR%%/lib-python/3/venv/scripts/posix/activate.fish
 %%PYPY_DIR%%/lib-python/3/warnings.py
 %%PYPY_DIR%%/lib-python/3/wave.py
 %%PYPY_DIR%%/lib-python/3/weakref.py
@@ -1851,10 +2025,86 @@ bin/pypy3
 %%PYPY_DIR%%/lib-python/3/xmlrpc/__init__.py
 %%PYPY_DIR%%/lib-python/3/xmlrpc/client.py
 %%PYPY_DIR%%/lib-python/3/xmlrpc/server.py
+%%PYPY_DIR%%/lib-python/3/zipapp.py
 %%PYPY_DIR%%/lib-python/3/zipfile.py
 %%PYPY_DIR%%/lib_pypy/__init__.py
 %%PYPY_DIR%%/lib_pypy/_audioop_build.py
 %%PYPY_DIR%%/lib_pypy/_audioop_cffi.%%PYPY_CFFI_VER%%.so
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/.gitignore
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/LICENSE
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/README.md
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/.build_openssl.py.swn
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/__init__.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/build_commoncrypto.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/build_constant_time.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/build_openssl.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/build_padding.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/commoncrypto/__init__.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/commoncrypto/cf.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/commoncrypto/common_cryptor.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/commoncrypto/common_digest.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/commoncrypto/common_hmac.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/commoncrypto/common_key_derivation.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/commoncrypto/common_symmetric_key_wrap.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/commoncrypto/seccertificate.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/commoncrypto/secimport.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/commoncrypto/secitem.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/commoncrypto/seckey.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/commoncrypto/seckeychain.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/commoncrypto/secpolicy.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/commoncrypto/sectransform.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/commoncrypto/sectrust.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/commoncrypto/secure_transport.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/hazmat_src/constant_time.c
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/hazmat_src/constant_time.h
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/hazmat_src/padding.c
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/hazmat_src/padding.h
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/__init__.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/aes.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/asn1.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/bignum.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/bio.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/callbacks.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/cmac.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/cms.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/conf.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/crypto.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/cryptography.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/dh.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/dsa.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/ec.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/ecdh.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/ecdsa.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/engine.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/err.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/evp.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/hmac.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/nid.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/objects.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/ocsp.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/opensslv.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/osrandom_engine.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/pem.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/pkcs12.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/pkcs7.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/rand.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/rsa.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/src/osrandom_engine.c
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/src/osrandom_engine.h
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/ssl.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/tls1.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/x509.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/x509_vfy.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/x509name.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/x509v3.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/utils.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_stdssl/.__init__.py.swn
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_stdssl/__init__.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_stdssl/certificate.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_stdssl/error.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_stdssl/errorcodes.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_stdssl/utility.py
+%%PYPY_DIR%%/lib_pypy/_cffi_ssl/tools/make_ssl_data.py
 %%PYPY_DIR%%/lib_pypy/_codecs_cn.py
 %%PYPY_DIR%%/lib_pypy/_codecs_hk.py
 %%PYPY_DIR%%/lib_pypy/_codecs_iso2022.py
@@ -1881,6 +2131,7 @@ bin/pypy3
 %%PYPY_DIR%%/lib_pypy/_curses_build.py
 %%PYPY_DIR%%/lib_pypy/_curses_cffi.%%PYPY_CFFI_VER%%.so
 %%PYPY_DIR%%/lib_pypy/_curses_cffi_check.%%PYPY_CFFI_VER%%.so
+%%PYPY_DIR%%/lib_pypy/_curses_cffi_check.c
 %%PYPY_DIR%%/lib_pypy/_curses_panel.py
 %%PYPY_DIR%%/lib_pypy/_dbm.py
 %%PYPY_DIR%%/lib_pypy/_decimal.py
@@ -1890,19 +2141,34 @@ bin/pypy3
 %%PYPY_DIR%%/lib_pypy/_functools.py
 %%PYPY_DIR%%/lib_pypy/_gdbm.py
 %%PYPY_DIR%%/lib_pypy/_gdbm_build.py
+%%PYPY_DIR%%/lib_pypy/_hashlib/__init__.py
+%%PYPY_DIR%%/lib_pypy/_libmpdec/basearith.c
 %%PYPY_DIR%%/lib_pypy/_libmpdec/basearith.h
 %%PYPY_DIR%%/lib_pypy/_libmpdec/bits.h
+%%PYPY_DIR%%/lib_pypy/_libmpdec/constants.c
 %%PYPY_DIR%%/lib_pypy/_libmpdec/constants.h
+%%PYPY_DIR%%/lib_pypy/_libmpdec/context.c
+%%PYPY_DIR%%/lib_pypy/_libmpdec/convolute.c
 %%PYPY_DIR%%/lib_pypy/_libmpdec/convolute.h
+%%PYPY_DIR%%/lib_pypy/_libmpdec/crt.c
 %%PYPY_DIR%%/lib_pypy/_libmpdec/crt.h
+%%PYPY_DIR%%/lib_pypy/_libmpdec/difradix2.c
 %%PYPY_DIR%%/lib_pypy/_libmpdec/difradix2.h
+%%PYPY_DIR%%/lib_pypy/_libmpdec/fnt.c
 %%PYPY_DIR%%/lib_pypy/_libmpdec/fnt.h
+%%PYPY_DIR%%/lib_pypy/_libmpdec/fourstep.c
 %%PYPY_DIR%%/lib_pypy/_libmpdec/fourstep.h
+%%PYPY_DIR%%/lib_pypy/_libmpdec/io.c
 %%PYPY_DIR%%/lib_pypy/_libmpdec/io.h
+%%PYPY_DIR%%/lib_pypy/_libmpdec/memory.c
 %%PYPY_DIR%%/lib_pypy/_libmpdec/memory.h
+%%PYPY_DIR%%/lib_pypy/_libmpdec/mpdecimal.c
 %%PYPY_DIR%%/lib_pypy/_libmpdec/mpdecimal.h
+%%PYPY_DIR%%/lib_pypy/_libmpdec/numbertheory.c
 %%PYPY_DIR%%/lib_pypy/_libmpdec/numbertheory.h
+%%PYPY_DIR%%/lib_pypy/_libmpdec/sixstep.c
 %%PYPY_DIR%%/lib_pypy/_libmpdec/sixstep.h
+%%PYPY_DIR%%/lib_pypy/_libmpdec/transpose.c
 %%PYPY_DIR%%/lib_pypy/_libmpdec/transpose.h
 %%PYPY_DIR%%/lib_pypy/_libmpdec/typearith.h
 %%PYPY_DIR%%/lib_pypy/_libmpdec/umodarith.h
@@ -1916,8 +2182,11 @@ bin/pypy3
 %%PYPY_DIR%%/lib_pypy/_md5.py
 %%PYPY_DIR%%/lib_pypy/_pwdgrp_build.py
 %%PYPY_DIR%%/lib_pypy/_pwdgrp_cffi.%%PYPY_CFFI_VER%%.so
+%%PYPY_DIR%%/lib_pypy/_pypy_collections.py
 %%PYPY_DIR%%/lib_pypy/_pypy_interact.py
 %%PYPY_DIR%%/lib_pypy/_pypy_irc_topic.py
+%%PYPY_DIR%%/lib_pypy/_pypy_openssl.%%PYPY_CFFI_VER%%.so
+%%PYPY_DIR%%/lib_pypy/_pypy_openssl.c
 %%PYPY_DIR%%/lib_pypy/_pypy_testcapi.py
 %%PYPY_DIR%%/lib_pypy/_pypy_wait.py
 %%PYPY_DIR%%/lib_pypy/_pypy_winbase_build.py
@@ -1930,6 +2199,9 @@ bin/pypy3
 %%PYPY_DIR%%/lib_pypy/_sha512.py
 %%PYPY_DIR%%/lib_pypy/_sqlite3.py
 %%PYPY_DIR%%/lib_pypy/_sqlite3_build.py
+%%PYPY_DIR%%/lib_pypy/_ssl/__init__.py
+%%PYPY_DIR%%/lib_pypy/_ssl_build.py
+%%PYPY_DIR%%/lib_pypy/_stat.py
 %%PYPY_DIR%%/lib_pypy/_structseq.py
 %%PYPY_DIR%%/lib_pypy/_sysconfigdata.py
 %%PYPY_DIR%%/lib_pypy/_syslog_build.py
@@ -1976,6 +2248,7 @@ bin/pypy3
 %%PYPY_DIR%%/lib_pypy/cffi/cffi_opcode.py
 %%PYPY_DIR%%/lib_pypy/cffi/commontypes.py
 %%PYPY_DIR%%/lib_pypy/cffi/cparser.py
+%%PYPY_DIR%%/lib_pypy/cffi/error.py
 %%PYPY_DIR%%/lib_pypy/cffi/ffiplatform.py
 %%PYPY_DIR%%/lib_pypy/cffi/gc_weakref.py
 %%PYPY_DIR%%/lib_pypy/cffi/lock.py
@@ -2039,6 +2312,10 @@ bin/pypy3
 @dir %%PYPY_DIR%%/lib-python/3/encodings/__pycache__
 @dir %%PYPY_DIR%%/lib-python/3/importlib/__pycache__
 @dir %%PYPY_DIR%%/lib_pypy/__pycache__
+@dir %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/__pycache__
+@dir %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/__pycache__
+@dir %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_stdssl/__pycache__
+@dir %%PYPY_DIR%%/lib_pypy/_hashlib/__pycache__
 @dir %%PYPY_DIR%%/lib_pypy/cffi/__pycache__
 @dir %%PYPY_DIR%%/lib_pypy/cffi/_pycparser/__pycache__
 @dir %%PYPY_DIR%%/lib_pypy/cffi/_pycparser/ply/__pycache__