# HG changeset patch
# User Franz Glasner <fzglas.hg@dom66.de>
# Date 1741783529 -3600
# Node ID 8b567a8743601e650d5ac577155a0e182e899dfe
# Parent  c43bcad6c935cd9e6bd38d992020994beadc906f
Upgrade to PyPy v7.3.19.

BUGS:
- pypy311 not yet supported.
- pypy39 not yet deleted.
- Tests for pypy3 not yet runnable.

diff -r c43bcad6c935 -r 8b567a874360 README
--- a/README	Sat Jan 20 07:37:03 2024 +0100
+++ b/README	Wed Mar 12 13:45:29 2025 +0100
@@ -3,3 +3,8 @@
 ======
 
 PyPy, PyPy3 and related packages for gdbm, sqlite3, tkinter
+
+
+For general build instructions see also
+
+  https://doc.pypy.org/en/latest/build.html
diff -r c43bcad6c935 -r 8b567a874360 lang/pypy2/Makefile
--- a/lang/pypy2/Makefile	Sat Jan 20 07:37:03 2024 +0100
+++ b/lang/pypy2/Makefile	Wed Mar 12 13:45:29 2025 +0100
@@ -2,7 +2,7 @@
 # based on the port created by: David Naylor <naylor.b.david@gmail.com>
 
 PORTNAME=	pypy2
-DISTVERSION=	7.3.15
+DISTVERSION=	7.3.19
 CATEGORIES=	lang python
 MASTER_SITES=	https://downloads.python.org/pypy/
 DISTNAME=	pypy${PYPY_PYTHON_IMPL_VER}-v${DISTVERSION}-src
diff -r c43bcad6c935 -r 8b567a874360 lang/pypy2/Makefile.cffi.inc
--- a/lang/pypy2/Makefile.cffi.inc	Sat Jan 20 07:37:03 2024 +0100
+++ b/lang/pypy2/Makefile.cffi.inc	Wed Mar 12 13:45:29 2025 +0100
@@ -9,7 +9,7 @@
 LICENSE_COMB=	multi
 .endif
 
-PYPY_DEFAULT_DISTVERSION?=	7.3.15
+PYPY_DEFAULT_DISTVERSION?=	7.3.19
 
 BUILD_DEPENDS+=	${FLAVOR}==${PYPY_PORTVERSION}:lang/${FLAVOR}
 RUN_DEPENDS+=	${FLAVOR}>=${PYPY_PORTVERSION}:lang/${FLAVOR}
diff -r c43bcad6c935 -r 8b567a874360 lang/pypy2/README
--- a/lang/pypy2/README	Sat Jan 20 07:37:03 2024 +0100
+++ b/lang/pypy2/README	Wed Mar 12 13:45:29 2025 +0100
@@ -158,3 +158,69 @@
 
   Deswegen in :file:`rpython/rlib/rposix.py` den Header :file:`termios.h`
   in die Platform-Konfigurations-Includes mit aufnehmen unter FreeBSD.
+
+
+Build von PyPy v7.3.19 auf FreeBSD-14.1
+=======================================
+
+Voraussetzungen
+---------------
+
+py-pycparser
+~~~~~~~~~~~~
+
+ACHTUNG: Ports-Tree auf alten Zeitpunkt stellen:
+         "hg update -r 377386a46a6b" (as-of 2021-01-08)
+
+Build py27-pycparser (Origin: devel/py-pycparser):
+
+  Dessen Voraussetzung ist py27-setuptools.
+
+    Entweder:
+
+      pkg install py27-setuptools44
+
+      pkg set -n py27-setuptools44:py27-setuptools
+
+    Oder:
+
+      Für dem Bau von py-pycparser  Mk/Uses/distutils  patchen, so daß als
+      dessen Dependency py27-setuptools44 statt py27-setuptools benutzt wird.
+
+    Dann:
+
+      cd devel/py-pycparser
+      make FLAVOR=py27 package
+
+Install this package: pkg install py27-pycparser
+
+Ports-Umgebung wieder restaurieren
+
+
+Weitere Pakete
+~~~~~~~~~~~~~~
+
+Install gmake, binutils, expat, libffi, libunwind, pkgconf
+
+NOTE: libz ist bereits im Basis-OS dabei.
+
+
+PyPy2
+-----
+
+In der aktuellen Version wird ein Linken mit "libffi.a" bevorzugt for dem
+Linken mit "libffi.so". Das ist aber nicht möglich, da "libffi.a" nicht mit
+"-fPIC" übersetzt ist, das aber nötig ist. Deswegen "rpython/rlib/clibffi.py"
+entsprechend patchen, daß dafür wieder "libffi.so" bevorzugt wird.
+
+Mit Python2.7 übersetzen:
+
+  make rmconfig
+  make package
+
+Installation -- auch aller optionalen Pakete pypy2-sqlite3, pypy3-gdbm und
+pypy2-tkinter
+
+Test mit
+
+  make test
diff -r c43bcad6c935 -r 8b567a874360 lang/pypy2/distinfo
--- a/lang/pypy2/distinfo	Sat Jan 20 07:37:03 2024 +0100
+++ b/lang/pypy2/distinfo	Wed Mar 12 13:45:29 2025 +0100
@@ -1,3 +1,3 @@
-TIMESTAMP = 1705608139
-SHA256 (pypy2.7-v7.3.15-src.tar.bz2) = a66ddaed39544a35bb7ab7a17dbf673a020c7cb3a614bd2b61a54776888daf2c
-SIZE (pypy2.7-v7.3.15-src.tar.bz2) = 19834343
+TIMESTAMP = 1741619168
+SHA256 (pypy2.7-v7.3.19-src.tar.bz2) = 8703cdcb01f9f82966dd43b6a6018f140399db51ebb43c125c1f9a215e7bb003
+SIZE (pypy2.7-v7.3.19-src.tar.bz2) = 21011665
diff -r c43bcad6c935 -r 8b567a874360 lang/pypy2/files/patch-rpython_rlib_clibffi.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/pypy2/files/patch-rpython_rlib_clibffi.py	Wed Mar 12 13:45:29 2025 +0100
@@ -0,0 +1,24 @@
+--- rpython/rlib/clibffi.py.orig	2025-02-22 16:54:09 UTC
++++ rpython/rlib/clibffi.py
+@@ -77,11 +77,16 @@ if not _WIN32:
+     library_dirs = platform.library_dirs_for_libffi()
+     libraries = ['ffi']
+     link_files = []
+-    for libdir in library_dirs:
+-        candidate = os.path.join(libdir, "libffi.a")
+-        if os.path.exists(candidate):
+-            link_files.append(candidate)
+-            libraries = []
++    #
++    # fag: linking with libffi.a yields an error on FreeBSD because it is
++    #      not compiled with -fPIC: so link with libffi.so instead. This
++    #      is also true for previous versions of pypy.
++    #
++    # for libdir in library_dirs:
++    #     candidate = os.path.join(libdir, "libffi.a")
++    #     if os.path.exists(candidate):
++    #         link_files.append(candidate)
++    #         libraries = []
+ 
+     eci = ExternalCompilationInfo(
+         pre_include_bits = pre_include_bits,
diff -r c43bcad6c935 -r 8b567a874360 lang/pypy2/files/patch-rpython_rlib_rposix.py
--- a/lang/pypy2/files/patch-rpython_rlib_rposix.py	Sat Jan 20 07:37:03 2024 +0100
+++ b/lang/pypy2/files/patch-rpython_rlib_rposix.py	Wed Mar 12 13:45:29 2025 +0100
@@ -1,6 +1,6 @@
---- rpython/rlib/rposix.py.orig	2023-12-23 15:29:17 UTC
+--- rpython/rlib/rposix.py.orig	2025-02-22 16:54:09 UTC
 +++ rpython/rlib/rposix.py
-@@ -214,6 +214,8 @@ else:
+@@ -212,6 +212,8 @@ else:
          includes.append('sys/sysmacros.h')
      if sys.platform.startswith('freebsd') or sys.platform.startswith('openbsd'):
          includes.append('sys/ttycom.h')
diff -r c43bcad6c935 -r 8b567a874360 lang/pypy2/pkg-plist
--- a/lang/pypy2/pkg-plist	Sat Jan 20 07:37:03 2024 +0100
+++ b/lang/pypy2/pkg-plist	Wed Mar 12 13:45:29 2025 +0100
@@ -3920,9 +3920,6 @@
 %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/__init__.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/__init__.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/__init__.pyo
-%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/aes.py
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/aes.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/aes.pyo
 %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/asn1.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/asn1.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/asn1.pyo
@@ -3989,9 +3986,6 @@
 %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/opensslv.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/opensslv.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/opensslv.pyo
-%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/osrandom_engine.py
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/osrandom_engine.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/osrandom_engine.pyo
 %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/pem.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/pem.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/pem.pyo
@@ -4013,8 +4007,6 @@
 %%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/rsa.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/rsa.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/rsa.pyo
-%%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
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/ssl.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/_cffi_ssl/_cffi_src/openssl/ssl.pyo
@@ -4161,6 +4153,9 @@
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/_pypy_irc_topic.pyo
 %%PYPY_DIR%%/lib_pypy/_pypy_openssl.c
 %%PYPY_DIR%%/lib_pypy/_pypy_openssl.%%PYPY_CFFI_VER%%.so
+%%PYPY_DIR%%/lib_pypy/_pypy_remote_debug.py
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/_pypy_remote_debug.pyc
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/_pypy_remote_debug.pyo
 %%PYPY_DIR%%/lib_pypy/_pypy_testcapi.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/_pypy_testcapi.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/_pypy_testcapi.pyo
@@ -4258,6 +4253,9 @@
 %%PYPY_DIR%%/lib_pypy/cffi/_cffi_errors.h
 %%PYPY_DIR%%/lib_pypy/cffi/_cffi_include.h
 %%PYPY_DIR%%/lib_pypy/cffi/_embedding.h
+%%PYPY_DIR%%/lib_pypy/cffi/_imp_emulation.py
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/cffi/_imp_emulation.pyc
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/cffi/_imp_emulation.pyo
 %%PYPY_DIR%%/lib_pypy/cffi/_pycparser/README
 %%PYPY_DIR%%/lib_pypy/cffi/_pycparser/__init__.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/cffi/_pycparser/__init__.pyc
@@ -4312,6 +4310,9 @@
 %%PYPY_DIR%%/lib_pypy/cffi/_pycparser/yacctab.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/cffi/_pycparser/yacctab.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/cffi/_pycparser/yacctab.pyo
+%%PYPY_DIR%%/lib_pypy/cffi/_shimmed_dist_utils.py
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/cffi/_shimmed_dist_utils.pyc
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/cffi/_shimmed_dist_utils.pyo
 %%PYPY_DIR%%/lib_pypy/cffi/api.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/cffi/api.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib_pypy/cffi/api.pyo
diff -r c43bcad6c935 -r 8b567a874360 lang/pypy3/Makefile
--- a/lang/pypy3/Makefile	Sat Jan 20 07:37:03 2024 +0100
+++ b/lang/pypy3/Makefile	Wed Mar 12 13:45:29 2025 +0100
@@ -2,7 +2,7 @@
 
 PORTNAME=	pypy3
 PORTVERSION=	3
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	lang python
 MASTER_SITES=
@@ -25,7 +25,7 @@
 		${PYPY_DIR}/bin/python${PYPY_PYTHON_IMPL_VER_MAJOR}
 
 # The default PyPy version that this meta-port is dependent on
-PYPY_VERSION=	7.3.15
+PYPY_VERSION=	7.3.19
 PYPY_PYTHON_IMPL_VERSION=	3.10
 PYPY_PYTHON_IMPL_VER_MAJOR=	${PYPY_PYTHON_IMPL_VERSION:C|([0-9]+)\.[0-9]+|\1|}
 PYPY_PORT=	pypy310
diff -r c43bcad6c935 -r 8b567a874360 lang/pypy3/Makefile.cffi.inc
--- a/lang/pypy3/Makefile.cffi.inc	Sat Jan 20 07:37:03 2024 +0100
+++ b/lang/pypy3/Makefile.cffi.inc	Wed Mar 12 13:45:29 2025 +0100
@@ -9,7 +9,7 @@
 LICENSE_COMB=	multi
 .endif
 
-PYPY_DEFAULT_DISTVERSION?=	7.3.15
+PYPY_DEFAULT_DISTVERSION?=	7.3.19
 
 BUILD_DEPENDS+=	${FLAVOR}==${PYPY_PORTVERSION}:lang/${FLAVOR}
 RUN_DEPENDS+=	${FLAVOR}>=${PYPY_PORTVERSION}:lang/${FLAVOR}
diff -r c43bcad6c935 -r 8b567a874360 lang/pypy3/README
--- a/lang/pypy3/README	Sat Jan 20 07:37:03 2024 +0100
+++ b/lang/pypy3/README	Wed Mar 12 13:45:29 2025 +0100
@@ -7,6 +7,14 @@
 
 Erst einmal PyPy(2) samt Installation
 
+Dann noch:
+
+  pkg install lzma db5
+
+Da gdbm mit dabei ist, das entsprechende Paket auch installieren:
+
+  pkg install gdbm
+
 
 PyPy3
 -----
@@ -23,6 +31,11 @@
 Import prüfen wie bei PyPy(2) und zusätzlich:
 
     import lzma
+    import dbm
+    import _gdbm    
+    import dbm.gnu
+    import _dbm
+    import dbm.ndbm
 
 
 pypy3-sqlite3
diff -r c43bcad6c935 -r 8b567a874360 lang/pypy310/Makefile
--- a/lang/pypy310/Makefile	Sat Jan 20 07:37:03 2024 +0100
+++ b/lang/pypy310/Makefile	Wed Mar 12 13:45:29 2025 +0100
@@ -2,7 +2,7 @@
 # based on the port created by: David Naylor <naylor.b.david@gmail.com>
 
 PORTNAME=	pypy310
-DISTVERSION=	7.3.15
+DISTVERSION=	7.3.19
 CATEGORIES=	lang python
 MASTER_SITES=	https://downloads.python.org/pypy/
 DISTNAME=	pypy${PYPY_PYTHON_IMPL_VER}-v${DISTVERSION}-src
@@ -21,8 +21,8 @@
 ONLY_FOR_ARCHS?=	amd64 armv6 armv7 i386 powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON?=	PyPy JIT only supported on these architectures
 
-LIB_DEPENDS=	libexpat.so:textproc/expat2 \
-		libffi.so:devel/libffi
+# libexpat is now vendored
+LIB_DEPENDS=	libffi.so:devel/libffi
 # Without gdbm is not supported on v7.3.9 any more: no extra package needed
 LIB_DEPENDS+=	libgdbm.so:databases/gdbm
 # We also need for dbm.ndbm the BerkeleyDB in version 5
@@ -113,7 +113,6 @@
 		lib-python/3/test/bisect_cmd.py \
 		lib-python/3/test/crashers/recursive_call.py \
 		lib-python/3/test/curses_tests.py \
-		lib-python/3/test/pystone.py \
 		lib-python/3/test/re_tests.py \
 		lib-python/3/test/regrtest.py \
 		lib-python/3/timeit.py \
diff -r c43bcad6c935 -r 8b567a874360 lang/pypy310/distinfo
--- a/lang/pypy310/distinfo	Sat Jan 20 07:37:03 2024 +0100
+++ b/lang/pypy310/distinfo	Wed Mar 12 13:45:29 2025 +0100
@@ -1,3 +1,3 @@
-TIMESTAMP = 1705608689
-SHA256 (pypy3.10-v7.3.15-src.tar.bz2) = 837622130b36603a1893899bd9f529961a8e4a56c9eb67268d72ddf8920c9579
-SIZE (pypy3.10-v7.3.15-src.tar.bz2) = 23934723
+TIMESTAMP = 1741738763
+SHA256 (pypy3.10-v7.3.19-src.tar.bz2) = a7c22930b918f40870865ed8a74147f4434ef84d3d6ca2b3c1eba9355d4929c8
+SIZE (pypy3.10-v7.3.19-src.tar.bz2) = 24547353
diff -r c43bcad6c935 -r 8b567a874360 lang/pypy310/files/patch-rpython_rlib_clibffi.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/pypy310/files/patch-rpython_rlib_clibffi.py	Wed Mar 12 13:45:29 2025 +0100
@@ -0,0 +1,24 @@
+--- rpython/rlib/clibffi.py.orig	2025-02-22 16:54:09 UTC
++++ rpython/rlib/clibffi.py
+@@ -77,11 +77,16 @@ if not _WIN32:
+     library_dirs = platform.library_dirs_for_libffi()
+     libraries = ['ffi']
+     link_files = []
+-    for libdir in library_dirs:
+-        candidate = os.path.join(libdir, "libffi.a")
+-        if os.path.exists(candidate):
+-            link_files.append(candidate)
+-            libraries = []
++    #
++    # fag: linking with libffi.a yields an error on FreeBSD because it is
++    #      not compiled with -fPIC: so link with libffi.so instead. This
++    #      is also true for previous versions of pypy.
++    #
++    # for libdir in library_dirs:
++    #     candidate = os.path.join(libdir, "libffi.a")
++    #     if os.path.exists(candidate):
++    #         link_files.append(candidate)
++    #         libraries = []
+ 
+     eci = ExternalCompilationInfo(
+         pre_include_bits = pre_include_bits,
diff -r c43bcad6c935 -r 8b567a874360 lang/pypy310/files/patch-rpython_rlib_rposix.py
--- a/lang/pypy310/files/patch-rpython_rlib_rposix.py	Sat Jan 20 07:37:03 2024 +0100
+++ b/lang/pypy310/files/patch-rpython_rlib_rposix.py	Wed Mar 12 13:45:29 2025 +0100
@@ -1,6 +1,6 @@
---- rpython/rlib/rposix.py.orig	2023-12-24 19:15:32 UTC
+--- rpython/rlib/rposix.py.orig	2025-02-24 17:28:26 UTC
 +++ rpython/rlib/rposix.py
-@@ -214,6 +214,8 @@ else:
+@@ -212,6 +212,8 @@ else:
          includes.append('sys/sysmacros.h')
      if sys.platform.startswith('freebsd') or sys.platform.startswith('openbsd'):
          includes.append('sys/ttycom.h')
@@ -9,7 +9,7 @@
      libraries = ['util']
  
  eci = ExternalCompilationInfo(
-@@ -3057,6 +3059,30 @@ if sys.platform.startswith('linux'):
+@@ -3067,6 +3069,30 @@ if sys.platform.startswith('linux'):
          """Passes offset==NULL; not support on all OSes"""
          res = c_sendfile(out_fd, in_fd, lltype.nullptr(_OFF_PTR_T.TO), count)
          return handle_posix_error('sendfile', res)
diff -r c43bcad6c935 -r 8b567a874360 lang/pypy310/files/patch-rpython_translator_platform_posix.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lang/pypy310/files/patch-rpython_translator_platform_posix.py	Wed Mar 12 13:45:29 2025 +0100
@@ -0,0 +1,21 @@
+--- rpython/translator/platform/posix.py.orig	2025-02-24 17:28:26 UTC
++++ rpython/translator/platform/posix.py
+@@ -32,6 +32,18 @@ class BasePosix(Platform):
+ 
+     def _includedirs(self, include_dirs):
+         assert '' not in include_dirs
++        #
++        # fag: While libexpat is now vendored in PyPy3, when compiling
++        # on FreeBSD "/usr/local/include" comes several times before
++        # the include path to the vendored "expat.h". So: remove all
++        # such items but the last one.
++        # Also assert that the last one is also the last entry in
++        # "include_dirs".
++        #
++        while include_dirs.count('/usr/local/include') > 1:
++            incpos = include_dirs.index('/usr/local/include')
++            del include_dirs[incpos]
++        assert include_dirs[-1] == '/usr/local/include'
+         return ['-I%s' % idir for idir in include_dirs]
+ 
+     def _linkfiles(self, link_files):
diff -r c43bcad6c935 -r 8b567a874360 lang/pypy310/pkg-plist
--- a/lang/pypy310/pkg-plist	Sat Jan 20 07:37:03 2024 +0100
+++ b/lang/pypy310/pkg-plist	Wed Mar 12 13:45:29 2025 +0100
@@ -85,10 +85,6 @@
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/__future__%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/__future__%%PYPY_BCTAG%%.opt-1.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/__future__%%PYPY_BCTAG%%.opt-2.pyc
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__init__.py
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/__init__%%PYPY_BCTAG%%.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/__init__%%PYPY_BCTAG%%.opt-1.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/__init__%%PYPY_BCTAG%%.opt-2.pyc
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__phello__.foo.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/__phello__.foo%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/__phello__.foo%%PYPY_BCTAG%%.opt-1.pyc
@@ -144,10 +140,6 @@
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_cffi_ssl/_cffi_src/__pycache__/build_openssl%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_cffi_ssl/_cffi_src/__pycache__/build_openssl%%PYPY_BCTAG%%.opt-1.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_cffi_ssl/_cffi_src/__pycache__/build_openssl%%PYPY_BCTAG%%.opt-2.pyc
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_cffi_ssl/_cffi_src/openssl/aes.py
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_cffi_ssl/_cffi_src/openssl/__pycache__/aes%%PYPY_BCTAG%%.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_cffi_ssl/_cffi_src/openssl/__pycache__/aes%%PYPY_BCTAG%%.opt-1.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_cffi_ssl/_cffi_src/openssl/__pycache__/aes%%PYPY_BCTAG%%.opt-2.pyc
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_cffi_ssl/_cffi_src/openssl/asn1.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_cffi_ssl/_cffi_src/openssl/__pycache__/asn1%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_cffi_ssl/_cffi_src/openssl/__pycache__/asn1%%PYPY_BCTAG%%.opt-1.pyc
@@ -236,10 +228,6 @@
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_cffi_ssl/_cffi_src/openssl/__pycache__/opensslv%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_cffi_ssl/_cffi_src/openssl/__pycache__/opensslv%%PYPY_BCTAG%%.opt-1.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_cffi_ssl/_cffi_src/openssl/__pycache__/opensslv%%PYPY_BCTAG%%.opt-2.pyc
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_cffi_ssl/_cffi_src/openssl/osrandom_engine.py
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_cffi_ssl/_cffi_src/openssl/__pycache__/osrandom_engine%%PYPY_BCTAG%%.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_cffi_ssl/_cffi_src/openssl/__pycache__/osrandom_engine%%PYPY_BCTAG%%.opt-1.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_cffi_ssl/_cffi_src/openssl/__pycache__/osrandom_engine%%PYPY_BCTAG%%.opt-2.pyc
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_cffi_ssl/_cffi_src/openssl/pem.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_cffi_ssl/_cffi_src/openssl/__pycache__/pem%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_cffi_ssl/_cffi_src/openssl/__pycache__/pem%%PYPY_BCTAG%%.opt-1.pyc
@@ -268,8 +256,6 @@
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_cffi_ssl/_cffi_src/openssl/__pycache__/rsa%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_cffi_ssl/_cffi_src/openssl/__pycache__/rsa%%PYPY_BCTAG%%.opt-1.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_cffi_ssl/_cffi_src/openssl/__pycache__/rsa%%PYPY_BCTAG%%.opt-2.pyc
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_cffi_ssl/_cffi_src/openssl/src/osrandom_engine.c
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_cffi_ssl/_cffi_src/openssl/src/osrandom_engine.h
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_cffi_ssl/_cffi_src/openssl/ssl.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_cffi_ssl/_cffi_src/openssl/__pycache__/ssl%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_cffi_ssl/_cffi_src/openssl/__pycache__/ssl%%PYPY_BCTAG%%.opt-1.pyc
@@ -359,6 +345,10 @@
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/_collections_abc%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/_collections_abc%%PYPY_BCTAG%%.opt-1.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/_collections_abc%%PYPY_BCTAG%%.opt-2.pyc
+%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_colorize.py
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/_colorize%%PYPY_BCTAG%%.pyc
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/_colorize%%PYPY_BCTAG%%.opt-1.pyc
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/_colorize%%PYPY_BCTAG%%.opt-2.pyc
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_compat_pickle.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/_compat_pickle%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/_compat_pickle%%PYPY_BCTAG%%.opt-1.pyc
@@ -574,6 +564,10 @@
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/_pypy_irc_topic%%PYPY_BCTAG%%.opt-2.pyc
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_pypy_openssl.c
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_pypy_openssl.%%PYPY_CFFI_VER%%.so
+%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_pypy_remote_debug.py
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/_pypy_remote_debug%%PYPY_BCTAG%%.pyc
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/_pypy_remote_debug%%PYPY_BCTAG%%.opt-1.pyc
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/_pypy_remote_debug%%PYPY_BCTAG%%.opt-2.pyc
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_pypy_testcapi.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/_pypy_testcapi%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/_pypy_testcapi%%PYPY_BCTAG%%.opt-1.pyc
@@ -682,10 +676,6 @@
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/_sysconfigdata%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/_sysconfigdata%%PYPY_BCTAG%%.opt-1.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/_sysconfigdata%%PYPY_BCTAG%%.opt-2.pyc
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_sysconfigdata__freebsd13_x86_64-unknown-freebsd13.2.py
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/_sysconfigdata__freebsd13_x86_64-unknown-freebsd13.2%%PYPY_BCTAG%%.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/_sysconfigdata__freebsd13_x86_64-unknown-freebsd13.2%%PYPY_BCTAG%%.opt-1.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/_sysconfigdata__freebsd13_x86_64-unknown-freebsd13.2%%PYPY_BCTAG%%.opt-2.pyc
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/_syslog_build.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/_syslog_build%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/_syslog_build%%PYPY_BCTAG%%.opt-1.pyc
@@ -920,10 +910,10 @@
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/calendar%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/calendar%%PYPY_BCTAG%%.opt-1.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/calendar%%PYPY_BCTAG%%.opt-2.pyc
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/cffi-1.16.0.dist-info/LICENSE
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/cffi-1.16.0.dist-info/METADATA
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/cffi-1.16.0.dist-info/entry_points.txt
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/cffi-1.16.0.dist-info/top_level.txt
+%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/cffi-1.18.0.dev0.dist-info/LICENSE
+%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/cffi-1.18.0.dev0.dist-info/METADATA
+%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/cffi-1.18.0.dev0.dist-info/entry_points.txt
+%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/cffi-1.18.0.dev0.dist-info/top_level.txt
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/cffi/__init__.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/cffi/__pycache__/__init__%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/cffi/__pycache__/__init__%%PYPY_BCTAG%%.opt-1.pyc
@@ -2350,9 +2340,6 @@
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/hpy/devel/include/hpy/universal/hpyfunc_trampolines.h
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/hpy/devel/include/hpy/universal/misc_trampolines.h
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/hpy/devel/include/hpy/version.h
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/hpy/devel/lib/cpython/libhpy-ctx-cpython.a
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/hpy/devel/lib/hybrid/libhpy-extra-hybrid.a
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/hpy/devel/lib/universal/libhpy-extra-universal.a
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/hpy/devel/src/runtime/argparse.c
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/hpy/devel/src/runtime/buildvalue.c
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/hpy/devel/src/runtime/ctx_bytes.c
@@ -2425,7 +2412,6 @@
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/HISTORY.txt
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/Icons/README.txt
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/Icons/folder.gif
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/Icons/idle.icns
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/Icons/idle.ico
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/Icons/idle_16.gif
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/Icons/idle_16.png
@@ -2451,10 +2437,6 @@
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/__pycache__/__main__%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/__pycache__/__main__%%PYPY_BCTAG%%.opt-1.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/__pycache__/__main__%%PYPY_BCTAG%%.opt-2.pyc
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/_pyclbr.py
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/__pycache__/_pyclbr%%PYPY_BCTAG%%.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/__pycache__/_pyclbr%%PYPY_BCTAG%%.opt-1.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/__pycache__/_pyclbr%%PYPY_BCTAG%%.opt-2.pyc
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/autocomplete.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/__pycache__/autocomplete%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/__pycache__/autocomplete%%PYPY_BCTAG%%.opt-1.pyc
@@ -2710,10 +2692,6 @@
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/idle_test/__pycache__/test_outwin%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/idle_test/__pycache__/test_outwin%%PYPY_BCTAG%%.opt-1.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/idle_test/__pycache__/test_outwin%%PYPY_BCTAG%%.opt-2.pyc
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/idle_test/test_paragraph.py
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/idle_test/__pycache__/test_paragraph%%PYPY_BCTAG%%.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/idle_test/__pycache__/test_paragraph%%PYPY_BCTAG%%.opt-1.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/idle_test/__pycache__/test_paragraph%%PYPY_BCTAG%%.opt-2.pyc
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/idle_test/test_parenmatch.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/idle_test/__pycache__/test_parenmatch%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/idle_test/__pycache__/test_parenmatch%%PYPY_BCTAG%%.opt-1.pyc
@@ -2750,10 +2728,6 @@
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/idle_test/__pycache__/test_rpc%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/idle_test/__pycache__/test_rpc%%PYPY_BCTAG%%.opt-1.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/idle_test/__pycache__/test_rpc%%PYPY_BCTAG%%.opt-2.pyc
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/idle_test/test_rstrip.py
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/idle_test/__pycache__/test_rstrip%%PYPY_BCTAG%%.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/idle_test/__pycache__/test_rstrip%%PYPY_BCTAG%%.opt-1.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/idle_test/__pycache__/test_rstrip%%PYPY_BCTAG%%.opt-2.pyc
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/idle_test/test_run.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/idle_test/__pycache__/test_run%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/idle_test/__pycache__/test_run%%PYPY_BCTAG%%.opt-1.pyc
@@ -2858,10 +2832,6 @@
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/__pycache__/outwin%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/__pycache__/outwin%%PYPY_BCTAG%%.opt-1.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/__pycache__/outwin%%PYPY_BCTAG%%.opt-2.pyc
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/paragraph.py
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/__pycache__/paragraph%%PYPY_BCTAG%%.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/__pycache__/paragraph%%PYPY_BCTAG%%.opt-1.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/__pycache__/paragraph%%PYPY_BCTAG%%.opt-2.pyc
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/parenmatch.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/__pycache__/parenmatch%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/__pycache__/parenmatch%%PYPY_BCTAG%%.opt-1.pyc
@@ -2898,10 +2868,6 @@
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/__pycache__/rpc%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/__pycache__/rpc%%PYPY_BCTAG%%.opt-1.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/__pycache__/rpc%%PYPY_BCTAG%%.opt-2.pyc
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/rstrip.py
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/__pycache__/rstrip%%PYPY_BCTAG%%.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/__pycache__/rstrip%%PYPY_BCTAG%%.opt-1.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/__pycache__/rstrip%%PYPY_BCTAG%%.opt-2.pyc
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/run.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/__pycache__/run%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/idlelib/__pycache__/run%%PYPY_BCTAG%%.opt-1.pyc
@@ -3440,14 +3406,6 @@
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/lzma%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/lzma%%PYPY_BCTAG%%.opt-1.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/lzma%%PYPY_BCTAG%%.opt-2.pyc
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/macpath.py
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/macpath%%PYPY_BCTAG%%.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/macpath%%PYPY_BCTAG%%.opt-1.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/macpath%%PYPY_BCTAG%%.opt-2.pyc
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/macurl2path.py
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/macurl2path%%PYPY_BCTAG%%.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/macurl2path%%PYPY_BCTAG%%.opt-1.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/macurl2path%%PYPY_BCTAG%%.opt-2.pyc
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/mailbox.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/mailbox%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/mailbox%%PYPY_BCTAG%%.opt-1.pyc
@@ -3709,18 +3667,14 @@
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/_minimal_curses%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/_minimal_curses%%PYPY_BCTAG%%.opt-1.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/_minimal_curses%%PYPY_BCTAG%%.opt-2.pyc
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/cmdrepl.py
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/cmdrepl%%PYPY_BCTAG%%.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/cmdrepl%%PYPY_BCTAG%%.opt-1.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/cmdrepl%%PYPY_BCTAG%%.opt-2.pyc
+%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__main__.py
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/__main__%%PYPY_BCTAG%%.pyc
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/__main__%%PYPY_BCTAG%%.opt-1.pyc
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/__main__%%PYPY_BCTAG%%.opt-2.pyc
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/commands.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/commands%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/commands%%PYPY_BCTAG%%.opt-1.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/commands%%PYPY_BCTAG%%.opt-2.pyc
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/completer.py
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/completer%%PYPY_BCTAG%%.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/completer%%PYPY_BCTAG%%.opt-1.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/completer%%PYPY_BCTAG%%.opt-2.pyc
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/completing_reader.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/completing_reader%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/completing_reader%%PYPY_BCTAG%%.opt-1.pyc
@@ -3729,10 +3683,6 @@
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/console%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/console%%PYPY_BCTAG%%.opt-1.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/console%%PYPY_BCTAG%%.opt-2.pyc
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/copy_code.py
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/copy_code%%PYPY_BCTAG%%.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/copy_code%%PYPY_BCTAG%%.opt-1.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/copy_code%%PYPY_BCTAG%%.opt-2.pyc
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/curses.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/curses%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/curses%%PYPY_BCTAG%%.opt-1.pyc
@@ -3753,26 +3703,15 @@
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/keymap%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/keymap%%PYPY_BCTAG%%.opt-1.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/keymap%%PYPY_BCTAG%%.opt-2.pyc
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/keymaps.py
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/keymaps%%PYPY_BCTAG%%.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/keymaps%%PYPY_BCTAG%%.opt-1.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/keymaps%%PYPY_BCTAG%%.opt-2.pyc
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/module_lister.py
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/module_lister%%PYPY_BCTAG%%.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/module_lister%%PYPY_BCTAG%%.opt-1.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/module_lister%%PYPY_BCTAG%%.opt-2.pyc
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/pygame_console.py
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/pygame_console%%PYPY_BCTAG%%.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/pygame_console%%PYPY_BCTAG%%.opt-1.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/pygame_console%%PYPY_BCTAG%%.opt-2.pyc
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/pygame_keymap.py
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/pygame_keymap%%PYPY_BCTAG%%.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/pygame_keymap%%PYPY_BCTAG%%.opt-1.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/pygame_keymap%%PYPY_BCTAG%%.opt-2.pyc
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/python_reader.py
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/python_reader%%PYPY_BCTAG%%.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/python_reader%%PYPY_BCTAG%%.opt-1.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/python_reader%%PYPY_BCTAG%%.opt-2.pyc
+%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/main.py
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/main%%PYPY_BCTAG%%.pyc
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/main%%PYPY_BCTAG%%.opt-1.pyc
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/main%%PYPY_BCTAG%%.opt-2.pyc
+%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/mypy.ini
+%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/pager.py
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/pager%%PYPY_BCTAG%%.pyc
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/pager%%PYPY_BCTAG%%.opt-1.pyc
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/pager%%PYPY_BCTAG%%.opt-2.pyc
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/reader.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/reader%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/reader%%PYPY_BCTAG%%.opt-1.pyc
@@ -3789,10 +3728,10 @@
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/trace%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/trace%%PYPY_BCTAG%%.opt-1.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/trace%%PYPY_BCTAG%%.opt-2.pyc
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/unicodedata_.py
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/unicodedata_%%PYPY_BCTAG%%.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/unicodedata_%%PYPY_BCTAG%%.opt-1.pyc
-%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/unicodedata_%%PYPY_BCTAG%%.opt-2.pyc
+%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/types.py
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/types%%PYPY_BCTAG%%.pyc
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/types%%PYPY_BCTAG%%.opt-1.pyc
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/types%%PYPY_BCTAG%%.opt-2.pyc
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/unix_console.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/unix_console%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/unix_console%%PYPY_BCTAG%%.opt-1.pyc
@@ -3801,6 +3740,14 @@
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/unix_eventqueue%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/unix_eventqueue%%PYPY_BCTAG%%.opt-1.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/unix_eventqueue%%PYPY_BCTAG%%.opt-2.pyc
+%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/utils.py
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/utils%%PYPY_BCTAG%%.pyc
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/utils%%PYPY_BCTAG%%.opt-1.pyc
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/utils%%PYPY_BCTAG%%.opt-2.pyc
+%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/windows_console.py
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/windows_console%%PYPY_BCTAG%%.pyc
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/windows_console%%PYPY_BCTAG%%.opt-1.pyc
+%%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/pyrepl/__pycache__/windows_console%%PYPY_BCTAG%%.opt-2.pyc
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/queue.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/queue%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/queue%%PYPY_BCTAG%%.opt-1.pyc
@@ -3817,7 +3764,6 @@
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/re%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/re%%PYPY_BCTAG%%.opt-1.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/re%%PYPY_BCTAG%%.opt-2.pyc
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/readline.egg-info
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/readline.py
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/readline%%PYPY_BCTAG%%.pyc
 %%BYTECOMPILE%%%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/__pycache__/readline%%PYPY_BCTAG%%.opt-1.pyc
@@ -4345,7 +4291,6 @@
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/test/pyclbr_input.py
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/test/pydoc_mod.py
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/test/pydocfodder.py
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/test/pystone.py
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/test/pythoninfo.py
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/test/randv2_32.pck
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/test/randv2_64.pck
@@ -4855,7 +4800,6 @@
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/test/test_long.py
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/test/test_longexp.py
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/test/test_lzma.py
-%%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/test/test_macurl2path.py
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/test/test_mailbox.py
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/test/test_mailcap.py
 %%PYPY_DIR%%/lib/%%PYTHON_IMPL_MINOR%%/test/test_marshal.py