From 1497c50b7d81885c1aa42d41fb942e3613e8ab7f Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Fri, 25 Nov 2022 19:30:34 +0000
Subject: [PATCH] use MODPY_PYBUILD

---
 math/py-PyWavelets/Makefile                   |    5 +-
 math/py-PyWavelets/pkg/PLIST                  |   55 +-
 math/py-affine/Makefile                       |    5 +-
 math/py-affine/pkg/PLIST                      |   20 +-
 math/py-cftime/Makefile                       |    5 +-
 math/py-cftime/pkg/PLIST                      |   13 +-
 math/py-ecos/Makefile                         |    5 +-
 math/py-ecos/pkg/PLIST                        |   15 +-
 math/py-graphviz/Makefile                     |    5 +-
 math/py-graphviz/pkg/PLIST                    |   19 +-
 math/py-h5py/Makefile                         |    5 +-
 math/py-h5py/pkg/PLIST                        |   67 +-
 math/py-mpmath/Makefile                       |    4 +-
 math/py-mpmath/pkg/PLIST                      |   98 +-
 math/py-netcdf4/Makefile                      |    4 +-
 math/py-netcdf4/pkg/PLIST                     |   16 +-
 math/py-networkx/Makefile                     |    4 +-
 math/py-networkx/pkg/PLIST                    |  577 ++++++-
 math/py-osqp/Makefile                         |    5 +-
 math/py-osqp/pkg/PLIST                        |   36 +-
 math/py-patsy/Makefile                        |    5 +-
 math/py-patsy/pkg/PLIST                       |   42 +-
 math/py-pysmt/Makefile                        |    4 +-
 math/py-pysmt/pkg/PLIST                       |  140 +-
 math/py-scs/Makefile                          |    5 +-
 math/py-scs/pkg/PLIST                         |   14 +-
 math/py-snuggs/Makefile                       |    5 +-
 math/py-snuggs/pkg/PLIST                      |   15 +-
 math/py-sympy/Makefile                        |    4 +-
 math/py-sympy/pkg/PLIST                       | 1393 ++++++++++++++++-
 math/py-tables/Makefile                       |   15 +-
 math/py-tables/pkg/PLIST                      |   91 +-
 security/ROPgadget/Makefile                   |    4 +-
 security/ROPgadget/pkg/PLIST                  |   33 +-
 security/angrop/Makefile                      |    4 +-
 security/angrop/pkg/PLIST                     |   20 +-
 security/boofuzz/Makefile                     |    4 +-
 security/boofuzz/pkg/PLIST                    |   95 +-
 security/fierce/Makefile                      |    4 +-
 security/fierce/pkg/PLIST                     |   16 +-
 security/hashid/Makefile                      |    4 +-
 security/hashid/pkg/PLIST                     |   14 +-
 security/knockpy/Makefile                     |    4 +-
 security/knockpy/pkg/PLIST                    |   17 +-
 security/plaso/Makefile                       |    4 +-
 security/plaso/pkg/PLIST                      |  445 +++++-
 security/pwntools/Makefile                    |    4 +-
 security/pwntools/pkg/PLIST                   |  203 ++-
 security/py-M2Crypto/Makefile                 |    4 +-
 security/py-M2Crypto/pkg/PLIST                |   50 +-
 security/py-artifacts/Makefile                |    5 +-
 security/py-artifacts/pkg/PLIST               |   23 +-
 security/py-asn1crypto/Makefile               |    4 +-
 security/py-asn1crypto/pkg/PLIST              |   35 +-
 security/py-axolotl-curve25519/Makefile       |    4 +-
 security/py-axolotl-curve25519/pkg/PLIST      |   10 +-
 security/py-axolotl/Makefile                  |    4 +-
 security/py-axolotl/pkg/PLIST                 |  101 +-
 security/py-cryptodome-test-vectors/Makefile  |    4 +-
 security/py-cryptodome-test-vectors/pkg/PLIST |   13 +-
 security/py-dfdatetime/Makefile               |    4 +-
 security/py-dfdatetime/pkg/PLIST              |   33 +-
 security/py-dfvfs/Makefile                    |    4 +-
 security/py-dfvfs/pkg/PLIST                   |  244 ++-
 security/py-dfwinreg/Makefile                 |    4 +-
 security/py-dfwinreg/pkg/PLIST                |   25 +-
 security/py-ecdsa/Makefile                    |    5 +-
 security/py-ecdsa/pkg/PLIST                   |   41 +-
 security/py-fickling/Makefile                 |    5 +-
 security/py-fickling/pkg/PLIST                |   20 +-
 security/py-hkdf/Makefile                     |    4 +-
 security/py-hkdf/pkg/PLIST                    |   11 +-
 security/py-hvac/Makefile                     |    4 +-
 security/py-hvac/pkg/PLIST                    |   76 +-
 security/py-josepy/Makefile                   |    5 +-
 security/py-josepy/pkg/PLIST                  |   24 +-
 security/py-libnacl/Makefile                  |    5 +-
 security/py-libnacl/pkg/PLIST                 |   24 +-
 security/py-oauthlib/Makefile                 |    5 +-
 security/py-oauthlib/pkg/PLIST                |   80 +-
 security/py-passlib/Makefile                  |    5 +-
 security/py-passlib/pkg/PLIST                 |  109 +-
 security/py-pbkdf2/Makefile                   |    4 +-
 security/py-pbkdf2/pkg/PLIST                  |   12 +-
 security/py-potr/Makefile                     |    4 +-
 security/py-potr/pkg/PLIST                    |   20 +-
 security/py-pykeepass/Makefile                |    4 +-
 security/py-pykeepass/pkg/PLIST               |   30 +-
 security/py-requests-aws4auth/Makefile        |    4 +-
 security/py-requests-aws4auth/pkg/PLIST       |   16 +-
 security/py-ropper/Makefile                   |    4 +-
 security/py-ropper/pkg/PLIST                  |   49 +-
 security/py-rsa/Makefile                      |    5 +-
 security/py-rsa/pkg/PLIST                     |   29 +-
 security/py-scp/Makefile                      |    4 +-
 security/py-scp/pkg/PLIST                     |   13 +-
 security/py-scrypt/Makefile                   |    4 +-
 security/py-scrypt/pkg/PLIST                  |   18 +-
 security/py-secretstorage/Makefile            |    5 +-
 security/py-secretstorage/pkg/PLIST           |   19 +-
 security/py-service_identity/Makefile         |    5 +-
 security/py-service_identity/pkg/PLIST        |   20 +-
 security/py-spake2/Makefile                   |    4 +-
 security/py-spake2/pkg/PLIST                  |   34 +-
 security/py-trustme/Makefile                  |    5 +-
 security/py-trustme/pkg/PLIST                 |   18 +-
 security/routersploit/Makefile                |    4 +-
 security/routersploit/pkg/PLIST               |  510 +++++-
 security/ssh-audit/Makefile                   |    4 +-
 security/ssh-audit/pkg/PLIST                  |   44 +-
 security/wfuzz/Makefile                       |    4 +-
 security/wfuzz/pkg/PLIST                      |  121 +-
 security/yubiserve/Makefile                   |    4 +-
 security/yubiserve/pkg/PLIST                  |   24 +-
 114 files changed, 5104 insertions(+), 506 deletions(-)

diff --git a/math/py-PyWavelets/Makefile b/math/py-PyWavelets/Makefile
index 79682a594a9..277e21859d5 100644
--- a/math/py-PyWavelets/Makefile
+++ b/math/py-PyWavelets/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	1.1.1
 DISTNAME =		PyWavelets-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		math
-REVISION =		5
+REVISION =		6
 
 WANTLIB =  pthread
 MAINTAINER =		Paul Irofti <paul@irofti.net>
@@ -25,7 +25,6 @@ BUILD_DEPENDS =		lang/cython${MODPY_FLAVOR} \
 TEST_DEPENDS =		devel/py-test${MODPY_FLAVOR}
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =	setuptools
 
 .include <bsd.port.mk>
diff --git a/math/py-PyWavelets/pkg/PLIST b/math/py-PyWavelets/pkg/PLIST
index 835cec2bda2..a5b694f88cc 100644
--- a/math/py-PyWavelets/pkg/PLIST
+++ b/math/py-PyWavelets/pkg/PLIST
@@ -1,28 +1,45 @@
 @pkgpath math/py-PyWavelets
-lib/python${MODPY_VERSION}/site-packages/PyWavelets-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/PyWavelets-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/PyWavelets-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/PyWavelets-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/PyWavelets-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/PyWavelets-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/PyWavelets-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/PyWavelets-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/PyWavelets-${MODPY_EGG_VERSION}.dist-info/LICENSES_bundled.txt
+lib/python${MODPY_VERSION}/site-packages/PyWavelets-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/PyWavelets-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/PyWavelets-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/PyWavelets-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pywt/
 lib/python${MODPY_VERSION}/site-packages/pywt/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}_c99_config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}_c99_config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}_cwt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}_cwt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}_doc_utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}_doc_utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}_dwt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}_dwt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}_functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}_functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}_multidim.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}_multidim.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}_multilevel.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}_multilevel.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}_pytest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}_pytest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}_pytesttester.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}_pytesttester.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}_swt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}_swt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}_thresholding.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}_thresholding.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}_utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}_utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}_wavelet_packets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}_wavelet_packets.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pywt/_c99_config.py
 lib/python${MODPY_VERSION}/site-packages/pywt/_cwt.py
@@ -31,6 +48,7 @@ lib/python${MODPY_VERSION}/site-packages/pywt/_dwt.py
 lib/python${MODPY_VERSION}/site-packages/pywt/_extensions/
 lib/python${MODPY_VERSION}/site-packages/pywt/_extensions/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pywt/_extensions/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pywt/_extensions/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/_extensions/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 @so lib/python${MODPY_VERSION}/site-packages/pywt/_extensions/_cwt.${MODPY_PYC_MAGIC_TAG}so
 @so lib/python${MODPY_VERSION}/site-packages/pywt/_extensions/_dwt.${MODPY_PYC_MAGIC_TAG}so
@@ -49,9 +67,13 @@ lib/python${MODPY_VERSION}/site-packages/pywt/conftest.py
 lib/python${MODPY_VERSION}/site-packages/pywt/data/
 lib/python${MODPY_VERSION}/site-packages/pywt/data/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pywt/data/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pywt/data/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/data/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/data/${MODPY_PYCACHE}_readers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/data/${MODPY_PYCACHE}_readers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/data/${MODPY_PYCACHE}_wavelab_signals.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/data/${MODPY_PYCACHE}_wavelab_signals.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/data/${MODPY_PYCACHE}create_dat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/data/${MODPY_PYCACHE}create_dat.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pywt/data/_readers.py
 lib/python${MODPY_VERSION}/site-packages/pywt/data/_wavelab_signals.py
@@ -63,28 +85,49 @@ lib/python${MODPY_VERSION}/site-packages/pywt/data/ecg.npy
 lib/python${MODPY_VERSION}/site-packages/pywt/data/sst_nino3.npz
 lib/python${MODPY_VERSION}/site-packages/pywt/tests/
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test__pywt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test__pywt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_concurrent.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_concurrent.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_cwt_wavelets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_cwt_wavelets.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_data.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_data.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_deprecations.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_deprecations.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_doc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_doc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_dwt_idwt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_dwt_idwt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_matlab_compatibility.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_matlab_compatibility.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_matlab_compatibility_cwt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_matlab_compatibility_cwt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_modes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_modes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_multidim.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_multidim.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_multilevel.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_multilevel.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_perfect_reconstruction.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_perfect_reconstruction.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_swt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_swt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_thresholding.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_thresholding.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_wavelet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_wavelet.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_wp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_wp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_wp2d.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/tests/${MODPY_PYCACHE}test_wp2d.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pywt/tests/data/
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pywt/tests/data/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pywt/tests/data/${MODPY_PYCACHE}generate_matlab_data.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/tests/data/${MODPY_PYCACHE}generate_matlab_data.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pywt/tests/data/${MODPY_PYCACHE}generate_matlab_data_cwt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pywt/tests/data/${MODPY_PYCACHE}generate_matlab_data_cwt.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pywt/tests/data/cwt_matlabR2015b_result.npz
 lib/python${MODPY_VERSION}/site-packages/pywt/tests/data/dwt_matlabR2012a_result.npz
diff --git a/math/py-affine/Makefile b/math/py-affine/Makefile
index 075e4a901de..d5b6b1160a2 100644
--- a/math/py-affine/Makefile
+++ b/math/py-affine/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	2.3.1
 DISTNAME =		affine-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		math
-REVISION =		0
+REVISION =		1
 
 MAINTAINER =		Martin Reindl <martin@catai.org>
 
@@ -14,8 +14,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =	setuptools
 
 TEST_DEPENDS =		devel/py-test-cov${MODPY_FLAVOR}
 
diff --git a/math/py-affine/pkg/PLIST b/math/py-affine/pkg/PLIST
index 54c4f7675d7..6773c1e90aa 100644
--- a/math/py-affine/pkg/PLIST
+++ b/math/py-affine/pkg/PLIST
@@ -1,21 +1,27 @@
 @pkgpath math/py-affine
 lib/python${MODPY_VERSION}/site-packages/affine/
-lib/python${MODPY_VERSION}/site-packages/affine-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/affine-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/affine-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/affine-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/affine-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/affine-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
-lib/python${MODPY_VERSION}/site-packages/affine-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/zip-safe
+lib/python${MODPY_VERSION}/site-packages/affine-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/affine-${MODPY_EGG_VERSION}.dist-info/AUTHORS.txt
+lib/python${MODPY_VERSION}/site-packages/affine-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/affine-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/affine-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/affine-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/affine-${MODPY_EGG_VERSION}.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/affine-${MODPY_EGG_VERSION}.dist-info/zip-safe
 lib/python${MODPY_VERSION}/site-packages/affine/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/affine/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/affine/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/affine/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/affine/tests/
 lib/python${MODPY_VERSION}/site-packages/affine/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/affine/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/affine/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/affine/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/affine/tests/${MODPY_PYCACHE}test_pickle.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/affine/tests/${MODPY_PYCACHE}test_pickle.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/affine/tests/${MODPY_PYCACHE}test_rotation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/affine/tests/${MODPY_PYCACHE}test_rotation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/affine/tests/${MODPY_PYCACHE}test_transform.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/affine/tests/${MODPY_PYCACHE}test_transform.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/affine/tests/test_pickle.py
 lib/python${MODPY_VERSION}/site-packages/affine/tests/test_rotation.py
diff --git a/math/py-cftime/Makefile b/math/py-cftime/Makefile
index 56bef862058..929835ea2c4 100644
--- a/math/py-cftime/Makefile
+++ b/math/py-cftime/Makefile
@@ -3,7 +3,7 @@ COMMENT=	time and date handling utility functions from netcdf4-python
 MODPY_EGG_VERSION= 	1.6.1
 DISTNAME=		cftime-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
-REVISION=		0
+REVISION=		1
 
 CATEGORIES=		math
 
@@ -17,9 +17,8 @@ PERMIT_PACKAGE=		Yes
 WANTLIB=		pthread
 
 MODULES=		lang/python
-MODPY_SETUPTOOLS=	Yes
+MODPY_PYBUILD =	setuptools
 MODPY_PI=		Yes
-MODPY_PYTEST=		Yes
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/math/py-cftime/pkg/PLIST b/math/py-cftime/pkg/PLIST
index bd87ec304ff..d554a9a70bd 100644
--- a/math/py-cftime/pkg/PLIST
+++ b/math/py-cftime/pkg/PLIST
@@ -1,13 +1,14 @@
 @conflict py-cftime-*
 @pkgpath math/py-cftime
 lib/python${MODPY_VERSION}/site-packages/cftime/
-lib/python${MODPY_VERSION}/site-packages/cftime-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/cftime-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/cftime-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/cftime-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/cftime-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/cftime-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/cftime-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/cftime-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/cftime-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/cftime-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/cftime-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/cftime-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/cftime/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/cftime/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/cftime/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/cftime/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 @so lib/python${MODPY_VERSION}/site-packages/cftime/_cftime.${MODPY_PYC_MAGIC_TAG}so
diff --git a/math/py-ecos/Makefile b/math/py-ecos/Makefile
index dd11d5cba20..3372d106f90 100644
--- a/math/py-ecos/Makefile
+++ b/math/py-ecos/Makefile
@@ -5,7 +5,7 @@ DISTNAME =		ecos-${MODPY_EGG_VERSION}
 V =			${MODPY_EGG_VERSION:S/post//}
 PKGNAME =		py-ecos-${V}
 CATEGORIES =		math
-REVISION =		6
+REVISION =		7
 
 WANTLIB =  pthread
 MAINTAINER =		Paul Irofti <paul@irofti.net>
@@ -20,8 +20,7 @@ RUN_DEPENDS =		math/py-numpy${MODPY_FLAVOR} \
 			math/py-scipy${MODPY_FLAVOR}
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =	setuptools
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/math/py-ecos/pkg/PLIST b/math/py-ecos/pkg/PLIST
index 5324a614d72..fa99ad331db 100644
--- a/math/py-ecos/pkg/PLIST
+++ b/math/py-ecos/pkg/PLIST
@@ -2,16 +2,19 @@
 @pkgpath math/py-ecos
 @so lib/python${MODPY_VERSION}/site-packages/_ecos.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/ecos/
-lib/python${MODPY_VERSION}/site-packages/ecos-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/ecos-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/ecos-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/ecos-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/ecos-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/ecos-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/ecos-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/ecos-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/ecos-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/ecos-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/ecos-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/ecos-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/ecos/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ecos/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ecos/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecos/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecos/${MODPY_PYCACHE}ecos.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecos/${MODPY_PYCACHE}ecos.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecos/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecos/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ecos/ecos.py
 lib/python${MODPY_VERSION}/site-packages/ecos/version.py
diff --git a/math/py-graphviz/Makefile b/math/py-graphviz/Makefile
index a146ad0b172..f7ec02baf37 100644
--- a/math/py-graphviz/Makefile
+++ b/math/py-graphviz/Makefile
@@ -3,7 +3,7 @@ COMMENT =		simple Python interface for Graphviz
 MODPY_EGG_VERSION =	0.14.1
 DISTNAME =		graphviz-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		3
+REVISION =		4
 
 CATEGORIES =		math
 
@@ -14,8 +14,7 @@ EXTRACT_SUFX =		.zip
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =	setuptools
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/math/py-graphviz/pkg/PLIST b/math/py-graphviz/pkg/PLIST
index 6f8bfeeddb6..1f5c89dbecf 100644
--- a/math/py-graphviz/pkg/PLIST
+++ b/math/py-graphviz/pkg/PLIST
@@ -1,19 +1,26 @@
 @pkgpath math/py-graphviz
 lib/python${MODPY_VERSION}/site-packages/graphviz/
-lib/python${MODPY_VERSION}/site-packages/graphviz-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/graphviz-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/graphviz-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/graphviz-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/graphviz-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/graphviz-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/graphviz-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/graphviz-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/graphviz-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/graphviz-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/graphviz-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/graphviz-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/graphviz/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/graphviz/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/graphviz/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/graphviz/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/graphviz/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/graphviz/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/graphviz/${MODPY_PYCACHE}backend.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/graphviz/${MODPY_PYCACHE}backend.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/graphviz/${MODPY_PYCACHE}dot.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/graphviz/${MODPY_PYCACHE}dot.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/graphviz/${MODPY_PYCACHE}files.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/graphviz/${MODPY_PYCACHE}files.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/graphviz/${MODPY_PYCACHE}lang.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/graphviz/${MODPY_PYCACHE}lang.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/graphviz/${MODPY_PYCACHE}tools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/graphviz/${MODPY_PYCACHE}tools.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/graphviz/_compat.py
 lib/python${MODPY_VERSION}/site-packages/graphviz/backend.py
diff --git a/math/py-h5py/Makefile b/math/py-h5py/Makefile
index b69555359f3..0db4d0e3503 100644
--- a/math/py-h5py/Makefile
+++ b/math/py-h5py/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	3.7.0
 DISTNAME =		h5py-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		math
-REVISION =		0
+REVISION =		1
 
 HOMEPAGE =		https://www.h5py.org/
 MAINTAINER =		Martin Reindl <martin@catai.org>
@@ -16,9 +16,8 @@ COMPILER =		base-clang ports-gcc
 COMPILER_LANGS =	c
 
 MODULES =		lang/python
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 MODPY_PI =		Yes
-MODPY_PYTEST =		Yes
 
 FLAVORS =	python3
 FLAVOR =	python3
diff --git a/math/py-h5py/pkg/PLIST b/math/py-h5py/pkg/PLIST
index 3b17939bc5a..7f4f9123440 100644
--- a/math/py-h5py/pkg/PLIST
+++ b/math/py-h5py/pkg/PLIST
@@ -1,33 +1,50 @@
 lib/python${MODPY_VERSION}/site-packages/h5py/
-lib/python${MODPY_VERSION}/site-packages/h5py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/h5py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/h5py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/h5py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/h5py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/h5py-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/h5py-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/h5py-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/h5py-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/h5py-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/h5py-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/h5py-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/h5py/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/h5py/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/h5py/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/${MODPY_PYCACHE}h5py_warnings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/${MODPY_PYCACHE}h5py_warnings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/${MODPY_PYCACHE}ipy_completer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/${MODPY_PYCACHE}ipy_completer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 @so lib/python${MODPY_VERSION}/site-packages/h5py/_conv.${MODPY_PYC_MAGIC_TAG}so
 @so lib/python${MODPY_VERSION}/site-packages/h5py/_errors.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/h5py/_hl/
 lib/python${MODPY_VERSION}/site-packages/h5py/_hl/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/h5py/_hl/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/h5py/_hl/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/_hl/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/_hl/${MODPY_PYCACHE}attrs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/_hl/${MODPY_PYCACHE}attrs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/_hl/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/_hl/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/_hl/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/_hl/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/_hl/${MODPY_PYCACHE}dataset.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/_hl/${MODPY_PYCACHE}dataset.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/_hl/${MODPY_PYCACHE}datatype.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/_hl/${MODPY_PYCACHE}datatype.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/_hl/${MODPY_PYCACHE}dims.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/_hl/${MODPY_PYCACHE}dims.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/_hl/${MODPY_PYCACHE}files.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/_hl/${MODPY_PYCACHE}files.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/_hl/${MODPY_PYCACHE}filters.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/_hl/${MODPY_PYCACHE}filters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/_hl/${MODPY_PYCACHE}group.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/_hl/${MODPY_PYCACHE}group.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/_hl/${MODPY_PYCACHE}selections.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/_hl/${MODPY_PYCACHE}selections.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/_hl/${MODPY_PYCACHE}selections2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/_hl/${MODPY_PYCACHE}selections2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/_hl/${MODPY_PYCACHE}vds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/_hl/${MODPY_PYCACHE}vds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/h5py/_hl/attrs.py
 lib/python${MODPY_VERSION}/site-packages/h5py/_hl/base.py
@@ -67,44 +84,78 @@ lib/python${MODPY_VERSION}/site-packages/h5py/ipy_completer.py
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_attribute_create.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_attribute_create.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_attrs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_attrs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_attrs_data.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_attrs_data.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_big_endian_file.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_big_endian_file.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_completions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_completions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_dataset.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_dataset.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_dataset_getitem.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_dataset_getitem.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_dataset_swmr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_dataset_swmr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_datatype.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_datatype.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_dimension_scales.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_dimension_scales.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_dims_dimensionproxy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_dims_dimensionproxy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_dtype.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_dtype.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_errors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_errors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_file.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_file.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_file2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_file2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_file_alignment.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_file_alignment.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_file_image.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_file_image.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_filters.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_filters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_group.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_group.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_h5.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_h5.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_h5d_direct_chunk.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_h5d_direct_chunk.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_h5f.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_h5f.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_h5o.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_h5o.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_h5p.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_h5p.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_h5pl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_h5pl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_h5t.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_h5t.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_objects.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_objects.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_selections.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_selections.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_slicing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/${MODPY_PYCACHE}test_slicing.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/common.py
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/conftest.py
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/data_files/
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/data_files/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/h5py/tests/data_files/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/data_files/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/data_files/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/data_files/vlen_string_dset.h5
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/data_files/vlen_string_dset_utc.h5
@@ -142,9 +193,13 @@ lib/python${MODPY_VERSION}/site-packages/h5py/tests/test_slicing.py
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/test_vds/
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/test_vds/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/h5py/tests/test_vds/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/test_vds/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/test_vds/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/test_vds/${MODPY_PYCACHE}test_highlevel_vds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/test_vds/${MODPY_PYCACHE}test_highlevel_vds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/test_vds/${MODPY_PYCACHE}test_lowlevel_vds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/test_vds/${MODPY_PYCACHE}test_lowlevel_vds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/h5py/tests/test_vds/${MODPY_PYCACHE}test_virtual_source.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/test_vds/${MODPY_PYCACHE}test_virtual_source.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/test_vds/test_highlevel_vds.py
 lib/python${MODPY_VERSION}/site-packages/h5py/tests/test_vds/test_lowlevel_vds.py
diff --git a/math/py-mpmath/Makefile b/math/py-mpmath/Makefile
index f1d3cf4fbda..ab421a7ff7d 100644
--- a/math/py-mpmath/Makefile
+++ b/math/py-mpmath/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	1.2.1
 DISTNAME =		mpmath-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		math
-REVISION =		0
+REVISION =		1
 
 HOMEPAGE =		http://mpmath.org/
 
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 MODPY_PYTEST_ARGS =	mpmath
 
 FLAVORS =		python3
diff --git a/math/py-mpmath/pkg/PLIST b/math/py-mpmath/pkg/PLIST
index 62e228e5ed3..ae24915cdd7 100644
--- a/math/py-mpmath/pkg/PLIST
+++ b/math/py-mpmath/pkg/PLIST
@@ -1,37 +1,59 @@
 @pkgpath math/py-mpmath
 lib/python${MODPY_VERSION}/site-packages/mpmath/
-lib/python${MODPY_VERSION}/site-packages/mpmath-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/mpmath-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/mpmath-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/mpmath-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/mpmath-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/mpmath-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/mpmath-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/mpmath-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/mpmath-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/mpmath-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/mpmath-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/mpmath-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/mpmath/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mpmath/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/mpmath/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/${MODPY_PYCACHE}ctx_base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/${MODPY_PYCACHE}ctx_base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/${MODPY_PYCACHE}ctx_fp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/${MODPY_PYCACHE}ctx_fp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/${MODPY_PYCACHE}ctx_iv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/${MODPY_PYCACHE}ctx_iv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/${MODPY_PYCACHE}ctx_mp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/${MODPY_PYCACHE}ctx_mp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/${MODPY_PYCACHE}ctx_mp_python.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/${MODPY_PYCACHE}ctx_mp_python.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/${MODPY_PYCACHE}function_docs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/${MODPY_PYCACHE}function_docs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/${MODPY_PYCACHE}identification.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/${MODPY_PYCACHE}identification.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/${MODPY_PYCACHE}math2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/${MODPY_PYCACHE}math2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/${MODPY_PYCACHE}rational.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/${MODPY_PYCACHE}rational.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/${MODPY_PYCACHE}usertools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/${MODPY_PYCACHE}usertools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/${MODPY_PYCACHE}visualization.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/${MODPY_PYCACHE}visualization.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mpmath/calculus/
 lib/python${MODPY_VERSION}/site-packages/mpmath/calculus/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mpmath/calculus/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/mpmath/calculus/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/calculus/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/calculus/${MODPY_PYCACHE}approximation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/calculus/${MODPY_PYCACHE}approximation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/calculus/${MODPY_PYCACHE}calculus.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/calculus/${MODPY_PYCACHE}calculus.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/calculus/${MODPY_PYCACHE}differentiation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/calculus/${MODPY_PYCACHE}differentiation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/calculus/${MODPY_PYCACHE}extrapolation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/calculus/${MODPY_PYCACHE}extrapolation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/calculus/${MODPY_PYCACHE}inverselaplace.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/calculus/${MODPY_PYCACHE}inverselaplace.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/calculus/${MODPY_PYCACHE}odes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/calculus/${MODPY_PYCACHE}odes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/calculus/${MODPY_PYCACHE}optimization.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/calculus/${MODPY_PYCACHE}optimization.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/calculus/${MODPY_PYCACHE}polynomials.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/calculus/${MODPY_PYCACHE}polynomials.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/calculus/${MODPY_PYCACHE}quadrature.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/calculus/${MODPY_PYCACHE}quadrature.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mpmath/calculus/approximation.py
 lib/python${MODPY_VERSION}/site-packages/mpmath/calculus/calculus.py
@@ -51,18 +73,31 @@ lib/python${MODPY_VERSION}/site-packages/mpmath/function_docs.py
 lib/python${MODPY_VERSION}/site-packages/mpmath/functions/
 lib/python${MODPY_VERSION}/site-packages/mpmath/functions/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mpmath/functions/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/mpmath/functions/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/functions/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/functions/${MODPY_PYCACHE}bessel.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/functions/${MODPY_PYCACHE}bessel.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/functions/${MODPY_PYCACHE}elliptic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/functions/${MODPY_PYCACHE}elliptic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/functions/${MODPY_PYCACHE}expintegrals.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/functions/${MODPY_PYCACHE}expintegrals.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/functions/${MODPY_PYCACHE}factorials.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/functions/${MODPY_PYCACHE}factorials.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/functions/${MODPY_PYCACHE}functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/functions/${MODPY_PYCACHE}functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/functions/${MODPY_PYCACHE}hypergeometric.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/functions/${MODPY_PYCACHE}hypergeometric.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/functions/${MODPY_PYCACHE}orthogonal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/functions/${MODPY_PYCACHE}orthogonal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/functions/${MODPY_PYCACHE}qfunctions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/functions/${MODPY_PYCACHE}qfunctions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/functions/${MODPY_PYCACHE}rszeta.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/functions/${MODPY_PYCACHE}rszeta.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/functions/${MODPY_PYCACHE}theta.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/functions/${MODPY_PYCACHE}theta.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/functions/${MODPY_PYCACHE}zeta.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/functions/${MODPY_PYCACHE}zeta.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/functions/${MODPY_PYCACHE}zetazeros.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/functions/${MODPY_PYCACHE}zetazeros.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mpmath/functions/bessel.py
 lib/python${MODPY_VERSION}/site-packages/mpmath/functions/elliptic.py
@@ -80,14 +115,23 @@ lib/python${MODPY_VERSION}/site-packages/mpmath/identification.py
 lib/python${MODPY_VERSION}/site-packages/mpmath/libmp/
 lib/python${MODPY_VERSION}/site-packages/mpmath/libmp/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mpmath/libmp/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/mpmath/libmp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/libmp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/libmp/${MODPY_PYCACHE}backend.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/libmp/${MODPY_PYCACHE}backend.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/libmp/${MODPY_PYCACHE}gammazeta.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/libmp/${MODPY_PYCACHE}gammazeta.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/libmp/${MODPY_PYCACHE}libelefun.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/libmp/${MODPY_PYCACHE}libelefun.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/libmp/${MODPY_PYCACHE}libhyper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/libmp/${MODPY_PYCACHE}libhyper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/libmp/${MODPY_PYCACHE}libintmath.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/libmp/${MODPY_PYCACHE}libintmath.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/libmp/${MODPY_PYCACHE}libmpc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/libmp/${MODPY_PYCACHE}libmpc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/libmp/${MODPY_PYCACHE}libmpf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/libmp/${MODPY_PYCACHE}libmpf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/libmp/${MODPY_PYCACHE}libmpi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/libmp/${MODPY_PYCACHE}libmpi.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mpmath/libmp/backend.py
 lib/python${MODPY_VERSION}/site-packages/mpmath/libmp/gammazeta.py
@@ -101,11 +145,17 @@ lib/python${MODPY_VERSION}/site-packages/mpmath/math2.py
 lib/python${MODPY_VERSION}/site-packages/mpmath/matrices/
 lib/python${MODPY_VERSION}/site-packages/mpmath/matrices/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mpmath/matrices/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/mpmath/matrices/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/matrices/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/matrices/${MODPY_PYCACHE}calculus.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/matrices/${MODPY_PYCACHE}calculus.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/matrices/${MODPY_PYCACHE}eigen.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/matrices/${MODPY_PYCACHE}eigen.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/matrices/${MODPY_PYCACHE}eigen_symmetric.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/matrices/${MODPY_PYCACHE}eigen_symmetric.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/matrices/${MODPY_PYCACHE}linalg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/matrices/${MODPY_PYCACHE}linalg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/matrices/${MODPY_PYCACHE}matrices.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/matrices/${MODPY_PYCACHE}matrices.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mpmath/matrices/calculus.py
 lib/python${MODPY_VERSION}/site-packages/mpmath/matrices/eigen.py
@@ -116,41 +166,77 @@ lib/python${MODPY_VERSION}/site-packages/mpmath/rational.py
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}extratest_gamma.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}extratest_gamma.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}extratest_zeta.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}extratest_zeta.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}runtests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}runtests.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_basic_ops.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_basic_ops.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_bitwise.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_bitwise.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_calculus.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_calculus.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_compatibility.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_compatibility.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_convert.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_convert.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_diff.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_diff.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_division.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_division.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_eigen.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_eigen.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_eigen_symmetric.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_eigen_symmetric.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_elliptic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_elliptic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_fp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_fp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_functions2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_functions2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_gammazeta.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_gammazeta.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_hp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_hp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_identify.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_identify.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_interval.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_interval.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_levin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_levin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_linalg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_linalg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_matrices.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_matrices.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_mpmath.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_mpmath.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_ode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_ode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_pickle.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_pickle.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_power.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_power.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_quad.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_quad.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_rootfinding.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_rootfinding.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_special.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_special.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_str.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_str.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_summation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_summation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_trig.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_trig.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_visualization.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}test_visualization.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}torture.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/${MODPY_PYCACHE}torture.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/extratest_gamma.py
 lib/python${MODPY_VERSION}/site-packages/mpmath/tests/extratest_zeta.py
diff --git a/math/py-netcdf4/Makefile b/math/py-netcdf4/Makefile
index e01f6c467ae..a1bd513ee09 100644
--- a/math/py-netcdf4/Makefile
+++ b/math/py-netcdf4/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION=	1.6.1
 DISTNAME=		netCDF4-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME:L}
 CATEGORIES=		math
-REVISION=		0
+REVISION=		1
 
 HOMEPAGE=		http://unidata.github.io/netcdf4-python/
 
@@ -14,7 +14,7 @@ MAINTAINER=		Martin Reindl <martin@catai.org>
 PERMIT_PACKAGE=		Yes
 
 MODULES=		lang/python
-MODPY_SETUPTOOLS=	Yes
+MODPY_PYBUILD =	setuptools
 MODPY_PI=		Yes
 
 WANTLIB+=		netcdf pthread
diff --git a/math/py-netcdf4/pkg/PLIST b/math/py-netcdf4/pkg/PLIST
index 25e9820ca98..e2fca9a18fb 100644
--- a/math/py-netcdf4/pkg/PLIST
+++ b/math/py-netcdf4/pkg/PLIST
@@ -3,16 +3,18 @@ bin/nc3tonc4
 bin/nc4tonc3
 bin/ncinfo
 lib/python${MODPY_VERSION}/site-packages/netCDF4/
-lib/python${MODPY_VERSION}/site-packages/netCDF4-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/netCDF4-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/netCDF4-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/netCDF4-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/netCDF4-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/netCDF4-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/netCDF4-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/netCDF4-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/netCDF4-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/netCDF4-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/netCDF4-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/netCDF4-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/netCDF4-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/netCDF4-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/netCDF4/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/netCDF4/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/netCDF4/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netCDF4/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/netCDF4/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/netCDF4/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 @so lib/python${MODPY_VERSION}/site-packages/netCDF4/_netCDF4.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/netCDF4/utils.py
diff --git a/math/py-networkx/Makefile b/math/py-networkx/Makefile
index b07b37310c2..7314524156b 100644
--- a/math/py-networkx/Makefile
+++ b/math/py-networkx/Makefile
@@ -3,7 +3,7 @@ COMMENT =		module for creating and manipulating graphs and networks
 MODPY_EGG_VERSION =	2.6.2
 DISTNAME =		networkx-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		math
 
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/math/py-networkx/pkg/PLIST b/math/py-networkx/pkg/PLIST
index c94d919bfdb..811420d40c3 100644
--- a/math/py-networkx/pkg/PLIST
+++ b/math/py-networkx/pkg/PLIST
@@ -1,90 +1,160 @@
 @pkgpath math/py-networkx
 lib/python${MODPY_VERSION}/site-packages/networkx/
-lib/python${MODPY_VERSION}/site-packages/networkx-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/networkx-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/networkx-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/networkx-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/networkx-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/networkx-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/networkx-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/networkx-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/networkx-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/networkx-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/networkx-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/networkx-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/networkx-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/networkx/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/${MODPY_PYCACHE}convert.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/${MODPY_PYCACHE}convert.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/${MODPY_PYCACHE}convert_matrix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/${MODPY_PYCACHE}convert_matrix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/${MODPY_PYCACHE}exception.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/${MODPY_PYCACHE}exception.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/${MODPY_PYCACHE}relabel.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/${MODPY_PYCACHE}relabel.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}asteroidal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}asteroidal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}boundary.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}boundary.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}bridges.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}bridges.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}chains.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}chains.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}chordal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}chordal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}clique.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}clique.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}cluster.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}cluster.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}communicability_alg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}communicability_alg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}covering.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}covering.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}cuts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}cuts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}cycles.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}cycles.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}d_separation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}d_separation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}dag.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}dag.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}distance_measures.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}distance_measures.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}distance_regular.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}distance_regular.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}dominance.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}dominance.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}dominating.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}dominating.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}efficiency_measures.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}efficiency_measures.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}euler.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}euler.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}graph_hashing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}graph_hashing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}graphical.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}graphical.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}hierarchy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}hierarchy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}hybrid.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}hybrid.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}isolate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}isolate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}link_prediction.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}link_prediction.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}lowest_common_ancestors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}lowest_common_ancestors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}matching.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}matching.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}mis.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}mis.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}moral.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}moral.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}non_randomness.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}non_randomness.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}planar_drawing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}planar_drawing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}planarity.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}planarity.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}reciprocity.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}reciprocity.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}regular.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}regular.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}richclub.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}richclub.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}similarity.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}similarity.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}simple_paths.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}simple_paths.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}smallworld.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}smallworld.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}smetric.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}smetric.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}sparsifiers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}sparsifiers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}structuralholes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}structuralholes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}summarization.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}summarization.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}swap.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}swap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}threshold.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}threshold.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}tournament.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}tournament.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}triads.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}triads.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}vitality.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}vitality.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}voronoi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}voronoi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}wiener.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/${MODPY_PYCACHE}wiener.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/${MODPY_PYCACHE}clique.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/${MODPY_PYCACHE}clique.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/${MODPY_PYCACHE}clustering_coefficient.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/${MODPY_PYCACHE}clustering_coefficient.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/${MODPY_PYCACHE}connectivity.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/${MODPY_PYCACHE}connectivity.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/${MODPY_PYCACHE}distance_measures.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/${MODPY_PYCACHE}distance_measures.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/${MODPY_PYCACHE}dominating_set.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/${MODPY_PYCACHE}dominating_set.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/${MODPY_PYCACHE}kcomponents.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/${MODPY_PYCACHE}kcomponents.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/${MODPY_PYCACHE}matching.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/${MODPY_PYCACHE}matching.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/${MODPY_PYCACHE}maxcut.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/${MODPY_PYCACHE}maxcut.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/${MODPY_PYCACHE}ramsey.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/${MODPY_PYCACHE}ramsey.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/${MODPY_PYCACHE}steinertree.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/${MODPY_PYCACHE}steinertree.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/${MODPY_PYCACHE}traveling_salesman.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/${MODPY_PYCACHE}traveling_salesman.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/${MODPY_PYCACHE}treewidth.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/${MODPY_PYCACHE}treewidth.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/${MODPY_PYCACHE}vertex_cover.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/${MODPY_PYCACHE}vertex_cover.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/clique.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/clustering_coefficient.py
@@ -99,19 +169,33 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/stein
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/${MODPY_PYCACHE}test_approx_clust_coeff.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/${MODPY_PYCACHE}test_approx_clust_coeff.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/${MODPY_PYCACHE}test_clique.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/${MODPY_PYCACHE}test_clique.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/${MODPY_PYCACHE}test_connectivity.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/${MODPY_PYCACHE}test_connectivity.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/${MODPY_PYCACHE}test_distance_measures.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/${MODPY_PYCACHE}test_distance_measures.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/${MODPY_PYCACHE}test_dominating_set.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/${MODPY_PYCACHE}test_dominating_set.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/${MODPY_PYCACHE}test_kcomponents.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/${MODPY_PYCACHE}test_kcomponents.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/${MODPY_PYCACHE}test_matching.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/${MODPY_PYCACHE}test_matching.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/${MODPY_PYCACHE}test_maxcut.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/${MODPY_PYCACHE}test_maxcut.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/${MODPY_PYCACHE}test_ramsey.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/${MODPY_PYCACHE}test_ramsey.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/${MODPY_PYCACHE}test_steinertree.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/${MODPY_PYCACHE}test_steinertree.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/${MODPY_PYCACHE}test_traveling_salesman.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/${MODPY_PYCACHE}test_traveling_salesman.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/${MODPY_PYCACHE}test_treewidth.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/${MODPY_PYCACHE}test_treewidth.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/${MODPY_PYCACHE}test_vertex_cover.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/${MODPY_PYCACHE}test_vertex_cover.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/test_approx_clust_coeff.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/tests/test_clique.py
@@ -132,11 +216,17 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/approximation/verte
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/${MODPY_PYCACHE}connectivity.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/${MODPY_PYCACHE}connectivity.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/${MODPY_PYCACHE}correlation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/${MODPY_PYCACHE}correlation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/${MODPY_PYCACHE}mixing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/${MODPY_PYCACHE}mixing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/${MODPY_PYCACHE}neighbor_degree.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/${MODPY_PYCACHE}neighbor_degree.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/${MODPY_PYCACHE}pairs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/${MODPY_PYCACHE}pairs.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/connectivity.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/correlation.py
@@ -146,12 +236,19 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/pairs
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/tests/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/tests/${MODPY_PYCACHE}base_test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/tests/${MODPY_PYCACHE}base_test.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/tests/${MODPY_PYCACHE}test_connectivity.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/tests/${MODPY_PYCACHE}test_connectivity.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/tests/${MODPY_PYCACHE}test_correlation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/tests/${MODPY_PYCACHE}test_correlation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/tests/${MODPY_PYCACHE}test_mixing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/tests/${MODPY_PYCACHE}test_mixing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/tests/${MODPY_PYCACHE}test_neighbor_degree.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/tests/${MODPY_PYCACHE}test_neighbor_degree.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/tests/${MODPY_PYCACHE}test_pairs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/tests/${MODPY_PYCACHE}test_pairs.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/tests/base_test.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/assortativity/tests/test_connectivity.py
@@ -163,17 +260,29 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/asteroidal.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/${MODPY_PYCACHE}basic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/${MODPY_PYCACHE}basic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/${MODPY_PYCACHE}centrality.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/${MODPY_PYCACHE}centrality.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/${MODPY_PYCACHE}cluster.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/${MODPY_PYCACHE}cluster.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/${MODPY_PYCACHE}covering.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/${MODPY_PYCACHE}covering.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/${MODPY_PYCACHE}edgelist.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/${MODPY_PYCACHE}edgelist.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/${MODPY_PYCACHE}generators.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/${MODPY_PYCACHE}generators.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/${MODPY_PYCACHE}matching.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/${MODPY_PYCACHE}matching.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/${MODPY_PYCACHE}matrix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/${MODPY_PYCACHE}matrix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/${MODPY_PYCACHE}projection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/${MODPY_PYCACHE}projection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/${MODPY_PYCACHE}redundancy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/${MODPY_PYCACHE}redundancy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/${MODPY_PYCACHE}spectral.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/${MODPY_PYCACHE}spectral.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/basic.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/centrality.py
@@ -189,17 +298,29 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/spectral.
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/tests/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/tests/${MODPY_PYCACHE}test_basic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/tests/${MODPY_PYCACHE}test_basic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/tests/${MODPY_PYCACHE}test_centrality.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/tests/${MODPY_PYCACHE}test_centrality.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/tests/${MODPY_PYCACHE}test_cluster.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/tests/${MODPY_PYCACHE}test_cluster.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/tests/${MODPY_PYCACHE}test_covering.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/tests/${MODPY_PYCACHE}test_covering.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/tests/${MODPY_PYCACHE}test_edgelist.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/tests/${MODPY_PYCACHE}test_edgelist.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/tests/${MODPY_PYCACHE}test_generators.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/tests/${MODPY_PYCACHE}test_generators.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/tests/${MODPY_PYCACHE}test_matching.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/tests/${MODPY_PYCACHE}test_matching.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/tests/${MODPY_PYCACHE}test_matrix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/tests/${MODPY_PYCACHE}test_matrix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/tests/${MODPY_PYCACHE}test_project.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/tests/${MODPY_PYCACHE}test_project.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/tests/${MODPY_PYCACHE}test_redundancy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/tests/${MODPY_PYCACHE}test_redundancy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/tests/${MODPY_PYCACHE}test_spectral_bipartivity.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/tests/${MODPY_PYCACHE}test_spectral_bipartivity.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/tests/test_basic.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bipartite/tests/test_centrality.py
@@ -217,26 +338,47 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/bridges.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}betweenness.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}betweenness.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}betweenness_subset.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}betweenness_subset.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}closeness.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}closeness.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}current_flow_betweenness.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}current_flow_betweenness.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}current_flow_betweenness_subset.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}current_flow_betweenness_subset.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}current_flow_closeness.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}current_flow_closeness.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}degree_alg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}degree_alg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}dispersion.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}dispersion.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}eigenvector.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}eigenvector.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}flow_matrix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}flow_matrix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}group.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}group.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}harmonic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}harmonic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}katz.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}katz.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}load.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}load.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}percolation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}percolation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}reaching.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}reaching.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}second_order.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}second_order.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}subgraph_alg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}subgraph_alg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}trophic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}trophic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}voterank_alg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/${MODPY_PYCACHE}voterank_alg.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/betweenness.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/betweenness_subset.py
@@ -259,25 +401,45 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/subgraph
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_betweenness_centrality.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_betweenness_centrality.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_betweenness_centrality_subset.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_betweenness_centrality_subset.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_closeness_centrality.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_closeness_centrality.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_current_flow_betweenness_centrality.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_current_flow_betweenness_centrality.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_current_flow_betweenness_centrality_subset.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_current_flow_betweenness_centrality_subset.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_current_flow_closeness.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_current_flow_closeness.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_degree_centrality.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_degree_centrality.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_dispersion.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_dispersion.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_eigenvector_centrality.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_eigenvector_centrality.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_group.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_group.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_harmonic_centrality.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_harmonic_centrality.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_katz_centrality.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_katz_centrality.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_load_centrality.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_load_centrality.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_percolation_centrality.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_percolation_centrality.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_reaching.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_reaching.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_second_order_centrality.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_second_order_centrality.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_subgraph.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_subgraph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_trophic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_trophic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_voterank.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/${MODPY_PYCACHE}test_voterank.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/test_betweenness_centrality.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/centrality/tests/test_betweenness_centrality_subset.py
@@ -307,9 +469,13 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/cluster.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/coloring/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/coloring/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/coloring/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/coloring/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/coloring/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/coloring/${MODPY_PYCACHE}equitable_coloring.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/coloring/${MODPY_PYCACHE}equitable_coloring.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/coloring/${MODPY_PYCACHE}greedy_coloring.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/coloring/${MODPY_PYCACHE}greedy_coloring.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/coloring/${MODPY_PYCACHE}greedy_coloring_with_interchange.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/coloring/${MODPY_PYCACHE}greedy_coloring_with_interchange.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/coloring/equitable_coloring.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/coloring/greedy_coloring.py
@@ -317,22 +483,34 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/coloring/greedy_col
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/coloring/tests/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/coloring/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/coloring/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/coloring/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/coloring/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/coloring/tests/${MODPY_PYCACHE}test_coloring.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/coloring/tests/${MODPY_PYCACHE}test_coloring.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/coloring/tests/test_coloring.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/communicability_alg.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/${MODPY_PYCACHE}asyn_fluid.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/${MODPY_PYCACHE}asyn_fluid.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/${MODPY_PYCACHE}centrality.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/${MODPY_PYCACHE}centrality.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/${MODPY_PYCACHE}community_utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/${MODPY_PYCACHE}community_utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/${MODPY_PYCACHE}kclique.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/${MODPY_PYCACHE}kclique.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/${MODPY_PYCACHE}kernighan_lin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/${MODPY_PYCACHE}kernighan_lin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/${MODPY_PYCACHE}label_propagation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/${MODPY_PYCACHE}label_propagation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/${MODPY_PYCACHE}lukes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/${MODPY_PYCACHE}lukes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/${MODPY_PYCACHE}modularity_max.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/${MODPY_PYCACHE}modularity_max.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/${MODPY_PYCACHE}quality.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/${MODPY_PYCACHE}quality.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/asyn_fluid.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/centrality.py
@@ -346,15 +524,25 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/quality.p
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/tests/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/tests/${MODPY_PYCACHE}test_asyn_fluid.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/tests/${MODPY_PYCACHE}test_asyn_fluid.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/tests/${MODPY_PYCACHE}test_centrality.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/tests/${MODPY_PYCACHE}test_centrality.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/tests/${MODPY_PYCACHE}test_kclique.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/tests/${MODPY_PYCACHE}test_kclique.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/tests/${MODPY_PYCACHE}test_kernighan_lin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/tests/${MODPY_PYCACHE}test_kernighan_lin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/tests/${MODPY_PYCACHE}test_label_propagation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/tests/${MODPY_PYCACHE}test_label_propagation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/tests/${MODPY_PYCACHE}test_lukes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/tests/${MODPY_PYCACHE}test_lukes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/tests/${MODPY_PYCACHE}test_modularity_max.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/tests/${MODPY_PYCACHE}test_modularity_max.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/tests/${MODPY_PYCACHE}test_quality.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/tests/${MODPY_PYCACHE}test_quality.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/tests/${MODPY_PYCACHE}test_utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/tests/${MODPY_PYCACHE}test_utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/tests/test_asyn_fluid.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/tests/test_centrality.py
@@ -368,12 +556,19 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/community/tests/tes
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/${MODPY_PYCACHE}attracting.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/${MODPY_PYCACHE}attracting.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/${MODPY_PYCACHE}biconnected.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/${MODPY_PYCACHE}biconnected.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/${MODPY_PYCACHE}connected.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/${MODPY_PYCACHE}connected.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/${MODPY_PYCACHE}semiconnected.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/${MODPY_PYCACHE}semiconnected.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/${MODPY_PYCACHE}strongly_connected.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/${MODPY_PYCACHE}strongly_connected.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/${MODPY_PYCACHE}weakly_connected.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/${MODPY_PYCACHE}weakly_connected.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/attracting.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/biconnected.py
@@ -383,12 +578,19 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/strongly
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/tests/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/tests/${MODPY_PYCACHE}test_attracting.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/tests/${MODPY_PYCACHE}test_attracting.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/tests/${MODPY_PYCACHE}test_biconnected.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/tests/${MODPY_PYCACHE}test_biconnected.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/tests/${MODPY_PYCACHE}test_connected.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/tests/${MODPY_PYCACHE}test_connected.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/tests/${MODPY_PYCACHE}test_semiconnected.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/tests/${MODPY_PYCACHE}test_semiconnected.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/tests/${MODPY_PYCACHE}test_strongly_connected.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/tests/${MODPY_PYCACHE}test_strongly_connected.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/tests/${MODPY_PYCACHE}test_weakly_connected.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/tests/${MODPY_PYCACHE}test_weakly_connected.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/tests/test_attracting.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/tests/test_biconnected.py
@@ -400,15 +602,25 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/components/weakly_c
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/${MODPY_PYCACHE}connectivity.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/${MODPY_PYCACHE}connectivity.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/${MODPY_PYCACHE}cuts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/${MODPY_PYCACHE}cuts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/${MODPY_PYCACHE}disjoint_paths.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/${MODPY_PYCACHE}disjoint_paths.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/${MODPY_PYCACHE}edge_augmentation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/${MODPY_PYCACHE}edge_augmentation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/${MODPY_PYCACHE}edge_kcomponents.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/${MODPY_PYCACHE}edge_kcomponents.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/${MODPY_PYCACHE}kcomponents.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/${MODPY_PYCACHE}kcomponents.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/${MODPY_PYCACHE}kcutsets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/${MODPY_PYCACHE}kcutsets.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/${MODPY_PYCACHE}stoerwagner.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/${MODPY_PYCACHE}stoerwagner.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/connectivity.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/cuts.py
@@ -421,14 +633,23 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/stoerw
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/tests/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/tests/${MODPY_PYCACHE}test_connectivity.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/tests/${MODPY_PYCACHE}test_connectivity.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/tests/${MODPY_PYCACHE}test_cuts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/tests/${MODPY_PYCACHE}test_cuts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/tests/${MODPY_PYCACHE}test_disjoint_paths.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/tests/${MODPY_PYCACHE}test_disjoint_paths.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/tests/${MODPY_PYCACHE}test_edge_augmentation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/tests/${MODPY_PYCACHE}test_edge_augmentation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/tests/${MODPY_PYCACHE}test_edge_kcomponents.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/tests/${MODPY_PYCACHE}test_edge_kcomponents.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/tests/${MODPY_PYCACHE}test_kcomponents.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/tests/${MODPY_PYCACHE}test_kcomponents.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/tests/${MODPY_PYCACHE}test_kcutsets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/tests/${MODPY_PYCACHE}test_kcutsets.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/tests/${MODPY_PYCACHE}test_stoer_wagner.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/tests/${MODPY_PYCACHE}test_stoer_wagner.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/tests/test_connectivity.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/connectivity/tests/test_cuts.py
@@ -454,17 +675,29 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/euler.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/${MODPY_PYCACHE}boykovkolmogorov.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/${MODPY_PYCACHE}boykovkolmogorov.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/${MODPY_PYCACHE}capacityscaling.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/${MODPY_PYCACHE}capacityscaling.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/${MODPY_PYCACHE}dinitz_alg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/${MODPY_PYCACHE}dinitz_alg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/${MODPY_PYCACHE}edmondskarp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/${MODPY_PYCACHE}edmondskarp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/${MODPY_PYCACHE}gomory_hu.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/${MODPY_PYCACHE}gomory_hu.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/${MODPY_PYCACHE}maxflow.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/${MODPY_PYCACHE}maxflow.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/${MODPY_PYCACHE}mincost.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/${MODPY_PYCACHE}mincost.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/${MODPY_PYCACHE}networksimplex.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/${MODPY_PYCACHE}networksimplex.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/${MODPY_PYCACHE}preflowpush.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/${MODPY_PYCACHE}preflowpush.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/${MODPY_PYCACHE}shortestaugmentingpath.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/${MODPY_PYCACHE}shortestaugmentingpath.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/boykovkolmogorov.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/capacityscaling.py
@@ -479,11 +712,17 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/shortestaugmen
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/tests/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/tests/${MODPY_PYCACHE}test_gomory_hu.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/tests/${MODPY_PYCACHE}test_gomory_hu.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/tests/${MODPY_PYCACHE}test_maxflow.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/tests/${MODPY_PYCACHE}test_maxflow.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/tests/${MODPY_PYCACHE}test_maxflow_large_graph.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/tests/${MODPY_PYCACHE}test_maxflow_large_graph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/tests/${MODPY_PYCACHE}test_mincost.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/tests/${MODPY_PYCACHE}test_mincost.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/tests/${MODPY_PYCACHE}test_networksimplex.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/tests/${MODPY_PYCACHE}test_networksimplex.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/tests/gl1.gpickle.bz2
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/flow/tests/gw1.gpickle.bz2
@@ -503,13 +742,21 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isolate.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/${MODPY_PYCACHE}ismags.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/${MODPY_PYCACHE}ismags.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/${MODPY_PYCACHE}isomorph.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/${MODPY_PYCACHE}isomorph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/${MODPY_PYCACHE}isomorphvf2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/${MODPY_PYCACHE}isomorphvf2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/${MODPY_PYCACHE}matchhelpers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/${MODPY_PYCACHE}matchhelpers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/${MODPY_PYCACHE}temporalisomorphvf2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/${MODPY_PYCACHE}temporalisomorphvf2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/${MODPY_PYCACHE}tree_isomorphism.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/${MODPY_PYCACHE}tree_isomorphism.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/${MODPY_PYCACHE}vf2userfunc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/${MODPY_PYCACHE}vf2userfunc.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/ismags.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/isomorph.py
@@ -519,13 +766,21 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/tempora
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/tests/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/tests/${MODPY_PYCACHE}test_ismags.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/tests/${MODPY_PYCACHE}test_ismags.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/tests/${MODPY_PYCACHE}test_isomorphism.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/tests/${MODPY_PYCACHE}test_isomorphism.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/tests/${MODPY_PYCACHE}test_isomorphvf2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/tests/${MODPY_PYCACHE}test_isomorphvf2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/tests/${MODPY_PYCACHE}test_match_helpers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/tests/${MODPY_PYCACHE}test_match_helpers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/tests/${MODPY_PYCACHE}test_temporalisomorphvf2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/tests/${MODPY_PYCACHE}test_temporalisomorphvf2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/tests/${MODPY_PYCACHE}test_tree_isomorphism.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/tests/${MODPY_PYCACHE}test_tree_isomorphism.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/tests/${MODPY_PYCACHE}test_vf2userfunc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/tests/${MODPY_PYCACHE}test_vf2userfunc.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/tests/iso_r01_s80.A99
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/tests/iso_r01_s80.B99
@@ -543,16 +798,22 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/isomorphism/vf2user
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/link_analysis/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/link_analysis/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/link_analysis/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/link_analysis/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/link_analysis/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/link_analysis/${MODPY_PYCACHE}hits_alg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/link_analysis/${MODPY_PYCACHE}hits_alg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/link_analysis/${MODPY_PYCACHE}pagerank_alg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/link_analysis/${MODPY_PYCACHE}pagerank_alg.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/link_analysis/hits_alg.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/link_analysis/pagerank_alg.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/link_analysis/tests/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/link_analysis/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/link_analysis/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/link_analysis/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/link_analysis/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/link_analysis/tests/${MODPY_PYCACHE}test_hits.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/link_analysis/tests/${MODPY_PYCACHE}test_hits.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/link_analysis/tests/${MODPY_PYCACHE}test_pagerank.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/link_analysis/tests/${MODPY_PYCACHE}test_pagerank.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/link_analysis/tests/test_hits.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/link_analysis/tests/test_pagerank.py
@@ -562,11 +823,14 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/matching.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/minors/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/minors/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/minors/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/minors/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/minors/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/minors/${MODPY_PYCACHE}contraction.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/minors/${MODPY_PYCACHE}contraction.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/minors/contraction.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/minors/tests/
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/minors/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/minors/tests/${MODPY_PYCACHE}test_contraction.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/minors/tests/${MODPY_PYCACHE}test_contraction.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/minors/tests/test_contraction.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/mis.py
@@ -574,17 +838,24 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/moral.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/node_classification/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/node_classification/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/node_classification/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/node_classification/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/node_classification/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/node_classification/${MODPY_PYCACHE}hmn.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/node_classification/${MODPY_PYCACHE}hmn.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/node_classification/${MODPY_PYCACHE}lgc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/node_classification/${MODPY_PYCACHE}lgc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/node_classification/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/node_classification/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/node_classification/hmn.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/node_classification/lgc.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/node_classification/tests/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/node_classification/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/node_classification/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/node_classification/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/node_classification/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/node_classification/tests/${MODPY_PYCACHE}test_harmonic_function.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/node_classification/tests/${MODPY_PYCACHE}test_harmonic_function.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/node_classification/tests/${MODPY_PYCACHE}test_local_and_global_consistency.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/node_classification/tests/${MODPY_PYCACHE}test_local_and_global_consistency.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/node_classification/tests/test_harmonic_function.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/node_classification/tests/test_local_and_global_consistency.py
@@ -593,10 +864,15 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/non_randomness.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/${MODPY_PYCACHE}all.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/${MODPY_PYCACHE}all.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/${MODPY_PYCACHE}binary.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/${MODPY_PYCACHE}binary.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/${MODPY_PYCACHE}product.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/${MODPY_PYCACHE}product.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/${MODPY_PYCACHE}unary.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/${MODPY_PYCACHE}unary.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/all.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/binary.py
@@ -604,10 +880,15 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/product.p
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/tests/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/tests/${MODPY_PYCACHE}test_all.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/tests/${MODPY_PYCACHE}test_all.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/tests/${MODPY_PYCACHE}test_binary.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/tests/${MODPY_PYCACHE}test_binary.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/tests/${MODPY_PYCACHE}test_product.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/tests/${MODPY_PYCACHE}test_product.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/tests/${MODPY_PYCACHE}test_unary.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/tests/${MODPY_PYCACHE}test_unary.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/tests/test_all.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/operators/tests/test_binary.py
@@ -622,11 +903,17 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/richclub.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/${MODPY_PYCACHE}astar.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/${MODPY_PYCACHE}astar.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/${MODPY_PYCACHE}dense.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/${MODPY_PYCACHE}dense.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/${MODPY_PYCACHE}generic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/${MODPY_PYCACHE}generic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/${MODPY_PYCACHE}unweighted.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/${MODPY_PYCACHE}unweighted.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/${MODPY_PYCACHE}weighted.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/${MODPY_PYCACHE}weighted.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/astar.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/dense.py
@@ -634,12 +921,19 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/gene
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/tests/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/tests/${MODPY_PYCACHE}test_astar.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/tests/${MODPY_PYCACHE}test_astar.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/tests/${MODPY_PYCACHE}test_dense.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/tests/${MODPY_PYCACHE}test_dense.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/tests/${MODPY_PYCACHE}test_dense_numpy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/tests/${MODPY_PYCACHE}test_dense_numpy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/tests/${MODPY_PYCACHE}test_generic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/tests/${MODPY_PYCACHE}test_generic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/tests/${MODPY_PYCACHE}test_unweighted.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/tests/${MODPY_PYCACHE}test_unweighted.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/tests/${MODPY_PYCACHE}test_weighted.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/tests/${MODPY_PYCACHE}test_weighted.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/tests/test_astar.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/shortest_paths/tests/test_dense.py
@@ -660,57 +954,109 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/swap.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_asteroidal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_asteroidal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_boundary.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_boundary.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_bridges.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_bridges.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_chains.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_chains.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_chordal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_chordal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_clique.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_clique.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_cluster.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_cluster.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_communicability.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_communicability.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_covering.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_covering.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_cuts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_cuts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_cycles.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_cycles.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_d_separation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_d_separation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_dag.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_dag.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_distance_measures.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_distance_measures.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_distance_regular.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_distance_regular.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_dominance.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_dominance.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_dominating.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_dominating.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_efficiency.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_efficiency.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_euler.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_euler.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_graph_hashing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_graph_hashing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_graphical.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_graphical.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_hierarchy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_hierarchy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_hybrid.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_hybrid.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_isolate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_isolate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_link_prediction.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_link_prediction.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_lowest_common_ancestors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_lowest_common_ancestors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_matching.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_matching.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_max_weight_clique.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_max_weight_clique.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_mis.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_mis.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_moral.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_moral.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_non_randomness.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_non_randomness.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_planar_drawing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_planar_drawing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_planarity.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_planarity.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_reciprocity.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_reciprocity.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_regular.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_regular.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_richclub.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_richclub.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_similarity.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_similarity.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_simple_paths.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_simple_paths.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_smallworld.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_smallworld.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_smetric.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_smetric.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_sparsifiers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_sparsifiers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_structuralholes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_structuralholes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_summarization.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_summarization.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_swap.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_swap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_threshold.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_threshold.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_tournament.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_tournament.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_triads.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_triads.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_vitality.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_vitality.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_voronoi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_voronoi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_wiener.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/${MODPY_PYCACHE}test_wiener.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/test_asteroidal.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tests/test_boundary.py
@@ -768,11 +1114,17 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tournament.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/${MODPY_PYCACHE}beamsearch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/${MODPY_PYCACHE}beamsearch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/${MODPY_PYCACHE}breadth_first_search.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/${MODPY_PYCACHE}breadth_first_search.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/${MODPY_PYCACHE}depth_first_search.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/${MODPY_PYCACHE}depth_first_search.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/${MODPY_PYCACHE}edgebfs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/${MODPY_PYCACHE}edgebfs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/${MODPY_PYCACHE}edgedfs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/${MODPY_PYCACHE}edgedfs.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/beamsearch.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/breadth_first_search.py
@@ -782,11 +1134,17 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/edgedfs.p
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/tests/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/tests/${MODPY_PYCACHE}test_beamsearch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/tests/${MODPY_PYCACHE}test_beamsearch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/tests/${MODPY_PYCACHE}test_bfs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/tests/${MODPY_PYCACHE}test_bfs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/tests/${MODPY_PYCACHE}test_dfs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/tests/${MODPY_PYCACHE}test_dfs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/tests/${MODPY_PYCACHE}test_edgebfs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/tests/${MODPY_PYCACHE}test_edgebfs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/tests/${MODPY_PYCACHE}test_edgedfs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/tests/${MODPY_PYCACHE}test_edgedfs.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/tests/test_beamsearch.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/tests/test_bfs.py
@@ -796,12 +1154,19 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/traversal/tests/tes
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/${MODPY_PYCACHE}branchings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/${MODPY_PYCACHE}branchings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/${MODPY_PYCACHE}coding.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/${MODPY_PYCACHE}coding.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/${MODPY_PYCACHE}decomposition.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/${MODPY_PYCACHE}decomposition.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/${MODPY_PYCACHE}mst.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/${MODPY_PYCACHE}mst.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/${MODPY_PYCACHE}operations.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/${MODPY_PYCACHE}operations.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/${MODPY_PYCACHE}recognition.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/${MODPY_PYCACHE}recognition.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/branchings.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/coding.py
@@ -812,12 +1177,19 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/recognition.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/tests/
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/tests/${MODPY_PYCACHE}test_branchings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/tests/${MODPY_PYCACHE}test_branchings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/tests/${MODPY_PYCACHE}test_coding.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/tests/${MODPY_PYCACHE}test_coding.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/tests/${MODPY_PYCACHE}test_decomposition.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/tests/${MODPY_PYCACHE}test_decomposition.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/tests/${MODPY_PYCACHE}test_mst.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/tests/${MODPY_PYCACHE}test_mst.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/tests/${MODPY_PYCACHE}test_operations.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/tests/${MODPY_PYCACHE}test_operations.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/tests/${MODPY_PYCACHE}test_recognition.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/tests/${MODPY_PYCACHE}test_recognition.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/tests/test_branchings.py
 lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/tree/tests/test_coding.py
@@ -832,16 +1204,27 @@ lib/python${MODPY_VERSION}/site-packages/networkx/algorithms/wiener.py
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/classes/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/classes/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/classes/${MODPY_PYCACHE}coreviews.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/${MODPY_PYCACHE}coreviews.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/classes/${MODPY_PYCACHE}digraph.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/${MODPY_PYCACHE}digraph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/classes/${MODPY_PYCACHE}filters.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/${MODPY_PYCACHE}filters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/classes/${MODPY_PYCACHE}function.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/${MODPY_PYCACHE}function.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/classes/${MODPY_PYCACHE}graph.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/${MODPY_PYCACHE}graph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/classes/${MODPY_PYCACHE}graphviews.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/${MODPY_PYCACHE}graphviews.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/classes/${MODPY_PYCACHE}multidigraph.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/${MODPY_PYCACHE}multidigraph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/classes/${MODPY_PYCACHE}multigraph.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/${MODPY_PYCACHE}multigraph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/classes/${MODPY_PYCACHE}ordered.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/${MODPY_PYCACHE}ordered.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/classes/${MODPY_PYCACHE}reportviews.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/${MODPY_PYCACHE}reportviews.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/coreviews.py
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/digraph.py
@@ -856,21 +1239,37 @@ lib/python${MODPY_VERSION}/site-packages/networkx/classes/reportviews.py
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}historical_tests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}historical_tests.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}test_coreviews.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}test_coreviews.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}test_digraph.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}test_digraph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}test_digraph_historical.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}test_digraph_historical.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}test_filters.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}test_filters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}test_function.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}test_function.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}test_graph.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}test_graph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}test_graph_historical.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}test_graph_historical.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}test_graphviews.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}test_graphviews.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}test_multidigraph.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}test_multidigraph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}test_multigraph.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}test_multigraph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}test_ordered.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}test_ordered.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}test_reportviews.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}test_reportviews.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}test_special.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}test_special.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}test_subgraphviews.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/${MODPY_PYCACHE}test_subgraphviews.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/historical_tests.py
 lib/python${MODPY_VERSION}/site-packages/networkx/classes/tests/test_coreviews.py
@@ -893,10 +1292,15 @@ lib/python${MODPY_VERSION}/site-packages/networkx/convert_matrix.py
 lib/python${MODPY_VERSION}/site-packages/networkx/drawing/
 lib/python${MODPY_VERSION}/site-packages/networkx/drawing/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/drawing/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/drawing/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/drawing/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/drawing/${MODPY_PYCACHE}layout.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/drawing/${MODPY_PYCACHE}layout.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/drawing/${MODPY_PYCACHE}nx_agraph.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/drawing/${MODPY_PYCACHE}nx_agraph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/drawing/${MODPY_PYCACHE}nx_pydot.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/drawing/${MODPY_PYCACHE}nx_pydot.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/drawing/${MODPY_PYCACHE}nx_pylab.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/drawing/${MODPY_PYCACHE}nx_pylab.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/drawing/layout.py
 lib/python${MODPY_VERSION}/site-packages/networkx/drawing/nx_agraph.py
@@ -905,10 +1309,15 @@ lib/python${MODPY_VERSION}/site-packages/networkx/drawing/nx_pylab.py
 lib/python${MODPY_VERSION}/site-packages/networkx/drawing/tests/
 lib/python${MODPY_VERSION}/site-packages/networkx/drawing/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/drawing/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/drawing/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/drawing/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/drawing/tests/${MODPY_PYCACHE}test_agraph.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/drawing/tests/${MODPY_PYCACHE}test_agraph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/drawing/tests/${MODPY_PYCACHE}test_layout.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/drawing/tests/${MODPY_PYCACHE}test_layout.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/drawing/tests/${MODPY_PYCACHE}test_pydot.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/drawing/tests/${MODPY_PYCACHE}test_pydot.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/drawing/tests/${MODPY_PYCACHE}test_pylab.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/drawing/tests/${MODPY_PYCACHE}test_pylab.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/drawing/tests/test_agraph.py
 lib/python${MODPY_VERSION}/site-packages/networkx/drawing/tests/test_layout.py
@@ -918,34 +1327,63 @@ lib/python${MODPY_VERSION}/site-packages/networkx/exception.py
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}atlas.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}atlas.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}classic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}classic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}cographs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}cographs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}community.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}community.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}degree_seq.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}degree_seq.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}directed.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}directed.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}duplication.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}duplication.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}ego.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}ego.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}expanders.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}expanders.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}geometric.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}geometric.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}harary_graph.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}harary_graph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}internet_as_graphs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}internet_as_graphs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}intersection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}intersection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}interval_graph.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}interval_graph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}joint_degree_seq.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}joint_degree_seq.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}lattice.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}lattice.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}line.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}line.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}mycielski.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}mycielski.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}nonisomorphic_trees.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}nonisomorphic_trees.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}random_clustered.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}random_clustered.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}random_graphs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}random_graphs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}small.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}small.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}social.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}social.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}spectral_graph_forge.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}spectral_graph_forge.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}stochastic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}stochastic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}sudoku.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}sudoku.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}trees.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}trees.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}triads.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/${MODPY_PYCACHE}triads.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/atlas.dat.gz
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/atlas.py
@@ -977,33 +1415,61 @@ lib/python${MODPY_VERSION}/site-packages/networkx/generators/sudoku.py
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_atlas.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_atlas.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_classic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_classic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_cographs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_cographs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_community.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_community.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_degree_seq.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_degree_seq.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_directed.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_directed.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_duplication.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_duplication.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_ego.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_ego.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_expanders.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_expanders.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_geometric.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_geometric.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_harary_graph.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_harary_graph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_internet_as_graphs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_internet_as_graphs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_intersection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_intersection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_interval_graph.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_interval_graph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_joint_degree_seq.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_joint_degree_seq.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_lattice.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_lattice.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_line.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_line.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_mycielski.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_mycielski.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_nonisomorphic_trees.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_nonisomorphic_trees.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_random_clustered.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_random_clustered.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_random_graphs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_random_graphs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_small.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_small.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_spectral_graph_forge.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_spectral_graph_forge.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_stochastic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_stochastic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_sudoku.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_sudoku.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_trees.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_trees.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_triads.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/${MODPY_PYCACHE}test_triads.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/test_atlas.py
 lib/python${MODPY_VERSION}/site-packages/networkx/generators/tests/test_classic.py
@@ -1037,13 +1503,21 @@ lib/python${MODPY_VERSION}/site-packages/networkx/generators/triads.py
 lib/python${MODPY_VERSION}/site-packages/networkx/linalg/
 lib/python${MODPY_VERSION}/site-packages/networkx/linalg/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/linalg/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/linalg/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/linalg/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/linalg/${MODPY_PYCACHE}algebraicconnectivity.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/linalg/${MODPY_PYCACHE}algebraicconnectivity.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/linalg/${MODPY_PYCACHE}attrmatrix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/linalg/${MODPY_PYCACHE}attrmatrix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/linalg/${MODPY_PYCACHE}bethehessianmatrix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/linalg/${MODPY_PYCACHE}bethehessianmatrix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/linalg/${MODPY_PYCACHE}graphmatrix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/linalg/${MODPY_PYCACHE}graphmatrix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/linalg/${MODPY_PYCACHE}laplacianmatrix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/linalg/${MODPY_PYCACHE}laplacianmatrix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/linalg/${MODPY_PYCACHE}modularitymatrix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/linalg/${MODPY_PYCACHE}modularitymatrix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/linalg/${MODPY_PYCACHE}spectrum.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/linalg/${MODPY_PYCACHE}spectrum.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/linalg/algebraicconnectivity.py
 lib/python${MODPY_VERSION}/site-packages/networkx/linalg/attrmatrix.py
@@ -1055,13 +1529,21 @@ lib/python${MODPY_VERSION}/site-packages/networkx/linalg/spectrum.py
 lib/python${MODPY_VERSION}/site-packages/networkx/linalg/tests/
 lib/python${MODPY_VERSION}/site-packages/networkx/linalg/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/linalg/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/linalg/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/linalg/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/linalg/tests/${MODPY_PYCACHE}test_algebraic_connectivity.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/linalg/tests/${MODPY_PYCACHE}test_algebraic_connectivity.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/linalg/tests/${MODPY_PYCACHE}test_attrmatrix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/linalg/tests/${MODPY_PYCACHE}test_attrmatrix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/linalg/tests/${MODPY_PYCACHE}test_bethehessian.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/linalg/tests/${MODPY_PYCACHE}test_bethehessian.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/linalg/tests/${MODPY_PYCACHE}test_graphmatrix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/linalg/tests/${MODPY_PYCACHE}test_graphmatrix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/linalg/tests/${MODPY_PYCACHE}test_laplacian.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/linalg/tests/${MODPY_PYCACHE}test_laplacian.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/linalg/tests/${MODPY_PYCACHE}test_modularity.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/linalg/tests/${MODPY_PYCACHE}test_modularity.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/linalg/tests/${MODPY_PYCACHE}test_spectrum.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/linalg/tests/${MODPY_PYCACHE}test_spectrum.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/linalg/tests/test_algebraic_connectivity.py
 lib/python${MODPY_VERSION}/site-packages/networkx/linalg/tests/test_attrmatrix.py
@@ -1073,21 +1555,37 @@ lib/python${MODPY_VERSION}/site-packages/networkx/linalg/tests/test_spectrum.py
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}adjlist.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}adjlist.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}edgelist.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}edgelist.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}gexf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}gexf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}gml.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}gml.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}gpickle.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}gpickle.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}graph6.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}graph6.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}graphml.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}graphml.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}leda.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}leda.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}multiline_adjlist.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}multiline_adjlist.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}nx_shp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}nx_shp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}nx_yaml.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}nx_yaml.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}p2g.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}p2g.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}pajek.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}pajek.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}sparse6.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}sparse6.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}text.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/${MODPY_PYCACHE}text.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/adjlist.py
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/edgelist.py
@@ -1099,11 +1597,17 @@ lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/graphml.py
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/${MODPY_PYCACHE}adjacency.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/${MODPY_PYCACHE}adjacency.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/${MODPY_PYCACHE}cytoscape.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/${MODPY_PYCACHE}cytoscape.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/${MODPY_PYCACHE}jit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/${MODPY_PYCACHE}jit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/${MODPY_PYCACHE}node_link.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/${MODPY_PYCACHE}node_link.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/${MODPY_PYCACHE}tree.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/${MODPY_PYCACHE}tree.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/adjacency.py
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/cytoscape.py
@@ -1112,11 +1616,17 @@ lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/node_link
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/tests/
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/tests/${MODPY_PYCACHE}test_adjacency.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/tests/${MODPY_PYCACHE}test_adjacency.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/tests/${MODPY_PYCACHE}test_cytoscape.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/tests/${MODPY_PYCACHE}test_cytoscape.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/tests/${MODPY_PYCACHE}test_jit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/tests/${MODPY_PYCACHE}test_jit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/tests/${MODPY_PYCACHE}test_node_link.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/tests/${MODPY_PYCACHE}test_node_link.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/tests/${MODPY_PYCACHE}test_tree.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/tests/${MODPY_PYCACHE}test_tree.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/tests/test_adjacency.py
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/json_graph/tests/test_cytoscape.py
@@ -1134,20 +1644,35 @@ lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/sparse6.py
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}test_adjlist.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}test_adjlist.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}test_edgelist.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}test_edgelist.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}test_getattr_nxyaml_removal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}test_getattr_nxyaml_removal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}test_gexf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}test_gexf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}test_gml.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}test_gml.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}test_gpickle.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}test_gpickle.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}test_graph6.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}test_graph6.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}test_graphml.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}test_graphml.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}test_leda.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}test_leda.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}test_p2g.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}test_p2g.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}test_pajek.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}test_pajek.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}test_shp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}test_shp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}test_sparse6.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}test_sparse6.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}test_text.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/${MODPY_PYCACHE}test_text.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/test_adjlist.py
 lib/python${MODPY_VERSION}/site-packages/networkx/readwrite/tests/test_edgelist.py
@@ -1168,28 +1693,42 @@ lib/python${MODPY_VERSION}/site-packages/networkx/relabel.py
 lib/python${MODPY_VERSION}/site-packages/networkx/testing/
 lib/python${MODPY_VERSION}/site-packages/networkx/testing/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/testing/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/testing/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/testing/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/testing/${MODPY_PYCACHE}test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/testing/${MODPY_PYCACHE}test.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/testing/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/testing/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/testing/test.py
 lib/python${MODPY_VERSION}/site-packages/networkx/testing/tests/
 lib/python${MODPY_VERSION}/site-packages/networkx/testing/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/testing/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/testing/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/testing/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/testing/tests/${MODPY_PYCACHE}test_utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/testing/tests/${MODPY_PYCACHE}test_utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/testing/tests/test_utils.py
 lib/python${MODPY_VERSION}/site-packages/networkx/testing/utils.py
 lib/python${MODPY_VERSION}/site-packages/networkx/tests/
 lib/python${MODPY_VERSION}/site-packages/networkx/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/tests/${MODPY_PYCACHE}test_all_random_functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/tests/${MODPY_PYCACHE}test_all_random_functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/tests/${MODPY_PYCACHE}test_convert.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/tests/${MODPY_PYCACHE}test_convert.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/tests/${MODPY_PYCACHE}test_convert_numpy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/tests/${MODPY_PYCACHE}test_convert_numpy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/tests/${MODPY_PYCACHE}test_convert_pandas.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/tests/${MODPY_PYCACHE}test_convert_pandas.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/tests/${MODPY_PYCACHE}test_convert_scipy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/tests/${MODPY_PYCACHE}test_convert_scipy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/tests/${MODPY_PYCACHE}test_exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/tests/${MODPY_PYCACHE}test_exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/tests/${MODPY_PYCACHE}test_import.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/tests/${MODPY_PYCACHE}test_import.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/tests/${MODPY_PYCACHE}test_relabel.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/tests/${MODPY_PYCACHE}test_relabel.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/tests/test_all_random_functions.py
 lib/python${MODPY_VERSION}/site-packages/networkx/tests/test_convert.py
@@ -1202,14 +1741,23 @@ lib/python${MODPY_VERSION}/site-packages/networkx/tests/test_relabel.py
 lib/python${MODPY_VERSION}/site-packages/networkx/utils/
 lib/python${MODPY_VERSION}/site-packages/networkx/utils/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/utils/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/utils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/utils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/utils/${MODPY_PYCACHE}contextmanagers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/utils/${MODPY_PYCACHE}contextmanagers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/utils/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/utils/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/utils/${MODPY_PYCACHE}heaps.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/utils/${MODPY_PYCACHE}heaps.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/utils/${MODPY_PYCACHE}mapped_queue.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/utils/${MODPY_PYCACHE}mapped_queue.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/utils/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/utils/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/utils/${MODPY_PYCACHE}random_sequence.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/utils/${MODPY_PYCACHE}random_sequence.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/utils/${MODPY_PYCACHE}rcm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/utils/${MODPY_PYCACHE}rcm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/utils/${MODPY_PYCACHE}union_find.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/utils/${MODPY_PYCACHE}union_find.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/utils/contextmanagers.py
 lib/python${MODPY_VERSION}/site-packages/networkx/utils/decorators.py
@@ -1221,15 +1769,25 @@ lib/python${MODPY_VERSION}/site-packages/networkx/utils/rcm.py
 lib/python${MODPY_VERSION}/site-packages/networkx/utils/tests/
 lib/python${MODPY_VERSION}/site-packages/networkx/utils/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/networkx/utils/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/networkx/utils/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/utils/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/utils/tests/${MODPY_PYCACHE}test__init.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/utils/tests/${MODPY_PYCACHE}test__init.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/utils/tests/${MODPY_PYCACHE}test_contextmanager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/utils/tests/${MODPY_PYCACHE}test_contextmanager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/utils/tests/${MODPY_PYCACHE}test_decorators.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/utils/tests/${MODPY_PYCACHE}test_decorators.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/utils/tests/${MODPY_PYCACHE}test_heaps.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/utils/tests/${MODPY_PYCACHE}test_heaps.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/utils/tests/${MODPY_PYCACHE}test_mapped_queue.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/utils/tests/${MODPY_PYCACHE}test_mapped_queue.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/utils/tests/${MODPY_PYCACHE}test_misc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/utils/tests/${MODPY_PYCACHE}test_misc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/utils/tests/${MODPY_PYCACHE}test_random_sequence.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/utils/tests/${MODPY_PYCACHE}test_random_sequence.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/utils/tests/${MODPY_PYCACHE}test_rcm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/utils/tests/${MODPY_PYCACHE}test_rcm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/networkx/utils/tests/${MODPY_PYCACHE}test_unionfind.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/networkx/utils/tests/${MODPY_PYCACHE}test_unionfind.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/networkx/utils/tests/test__init.py
 lib/python${MODPY_VERSION}/site-packages/networkx/utils/tests/test_contextmanager.py
@@ -1249,7 +1807,6 @@ share/doc/networkx-${MODPY_EGG_VERSION}/examples/3d_drawing/README.txt
 share/doc/networkx-${MODPY_EGG_VERSION}/examples/3d_drawing/mayavi2_spring.py
 share/doc/networkx-${MODPY_EGG_VERSION}/examples/3d_drawing/plot_basic.py
 share/doc/networkx-${MODPY_EGG_VERSION}/examples/README.txt
-share/doc/networkx-${MODPY_EGG_VERSION}/examples/advanced/
 share/doc/networkx-${MODPY_EGG_VERSION}/examples/algorithms/
 share/doc/networkx-${MODPY_EGG_VERSION}/examples/algorithms/README.txt
 share/doc/networkx-${MODPY_EGG_VERSION}/examples/algorithms/WormNet.v3.benchmark.txt
@@ -1308,10 +1865,6 @@ share/doc/networkx-${MODPY_EGG_VERSION}/examples/graph/plot_roget.py
 share/doc/networkx-${MODPY_EGG_VERSION}/examples/graph/plot_words.py
 share/doc/networkx-${MODPY_EGG_VERSION}/examples/graph/roget_dat.txt.gz
 share/doc/networkx-${MODPY_EGG_VERSION}/examples/graph/words_dat.txt.gz
-share/doc/networkx-${MODPY_EGG_VERSION}/examples/javascript/
-share/doc/networkx-${MODPY_EGG_VERSION}/examples/javascript/force/
-share/doc/networkx-${MODPY_EGG_VERSION}/examples/jit/
-share/doc/networkx-${MODPY_EGG_VERSION}/examples/pygraphviz/
 share/doc/networkx-${MODPY_EGG_VERSION}/examples/subclass/
 share/doc/networkx-${MODPY_EGG_VERSION}/examples/subclass/README.txt
 share/doc/networkx-${MODPY_EGG_VERSION}/examples/subclass/plot_antigraph.py
diff --git a/math/py-osqp/Makefile b/math/py-osqp/Makefile
index a2b6ee71cb7..d17f10dbbbd 100644
--- a/math/py-osqp/Makefile
+++ b/math/py-osqp/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	0.6.1
 DISTNAME =		osqp-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		math
-REVISION =		6
+REVISION =		7
 
 WANTLIB =  pthread
 MAINTAINER =		Paul Irofti <paul@irofti.net>
@@ -22,8 +22,7 @@ RUN_DEPENDS =		math/py-numpy${MODPY_FLAVOR}	\
 			devel/py-future${MODPY_FLAVOR}
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =	setuptools
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/math/py-osqp/pkg/PLIST b/math/py-osqp/pkg/PLIST
index a278db3656b..cfbc75c73a4 100644
--- a/math/py-osqp/pkg/PLIST
+++ b/math/py-osqp/pkg/PLIST
@@ -1,28 +1,35 @@
 @conflict py-osqp-*
 @pkgpath math/py-osqp
 lib/python${MODPY_VERSION}/site-packages/osqp/
-lib/python${MODPY_VERSION}/site-packages/osqp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/osqp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/osqp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/osqp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/osqp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/osqp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/osqp-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/osqp-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/osqp-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/osqp-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/osqp-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/osqp-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/osqp/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/osqp/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/osqp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/osqp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/osqp/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/osqp/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/osqp/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/osqp/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 @so lib/python${MODPY_VERSION}/site-packages/osqp/_osqp.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/osqp/codegen/
 lib/python${MODPY_VERSION}/site-packages/osqp/codegen/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/osqp/codegen/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/osqp/codegen/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/osqp/codegen/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/osqp/codegen/${MODPY_PYCACHE}code_generator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/osqp/codegen/${MODPY_PYCACHE}code_generator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/osqp/codegen/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/osqp/codegen/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/osqp/codegen/code_generator.py
 lib/python${MODPY_VERSION}/site-packages/osqp/codegen/files_to_generate/
 lib/python${MODPY_VERSION}/site-packages/osqp/codegen/files_to_generate/CMakeLists.txt
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/osqp/codegen/files_to_generate/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/osqp/codegen/files_to_generate/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/osqp/codegen/files_to_generate/${MODPY_PYCACHE}setup.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/osqp/codegen/files_to_generate/emosqpmodule.c
 lib/python${MODPY_VERSION}/site-packages/osqp/codegen/files_to_generate/example.c
@@ -43,7 +50,6 @@ lib/python${MODPY_VERSION}/site-packages/osqp/codegen/sources/include/osqp.h
 lib/python${MODPY_VERSION}/site-packages/osqp/codegen/sources/include/proj.h
 lib/python${MODPY_VERSION}/site-packages/osqp/codegen/sources/include/qdldl.h
 lib/python${MODPY_VERSION}/site-packages/osqp/codegen/sources/include/qdldl_interface.h
-lib/python${MODPY_VERSION}/site-packages/osqp/codegen/sources/include/qdldl_types.h
 lib/python${MODPY_VERSION}/site-packages/osqp/codegen/sources/include/scaling.h
 lib/python${MODPY_VERSION}/site-packages/osqp/codegen/sources/include/types.h
 lib/python${MODPY_VERSION}/site-packages/osqp/codegen/sources/include/util.h
@@ -64,18 +70,31 @@ lib/python${MODPY_VERSION}/site-packages/osqp/interface.py
 lib/python${MODPY_VERSION}/site-packages/osqp/tests/
 lib/python${MODPY_VERSION}/site-packages/osqp/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/osqp/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/osqp/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/osqp/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/osqp/tests/${MODPY_PYCACHE}basic_test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/osqp/tests/${MODPY_PYCACHE}basic_test.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/osqp/tests/${MODPY_PYCACHE}codegen_matrices_test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/osqp/tests/${MODPY_PYCACHE}codegen_matrices_test.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/osqp/tests/${MODPY_PYCACHE}codegen_vectors_test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/osqp/tests/${MODPY_PYCACHE}codegen_vectors_test.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/osqp/tests/${MODPY_PYCACHE}dual_infeasibility_test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/osqp/tests/${MODPY_PYCACHE}dual_infeasibility_test.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/osqp/tests/${MODPY_PYCACHE}feasibility_test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/osqp/tests/${MODPY_PYCACHE}feasibility_test.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/osqp/tests/${MODPY_PYCACHE}mkl_pardiso_test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/osqp/tests/${MODPY_PYCACHE}mkl_pardiso_test.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/osqp/tests/${MODPY_PYCACHE}non_convex_test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/osqp/tests/${MODPY_PYCACHE}non_convex_test.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/osqp/tests/${MODPY_PYCACHE}polishing_test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/osqp/tests/${MODPY_PYCACHE}polishing_test.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/osqp/tests/${MODPY_PYCACHE}primal_infeasibility_test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/osqp/tests/${MODPY_PYCACHE}primal_infeasibility_test.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/osqp/tests/${MODPY_PYCACHE}unconstrained_test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/osqp/tests/${MODPY_PYCACHE}unconstrained_test.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/osqp/tests/${MODPY_PYCACHE}update_matrices_test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/osqp/tests/${MODPY_PYCACHE}update_matrices_test.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/osqp/tests/${MODPY_PYCACHE}warm_start_test.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/osqp/tests/${MODPY_PYCACHE}warm_start_test.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/osqp/tests/basic_test.py
 lib/python${MODPY_VERSION}/site-packages/osqp/tests/codegen_matrices_test.py
@@ -93,8 +112,11 @@ lib/python${MODPY_VERSION}/site-packages/osqp/utils.py
 lib/python${MODPY_VERSION}/site-packages/osqppurepy/
 lib/python${MODPY_VERSION}/site-packages/osqppurepy/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/osqppurepy/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/osqppurepy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/osqppurepy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/osqppurepy/${MODPY_PYCACHE}_osqp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/osqppurepy/${MODPY_PYCACHE}_osqp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/osqppurepy/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/osqppurepy/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/osqppurepy/_osqp.py
 lib/python${MODPY_VERSION}/site-packages/osqppurepy/interface.py
diff --git a/math/py-patsy/Makefile b/math/py-patsy/Makefile
index 99dcaa8dd2a..7f3db048be5 100644
--- a/math/py-patsy/Makefile
+++ b/math/py-patsy/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	0.4.1
 DISTNAME =		patsy-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		math
-REVISION =		5
+REVISION =		6
 
 # BSD
 PERMIT_PACKAGE =	Yes
@@ -14,8 +14,7 @@ EXTRACT_SUFX =		.zip
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =	setuptools
 MODPY_PYTEST_ARGS =	patsy
 
 RUN_DEPENDS =		devel/py-six${MODPY_FLAVOR} \
diff --git a/math/py-patsy/pkg/PLIST b/math/py-patsy/pkg/PLIST
index 846c5bbadbd..b848ac15036 100644
--- a/math/py-patsy/pkg/PLIST
+++ b/math/py-patsy/pkg/PLIST
@@ -1,43 +1,73 @@
 @conflict py-patsy-*
 @pkgpath math/py-patsy
 lib/python${MODPY_VERSION}/site-packages/patsy/
-lib/python${MODPY_VERSION}/site-packages/patsy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/patsy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/patsy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/patsy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/patsy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/patsy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/patsy-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/patsy-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/patsy-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/patsy-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/patsy-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/patsy-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/patsy/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}build.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}build.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}builtins.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}builtins.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}categorical.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}categorical.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}compat_ordereddict.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}compat_ordereddict.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}constraint.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}constraint.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}contrasts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}contrasts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}desc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}desc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}design_info.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}design_info.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}eval.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}eval.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}highlevel.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}highlevel.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}infix_parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}infix_parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}mgcv_cubic_splines.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}mgcv_cubic_splines.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}missing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}missing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}origin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}origin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}parse_formula.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}parse_formula.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}redundancy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}redundancy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}splines.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}splines.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}state.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}state.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}test_build.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}test_build.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}test_highlevel.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}test_highlevel.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}test_regressions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}test_regressions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}test_splines_bs_data.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}test_splines_bs_data.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}test_splines_crs_data.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}test_splines_crs_data.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}test_state.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}test_state.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}tokens.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}tokens.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}user_util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}user_util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/patsy/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/patsy/build.py
 lib/python${MODPY_VERSION}/site-packages/patsy/builtins.py
diff --git a/math/py-pysmt/Makefile b/math/py-pysmt/Makefile
index 18e1b35cb31..ee1649d35e0 100644
--- a/math/py-pysmt/Makefile
+++ b/math/py-pysmt/Makefile
@@ -3,7 +3,7 @@ COMMENT =		library for SMT formulae manipulation and solving
 MODPY_EGG_VERSION =	0.8.0
 DISTNAME =		PySMT-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		5
+REVISION =		6
 
 CATEGORIES =		math
 
@@ -15,7 +15,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/math/py-pysmt/pkg/PLIST b/math/py-pysmt/pkg/PLIST
index 55ff844afa2..6f1cc19c148 100644
--- a/math/py-pysmt/pkg/PLIST
+++ b/math/py-pysmt/pkg/PLIST
@@ -1,60 +1,95 @@
-@pkgpath math/py-pysmt
 @conflict py-PySMT-<0.8.0p1
+@pkgpath math/py-pysmt
 bin/pysmt
 bin/pysmt-install
 bin/pysmt-shell
-lib/python${MODPY_VERSION}/site-packages/PySMT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/PySMT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/PySMT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/PySMT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/PySMT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/PySMT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/PySMT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/PySMT-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/PySMT-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/PySMT-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/PySMT-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/PySMT-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/PySMT-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/PySMT-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pysmt/
 lib/python${MODPY_VERSION}/site-packages/pysmt/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}configuration.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}configuration.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}environment.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}environment.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}factory.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}factory.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}fnode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}fnode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}formula.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}formula.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}logics.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}logics.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}operators.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}operators.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}oracles.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}oracles.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}parsing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}parsing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}printers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}printers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}rewritings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}rewritings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}shortcuts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}shortcuts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}simplifier.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}simplifier.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}substituter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}substituter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}type_checker.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}type_checker.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}typing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}typing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/${MODPY_PYCACHE}check_version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/${MODPY_PYCACHE}check_version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/${MODPY_PYCACHE}install.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/${MODPY_PYCACHE}install.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/${MODPY_PYCACHE}shell.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/${MODPY_PYCACHE}shell.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/check_version.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/install.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}bdd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}bdd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}btor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}btor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}cvc4.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}cvc4.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}cvc4gpl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}cvc4gpl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}msat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}msat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}pico.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}pico.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}yices.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}yices.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}z3.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/${MODPY_PYCACHE}z3.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/base.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/cmd/installers/bdd.py
@@ -85,18 +120,26 @@ lib/python${MODPY_VERSION}/site-packages/pysmt/simplifier.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/smtlib/
 lib/python${MODPY_VERSION}/site-packages/pysmt/smtlib/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysmt/smtlib/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysmt/smtlib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/smtlib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/smtlib/${MODPY_PYCACHE}annotations.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/smtlib/${MODPY_PYCACHE}annotations.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/smtlib/${MODPY_PYCACHE}commands.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/smtlib/${MODPY_PYCACHE}commands.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/smtlib/${MODPY_PYCACHE}printers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/smtlib/${MODPY_PYCACHE}printers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/smtlib/${MODPY_PYCACHE}script.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/smtlib/${MODPY_PYCACHE}script.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/smtlib/${MODPY_PYCACHE}solver.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/smtlib/${MODPY_PYCACHE}solver.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysmt/smtlib/annotations.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/smtlib/commands.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/smtlib/parser/
 lib/python${MODPY_VERSION}/site-packages/pysmt/smtlib/parser/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysmt/smtlib/parser/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysmt/smtlib/parser/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/smtlib/parser/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/smtlib/parser/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/smtlib/parser/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysmt/smtlib/parser/parser.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/smtlib/printers.py
@@ -105,21 +148,37 @@ lib/python${MODPY_VERSION}/site-packages/pysmt/smtlib/solver.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}bdd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}bdd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}btor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}btor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}cvc4.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}cvc4.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}eager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}eager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}interpolation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}interpolation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}msat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}msat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}options.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}options.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}pico.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}pico.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}portfolio.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}portfolio.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}qelim.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}qelim.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}smtlib.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}smtlib.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}solver.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}solver.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}yices.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}yices.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}z3.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}z3.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}z3_flymake.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/${MODPY_PYCACHE}z3_flymake.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/bdd.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/solvers/btor.py
@@ -140,69 +199,129 @@ lib/python${MODPY_VERSION}/site-packages/pysmt/substituter.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}examples.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}examples.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_array.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_array.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_back.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_back.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_bdd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_bdd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_bv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_bv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_bv_simplification.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_bv_simplification.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_cnf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_cnf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_configuration.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_configuration.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_constants.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_constants.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_cvc4_quantifiers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_cvc4_quantifiers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_dwf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_dwf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_eager_model.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_eager_model.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_env.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_env.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_euf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_euf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_formula.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_formula.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_hr_parsing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_hr_parsing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_imports.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_imports.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_int.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_int.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_interpolation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_interpolation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_lira.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_lira.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_logics.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_logics.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_models.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_models.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_native_qe.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_native_qe.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_nlira.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_nlira.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_oracles.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_oracles.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_portfolio.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_portfolio.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_printing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_printing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_qe.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_qe.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_regressions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_regressions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_rewritings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_rewritings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_shannon_expansion.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_shannon_expansion.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_simplify.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_simplify.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_size.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_size.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_solving.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_solving.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_sorts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_sorts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_string.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_string.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_typechecker.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_typechecker.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_unsat_cores.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_unsat_cores.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_walker_ext.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_walker_ext.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_walkers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/${MODPY_PYCACHE}test_walkers.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/examples.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}parser_utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}parser_utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_annotations.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_annotations.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_fuzzed.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_fuzzed.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_generic_wrapper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_generic_wrapper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_griggio.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_griggio.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_parser_examples.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_parser_examples.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_parser_extensibility.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_parser_extensibility.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_parser_invalid.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_parser_invalid.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_parser_lra.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_parser_lra.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_parser_qf_arrays.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_parser_qf_arrays.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_parser_qf_lia.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_parser_qf_lia.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_parser_qf_lira.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_parser_qf_lira.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_parser_qf_lra.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_parser_qf_lra.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_parser_qf_nia.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_parser_qf_nia.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_parser_qf_nra.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_parser_qf_nra.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_parser_qf_ufbv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_parser_qf_ufbv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_parser_type_error.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_parser_type_error.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_smtlibscript.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/${MODPY_PYCACHE}test_smtlibscript.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/parser_utils.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/test/smtlib/test_annotations.py
@@ -267,10 +386,15 @@ lib/python${MODPY_VERSION}/site-packages/pysmt/utils.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/walkers/
 lib/python${MODPY_VERSION}/site-packages/pysmt/walkers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pysmt/walkers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pysmt/walkers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/walkers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/walkers/${MODPY_PYCACHE}dag.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/walkers/${MODPY_PYCACHE}dag.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/walkers/${MODPY_PYCACHE}generic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/walkers/${MODPY_PYCACHE}generic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/walkers/${MODPY_PYCACHE}identitydag.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/walkers/${MODPY_PYCACHE}identitydag.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pysmt/walkers/${MODPY_PYCACHE}tree.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pysmt/walkers/${MODPY_PYCACHE}tree.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pysmt/walkers/dag.py
 lib/python${MODPY_VERSION}/site-packages/pysmt/walkers/generic.py
diff --git a/math/py-scs/Makefile b/math/py-scs/Makefile
index 3b9d681caa4..c072850b176 100644
--- a/math/py-scs/Makefile
+++ b/math/py-scs/Makefile
@@ -5,7 +5,7 @@ DISTNAME =		scs-${MODPY_EGG_VERSION}
 V =			${MODPY_EGG_VERSION:S/-/./}
 PKGNAME =		py-scs-${V}
 CATEGORIES =		math
-REVISION =		6
+REVISION =		7
 
 MAINTAINER =		Paul Irofti <paul@irofti.net>
 
@@ -21,8 +21,7 @@ RUN_DEPENDS =		math/py-numpy${MODPY_FLAVOR} \
 			math/py-scipy${MODPY_FLAVOR}
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =	setuptools
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/math/py-scs/pkg/PLIST b/math/py-scs/pkg/PLIST
index deb2bdad92c..4b234c8c75b 100644
--- a/math/py-scs/pkg/PLIST
+++ b/math/py-scs/pkg/PLIST
@@ -4,13 +4,13 @@
 @so lib/python${MODPY_VERSION}/site-packages/_scs_indirect.${MODPY_PYC_MAGIC_TAG}so
 @so lib/python${MODPY_VERSION}/site-packages/_scs_python.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/scs/
-lib/python${MODPY_VERSION}/site-packages/scs-2.1.1.post2-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/scs-2.1.1.post2-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/scs-2.1.1.post2-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/scs-2.1.1.post2-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/scs-2.1.1.post2-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/scs-2.1.1.post2-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/scs-2.1.1.post2-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/scs-2.1.1.post2.dist-info/
+lib/python${MODPY_VERSION}/site-packages/scs-2.1.1.post2.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/scs-2.1.1.post2.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/scs-2.1.1.post2.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/scs-2.1.1.post2.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/scs-2.1.1.post2.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/scs/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scs/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
diff --git a/math/py-snuggs/Makefile b/math/py-snuggs/Makefile
index 3a5d433a2cb..5a3cae9cfab 100644
--- a/math/py-snuggs/Makefile
+++ b/math/py-snuggs/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	1.4.7
 DISTNAME =		snuggs-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		math
-REVISION =		3
+REVISION =		4
 
 MAINTAINER =		Martin Reindl <martin@catai.org>
 
@@ -14,8 +14,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =	setuptools
 
 RUN_DEPENDS =		devel/py-parsing${MODPY_FLAVOR} \
 			devel/py-click${MODPY_FLAVOR} \
diff --git a/math/py-snuggs/pkg/PLIST b/math/py-snuggs/pkg/PLIST
index 0593fcf8f1c..ea90085589e 100644
--- a/math/py-snuggs/pkg/PLIST
+++ b/math/py-snuggs/pkg/PLIST
@@ -1,13 +1,14 @@
 @conflict py-snuggs-*
 @pkgpath math/py-snuggs
 lib/python${MODPY_VERSION}/site-packages/snuggs/
-lib/python${MODPY_VERSION}/site-packages/snuggs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/snuggs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/snuggs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/snuggs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/snuggs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/snuggs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/snuggs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/snuggs-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/snuggs-${MODPY_EGG_VERSION}.dist-info/AUTHORS.txt
+lib/python${MODPY_VERSION}/site-packages/snuggs-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/snuggs-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/snuggs-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/snuggs-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/snuggs-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/snuggs/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/snuggs/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/snuggs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/snuggs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
diff --git a/math/py-sympy/Makefile b/math/py-sympy/Makefile
index f2f730d7135..39f7a26c3d2 100644
--- a/math/py-sympy/Makefile
+++ b/math/py-sympy/Makefile
@@ -3,7 +3,7 @@ COMMENT =		computer algebra system (CAS) in Python
 MODPY_EGG_VERSION =	1.7.1
 DISTNAME =		sympy-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		math
 
@@ -18,7 +18,7 @@ FLAVORS =		python3
 FLAVOR =		python3
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 
 RUN_DEPENDS =		devel/ipython${MODPY_FLAVOR} \
 			math/py-mpmath${MODPY_FLAVOR}
diff --git a/math/py-sympy/pkg/PLIST b/math/py-sympy/pkg/PLIST
index 11759785610..5d6c5a19617 100644
--- a/math/py-sympy/pkg/PLIST
+++ b/math/py-sympy/pkg/PLIST
@@ -1,48 +1,67 @@
 @conflict py-sympy-*
 @pkgpath math/py-sympy
 bin/isympy
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}isympy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}isympy.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/isympy.py
 lib/python${MODPY_VERSION}/site-packages/sympy/
-lib/python${MODPY_VERSION}/site-packages/sympy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/sympy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/sympy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/sympy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/sympy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/sympy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/sympy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/sympy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/sympy-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/sympy-${MODPY_EGG_VERSION}.dist-info/AUTHORS
+lib/python${MODPY_VERSION}/site-packages/sympy-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/sympy-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/sympy-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/sympy-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/sympy-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/sympy-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/sympy/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/${MODPY_PYCACHE}abc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/${MODPY_PYCACHE}abc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/${MODPY_PYCACHE}galgebra.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/${MODPY_PYCACHE}galgebra.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/${MODPY_PYCACHE}release.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/${MODPY_PYCACHE}release.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/${MODPY_PYCACHE}this.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/${MODPY_PYCACHE}this.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/abc.py
 lib/python${MODPY_VERSION}/site-packages/sympy/algebras/
 lib/python${MODPY_VERSION}/site-packages/sympy/algebras/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/algebras/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/algebras/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/algebras/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/algebras/${MODPY_PYCACHE}quaternion.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/algebras/${MODPY_PYCACHE}quaternion.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/algebras/quaternion.py
 lib/python${MODPY_VERSION}/site-packages/sympy/algebras/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/algebras/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/algebras/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/algebras/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/algebras/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/algebras/tests/${MODPY_PYCACHE}test_quaternion.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/algebras/tests/${MODPY_PYCACHE}test_quaternion.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/algebras/tests/test_quaternion.py
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/${MODPY_PYCACHE}ask.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/${MODPY_PYCACHE}ask.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/${MODPY_PYCACHE}ask_generated.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/${MODPY_PYCACHE}ask_generated.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/${MODPY_PYCACHE}assume.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/${MODPY_PYCACHE}assume.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/${MODPY_PYCACHE}cnf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/${MODPY_PYCACHE}cnf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/${MODPY_PYCACHE}refine.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/${MODPY_PYCACHE}refine.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/${MODPY_PYCACHE}satask.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/${MODPY_PYCACHE}satask.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/${MODPY_PYCACHE}sathandlers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/${MODPY_PYCACHE}sathandlers.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/ask.py
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/ask_generated.py
@@ -51,12 +70,19 @@ lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/cnf.py
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/handlers/
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/handlers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/handlers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/handlers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/handlers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/handlers/${MODPY_PYCACHE}calculus.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/handlers/${MODPY_PYCACHE}calculus.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/handlers/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/handlers/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/handlers/${MODPY_PYCACHE}matrices.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/handlers/${MODPY_PYCACHE}matrices.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/handlers/${MODPY_PYCACHE}ntheory.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/handlers/${MODPY_PYCACHE}ntheory.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/handlers/${MODPY_PYCACHE}order.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/handlers/${MODPY_PYCACHE}order.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/handlers/${MODPY_PYCACHE}sets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/handlers/${MODPY_PYCACHE}sets.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/handlers/calculus.py
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/handlers/common.py
@@ -70,13 +96,21 @@ lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/sathandlers.py
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/tests/${MODPY_PYCACHE}test_assumptions_2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/tests/${MODPY_PYCACHE}test_assumptions_2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/tests/${MODPY_PYCACHE}test_context.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/tests/${MODPY_PYCACHE}test_context.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/tests/${MODPY_PYCACHE}test_matrices.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/tests/${MODPY_PYCACHE}test_matrices.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/tests/${MODPY_PYCACHE}test_query.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/tests/${MODPY_PYCACHE}test_query.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/tests/${MODPY_PYCACHE}test_refine.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/tests/${MODPY_PYCACHE}test_refine.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/tests/${MODPY_PYCACHE}test_satask.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/tests/${MODPY_PYCACHE}test_satask.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/tests/${MODPY_PYCACHE}test_sathandlers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/tests/${MODPY_PYCACHE}test_sathandlers.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/tests/test_assumptions_2.py
 lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/tests/test_context.py
@@ -88,9 +122,13 @@ lib/python${MODPY_VERSION}/site-packages/sympy/assumptions/tests/test_sathandler
 lib/python${MODPY_VERSION}/site-packages/sympy/benchmarks/
 lib/python${MODPY_VERSION}/site-packages/sympy/benchmarks/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/benchmarks/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/benchmarks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/benchmarks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/benchmarks/${MODPY_PYCACHE}bench_discrete_log.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/benchmarks/${MODPY_PYCACHE}bench_discrete_log.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/benchmarks/${MODPY_PYCACHE}bench_meijerint.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/benchmarks/${MODPY_PYCACHE}bench_meijerint.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/benchmarks/${MODPY_PYCACHE}bench_symbench.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/benchmarks/${MODPY_PYCACHE}bench_symbench.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/benchmarks/bench_discrete_log.py
 lib/python${MODPY_VERSION}/site-packages/sympy/benchmarks/bench_meijerint.py
@@ -98,10 +136,15 @@ lib/python${MODPY_VERSION}/site-packages/sympy/benchmarks/bench_symbench.py
 lib/python${MODPY_VERSION}/site-packages/sympy/calculus/
 lib/python${MODPY_VERSION}/site-packages/sympy/calculus/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/calculus/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/calculus/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/calculus/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/calculus/${MODPY_PYCACHE}euler.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/calculus/${MODPY_PYCACHE}euler.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/calculus/${MODPY_PYCACHE}finite_diff.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/calculus/${MODPY_PYCACHE}finite_diff.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/calculus/${MODPY_PYCACHE}singularities.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/calculus/${MODPY_PYCACHE}singularities.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/calculus/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/calculus/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/calculus/euler.py
 lib/python${MODPY_VERSION}/site-packages/sympy/calculus/finite_diff.py
@@ -109,10 +152,15 @@ lib/python${MODPY_VERSION}/site-packages/sympy/calculus/singularities.py
 lib/python${MODPY_VERSION}/site-packages/sympy/calculus/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/calculus/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/calculus/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/calculus/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/calculus/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/calculus/tests/${MODPY_PYCACHE}test_euler.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/calculus/tests/${MODPY_PYCACHE}test_euler.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/calculus/tests/${MODPY_PYCACHE}test_finite_diff.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/calculus/tests/${MODPY_PYCACHE}test_finite_diff.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/calculus/tests/${MODPY_PYCACHE}test_singularities.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/calculus/tests/${MODPY_PYCACHE}test_singularities.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/calculus/tests/${MODPY_PYCACHE}test_util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/calculus/tests/${MODPY_PYCACHE}test_util.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/calculus/tests/test_euler.py
 lib/python${MODPY_VERSION}/site-packages/sympy/calculus/tests/test_finite_diff.py
@@ -122,37 +170,59 @@ lib/python${MODPY_VERSION}/site-packages/sympy/calculus/util.py
 lib/python${MODPY_VERSION}/site-packages/sympy/categories/
 lib/python${MODPY_VERSION}/site-packages/sympy/categories/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/categories/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/categories/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/categories/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/categories/${MODPY_PYCACHE}baseclasses.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/categories/${MODPY_PYCACHE}baseclasses.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/categories/${MODPY_PYCACHE}diagram_drawing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/categories/${MODPY_PYCACHE}diagram_drawing.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/categories/baseclasses.py
 lib/python${MODPY_VERSION}/site-packages/sympy/categories/diagram_drawing.py
 lib/python${MODPY_VERSION}/site-packages/sympy/categories/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/categories/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/categories/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/categories/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/categories/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/categories/tests/${MODPY_PYCACHE}test_baseclasses.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/categories/tests/${MODPY_PYCACHE}test_baseclasses.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/categories/tests/${MODPY_PYCACHE}test_drawing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/categories/tests/${MODPY_PYCACHE}test_drawing.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/categories/tests/test_baseclasses.py
 lib/python${MODPY_VERSION}/site-packages/sympy/categories/tests/test_drawing.py
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}algorithms.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}algorithms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}approximations.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}approximations.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}array_utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}array_utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}ast.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}ast.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}cfunctions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}cfunctions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}cnodes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}cnodes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}cutils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}cutils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}cxxnodes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}cxxnodes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}fnodes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}fnodes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}futils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}futils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}matrix_nodes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}matrix_nodes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}numpy_nodes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}numpy_nodes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}pyutils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}pyutils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}rewriting.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}rewriting.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}scipy_nodes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/${MODPY_PYCACHE}scipy_nodes.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/algorithms.py
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/approximations.py
@@ -172,19 +242,33 @@ lib/python${MODPY_VERSION}/site-packages/sympy/codegen/scipy_nodes.py
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/${MODPY_PYCACHE}test_algorithms.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/${MODPY_PYCACHE}test_algorithms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/${MODPY_PYCACHE}test_applications.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/${MODPY_PYCACHE}test_applications.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/${MODPY_PYCACHE}test_approximations.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/${MODPY_PYCACHE}test_approximations.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/${MODPY_PYCACHE}test_array_utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/${MODPY_PYCACHE}test_array_utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/${MODPY_PYCACHE}test_ast.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/${MODPY_PYCACHE}test_ast.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/${MODPY_PYCACHE}test_cfunctions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/${MODPY_PYCACHE}test_cfunctions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/${MODPY_PYCACHE}test_cnodes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/${MODPY_PYCACHE}test_cnodes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/${MODPY_PYCACHE}test_cxxnodes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/${MODPY_PYCACHE}test_cxxnodes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/${MODPY_PYCACHE}test_fnodes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/${MODPY_PYCACHE}test_fnodes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/${MODPY_PYCACHE}test_numpy_nodes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/${MODPY_PYCACHE}test_numpy_nodes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/${MODPY_PYCACHE}test_pyutils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/${MODPY_PYCACHE}test_pyutils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/${MODPY_PYCACHE}test_rewriting.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/${MODPY_PYCACHE}test_rewriting.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/${MODPY_PYCACHE}test_scipy_nodes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/${MODPY_PYCACHE}test_scipy_nodes.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/test_algorithms.py
 lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/test_applications.py
@@ -202,27 +286,49 @@ lib/python${MODPY_VERSION}/site-packages/sympy/codegen/tests/test_scipy_nodes.py
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}coset_table.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}coset_table.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}fp_groups.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}fp_groups.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}free_groups.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}free_groups.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}generators.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}generators.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}graycode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}graycode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}group_constructs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}group_constructs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}homomorphisms.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}homomorphisms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}named_groups.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}named_groups.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}partitions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}partitions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}pc_groups.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}pc_groups.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}perm_groups.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}perm_groups.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}permutations.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}permutations.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}polyhedron.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}polyhedron.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}prufer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}prufer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}rewritingsystem.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}rewritingsystem.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}rewritingsystem_fsm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}rewritingsystem_fsm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}schur_number.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}schur_number.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}subsets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}subsets.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}tensor_can.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}tensor_can.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}testutil.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}testutil.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/coset_table.py
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/fp_groups.py
@@ -246,26 +352,47 @@ lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tensor_can.py
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_coset_table.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_coset_table.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_fp_groups.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_fp_groups.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_free_groups.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_free_groups.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_generators.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_generators.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_graycode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_graycode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_group_constructs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_group_constructs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_homomorphisms.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_homomorphisms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_named_groups.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_named_groups.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_partitions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_partitions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_pc_groups.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_pc_groups.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_perm_groups.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_perm_groups.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_permutations.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_permutations.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_polyhedron.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_polyhedron.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_prufer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_prufer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_rewriting.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_rewriting.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_schur_number.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_schur_number.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_subsets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_subsets.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_tensor_can.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_tensor_can.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_testutil.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_testutil.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/${MODPY_PYCACHE}test_util.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/test_coset_table.py
 lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/tests/test_fp_groups.py
@@ -292,13 +419,21 @@ lib/python${MODPY_VERSION}/site-packages/sympy/combinatorics/util.py
 lib/python${MODPY_VERSION}/site-packages/sympy/concrete/
 lib/python${MODPY_VERSION}/site-packages/sympy/concrete/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/concrete/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/concrete/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/concrete/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/concrete/${MODPY_PYCACHE}delta.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/concrete/${MODPY_PYCACHE}delta.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/concrete/${MODPY_PYCACHE}expr_with_intlimits.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/concrete/${MODPY_PYCACHE}expr_with_intlimits.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/concrete/${MODPY_PYCACHE}expr_with_limits.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/concrete/${MODPY_PYCACHE}expr_with_limits.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/concrete/${MODPY_PYCACHE}gosper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/concrete/${MODPY_PYCACHE}gosper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/concrete/${MODPY_PYCACHE}guess.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/concrete/${MODPY_PYCACHE}guess.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/concrete/${MODPY_PYCACHE}products.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/concrete/${MODPY_PYCACHE}products.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/concrete/${MODPY_PYCACHE}summations.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/concrete/${MODPY_PYCACHE}summations.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/concrete/delta.py
 lib/python${MODPY_VERSION}/site-packages/sympy/concrete/expr_with_intlimits.py
@@ -310,11 +445,17 @@ lib/python${MODPY_VERSION}/site-packages/sympy/concrete/summations.py
 lib/python${MODPY_VERSION}/site-packages/sympy/concrete/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/concrete/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/concrete/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/concrete/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/concrete/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/concrete/tests/${MODPY_PYCACHE}test_delta.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/concrete/tests/${MODPY_PYCACHE}test_delta.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/concrete/tests/${MODPY_PYCACHE}test_gosper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/concrete/tests/${MODPY_PYCACHE}test_gosper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/concrete/tests/${MODPY_PYCACHE}test_guess.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/concrete/tests/${MODPY_PYCACHE}test_guess.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/concrete/tests/${MODPY_PYCACHE}test_products.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/concrete/tests/${MODPY_PYCACHE}test_products.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/concrete/tests/${MODPY_PYCACHE}test_sums_products.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/concrete/tests/${MODPY_PYCACHE}test_sums_products.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/concrete/tests/test_delta.py
 lib/python${MODPY_VERSION}/site-packages/sympy/concrete/tests/test_gosper.py
@@ -325,37 +466,69 @@ lib/python${MODPY_VERSION}/site-packages/sympy/conftest.py
 lib/python${MODPY_VERSION}/site-packages/sympy/core/
 lib/python${MODPY_VERSION}/site-packages/sympy/core/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}_print_helpers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}_print_helpers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}add.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}add.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}alphabets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}alphabets.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}assumptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}assumptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}backend.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}backend.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}basic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}basic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}compatibility.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}compatibility.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}containers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}containers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}coreerrors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}coreerrors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}evalf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}evalf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}expr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}expr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}exprtools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}exprtools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}facts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}facts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}function.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}function.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}logic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}logic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}mod.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}mod.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}mul.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}mul.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}multidimensional.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}multidimensional.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}numbers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}numbers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}operations.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}operations.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}parameters.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}parameters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}power.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}power.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}relational.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}relational.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}rules.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}rules.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}singleton.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}singleton.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}symbol.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}symbol.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}sympify.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}sympify.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}trace.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/${MODPY_PYCACHE}trace.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/core/_print_helpers.py
 lib/python${MODPY_VERSION}/site-packages/sympy/core/add.py
@@ -366,12 +539,19 @@ lib/python${MODPY_VERSION}/site-packages/sympy/core/basic.py
 lib/python${MODPY_VERSION}/site-packages/sympy/core/benchmarks/
 lib/python${MODPY_VERSION}/site-packages/sympy/core/benchmarks/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/core/benchmarks/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/core/benchmarks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/benchmarks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/benchmarks/${MODPY_PYCACHE}bench_arit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/benchmarks/${MODPY_PYCACHE}bench_arit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/benchmarks/${MODPY_PYCACHE}bench_assumptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/benchmarks/${MODPY_PYCACHE}bench_assumptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/benchmarks/${MODPY_PYCACHE}bench_basic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/benchmarks/${MODPY_PYCACHE}bench_basic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/benchmarks/${MODPY_PYCACHE}bench_expand.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/benchmarks/${MODPY_PYCACHE}bench_expand.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/benchmarks/${MODPY_PYCACHE}bench_numbers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/benchmarks/${MODPY_PYCACHE}bench_numbers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/benchmarks/${MODPY_PYCACHE}bench_sympify.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/benchmarks/${MODPY_PYCACHE}bench_sympify.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/core/benchmarks/bench_arit.py
 lib/python${MODPY_VERSION}/site-packages/sympy/core/benchmarks/bench_assumptions.py
@@ -406,43 +586,81 @@ lib/python${MODPY_VERSION}/site-packages/sympy/core/sympify.py
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_args.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_args.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_arit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_arit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_assumptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_assumptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_basic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_basic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_cache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_cache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_compatibility.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_compatibility.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_complex.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_complex.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_constructor_postprocessor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_constructor_postprocessor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_containers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_containers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_count_ops.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_count_ops.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_diff.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_diff.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_equal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_equal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_eval.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_eval.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_evalf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_evalf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_expand.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_expand.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_expr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_expr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_exprtools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_exprtools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_facts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_facts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_function.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_function.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_logic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_logic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_match.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_match.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_multidimensional.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_multidimensional.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_noncommutative.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_noncommutative.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_numbers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_numbers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_operations.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_operations.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_parameters.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_parameters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_power.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_power.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_priority.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_priority.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_relational.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_relational.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_rules.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_rules.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_singleton.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_singleton.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_subs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_subs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_symbol.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_symbol.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_sympify.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_sympify.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_trace.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_trace.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_truediv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_truediv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_var.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/${MODPY_PYCACHE}test_var.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/test_args.py
 lib/python${MODPY_VERSION}/site-packages/sympy/core/tests/test_arit.py
@@ -485,42 +703,58 @@ lib/python${MODPY_VERSION}/site-packages/sympy/core/trace.py
 lib/python${MODPY_VERSION}/site-packages/sympy/crypto/
 lib/python${MODPY_VERSION}/site-packages/sympy/crypto/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/crypto/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/crypto/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/crypto/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/crypto/${MODPY_PYCACHE}crypto.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/crypto/${MODPY_PYCACHE}crypto.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/crypto/crypto.py
 lib/python${MODPY_VERSION}/site-packages/sympy/crypto/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/crypto/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/crypto/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/crypto/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/crypto/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/crypto/tests/${MODPY_PYCACHE}test_crypto.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/crypto/tests/${MODPY_PYCACHE}test_crypto.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/crypto/tests/test_crypto.py
 lib/python${MODPY_VERSION}/site-packages/sympy/deprecated/
 lib/python${MODPY_VERSION}/site-packages/sympy/deprecated/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/deprecated/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/deprecated/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/deprecated/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/deprecated/${MODPY_PYCACHE}class_registry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/deprecated/${MODPY_PYCACHE}class_registry.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/deprecated/class_registry.py
 lib/python${MODPY_VERSION}/site-packages/sympy/deprecated/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/deprecated/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/deprecated/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/deprecated/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/deprecated/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/deprecated/tests/${MODPY_PYCACHE}test_class_registry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/deprecated/tests/${MODPY_PYCACHE}test_class_registry.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/deprecated/tests/test_class_registry.py
 lib/python${MODPY_VERSION}/site-packages/sympy/diffgeom/
 lib/python${MODPY_VERSION}/site-packages/sympy/diffgeom/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/diffgeom/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/diffgeom/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/diffgeom/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/diffgeom/${MODPY_PYCACHE}diffgeom.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/diffgeom/${MODPY_PYCACHE}diffgeom.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/diffgeom/${MODPY_PYCACHE}rn.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/diffgeom/${MODPY_PYCACHE}rn.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/diffgeom/diffgeom.py
 lib/python${MODPY_VERSION}/site-packages/sympy/diffgeom/rn.py
 lib/python${MODPY_VERSION}/site-packages/sympy/diffgeom/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/diffgeom/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/diffgeom/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/diffgeom/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/diffgeom/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/diffgeom/tests/${MODPY_PYCACHE}test_class_structure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/diffgeom/tests/${MODPY_PYCACHE}test_class_structure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/diffgeom/tests/${MODPY_PYCACHE}test_diffgeom.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/diffgeom/tests/${MODPY_PYCACHE}test_diffgeom.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/diffgeom/tests/${MODPY_PYCACHE}test_function_diffgeom_book.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/diffgeom/tests/${MODPY_PYCACHE}test_function_diffgeom_book.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/diffgeom/tests/${MODPY_PYCACHE}test_hyperbolic_space.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/diffgeom/tests/${MODPY_PYCACHE}test_hyperbolic_space.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/diffgeom/tests/test_class_structure.py
 lib/python${MODPY_VERSION}/site-packages/sympy/diffgeom/tests/test_diffgeom.py
@@ -529,18 +763,26 @@ lib/python${MODPY_VERSION}/site-packages/sympy/diffgeom/tests/test_hyperbolic_sp
 lib/python${MODPY_VERSION}/site-packages/sympy/discrete/
 lib/python${MODPY_VERSION}/site-packages/sympy/discrete/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/discrete/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/discrete/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/discrete/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/discrete/${MODPY_PYCACHE}convolutions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/discrete/${MODPY_PYCACHE}convolutions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/discrete/${MODPY_PYCACHE}recurrences.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/discrete/${MODPY_PYCACHE}recurrences.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/discrete/${MODPY_PYCACHE}transforms.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/discrete/${MODPY_PYCACHE}transforms.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/discrete/convolutions.py
 lib/python${MODPY_VERSION}/site-packages/sympy/discrete/recurrences.py
 lib/python${MODPY_VERSION}/site-packages/sympy/discrete/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/discrete/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/discrete/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/discrete/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/discrete/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/discrete/tests/${MODPY_PYCACHE}test_convolutions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/discrete/tests/${MODPY_PYCACHE}test_convolutions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/discrete/tests/${MODPY_PYCACHE}test_recurrences.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/discrete/tests/${MODPY_PYCACHE}test_recurrences.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/discrete/tests/${MODPY_PYCACHE}test_transforms.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/discrete/tests/${MODPY_PYCACHE}test_transforms.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/discrete/tests/test_convolutions.py
 lib/python${MODPY_VERSION}/site-packages/sympy/discrete/tests/test_recurrences.py
@@ -549,18 +791,27 @@ lib/python${MODPY_VERSION}/site-packages/sympy/discrete/transforms.py
 lib/python${MODPY_VERSION}/site-packages/sympy/external/
 lib/python${MODPY_VERSION}/site-packages/sympy/external/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/external/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/external/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/external/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/external/${MODPY_PYCACHE}importtools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/external/${MODPY_PYCACHE}importtools.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/external/importtools.py
 lib/python${MODPY_VERSION}/site-packages/sympy/external/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/external/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/external/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/external/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/external/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/external/tests/${MODPY_PYCACHE}test_autowrap.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/external/tests/${MODPY_PYCACHE}test_autowrap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/external/tests/${MODPY_PYCACHE}test_codegen.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/external/tests/${MODPY_PYCACHE}test_codegen.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/external/tests/${MODPY_PYCACHE}test_importtools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/external/tests/${MODPY_PYCACHE}test_importtools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/external/tests/${MODPY_PYCACHE}test_numpy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/external/tests/${MODPY_PYCACHE}test_numpy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/external/tests/${MODPY_PYCACHE}test_sage.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/external/tests/${MODPY_PYCACHE}test_sage.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/external/tests/${MODPY_PYCACHE}test_scipy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/external/tests/${MODPY_PYCACHE}test_scipy.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/external/tests/test_autowrap.py
 lib/python${MODPY_VERSION}/site-packages/sympy/external/tests/test_codegen.py
@@ -571,38 +822,55 @@ lib/python${MODPY_VERSION}/site-packages/sympy/external/tests/test_scipy.py
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/functions/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/combinatorial/
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/combinatorial/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/functions/combinatorial/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/combinatorial/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/combinatorial/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/combinatorial/${MODPY_PYCACHE}factorials.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/combinatorial/${MODPY_PYCACHE}factorials.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/combinatorial/${MODPY_PYCACHE}numbers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/combinatorial/${MODPY_PYCACHE}numbers.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/combinatorial/factorials.py
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/combinatorial/numbers.py
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/combinatorial/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/combinatorial/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/functions/combinatorial/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/combinatorial/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/combinatorial/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/combinatorial/tests/${MODPY_PYCACHE}test_comb_factorials.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/combinatorial/tests/${MODPY_PYCACHE}test_comb_factorials.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/combinatorial/tests/${MODPY_PYCACHE}test_comb_numbers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/combinatorial/tests/${MODPY_PYCACHE}test_comb_numbers.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/combinatorial/tests/test_comb_factorials.py
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/combinatorial/tests/test_comb_numbers.py
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/${MODPY_PYCACHE}complexes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/${MODPY_PYCACHE}complexes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/${MODPY_PYCACHE}exponential.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/${MODPY_PYCACHE}exponential.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/${MODPY_PYCACHE}hyperbolic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/${MODPY_PYCACHE}hyperbolic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/${MODPY_PYCACHE}integers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/${MODPY_PYCACHE}integers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/${MODPY_PYCACHE}miscellaneous.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/${MODPY_PYCACHE}miscellaneous.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/${MODPY_PYCACHE}piecewise.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/${MODPY_PYCACHE}piecewise.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/${MODPY_PYCACHE}trigonometric.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/${MODPY_PYCACHE}trigonometric.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/benchmarks/
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/benchmarks/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/benchmarks/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/benchmarks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/benchmarks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/benchmarks/${MODPY_PYCACHE}bench_exp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/benchmarks/${MODPY_PYCACHE}bench_exp.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/benchmarks/bench_exp.py
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/complexes.py
@@ -614,14 +882,23 @@ lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/piecewise.py
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/tests/${MODPY_PYCACHE}test_complexes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/tests/${MODPY_PYCACHE}test_complexes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/tests/${MODPY_PYCACHE}test_exponential.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/tests/${MODPY_PYCACHE}test_exponential.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/tests/${MODPY_PYCACHE}test_hyperbolic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/tests/${MODPY_PYCACHE}test_hyperbolic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/tests/${MODPY_PYCACHE}test_integers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/tests/${MODPY_PYCACHE}test_integers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/tests/${MODPY_PYCACHE}test_interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/tests/${MODPY_PYCACHE}test_interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/tests/${MODPY_PYCACHE}test_miscellaneous.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/tests/${MODPY_PYCACHE}test_miscellaneous.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/tests/${MODPY_PYCACHE}test_piecewise.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/tests/${MODPY_PYCACHE}test_piecewise.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/tests/${MODPY_PYCACHE}test_trigonometric.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/tests/${MODPY_PYCACHE}test_trigonometric.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/tests/test_complexes.py
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/tests/test_exponential.py
@@ -635,25 +912,42 @@ lib/python${MODPY_VERSION}/site-packages/sympy/functions/elementary/trigonometri
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}bessel.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}bessel.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}beta_functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}beta_functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}bsplines.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}bsplines.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}delta_functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}delta_functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}elliptic_integrals.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}elliptic_integrals.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}error_functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}error_functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}gamma_functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}gamma_functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}hyper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}hyper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}mathieu_functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}mathieu_functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}polynomials.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}polynomials.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}singularity_functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}singularity_functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}spherical_harmonics.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}spherical_harmonics.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}tensor_functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}tensor_functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}zeta_functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/${MODPY_PYCACHE}zeta_functions.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/benchmarks/
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/benchmarks/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/benchmarks/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/benchmarks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/benchmarks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/benchmarks/${MODPY_PYCACHE}bench_special.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/benchmarks/${MODPY_PYCACHE}bench_special.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/benchmarks/bench_special.py
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/bessel.py
@@ -672,20 +966,35 @@ lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tensor_function
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}test_bessel.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}test_bessel.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}test_beta_functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}test_beta_functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}test_bsplines.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}test_bsplines.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}test_delta_functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}test_delta_functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}test_elliptic_integrals.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}test_elliptic_integrals.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}test_error_functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}test_error_functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}test_gamma_functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}test_gamma_functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}test_hyper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}test_hyper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}test_mathieu.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}test_mathieu.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}test_singularity_functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}test_singularity_functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}test_spec_polynomials.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}test_spec_polynomials.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}test_spherical_harmonics.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}test_spherical_harmonics.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}test_tensor_functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}test_tensor_functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}test_zeta_functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/${MODPY_PYCACHE}test_zeta_functions.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/test_bessel.py
 lib/python${MODPY_VERSION}/site-packages/sympy/functions/special/tests/test_beta_functions.py
@@ -706,16 +1015,27 @@ lib/python${MODPY_VERSION}/site-packages/sympy/galgebra.py
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/geometry/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/geometry/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/geometry/${MODPY_PYCACHE}curve.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/${MODPY_PYCACHE}curve.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/geometry/${MODPY_PYCACHE}ellipse.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/${MODPY_PYCACHE}ellipse.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/geometry/${MODPY_PYCACHE}entity.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/${MODPY_PYCACHE}entity.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/geometry/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/geometry/${MODPY_PYCACHE}line.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/${MODPY_PYCACHE}line.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/geometry/${MODPY_PYCACHE}parabola.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/${MODPY_PYCACHE}parabola.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/geometry/${MODPY_PYCACHE}plane.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/${MODPY_PYCACHE}plane.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/geometry/${MODPY_PYCACHE}point.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/${MODPY_PYCACHE}point.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/geometry/${MODPY_PYCACHE}polygon.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/${MODPY_PYCACHE}polygon.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/geometry/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/curve.py
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/ellipse.py
@@ -729,16 +1049,27 @@ lib/python${MODPY_VERSION}/site-packages/sympy/geometry/polygon.py
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/geometry/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/geometry/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/geometry/tests/${MODPY_PYCACHE}test_curve.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/tests/${MODPY_PYCACHE}test_curve.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/geometry/tests/${MODPY_PYCACHE}test_ellipse.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/tests/${MODPY_PYCACHE}test_ellipse.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/geometry/tests/${MODPY_PYCACHE}test_entity.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/tests/${MODPY_PYCACHE}test_entity.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/geometry/tests/${MODPY_PYCACHE}test_geometrysets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/tests/${MODPY_PYCACHE}test_geometrysets.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/geometry/tests/${MODPY_PYCACHE}test_line.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/tests/${MODPY_PYCACHE}test_line.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/geometry/tests/${MODPY_PYCACHE}test_parabola.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/tests/${MODPY_PYCACHE}test_parabola.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/geometry/tests/${MODPY_PYCACHE}test_plane.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/tests/${MODPY_PYCACHE}test_plane.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/geometry/tests/${MODPY_PYCACHE}test_point.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/tests/${MODPY_PYCACHE}test_point.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/geometry/tests/${MODPY_PYCACHE}test_polygon.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/tests/${MODPY_PYCACHE}test_polygon.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/geometry/tests/${MODPY_PYCACHE}test_util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/tests/${MODPY_PYCACHE}test_util.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/tests/test_curve.py
 lib/python${MODPY_VERSION}/site-packages/sympy/geometry/tests/test_ellipse.py
@@ -754,11 +1085,17 @@ lib/python${MODPY_VERSION}/site-packages/sympy/geometry/util.py
 lib/python${MODPY_VERSION}/site-packages/sympy/holonomic/
 lib/python${MODPY_VERSION}/site-packages/sympy/holonomic/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/holonomic/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/holonomic/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/holonomic/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/holonomic/${MODPY_PYCACHE}holonomic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/holonomic/${MODPY_PYCACHE}holonomic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/holonomic/${MODPY_PYCACHE}holonomicerrors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/holonomic/${MODPY_PYCACHE}holonomicerrors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/holonomic/${MODPY_PYCACHE}linearsolver.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/holonomic/${MODPY_PYCACHE}linearsolver.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/holonomic/${MODPY_PYCACHE}numerical.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/holonomic/${MODPY_PYCACHE}numerical.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/holonomic/${MODPY_PYCACHE}recurrence.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/holonomic/${MODPY_PYCACHE}recurrence.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/holonomic/holonomic.py
 lib/python${MODPY_VERSION}/site-packages/sympy/holonomic/holonomicerrors.py
@@ -768,35 +1105,57 @@ lib/python${MODPY_VERSION}/site-packages/sympy/holonomic/recurrence.py
 lib/python${MODPY_VERSION}/site-packages/sympy/holonomic/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/holonomic/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/holonomic/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/holonomic/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/holonomic/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/holonomic/tests/${MODPY_PYCACHE}test_holonomic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/holonomic/tests/${MODPY_PYCACHE}test_holonomic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/holonomic/tests/${MODPY_PYCACHE}test_recurrence.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/holonomic/tests/${MODPY_PYCACHE}test_recurrence.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/holonomic/tests/test_holonomic.py
 lib/python${MODPY_VERSION}/site-packages/sympy/holonomic/tests/test_recurrence.py
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}deltafunctions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}deltafunctions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}heurisch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}heurisch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}integrals.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}integrals.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}intpoly.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}intpoly.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}manualintegrate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}manualintegrate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}meijerint.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}meijerint.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}meijerint_doc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}meijerint_doc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}prde.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}prde.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}quadrature.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}quadrature.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}rationaltools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}rationaltools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}rde.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}rde.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}risch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}risch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}singularityfunctions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}singularityfunctions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}transforms.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}transforms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}trigonometry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/${MODPY_PYCACHE}trigonometry.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/benchmarks/
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/benchmarks/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/integrals/benchmarks/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/benchmarks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/benchmarks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/benchmarks/${MODPY_PYCACHE}bench_integrate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/benchmarks/${MODPY_PYCACHE}bench_integrate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/benchmarks/${MODPY_PYCACHE}bench_trigintegrate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/benchmarks/${MODPY_PYCACHE}bench_trigintegrate.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/benchmarks/bench_integrate.py
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/benchmarks/bench_trigintegrate.py
@@ -815,18 +1174,27 @@ lib/python${MODPY_VERSION}/site-packages/sympy/integrals/risch.py
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/${MODPY_PYCACHE}constraints.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/${MODPY_PYCACHE}constraints.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/${MODPY_PYCACHE}rubimain.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/${MODPY_PYCACHE}rubimain.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/${MODPY_PYCACHE}symbol.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/${MODPY_PYCACHE}symbol.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/${MODPY_PYCACHE}utility_function.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/${MODPY_PYCACHE}utility_function.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/constraints.py
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/parsetools/
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/parsetools/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/parsetools/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/parsetools/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/parsetools/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/parsetools/${MODPY_PYCACHE}generate_rules.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/parsetools/${MODPY_PYCACHE}generate_rules.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/parsetools/${MODPY_PYCACHE}generate_tests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/parsetools/${MODPY_PYCACHE}generate_tests.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/parsetools/${MODPY_PYCACHE}parse.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/parsetools/${MODPY_PYCACHE}parse.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/parsetools/generate_rules.py
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/parsetools/generate_tests.py
@@ -835,30 +1203,48 @@ lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/parsetools/parse.p
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/parsetools/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/parsetools/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/parsetools/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/parsetools/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/parsetools/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/parsetools/tests/${MODPY_PYCACHE}test_parse.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/parsetools/tests/${MODPY_PYCACHE}test_parse.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/parsetools/tests/test_parse.py
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}test_1_2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}test_1_2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}test_1_3.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}test_1_3.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}test_1_4.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}test_1_4.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}test_exponential.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}test_exponential.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}test_hyperbolic_sine.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}test_hyperbolic_sine.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}test_inverse_hyperbolic_sine.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}test_inverse_hyperbolic_sine.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}test_inverse_sine.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}test_inverse_sine.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}test_logarithms.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}test_logarithms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}test_miscellaneous_algebra.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}test_miscellaneous_algebra.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}test_secant.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}test_secant.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}test_sine.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}test_sine.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}test_special_functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}test_special_functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}test_tangent.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}test_tangent.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}test_trinomials.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/${MODPY_PYCACHE}test_trinomials.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/test_1_2.py
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubi_tests/tests/test_1_3.py
@@ -878,24 +1264,43 @@ lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rubimain.py
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}binomial_products.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}binomial_products.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}exponential.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}exponential.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}hyperbolic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}hyperbolic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}integrand_simplification.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}integrand_simplification.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}inverse_hyperbolic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}inverse_hyperbolic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}inverse_trig.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}inverse_trig.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}linear_products.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}linear_products.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}logarithms.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}logarithms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}miscellaneous_algebraic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}miscellaneous_algebraic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}miscellaneous_integration.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}miscellaneous_integration.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}miscellaneous_trig.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}miscellaneous_trig.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}piecewise_linear.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}piecewise_linear.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}quadratic_products.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}quadratic_products.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}secant.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}secant.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}sine.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}sine.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}special_functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}special_functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}tangent.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}tangent.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}trinomial_products.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/${MODPY_PYCACHE}trinomial_products.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/binomial_products.py
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/rules/exponential.py
@@ -919,8 +1324,11 @@ lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/symbol.py
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/tests/${MODPY_PYCACHE}test_rubi_integrate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/tests/${MODPY_PYCACHE}test_rubi_integrate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/tests/${MODPY_PYCACHE}test_utility_function.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/tests/${MODPY_PYCACHE}test_utility_function.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/tests/test_rubi_integrate.py
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/rubi/tests/test_utility_function.py
@@ -929,22 +1337,39 @@ lib/python${MODPY_VERSION}/site-packages/sympy/integrals/singularityfunctions.py
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_deltafunctions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_deltafunctions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_failing_integrals.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_failing_integrals.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_heurisch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_heurisch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_integrals.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_integrals.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_intpoly.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_intpoly.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_lineintegrals.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_lineintegrals.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_manual.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_manual.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_meijerint.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_meijerint.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_prde.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_prde.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_quadrature.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_quadrature.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_rationaltools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_rationaltools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_rde.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_rde.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_risch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_risch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_singularityfunctions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_singularityfunctions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_transforms.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_transforms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_trigonometry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/${MODPY_PYCACHE}test_trigonometry.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/test_deltafunctions.py
 lib/python${MODPY_VERSION}/site-packages/sympy/integrals/tests/test_failing_integrals.py
@@ -967,9 +1392,13 @@ lib/python${MODPY_VERSION}/site-packages/sympy/integrals/trigonometry.py
 lib/python${MODPY_VERSION}/site-packages/sympy/interactive/
 lib/python${MODPY_VERSION}/site-packages/sympy/interactive/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/interactive/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/interactive/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/interactive/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/interactive/${MODPY_PYCACHE}ipythonprinting.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/interactive/${MODPY_PYCACHE}ipythonprinting.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/interactive/${MODPY_PYCACHE}printing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/interactive/${MODPY_PYCACHE}printing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/interactive/${MODPY_PYCACHE}session.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/interactive/${MODPY_PYCACHE}session.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/interactive/ipythonprinting.py
 lib/python${MODPY_VERSION}/site-packages/sympy/interactive/printing.py
@@ -977,9 +1406,13 @@ lib/python${MODPY_VERSION}/site-packages/sympy/interactive/session.py
 lib/python${MODPY_VERSION}/site-packages/sympy/interactive/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/interactive/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/interactive/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/interactive/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/interactive/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/interactive/tests/${MODPY_PYCACHE}test_interactive.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/interactive/tests/${MODPY_PYCACHE}test_interactive.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/interactive/tests/${MODPY_PYCACHE}test_ipython.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/interactive/tests/${MODPY_PYCACHE}test_ipython.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/interactive/tests/${MODPY_PYCACHE}test_ipythonprinting.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/interactive/tests/${MODPY_PYCACHE}test_ipythonprinting.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/interactive/tests/test_interactive.py
 lib/python${MODPY_VERSION}/site-packages/sympy/interactive/tests/test_ipython.py
@@ -987,18 +1420,31 @@ lib/python${MODPY_VERSION}/site-packages/sympy/interactive/tests/test_ipythonpri
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/${MODPY_PYCACHE}cartan_matrix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/${MODPY_PYCACHE}cartan_matrix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/${MODPY_PYCACHE}cartan_type.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/${MODPY_PYCACHE}cartan_type.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/${MODPY_PYCACHE}dynkin_diagram.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/${MODPY_PYCACHE}dynkin_diagram.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/${MODPY_PYCACHE}root_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/${MODPY_PYCACHE}root_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/${MODPY_PYCACHE}type_a.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/${MODPY_PYCACHE}type_a.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/${MODPY_PYCACHE}type_b.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/${MODPY_PYCACHE}type_b.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/${MODPY_PYCACHE}type_c.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/${MODPY_PYCACHE}type_c.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/${MODPY_PYCACHE}type_d.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/${MODPY_PYCACHE}type_d.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/${MODPY_PYCACHE}type_e.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/${MODPY_PYCACHE}type_e.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/${MODPY_PYCACHE}type_f.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/${MODPY_PYCACHE}type_f.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/${MODPY_PYCACHE}type_g.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/${MODPY_PYCACHE}type_g.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/${MODPY_PYCACHE}weyl_group.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/${MODPY_PYCACHE}weyl_group.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/cartan_matrix.py
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/cartan_type.py
@@ -1007,18 +1453,31 @@ lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/root_system.py
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/${MODPY_PYCACHE}test_cartan_matrix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/${MODPY_PYCACHE}test_cartan_matrix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/${MODPY_PYCACHE}test_cartan_type.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/${MODPY_PYCACHE}test_cartan_type.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/${MODPY_PYCACHE}test_dynkin_diagram.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/${MODPY_PYCACHE}test_dynkin_diagram.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/${MODPY_PYCACHE}test_root_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/${MODPY_PYCACHE}test_root_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/${MODPY_PYCACHE}test_type_A.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/${MODPY_PYCACHE}test_type_A.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/${MODPY_PYCACHE}test_type_B.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/${MODPY_PYCACHE}test_type_B.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/${MODPY_PYCACHE}test_type_C.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/${MODPY_PYCACHE}test_type_C.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/${MODPY_PYCACHE}test_type_D.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/${MODPY_PYCACHE}test_type_D.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/${MODPY_PYCACHE}test_type_E.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/${MODPY_PYCACHE}test_type_E.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/${MODPY_PYCACHE}test_type_F.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/${MODPY_PYCACHE}test_type_F.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/${MODPY_PYCACHE}test_type_G.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/${MODPY_PYCACHE}test_type_G.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/${MODPY_PYCACHE}test_weyl_group.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/${MODPY_PYCACHE}test_weyl_group.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/test_cartan_matrix.py
 lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/tests/test_cartan_type.py
@@ -1043,15 +1502,22 @@ lib/python${MODPY_VERSION}/site-packages/sympy/liealgebras/weyl_group.py
 lib/python${MODPY_VERSION}/site-packages/sympy/logic/
 lib/python${MODPY_VERSION}/site-packages/sympy/logic/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/logic/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/logic/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/logic/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/logic/${MODPY_PYCACHE}boolalg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/logic/${MODPY_PYCACHE}boolalg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/logic/${MODPY_PYCACHE}inference.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/logic/${MODPY_PYCACHE}inference.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/logic/algorithms/
 lib/python${MODPY_VERSION}/site-packages/sympy/logic/algorithms/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/logic/algorithms/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/logic/algorithms/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/logic/algorithms/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/logic/algorithms/${MODPY_PYCACHE}dpll.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/logic/algorithms/${MODPY_PYCACHE}dpll.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/logic/algorithms/${MODPY_PYCACHE}dpll2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/logic/algorithms/${MODPY_PYCACHE}dpll2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/logic/algorithms/${MODPY_PYCACHE}pycosat_wrapper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/logic/algorithms/${MODPY_PYCACHE}pycosat_wrapper.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/logic/algorithms/dpll.py
 lib/python${MODPY_VERSION}/site-packages/sympy/logic/algorithms/dpll2.py
@@ -1061,9 +1527,13 @@ lib/python${MODPY_VERSION}/site-packages/sympy/logic/inference.py
 lib/python${MODPY_VERSION}/site-packages/sympy/logic/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/logic/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/logic/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/logic/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/logic/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/logic/tests/${MODPY_PYCACHE}test_boolalg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/logic/tests/${MODPY_PYCACHE}test_boolalg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/logic/tests/${MODPY_PYCACHE}test_dimacs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/logic/tests/${MODPY_PYCACHE}test_dimacs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/logic/tests/${MODPY_PYCACHE}test_inference.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/logic/tests/${MODPY_PYCACHE}test_inference.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/logic/tests/test_boolalg.py
 lib/python${MODPY_VERSION}/site-packages/sympy/logic/tests/test_dimacs.py
@@ -1071,36 +1541,60 @@ lib/python${MODPY_VERSION}/site-packages/sympy/logic/tests/test_inference.py
 lib/python${MODPY_VERSION}/site-packages/sympy/logic/utilities/
 lib/python${MODPY_VERSION}/site-packages/sympy/logic/utilities/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/logic/utilities/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/logic/utilities/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/logic/utilities/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/logic/utilities/${MODPY_PYCACHE}dimacs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/logic/utilities/${MODPY_PYCACHE}dimacs.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/logic/utilities/dimacs.py
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}decompositions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}decompositions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}dense.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}dense.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}densearith.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}densearith.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}densesolve.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}densesolve.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}densetools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}densetools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}determinant.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}determinant.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}eigen.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}eigen.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}graph.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}graph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}immutable.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}immutable.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}inverse.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}inverse.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}matrices.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}matrices.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}normalforms.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}normalforms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}reductions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}reductions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}solvers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}solvers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}sparse.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}sparse.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}sparsetools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}sparsetools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}subspaces.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}subspaces.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}utilities.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/${MODPY_PYCACHE}utilities.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/benchmarks/
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/benchmarks/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/matrices/benchmarks/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/benchmarks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/benchmarks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/benchmarks/${MODPY_PYCACHE}bench_matrix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/benchmarks/${MODPY_PYCACHE}bench_matrix.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/benchmarks/bench_matrix.py
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/common.py
@@ -1114,29 +1608,53 @@ lib/python${MODPY_VERSION}/site-packages/sympy/matrices/eigen.py
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}adjoint.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}adjoint.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}applyfunc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}applyfunc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}blockmatrix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}blockmatrix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}companion.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}companion.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}determinant.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}determinant.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}diagonal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}diagonal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}dotproduct.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}dotproduct.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}factorizations.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}factorizations.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}fourier.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}fourier.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}funcmatrix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}funcmatrix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}hadamard.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}hadamard.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}inverse.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}inverse.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}kronecker.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}kronecker.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}matadd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}matadd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}matexpr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}matexpr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}matmul.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}matmul.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}matpow.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}matpow.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}permutation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}permutation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}sets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}sets.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}slice.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}slice.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}special.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}special.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}trace.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}trace.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}transpose.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/${MODPY_PYCACHE}transpose.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/adjoint.py
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/applyfunc.py
@@ -1162,31 +1680,57 @@ lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/special.py
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_adjoint.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_adjoint.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_applyfunc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_applyfunc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_blockmatrix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_blockmatrix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_companion.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_companion.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_derivatives.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_derivatives.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_determinant.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_determinant.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_diagonal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_diagonal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_dotproduct.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_dotproduct.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_factorizations.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_factorizations.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_fourier.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_fourier.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_funcmatrix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_funcmatrix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_hadamard.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_hadamard.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_indexing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_indexing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_inverse.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_inverse.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_kronecker.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_kronecker.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_matadd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_matadd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_matexpr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_matexpr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_matmul.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_matmul.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_matpow.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_matpow.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_permutation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_permutation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_sets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_sets.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_slice.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_slice.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_special.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_special.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_trace.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_trace.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_transpose.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/${MODPY_PYCACHE}test_transpose.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/test_adjoint.py
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/expressions/tests/test_applyfunc.py
@@ -1228,23 +1772,41 @@ lib/python${MODPY_VERSION}/site-packages/sympy/matrices/subspaces.py
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_commonmatrix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_commonmatrix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_decompositions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_decompositions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_densearith.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_densearith.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_densesolve.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_densesolve.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_densetools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_densetools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_determinant.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_determinant.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_eigen.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_eigen.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_graph.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_graph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_immutable.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_immutable.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_interactions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_interactions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_matrices.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_matrices.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_normalforms.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_normalforms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_reductions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_reductions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_solvers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_solvers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_sparse.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_sparse.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_sparsetools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_sparsetools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_subspaces.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/${MODPY_PYCACHE}test_subspaces.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/test_commonmatrix.py
 lib/python${MODPY_VERSION}/site-packages/sympy/matrices/tests/test_decompositions.py
@@ -1267,10 +1829,15 @@ lib/python${MODPY_VERSION}/site-packages/sympy/matrices/utilities.py
 lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/
 lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/${MODPY_PYCACHE}conflict.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/${MODPY_PYCACHE}conflict.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/${MODPY_PYCACHE}dispatcher.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/${MODPY_PYCACHE}dispatcher.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/conflict.py
 lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/core.py
@@ -1278,9 +1845,13 @@ lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/dispatcher.py
 lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/tests/${MODPY_PYCACHE}test_conflict.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/tests/${MODPY_PYCACHE}test_conflict.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/tests/${MODPY_PYCACHE}test_core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/tests/${MODPY_PYCACHE}test_core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/tests/${MODPY_PYCACHE}test_dispatcher.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/tests/${MODPY_PYCACHE}test_dispatcher.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/tests/test_conflict.py
 lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/tests/test_core.py
@@ -1289,20 +1860,35 @@ lib/python${MODPY_VERSION}/site-packages/sympy/multipledispatch/utils.py
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}bbp_pi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}bbp_pi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}continued_fraction.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}continued_fraction.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}digits.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}digits.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}ecm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}ecm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}egyptian_fraction.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}egyptian_fraction.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}elliptic_curve.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}elliptic_curve.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}factor_.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}factor_.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}generate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}generate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}modular.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}modular.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}multinomial.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}multinomial.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}partitions_.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}partitions_.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}primetest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}primetest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}qs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}qs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}residue_ntheory.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/${MODPY_PYCACHE}residue_ntheory.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/bbp_pi.py
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/continued_fraction.py
@@ -1321,20 +1907,35 @@ lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/residue_ntheory.py
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}test_bbp_pi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}test_bbp_pi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}test_continued_fraction.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}test_continued_fraction.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}test_digits.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}test_digits.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}test_ecm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}test_ecm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}test_egyptian_fraction.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}test_egyptian_fraction.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}test_elliptic_curve.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}test_elliptic_curve.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}test_factor_.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}test_factor_.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}test_generate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}test_generate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}test_modular.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}test_modular.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}test_multinomial.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}test_multinomial.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}test_partitions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}test_partitions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}test_primetest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}test_primetest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}test_qs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}test_qs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}test_residue.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/${MODPY_PYCACHE}test_residue.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/test_bbp_pi.py
 lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/test_continued_fraction.py
@@ -1353,26 +1954,39 @@ lib/python${MODPY_VERSION}/site-packages/sympy/ntheory/tests/test_residue.py
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/parsing/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/${MODPY_PYCACHE}ast_parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/${MODPY_PYCACHE}ast_parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/${MODPY_PYCACHE}mathematica.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/${MODPY_PYCACHE}mathematica.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/${MODPY_PYCACHE}maxima.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/${MODPY_PYCACHE}maxima.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/${MODPY_PYCACHE}sym_expr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/${MODPY_PYCACHE}sym_expr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/${MODPY_PYCACHE}sympy_parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/${MODPY_PYCACHE}sympy_parser.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/ast_parser.py
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/Autolev.g4
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/${MODPY_PYCACHE}_listener_autolev_antlr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/${MODPY_PYCACHE}_listener_autolev_antlr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/${MODPY_PYCACHE}_parse_autolev_antlr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/${MODPY_PYCACHE}_parse_autolev_antlr.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/_antlr/
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/_antlr/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/_antlr/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/_antlr/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/_antlr/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/_antlr/${MODPY_PYCACHE}autolevlexer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/_antlr/${MODPY_PYCACHE}autolevlexer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/_antlr/${MODPY_PYCACHE}autolevlistener.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/_antlr/${MODPY_PYCACHE}autolevlistener.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/_antlr/${MODPY_PYCACHE}autolevparser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/_antlr/${MODPY_PYCACHE}autolevparser.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/_antlr/autolevlexer.py
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/_antlr/autolevlistener.py
@@ -1382,23 +1996,39 @@ lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/_parse_autolev_an
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/README.txt
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/${MODPY_PYCACHE}ruletest1.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/${MODPY_PYCACHE}ruletest1.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/${MODPY_PYCACHE}ruletest10.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/${MODPY_PYCACHE}ruletest10.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/${MODPY_PYCACHE}ruletest11.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/${MODPY_PYCACHE}ruletest11.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/${MODPY_PYCACHE}ruletest12.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/${MODPY_PYCACHE}ruletest12.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/${MODPY_PYCACHE}ruletest2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/${MODPY_PYCACHE}ruletest2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/${MODPY_PYCACHE}ruletest3.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/${MODPY_PYCACHE}ruletest3.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/${MODPY_PYCACHE}ruletest4.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/${MODPY_PYCACHE}ruletest4.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/${MODPY_PYCACHE}ruletest5.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/${MODPY_PYCACHE}ruletest5.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/${MODPY_PYCACHE}ruletest6.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/${MODPY_PYCACHE}ruletest6.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/${MODPY_PYCACHE}ruletest7.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/${MODPY_PYCACHE}ruletest7.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/${MODPY_PYCACHE}ruletest8.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/${MODPY_PYCACHE}ruletest8.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/${MODPY_PYCACHE}ruletest9.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/${MODPY_PYCACHE}ruletest9.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/pydy-example-repo/
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/pydy-example-repo/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/pydy-example-repo/${MODPY_PYCACHE}chaos_pendulum.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/pydy-example-repo/${MODPY_PYCACHE}chaos_pendulum.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/pydy-example-repo/${MODPY_PYCACHE}double_pendulum.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/pydy-example-repo/${MODPY_PYCACHE}double_pendulum.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/pydy-example-repo/${MODPY_PYCACHE}mass_spring_damper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/pydy-example-repo/${MODPY_PYCACHE}mass_spring_damper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/pydy-example-repo/${MODPY_PYCACHE}non_min_pendulum.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/pydy-example-repo/${MODPY_PYCACHE}non_min_pendulum.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/pydy-example-repo/chaos_pendulum.al
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/pydy-example-repo/chaos_pendulum.py
@@ -1435,13 +2065,17 @@ lib/python${MODPY_VERSION}/site-packages/sympy/parsing/autolev/test-examples/rul
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/c/
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/c/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/parsing/c/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/c/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/c/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/c/${MODPY_PYCACHE}c_parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/c/${MODPY_PYCACHE}c_parser.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/c/c_parser.py
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/fortran/
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/fortran/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/parsing/fortran/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/fortran/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/fortran/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/fortran/${MODPY_PYCACHE}fortran_parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/fortran/${MODPY_PYCACHE}fortran_parser.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/fortran/fortran_parser.py
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/latex/
@@ -1449,15 +2083,22 @@ lib/python${MODPY_VERSION}/site-packages/sympy/parsing/latex/LICENSE.txt
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/latex/LaTeX.g4
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/latex/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/parsing/latex/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/latex/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/latex/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/latex/${MODPY_PYCACHE}_build_latex_antlr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/latex/${MODPY_PYCACHE}_build_latex_antlr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/latex/${MODPY_PYCACHE}_parse_latex_antlr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/latex/${MODPY_PYCACHE}_parse_latex_antlr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/latex/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/latex/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/latex/_antlr/
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/latex/_antlr/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/parsing/latex/_antlr/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/latex/_antlr/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/latex/_antlr/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/latex/_antlr/${MODPY_PYCACHE}latexlexer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/latex/_antlr/${MODPY_PYCACHE}latexlexer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/latex/_antlr/${MODPY_PYCACHE}latexparser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/latex/_antlr/${MODPY_PYCACHE}latexparser.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/latex/_antlr/latexlexer.py
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/latex/_antlr/latexparser.py
@@ -1471,17 +2112,29 @@ lib/python${MODPY_VERSION}/site-packages/sympy/parsing/sympy_parser.py
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/${MODPY_PYCACHE}test_ast_parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/${MODPY_PYCACHE}test_ast_parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/${MODPY_PYCACHE}test_autolev.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/${MODPY_PYCACHE}test_autolev.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/${MODPY_PYCACHE}test_c_parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/${MODPY_PYCACHE}test_c_parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/${MODPY_PYCACHE}test_fortran_parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/${MODPY_PYCACHE}test_fortran_parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/${MODPY_PYCACHE}test_implicit_multiplication_application.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/${MODPY_PYCACHE}test_implicit_multiplication_application.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/${MODPY_PYCACHE}test_latex.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/${MODPY_PYCACHE}test_latex.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/${MODPY_PYCACHE}test_latex_deps.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/${MODPY_PYCACHE}test_latex_deps.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/${MODPY_PYCACHE}test_mathematica.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/${MODPY_PYCACHE}test_mathematica.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/${MODPY_PYCACHE}test_maxima.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/${MODPY_PYCACHE}test_maxima.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/${MODPY_PYCACHE}test_sym_expr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/${MODPY_PYCACHE}test_sym_expr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/${MODPY_PYCACHE}test_sympy_parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/${MODPY_PYCACHE}test_sympy_parser.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/test_ast_parser.py
 lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/test_autolev.py
@@ -1497,51 +2150,73 @@ lib/python${MODPY_VERSION}/site-packages/sympy/parsing/tests/test_sympy_parser.p
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/physics/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/${MODPY_PYCACHE}gaussopt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/${MODPY_PYCACHE}gaussopt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/${MODPY_PYCACHE}hydrogen.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/${MODPY_PYCACHE}hydrogen.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/${MODPY_PYCACHE}matrices.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/${MODPY_PYCACHE}matrices.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/${MODPY_PYCACHE}paulialgebra.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/${MODPY_PYCACHE}paulialgebra.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/${MODPY_PYCACHE}pring.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/${MODPY_PYCACHE}pring.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/${MODPY_PYCACHE}qho_1d.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/${MODPY_PYCACHE}qho_1d.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/${MODPY_PYCACHE}secondquant.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/${MODPY_PYCACHE}secondquant.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/${MODPY_PYCACHE}sho.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/${MODPY_PYCACHE}sho.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/${MODPY_PYCACHE}wigner.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/${MODPY_PYCACHE}wigner.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/continuum_mechanics/
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/continuum_mechanics/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/physics/continuum_mechanics/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/continuum_mechanics/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/continuum_mechanics/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/continuum_mechanics/${MODPY_PYCACHE}beam.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/continuum_mechanics/${MODPY_PYCACHE}beam.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/continuum_mechanics/beam.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/continuum_mechanics/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/continuum_mechanics/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/physics/continuum_mechanics/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/continuum_mechanics/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/continuum_mechanics/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/continuum_mechanics/tests/${MODPY_PYCACHE}test_beam.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/continuum_mechanics/tests/${MODPY_PYCACHE}test_beam.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/continuum_mechanics/tests/test_beam.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/control/
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/control/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/physics/control/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/control/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/control/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/control/${MODPY_PYCACHE}lti.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/control/${MODPY_PYCACHE}lti.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/control/lti.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/control/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/control/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/physics/control/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/control/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/control/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/control/tests/${MODPY_PYCACHE}test_lti.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/control/tests/${MODPY_PYCACHE}test_lti.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/control/tests/test_lti.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/gaussopt.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/hep/
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/hep/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/physics/hep/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/hep/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/hep/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/hep/${MODPY_PYCACHE}gamma_matrices.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/hep/${MODPY_PYCACHE}gamma_matrices.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/hep/gamma_matrices.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/hep/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/hep/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/physics/hep/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/hep/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/hep/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/hep/tests/${MODPY_PYCACHE}test_gamma_matrices.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/hep/tests/${MODPY_PYCACHE}test_gamma_matrices.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/hep/tests/test_gamma_matrices.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/hydrogen.py
@@ -1549,15 +2224,25 @@ lib/python${MODPY_VERSION}/site-packages/sympy/physics/matrices.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/${MODPY_PYCACHE}body.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/${MODPY_PYCACHE}body.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/${MODPY_PYCACHE}functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/${MODPY_PYCACHE}functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/${MODPY_PYCACHE}kane.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/${MODPY_PYCACHE}kane.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/${MODPY_PYCACHE}lagrange.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/${MODPY_PYCACHE}lagrange.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/${MODPY_PYCACHE}linearize.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/${MODPY_PYCACHE}linearize.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/${MODPY_PYCACHE}models.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/${MODPY_PYCACHE}models.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/${MODPY_PYCACHE}particle.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/${MODPY_PYCACHE}particle.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/${MODPY_PYCACHE}rigidbody.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/${MODPY_PYCACHE}rigidbody.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/${MODPY_PYCACHE}system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/${MODPY_PYCACHE}system.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/body.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/functions.py
@@ -1571,19 +2256,33 @@ lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/system.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/${MODPY_PYCACHE}test_body.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/${MODPY_PYCACHE}test_body.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/${MODPY_PYCACHE}test_functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/${MODPY_PYCACHE}test_functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/${MODPY_PYCACHE}test_kane.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/${MODPY_PYCACHE}test_kane.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/${MODPY_PYCACHE}test_kane2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/${MODPY_PYCACHE}test_kane2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/${MODPY_PYCACHE}test_kane3.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/${MODPY_PYCACHE}test_kane3.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/${MODPY_PYCACHE}test_kane4.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/${MODPY_PYCACHE}test_kane4.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/${MODPY_PYCACHE}test_lagrange.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/${MODPY_PYCACHE}test_lagrange.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/${MODPY_PYCACHE}test_lagrange2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/${MODPY_PYCACHE}test_lagrange2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/${MODPY_PYCACHE}test_linearize.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/${MODPY_PYCACHE}test_linearize.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/${MODPY_PYCACHE}test_models.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/${MODPY_PYCACHE}test_models.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/${MODPY_PYCACHE}test_particle.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/${MODPY_PYCACHE}test_particle.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/${MODPY_PYCACHE}test_rigidbody.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/${MODPY_PYCACHE}test_rigidbody.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/${MODPY_PYCACHE}test_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/${MODPY_PYCACHE}test_system.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/test_body.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/test_functions.py
@@ -1601,11 +2300,17 @@ lib/python${MODPY_VERSION}/site-packages/sympy/physics/mechanics/tests/test_syst
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/${MODPY_PYCACHE}gaussopt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/${MODPY_PYCACHE}gaussopt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/${MODPY_PYCACHE}medium.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/${MODPY_PYCACHE}medium.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/${MODPY_PYCACHE}polarization.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/${MODPY_PYCACHE}polarization.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/${MODPY_PYCACHE}waves.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/${MODPY_PYCACHE}waves.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/gaussopt.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/medium.py
@@ -1613,11 +2318,17 @@ lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/polarization.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/tests/${MODPY_PYCACHE}test_gaussopt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/tests/${MODPY_PYCACHE}test_gaussopt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/tests/${MODPY_PYCACHE}test_medium.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/tests/${MODPY_PYCACHE}test_medium.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/tests/${MODPY_PYCACHE}test_polarization.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/tests/${MODPY_PYCACHE}test_polarization.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/tests/${MODPY_PYCACHE}test_utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/tests/${MODPY_PYCACHE}test_utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/tests/${MODPY_PYCACHE}test_waves.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/tests/${MODPY_PYCACHE}test_waves.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/tests/test_gaussopt.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/optics/tests/test_medium.py
@@ -1632,40 +2343,75 @@ lib/python${MODPY_VERSION}/site-packages/sympy/physics/qho_1d.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}anticommutator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}anticommutator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}boson.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}boson.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}cartesian.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}cartesian.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}cg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}cg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}circuitplot.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}circuitplot.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}circuitutils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}circuitutils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}commutator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}commutator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}dagger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}dagger.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}density.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}density.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}fermion.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}fermion.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}gate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}gate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}grover.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}grover.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}hilbert.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}hilbert.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}identitysearch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}identitysearch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}innerproduct.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}innerproduct.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}matrixcache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}matrixcache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}matrixutils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}matrixutils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}operator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}operator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}operatorordering.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}operatorordering.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}operatorset.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}operatorset.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}pauli.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}pauli.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}piab.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}piab.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}qapply.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}qapply.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}qasm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}qasm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}qexpr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}qexpr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}qft.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}qft.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}qubit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}qubit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}represent.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}represent.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}sho1d.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}sho1d.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}shor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}shor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}spin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}spin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}state.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}state.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}tensorproduct.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/${MODPY_PYCACHE}tensorproduct.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/anticommutator.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/boson.py
@@ -1704,40 +2450,75 @@ lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tensorproduct.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_anticommutator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_anticommutator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_boson.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_boson.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_cartesian.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_cartesian.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_cg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_cg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_circuitplot.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_circuitplot.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_circuitutils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_circuitutils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_commutator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_commutator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_constants.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_constants.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_dagger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_dagger.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_density.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_density.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_fermion.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_fermion.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_gate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_gate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_grover.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_grover.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_hilbert.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_hilbert.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_identitysearch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_identitysearch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_innerproduct.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_innerproduct.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_matrixutils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_matrixutils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_operator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_operator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_operatorordering.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_operatorordering.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_operatorset.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_operatorset.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_pauli.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_pauli.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_piab.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_piab.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_printing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_printing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_qapply.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_qapply.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_qasm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_qasm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_qexpr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_qexpr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_qft.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_qft.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_qubit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_qubit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_represent.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_represent.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_sho1d.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_sho1d.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_shor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_shor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_spin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_spin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_state.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_state.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_tensorproduct.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/${MODPY_PYCACHE}test_tensorproduct.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/test_anticommutator.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/quantum/tests/test_boson.py
@@ -1778,14 +2559,23 @@ lib/python${MODPY_VERSION}/site-packages/sympy/physics/sho.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/physics/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/tests/${MODPY_PYCACHE}test_clebsch_gordan.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/tests/${MODPY_PYCACHE}test_clebsch_gordan.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/tests/${MODPY_PYCACHE}test_hydrogen.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/tests/${MODPY_PYCACHE}test_hydrogen.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/tests/${MODPY_PYCACHE}test_paulialgebra.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/tests/${MODPY_PYCACHE}test_paulialgebra.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/tests/${MODPY_PYCACHE}test_physics_matrices.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/tests/${MODPY_PYCACHE}test_physics_matrices.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/tests/${MODPY_PYCACHE}test_pring.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/tests/${MODPY_PYCACHE}test_pring.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/tests/${MODPY_PYCACHE}test_qho_1d.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/tests/${MODPY_PYCACHE}test_qho_1d.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/tests/${MODPY_PYCACHE}test_secondquant.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/tests/${MODPY_PYCACHE}test_secondquant.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/tests/${MODPY_PYCACHE}test_sho.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/tests/${MODPY_PYCACHE}test_sho.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/tests/test_clebsch_gordan.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/tests/test_hydrogen.py
@@ -1798,17 +2588,26 @@ lib/python${MODPY_VERSION}/site-packages/sympy/physics/tests/test_sho.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/${MODPY_PYCACHE}dimensions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/${MODPY_PYCACHE}dimensions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/${MODPY_PYCACHE}prefixes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/${MODPY_PYCACHE}prefixes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/${MODPY_PYCACHE}quantities.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/${MODPY_PYCACHE}quantities.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/${MODPY_PYCACHE}unitsystem.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/${MODPY_PYCACHE}unitsystem.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/definitions/
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/definitions/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/definitions/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/definitions/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/definitions/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/definitions/${MODPY_PYCACHE}dimension_definitions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/definitions/${MODPY_PYCACHE}dimension_definitions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/definitions/${MODPY_PYCACHE}unit_definitions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/definitions/${MODPY_PYCACHE}unit_definitions.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/definitions/dimension_definitions.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/definitions/unit_definitions.py
@@ -1818,12 +2617,19 @@ lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/quantities.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/systems/
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/systems/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/systems/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/systems/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/systems/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/systems/${MODPY_PYCACHE}cgs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/systems/${MODPY_PYCACHE}cgs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/systems/${MODPY_PYCACHE}length_weight_time.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/systems/${MODPY_PYCACHE}length_weight_time.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/systems/${MODPY_PYCACHE}mks.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/systems/${MODPY_PYCACHE}mks.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/systems/${MODPY_PYCACHE}mksa.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/systems/${MODPY_PYCACHE}mksa.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/systems/${MODPY_PYCACHE}natural.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/systems/${MODPY_PYCACHE}natural.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/systems/${MODPY_PYCACHE}si.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/systems/${MODPY_PYCACHE}si.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/systems/cgs.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/systems/length_weight_time.py
@@ -1834,13 +2640,21 @@ lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/systems/si.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/tests/${MODPY_PYCACHE}test_dimensions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/tests/${MODPY_PYCACHE}test_dimensions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/tests/${MODPY_PYCACHE}test_dimensionsystem.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/tests/${MODPY_PYCACHE}test_dimensionsystem.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/tests/${MODPY_PYCACHE}test_prefixes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/tests/${MODPY_PYCACHE}test_prefixes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/tests/${MODPY_PYCACHE}test_quantities.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/tests/${MODPY_PYCACHE}test_quantities.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/tests/${MODPY_PYCACHE}test_unit_system_cgs_gauss.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/tests/${MODPY_PYCACHE}test_unit_system_cgs_gauss.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/tests/${MODPY_PYCACHE}test_unitsystem.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/tests/${MODPY_PYCACHE}test_unitsystem.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/tests/${MODPY_PYCACHE}test_util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/tests/${MODPY_PYCACHE}test_util.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/tests/test_dimensions.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/tests/test_dimensionsystem.py
@@ -1854,13 +2668,21 @@ lib/python${MODPY_VERSION}/site-packages/sympy/physics/units/util.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/${MODPY_PYCACHE}dyadic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/${MODPY_PYCACHE}dyadic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/${MODPY_PYCACHE}fieldfunctions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/${MODPY_PYCACHE}fieldfunctions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/${MODPY_PYCACHE}frame.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/${MODPY_PYCACHE}frame.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/${MODPY_PYCACHE}functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/${MODPY_PYCACHE}functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/${MODPY_PYCACHE}point.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/${MODPY_PYCACHE}point.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/${MODPY_PYCACHE}printing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/${MODPY_PYCACHE}printing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/${MODPY_PYCACHE}vector.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/${MODPY_PYCACHE}vector.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/dyadic.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/fieldfunctions.py
@@ -1871,14 +2693,23 @@ lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/printing.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/tests/${MODPY_PYCACHE}test_dyadic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/tests/${MODPY_PYCACHE}test_dyadic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/tests/${MODPY_PYCACHE}test_fieldfunctions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/tests/${MODPY_PYCACHE}test_fieldfunctions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/tests/${MODPY_PYCACHE}test_frame.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/tests/${MODPY_PYCACHE}test_frame.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/tests/${MODPY_PYCACHE}test_functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/tests/${MODPY_PYCACHE}test_functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/tests/${MODPY_PYCACHE}test_output.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/tests/${MODPY_PYCACHE}test_output.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/tests/${MODPY_PYCACHE}test_point.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/tests/${MODPY_PYCACHE}test_point.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/tests/${MODPY_PYCACHE}test_printing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/tests/${MODPY_PYCACHE}test_printing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/tests/${MODPY_PYCACHE}test_vector.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/tests/${MODPY_PYCACHE}test_vector.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/tests/test_dyadic.py
 lib/python${MODPY_VERSION}/site-packages/sympy/physics/vector/tests/test_fieldfunctions.py
@@ -1893,18 +2724,27 @@ lib/python${MODPY_VERSION}/site-packages/sympy/physics/wigner.py
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/plotting/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/${MODPY_PYCACHE}experimental_lambdify.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/${MODPY_PYCACHE}experimental_lambdify.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/${MODPY_PYCACHE}plot.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/${MODPY_PYCACHE}plot.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/${MODPY_PYCACHE}plot_implicit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/${MODPY_PYCACHE}plot_implicit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/${MODPY_PYCACHE}textplot.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/${MODPY_PYCACHE}textplot.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/experimental_lambdify.py
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/intervalmath/
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/intervalmath/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/plotting/intervalmath/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/intervalmath/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/intervalmath/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/intervalmath/${MODPY_PYCACHE}interval_arithmetic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/intervalmath/${MODPY_PYCACHE}interval_arithmetic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/intervalmath/${MODPY_PYCACHE}interval_membership.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/intervalmath/${MODPY_PYCACHE}interval_membership.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/intervalmath/${MODPY_PYCACHE}lib_interval.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/intervalmath/${MODPY_PYCACHE}lib_interval.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/intervalmath/interval_arithmetic.py
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/intervalmath/interval_membership.py
@@ -1912,9 +2752,13 @@ lib/python${MODPY_VERSION}/site-packages/sympy/plotting/intervalmath/lib_interva
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/intervalmath/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/intervalmath/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/plotting/intervalmath/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/intervalmath/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/intervalmath/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/intervalmath/tests/${MODPY_PYCACHE}test_interval_functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/intervalmath/tests/${MODPY_PYCACHE}test_interval_functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/intervalmath/tests/${MODPY_PYCACHE}test_interval_membership.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/intervalmath/tests/${MODPY_PYCACHE}test_interval_membership.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/intervalmath/tests/${MODPY_PYCACHE}test_intervalmath.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/intervalmath/tests/${MODPY_PYCACHE}test_intervalmath.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/intervalmath/tests/test_interval_functions.py
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/intervalmath/tests/test_interval_membership.py
@@ -1924,22 +2768,39 @@ lib/python${MODPY_VERSION}/site-packages/sympy/plotting/plot_implicit.py
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}color_scheme.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}color_scheme.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}managed_window.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}managed_window.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}plot.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}plot.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}plot_axes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}plot_axes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}plot_camera.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}plot_camera.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}plot_controller.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}plot_controller.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}plot_curve.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}plot_curve.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}plot_interval.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}plot_interval.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}plot_mode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}plot_mode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}plot_mode_base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}plot_mode_base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}plot_modes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}plot_modes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}plot_object.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}plot_object.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}plot_rotation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}plot_rotation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}plot_surface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}plot_surface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}plot_window.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}plot_window.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/color_scheme.py
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/managed_window.py
@@ -1959,17 +2820,24 @@ lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/plot_window.p
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/tests/${MODPY_PYCACHE}test_plotting.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/tests/${MODPY_PYCACHE}test_plotting.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/tests/test_plotting.py
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/pygletplot/util.py
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/plotting/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/tests/${MODPY_PYCACHE}test_experimental_lambdify.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/tests/${MODPY_PYCACHE}test_experimental_lambdify.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/tests/${MODPY_PYCACHE}test_plot.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/tests/${MODPY_PYCACHE}test_plot.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/tests/${MODPY_PYCACHE}test_plot_implicit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/tests/${MODPY_PYCACHE}test_plot_implicit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/plotting/tests/${MODPY_PYCACHE}test_textplot.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/tests/${MODPY_PYCACHE}test_textplot.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/tests/test_experimental_lambdify.py
 lib/python${MODPY_VERSION}/site-packages/sympy/plotting/tests/test_plot.py
@@ -1983,55 +2851,102 @@ lib/python${MODPY_VERSION}/site-packages/sympy/plotting/textplot.py
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}compatibility.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}compatibility.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}constructor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}constructor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}densearith.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}densearith.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}densebasic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}densebasic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}densetools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}densetools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}dispersion.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}dispersion.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}distributedmodules.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}distributedmodules.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}domainmatrix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}domainmatrix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}euclidtools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}euclidtools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}factortools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}factortools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}fglmtools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}fglmtools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}fields.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}fields.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}galoistools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}galoistools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}groebnertools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}groebnertools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}heuristicgcd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}heuristicgcd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}modulargcd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}modulargcd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}monomials.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}monomials.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}multivariate_resultants.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}multivariate_resultants.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}numberfields.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}numberfields.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}orderings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}orderings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}orthopolys.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}orthopolys.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}partfrac.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}partfrac.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}polyclasses.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}polyclasses.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}polyconfig.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}polyconfig.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}polyerrors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}polyerrors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}polyfuncs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}polyfuncs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}polymatrix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}polymatrix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}polyoptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}polyoptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}polyquinticconst.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}polyquinticconst.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}polyroots.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}polyroots.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}polytools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}polytools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}polyutils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}polyutils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}rationaltools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}rationaltools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}ring_series.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}ring_series.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}rings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}rings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}rootisolation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}rootisolation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}rootoftools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}rootoftools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}solvers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}solvers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}specialpolys.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}specialpolys.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}sqfreetools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}sqfreetools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}subresultants_qq_zz.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/${MODPY_PYCACHE}subresultants_qq_zz.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/${MODPY_PYCACHE}extensions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/${MODPY_PYCACHE}extensions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/${MODPY_PYCACHE}homomorphisms.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/${MODPY_PYCACHE}homomorphisms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/${MODPY_PYCACHE}ideals.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/${MODPY_PYCACHE}ideals.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/${MODPY_PYCACHE}modules.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/${MODPY_PYCACHE}modules.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/extensions.py
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/homomorphisms.py
@@ -2040,10 +2955,15 @@ lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/modules.py
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/tests/${MODPY_PYCACHE}test_extensions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/tests/${MODPY_PYCACHE}test_extensions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/tests/${MODPY_PYCACHE}test_homomorphisms.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/tests/${MODPY_PYCACHE}test_homomorphisms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/tests/${MODPY_PYCACHE}test_ideals.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/tests/${MODPY_PYCACHE}test_ideals.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/tests/${MODPY_PYCACHE}test_modules.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/tests/${MODPY_PYCACHE}test_modules.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/tests/test_extensions.py
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/tests/test_homomorphisms.py
@@ -2052,9 +2972,13 @@ lib/python${MODPY_VERSION}/site-packages/sympy/polys/agca/tests/test_modules.py
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/benchmarks/
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/benchmarks/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/polys/benchmarks/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/benchmarks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/benchmarks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/benchmarks/${MODPY_PYCACHE}bench_galoispolys.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/benchmarks/${MODPY_PYCACHE}bench_galoispolys.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/benchmarks/${MODPY_PYCACHE}bench_groebnertools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/benchmarks/${MODPY_PYCACHE}bench_groebnertools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/benchmarks/${MODPY_PYCACHE}bench_solvers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/benchmarks/${MODPY_PYCACHE}bench_solvers.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/benchmarks/bench_galoispolys.py
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/benchmarks/bench_groebnertools.py
@@ -2070,36 +2994,67 @@ lib/python${MODPY_VERSION}/site-packages/sympy/polys/domainmatrix.py
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}algebraicfield.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}algebraicfield.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}characteristiczero.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}characteristiczero.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}complexfield.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}complexfield.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}compositedomain.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}compositedomain.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}domain.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}domain.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}domainelement.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}domainelement.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}expressiondomain.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}expressiondomain.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}field.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}field.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}finitefield.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}finitefield.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}fractionfield.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}fractionfield.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}gaussiandomains.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}gaussiandomains.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}gmpyfinitefield.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}gmpyfinitefield.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}gmpyintegerring.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}gmpyintegerring.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}gmpyrationalfield.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}gmpyrationalfield.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}groundtypes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}groundtypes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}integerring.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}integerring.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}modularinteger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}modularinteger.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}mpelements.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}mpelements.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}old_fractionfield.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}old_fractionfield.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}old_polynomialring.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}old_polynomialring.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}polynomialring.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}polynomialring.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}pythonfinitefield.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}pythonfinitefield.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}pythonintegerring.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}pythonintegerring.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}pythonrational.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}pythonrational.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}pythonrationalfield.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}pythonrationalfield.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}quotientring.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}quotientring.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}rationalfield.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}rationalfield.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}realfield.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}realfield.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}ring.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}ring.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}simpledomain.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/${MODPY_PYCACHE}simpledomain.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/algebraicfield.py
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/characteristiczero.py
@@ -2134,9 +3089,13 @@ lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/simpledomain.py
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/tests/${MODPY_PYCACHE}test_domains.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/tests/${MODPY_PYCACHE}test_domains.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/tests/${MODPY_PYCACHE}test_polynomialring.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/tests/${MODPY_PYCACHE}test_polynomialring.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/tests/${MODPY_PYCACHE}test_quotientring.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/tests/${MODPY_PYCACHE}test_quotientring.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/tests/test_domains.py
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/domains/tests/test_polynomialring.py
@@ -2177,44 +3136,83 @@ lib/python${MODPY_VERSION}/site-packages/sympy/polys/subresultants_qq_zz.py
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_constructor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_constructor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_densearith.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_densearith.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_densebasic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_densebasic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_densetools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_densetools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_dispersion.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_dispersion.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_distributedmodules.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_distributedmodules.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_domainmatrix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_domainmatrix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_euclidtools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_euclidtools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_factortools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_factortools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_fields.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_fields.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_galoistools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_galoistools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_groebnertools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_groebnertools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_heuristicgcd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_heuristicgcd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_injections.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_injections.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_modulargcd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_modulargcd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_monomials.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_monomials.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_multivariate_resultants.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_multivariate_resultants.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_numberfields.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_numberfields.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_orderings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_orderings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_orthopolys.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_orthopolys.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_partfrac.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_partfrac.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_polyclasses.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_polyclasses.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_polyfuncs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_polyfuncs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_polymatrix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_polymatrix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_polyoptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_polyoptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_polyroots.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_polyroots.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_polytools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_polytools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_polyutils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_polyutils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_pythonrational.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_pythonrational.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_rationaltools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_rationaltools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_ring_series.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_ring_series.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_rings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_rings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_rootisolation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_rootisolation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_rootoftools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_rootoftools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_solvers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_solvers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_specialpolys.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_specialpolys.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_sqfreetools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_sqfreetools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_subresultants_qq_zz.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/${MODPY_PYCACHE}test_subresultants_qq_zz.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/test_constructor.py
 lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/test_densearith.py
@@ -2257,40 +3255,75 @@ lib/python${MODPY_VERSION}/site-packages/sympy/polys/tests/test_subresultants_qq
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}c.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}c.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}ccode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}ccode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}codeprinter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}codeprinter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}conventions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}conventions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}cxx.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}cxx.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}cxxcode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}cxxcode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}defaults.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}defaults.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}dot.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}dot.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}fcode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}fcode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}fortran.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}fortran.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}glsl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}glsl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}gtk.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}gtk.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}jscode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}jscode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}julia.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}julia.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}lambdarepr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}lambdarepr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}latex.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}latex.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}llvmjitcode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}llvmjitcode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}maple.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}maple.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}mathematica.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}mathematica.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}mathml.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}mathml.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}octave.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}octave.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}precedence.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}precedence.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}preview.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}preview.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}printer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}printer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}pycode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}pycode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}python.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}python.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}rcode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}rcode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}repr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}repr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}rust.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}rust.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}str.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}str.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}tableform.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}tableform.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}tensorflow.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}tensorflow.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}theanocode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}theanocode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}tree.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/${MODPY_PYCACHE}tree.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/c.py
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/ccode.py
@@ -2317,9 +3350,13 @@ lib/python${MODPY_VERSION}/site-packages/sympy/printing/precedence.py
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/pretty/
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/pretty/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/printing/pretty/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/pretty/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/pretty/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/pretty/${MODPY_PYCACHE}pretty.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/pretty/${MODPY_PYCACHE}pretty.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/pretty/${MODPY_PYCACHE}pretty_symbology.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/pretty/${MODPY_PYCACHE}pretty_symbology.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/pretty/${MODPY_PYCACHE}stringpict.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/pretty/${MODPY_PYCACHE}stringpict.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/pretty/pretty.py
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/pretty/pretty_symbology.py
@@ -2327,7 +3364,9 @@ lib/python${MODPY_VERSION}/site-packages/sympy/printing/pretty/stringpict.py
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/pretty/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/pretty/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/printing/pretty/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/pretty/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/pretty/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/pretty/tests/${MODPY_PYCACHE}test_pretty.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/pretty/tests/${MODPY_PYCACHE}test_pretty.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/pretty/tests/test_pretty.py
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/preview.py
@@ -2343,36 +3382,67 @@ lib/python${MODPY_VERSION}/site-packages/sympy/printing/tensorflow.py
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_c.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_c.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_codeprinter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_codeprinter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_conventions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_conventions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_cxx.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_cxx.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_dot.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_dot.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_fortran.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_fortran.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_glsl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_glsl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_gtk.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_gtk.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_jscode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_jscode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_julia.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_julia.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_lambdarepr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_lambdarepr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_latex.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_latex.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_llvmjit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_llvmjit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_maple.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_maple.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_mathematica.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_mathematica.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_mathml.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_mathml.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_numpy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_numpy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_octave.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_octave.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_precedence.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_precedence.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_preview.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_preview.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_pycode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_pycode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_python.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_python.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_rcode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_rcode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_repr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_repr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_rust.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_rust.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_str.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_str.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_tableform.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_tableform.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_tensorflow.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_tensorflow.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_theanocode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_theanocode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_tree.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/${MODPY_PYCACHE}test_tree.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/test_c.py
 lib/python${MODPY_VERSION}/site-packages/sympy/printing/tests/test_codeprinter.py
@@ -2410,32 +3480,51 @@ lib/python${MODPY_VERSION}/site-packages/sympy/release.py
 lib/python${MODPY_VERSION}/site-packages/sympy/sandbox/
 lib/python${MODPY_VERSION}/site-packages/sympy/sandbox/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/sandbox/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/sandbox/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/sandbox/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/sandbox/${MODPY_PYCACHE}indexed_integrals.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/sandbox/${MODPY_PYCACHE}indexed_integrals.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/sandbox/indexed_integrals.py
 lib/python${MODPY_VERSION}/site-packages/sympy/sandbox/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/sandbox/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/sandbox/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/sandbox/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/sandbox/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/sandbox/tests/${MODPY_PYCACHE}test_indexed_integrals.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/sandbox/tests/${MODPY_PYCACHE}test_indexed_integrals.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/sandbox/tests/test_indexed_integrals.py
 lib/python${MODPY_VERSION}/site-packages/sympy/series/
 lib/python${MODPY_VERSION}/site-packages/sympy/series/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}acceleration.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}acceleration.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}approximants.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}approximants.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}aseries.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}aseries.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}formal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}formal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}fourier.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}fourier.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}gruntz.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}gruntz.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}kauers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}kauers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}limits.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}limits.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}limitseq.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}limitseq.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}order.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}order.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}residues.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}residues.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}sequences.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}sequences.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}series.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}series.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}series_class.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/${MODPY_PYCACHE}series_class.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/series/acceleration.py
 lib/python${MODPY_VERSION}/site-packages/sympy/series/approximants.py
@@ -2443,8 +3532,11 @@ lib/python${MODPY_VERSION}/site-packages/sympy/series/aseries.py
 lib/python${MODPY_VERSION}/site-packages/sympy/series/benchmarks/
 lib/python${MODPY_VERSION}/site-packages/sympy/series/benchmarks/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/series/benchmarks/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/series/benchmarks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/benchmarks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/benchmarks/${MODPY_PYCACHE}bench_limit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/benchmarks/${MODPY_PYCACHE}bench_limit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/benchmarks/${MODPY_PYCACHE}bench_order.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/benchmarks/${MODPY_PYCACHE}bench_order.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/series/benchmarks/bench_limit.py
 lib/python${MODPY_VERSION}/site-packages/sympy/series/benchmarks/bench_order.py
@@ -2462,21 +3554,37 @@ lib/python${MODPY_VERSION}/site-packages/sympy/series/series_class.py
 lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_approximants.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_approximants.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_aseries.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_aseries.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_demidovich.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_demidovich.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_formal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_formal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_fourier.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_fourier.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_gruntz.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_gruntz.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_kauers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_kauers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_limits.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_limits.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_limitseq.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_limitseq.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_lseries.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_lseries.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_nseries.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_nseries.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_order.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_order.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_residues.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_residues.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_sequences.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_sequences.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_series.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/${MODPY_PYCACHE}test_series.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/test_approximants.py
 lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/test_aseries.py
@@ -2496,13 +3604,21 @@ lib/python${MODPY_VERSION}/site-packages/sympy/series/tests/test_series.py
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/sets/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/sets/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/sets/${MODPY_PYCACHE}conditionset.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/${MODPY_PYCACHE}conditionset.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/sets/${MODPY_PYCACHE}contains.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/${MODPY_PYCACHE}contains.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/sets/${MODPY_PYCACHE}fancysets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/${MODPY_PYCACHE}fancysets.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/sets/${MODPY_PYCACHE}ordinals.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/${MODPY_PYCACHE}ordinals.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/sets/${MODPY_PYCACHE}powerset.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/${MODPY_PYCACHE}powerset.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/sets/${MODPY_PYCACHE}setexpr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/${MODPY_PYCACHE}setexpr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/sets/${MODPY_PYCACHE}sets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/${MODPY_PYCACHE}sets.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/conditionset.py
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/contains.py
@@ -2510,14 +3626,23 @@ lib/python${MODPY_VERSION}/site-packages/sympy/sets/fancysets.py
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/handlers/
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/handlers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/sets/handlers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/sets/handlers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/handlers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/sets/handlers/${MODPY_PYCACHE}add.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/handlers/${MODPY_PYCACHE}add.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/sets/handlers/${MODPY_PYCACHE}comparison.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/handlers/${MODPY_PYCACHE}comparison.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/sets/handlers/${MODPY_PYCACHE}functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/handlers/${MODPY_PYCACHE}functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/sets/handlers/${MODPY_PYCACHE}intersection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/handlers/${MODPY_PYCACHE}intersection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/sets/handlers/${MODPY_PYCACHE}issubset.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/handlers/${MODPY_PYCACHE}issubset.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/sets/handlers/${MODPY_PYCACHE}mul.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/handlers/${MODPY_PYCACHE}mul.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/sets/handlers/${MODPY_PYCACHE}power.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/handlers/${MODPY_PYCACHE}power.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/sets/handlers/${MODPY_PYCACHE}union.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/handlers/${MODPY_PYCACHE}union.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/handlers/add.py
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/handlers/comparison.py
@@ -2534,13 +3659,21 @@ lib/python${MODPY_VERSION}/site-packages/sympy/sets/sets.py
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/sets/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/sets/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/sets/tests/${MODPY_PYCACHE}test_conditionset.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/tests/${MODPY_PYCACHE}test_conditionset.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/sets/tests/${MODPY_PYCACHE}test_contains.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/tests/${MODPY_PYCACHE}test_contains.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/sets/tests/${MODPY_PYCACHE}test_fancysets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/tests/${MODPY_PYCACHE}test_fancysets.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/sets/tests/${MODPY_PYCACHE}test_ordinals.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/tests/${MODPY_PYCACHE}test_ordinals.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/sets/tests/${MODPY_PYCACHE}test_powerset.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/tests/${MODPY_PYCACHE}test_powerset.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/sets/tests/${MODPY_PYCACHE}test_setexpr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/tests/${MODPY_PYCACHE}test_setexpr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/sets/tests/${MODPY_PYCACHE}test_sets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/tests/${MODPY_PYCACHE}test_sets.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/tests/test_conditionset.py
 lib/python${MODPY_VERSION}/site-packages/sympy/sets/tests/test_contains.py
@@ -2552,21 +3685,37 @@ lib/python${MODPY_VERSION}/site-packages/sympy/sets/tests/test_sets.py
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}combsimp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}combsimp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}cse_main.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}cse_main.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}cse_opts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}cse_opts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}epathtools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}epathtools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}fu.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}fu.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}gammasimp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}gammasimp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}hyperexpand.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}hyperexpand.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}hyperexpand_doc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}hyperexpand_doc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}powsimp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}powsimp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}radsimp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}radsimp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}ratsimp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}ratsimp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}simplify.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}simplify.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}sqrtdenest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}sqrtdenest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}traversaltools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}traversaltools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}trigsimp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/${MODPY_PYCACHE}trigsimp.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/combsimp.py
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/cse_main.py
@@ -2584,21 +3733,37 @@ lib/python${MODPY_VERSION}/site-packages/sympy/simplify/sqrtdenest.py
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_combsimp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_combsimp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_cse.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_cse.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_epathtools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_epathtools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_fu.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_fu.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_function.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_function.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_gammasimp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_gammasimp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_hyperexpand.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_hyperexpand.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_powsimp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_powsimp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_radsimp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_radsimp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_ratsimp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_ratsimp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_rewrite.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_rewrite.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_simplify.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_simplify.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_sqrtdenest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_sqrtdenest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_traversaltools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_traversaltools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_trigsimp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/${MODPY_PYCACHE}test_trigsimp.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/test_combsimp.py
 lib/python${MODPY_VERSION}/site-packages/sympy/simplify/tests/test_cse.py
@@ -2620,20 +3785,32 @@ lib/python${MODPY_VERSION}/site-packages/sympy/simplify/trigsimp.py
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/solvers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/${MODPY_PYCACHE}bivariate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/${MODPY_PYCACHE}bivariate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/${MODPY_PYCACHE}decompogen.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/${MODPY_PYCACHE}decompogen.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/${MODPY_PYCACHE}deutils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/${MODPY_PYCACHE}deutils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/${MODPY_PYCACHE}inequalities.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/${MODPY_PYCACHE}inequalities.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/${MODPY_PYCACHE}pde.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/${MODPY_PYCACHE}pde.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/${MODPY_PYCACHE}polysys.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/${MODPY_PYCACHE}polysys.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/${MODPY_PYCACHE}recurr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/${MODPY_PYCACHE}recurr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/${MODPY_PYCACHE}solvers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/${MODPY_PYCACHE}solvers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/${MODPY_PYCACHE}solveset.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/${MODPY_PYCACHE}solveset.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/benchmarks/
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/benchmarks/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/solvers/benchmarks/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/benchmarks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/benchmarks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/benchmarks/${MODPY_PYCACHE}bench_solvers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/benchmarks/${MODPY_PYCACHE}bench_solvers.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/benchmarks/bench_solvers.py
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/bivariate.py
@@ -2642,23 +3819,32 @@ lib/python${MODPY_VERSION}/site-packages/sympy/solvers/deutils.py
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/diophantine/
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/diophantine/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/solvers/diophantine/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/diophantine/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/diophantine/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/diophantine/${MODPY_PYCACHE}diophantine.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/diophantine/${MODPY_PYCACHE}diophantine.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/diophantine/diophantine.py
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/diophantine/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/diophantine/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/solvers/diophantine/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/diophantine/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/diophantine/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/diophantine/tests/${MODPY_PYCACHE}test_diophantine.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/diophantine/tests/${MODPY_PYCACHE}test_diophantine.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/diophantine/tests/test_diophantine.py
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/inequalities.py
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/${MODPY_PYCACHE}ode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/${MODPY_PYCACHE}ode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/${MODPY_PYCACHE}single.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/${MODPY_PYCACHE}single.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/${MODPY_PYCACHE}subscheck.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/${MODPY_PYCACHE}subscheck.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/${MODPY_PYCACHE}systems.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/${MODPY_PYCACHE}systems.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/ode.py
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/single.py
@@ -2667,10 +3853,15 @@ lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/systems.py
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/tests/${MODPY_PYCACHE}test_ode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/tests/${MODPY_PYCACHE}test_ode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/tests/${MODPY_PYCACHE}test_single.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/tests/${MODPY_PYCACHE}test_single.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/tests/${MODPY_PYCACHE}test_subscheck.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/tests/${MODPY_PYCACHE}test_subscheck.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/tests/${MODPY_PYCACHE}test_systems.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/tests/${MODPY_PYCACHE}test_systems.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/tests/test_ode.py
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/ode/tests/test_single.py
@@ -2684,15 +3875,25 @@ lib/python${MODPY_VERSION}/site-packages/sympy/solvers/solveset.py
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/solvers/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/tests/${MODPY_PYCACHE}test_constantsimp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/tests/${MODPY_PYCACHE}test_constantsimp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/tests/${MODPY_PYCACHE}test_decompogen.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/tests/${MODPY_PYCACHE}test_decompogen.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/tests/${MODPY_PYCACHE}test_inequalities.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/tests/${MODPY_PYCACHE}test_inequalities.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/tests/${MODPY_PYCACHE}test_numeric.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/tests/${MODPY_PYCACHE}test_numeric.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/tests/${MODPY_PYCACHE}test_pde.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/tests/${MODPY_PYCACHE}test_pde.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/tests/${MODPY_PYCACHE}test_polysys.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/tests/${MODPY_PYCACHE}test_polysys.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/tests/${MODPY_PYCACHE}test_recurr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/tests/${MODPY_PYCACHE}test_recurr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/tests/${MODPY_PYCACHE}test_solvers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/tests/${MODPY_PYCACHE}test_solvers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/solvers/tests/${MODPY_PYCACHE}test_solveset.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/tests/${MODPY_PYCACHE}test_solveset.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/tests/test_constantsimp.py
 lib/python${MODPY_VERSION}/site-packages/sympy/solvers/tests/test_decompogen.py
@@ -2706,25 +3907,45 @@ lib/python${MODPY_VERSION}/site-packages/sympy/solvers/tests/test_solveset.py
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}compound_rv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}compound_rv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}crv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}crv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}crv_types.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}crv_types.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}drv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}drv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}drv_types.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}drv_types.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}error_prop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}error_prop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}frv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}frv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}frv_types.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}frv_types.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}joint_rv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}joint_rv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}joint_rv_types.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}joint_rv_types.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}matrix_distributions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}matrix_distributions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}random_matrix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}random_matrix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}random_matrix_models.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}random_matrix_models.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}rv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}rv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}rv_interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}rv_interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}stochastic_process.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}stochastic_process.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}stochastic_process_types.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}stochastic_process_types.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}symbolic_multivariate_probability.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}symbolic_multivariate_probability.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}symbolic_probability.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/${MODPY_PYCACHE}symbolic_probability.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/compound_rv.py
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/crv.py
@@ -2748,19 +3969,33 @@ lib/python${MODPY_VERSION}/site-packages/sympy/stats/symbolic_probability.py
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/${MODPY_PYCACHE}test_compound_rv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/${MODPY_PYCACHE}test_compound_rv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/${MODPY_PYCACHE}test_continuous_rv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/${MODPY_PYCACHE}test_continuous_rv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/${MODPY_PYCACHE}test_discrete_rv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/${MODPY_PYCACHE}test_discrete_rv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/${MODPY_PYCACHE}test_error_prop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/${MODPY_PYCACHE}test_error_prop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/${MODPY_PYCACHE}test_finite_rv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/${MODPY_PYCACHE}test_finite_rv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/${MODPY_PYCACHE}test_joint_rv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/${MODPY_PYCACHE}test_joint_rv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/${MODPY_PYCACHE}test_matrix_distributions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/${MODPY_PYCACHE}test_matrix_distributions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/${MODPY_PYCACHE}test_mix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/${MODPY_PYCACHE}test_mix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/${MODPY_PYCACHE}test_random_matrix.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/${MODPY_PYCACHE}test_random_matrix.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/${MODPY_PYCACHE}test_rv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/${MODPY_PYCACHE}test_rv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/${MODPY_PYCACHE}test_stochastic_process.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/${MODPY_PYCACHE}test_stochastic_process.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/${MODPY_PYCACHE}test_symbolic_multivariate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/${MODPY_PYCACHE}test_symbolic_multivariate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/${MODPY_PYCACHE}test_symbolic_probability.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/${MODPY_PYCACHE}test_symbolic_probability.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/test_compound_rv.py
 lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/test_continuous_rv.py
@@ -2778,27 +4013,42 @@ lib/python${MODPY_VERSION}/site-packages/sympy/stats/tests/test_symbolic_probabi
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/strategies/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/strategies/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/strategies/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/strategies/${MODPY_PYCACHE}rl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/${MODPY_PYCACHE}rl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/strategies/${MODPY_PYCACHE}tools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/${MODPY_PYCACHE}tools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/strategies/${MODPY_PYCACHE}traverse.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/${MODPY_PYCACHE}traverse.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/strategies/${MODPY_PYCACHE}tree.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/${MODPY_PYCACHE}tree.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/strategies/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/branch/
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/branch/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/strategies/branch/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/strategies/branch/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/branch/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/strategies/branch/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/branch/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/strategies/branch/${MODPY_PYCACHE}tools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/branch/${MODPY_PYCACHE}tools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/strategies/branch/${MODPY_PYCACHE}traverse.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/branch/${MODPY_PYCACHE}traverse.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/branch/core.py
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/branch/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/branch/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/strategies/branch/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/strategies/branch/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/branch/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/strategies/branch/tests/${MODPY_PYCACHE}test_core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/branch/tests/${MODPY_PYCACHE}test_core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/strategies/branch/tests/${MODPY_PYCACHE}test_tools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/branch/tests/${MODPY_PYCACHE}test_tools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/strategies/branch/tests/${MODPY_PYCACHE}test_traverse.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/branch/tests/${MODPY_PYCACHE}test_traverse.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/branch/tests/test_core.py
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/branch/tests/test_tools.py
@@ -2810,12 +4060,19 @@ lib/python${MODPY_VERSION}/site-packages/sympy/strategies/rl.py
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/strategies/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/strategies/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/strategies/tests/${MODPY_PYCACHE}test_core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/tests/${MODPY_PYCACHE}test_core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/strategies/tests/${MODPY_PYCACHE}test_rl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/tests/${MODPY_PYCACHE}test_rl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/strategies/tests/${MODPY_PYCACHE}test_strat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/tests/${MODPY_PYCACHE}test_strat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/strategies/tests/${MODPY_PYCACHE}test_tools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/tests/${MODPY_PYCACHE}test_tools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/strategies/tests/${MODPY_PYCACHE}test_traverse.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/tests/${MODPY_PYCACHE}test_traverse.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/strategies/tests/${MODPY_PYCACHE}test_tree.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/tests/${MODPY_PYCACHE}test_tree.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/tests/test_core.py
 lib/python${MODPY_VERSION}/site-packages/sympy/strategies/tests/test_rl.py
@@ -2830,22 +4087,36 @@ lib/python${MODPY_VERSION}/site-packages/sympy/strategies/util.py
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/tensor/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/tensor/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/tensor/${MODPY_PYCACHE}functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/${MODPY_PYCACHE}functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/tensor/${MODPY_PYCACHE}index_methods.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/${MODPY_PYCACHE}index_methods.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/tensor/${MODPY_PYCACHE}indexed.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/${MODPY_PYCACHE}indexed.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/tensor/${MODPY_PYCACHE}tensor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/${MODPY_PYCACHE}tensor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/tensor/${MODPY_PYCACHE}toperators.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/${MODPY_PYCACHE}toperators.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/${MODPY_PYCACHE}array_comprehension.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/${MODPY_PYCACHE}array_comprehension.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/${MODPY_PYCACHE}array_derivatives.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/${MODPY_PYCACHE}array_derivatives.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/${MODPY_PYCACHE}arrayop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/${MODPY_PYCACHE}arrayop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/${MODPY_PYCACHE}dense_ndim_array.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/${MODPY_PYCACHE}dense_ndim_array.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/${MODPY_PYCACHE}mutable_ndim_array.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/${MODPY_PYCACHE}mutable_ndim_array.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/${MODPY_PYCACHE}ndim_array.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/${MODPY_PYCACHE}ndim_array.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/${MODPY_PYCACHE}sparse_ndim_array.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/${MODPY_PYCACHE}sparse_ndim_array.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/array_comprehension.py
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/array_derivatives.py
@@ -2857,13 +4128,21 @@ lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/sparse_ndim_array.py
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/tests/${MODPY_PYCACHE}test_array_comprehension.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/tests/${MODPY_PYCACHE}test_array_comprehension.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/tests/${MODPY_PYCACHE}test_array_derivatives.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/tests/${MODPY_PYCACHE}test_array_derivatives.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/tests/${MODPY_PYCACHE}test_arrayop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/tests/${MODPY_PYCACHE}test_arrayop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/tests/${MODPY_PYCACHE}test_immutable_ndim_array.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/tests/${MODPY_PYCACHE}test_immutable_ndim_array.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/tests/${MODPY_PYCACHE}test_mutable_ndim_array.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/tests/${MODPY_PYCACHE}test_mutable_ndim_array.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/tests/${MODPY_PYCACHE}test_ndim_array.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/tests/${MODPY_PYCACHE}test_ndim_array.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/tests/${MODPY_PYCACHE}test_ndim_array_conversions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/tests/${MODPY_PYCACHE}test_ndim_array_conversions.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/tests/test_array_comprehension.py
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/array/tests/test_array_derivatives.py
@@ -2879,12 +4158,19 @@ lib/python${MODPY_VERSION}/site-packages/sympy/tensor/tensor.py
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/tensor/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/tensor/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/tensor/tests/${MODPY_PYCACHE}test_functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/tests/${MODPY_PYCACHE}test_functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/tensor/tests/${MODPY_PYCACHE}test_index_methods.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/tests/${MODPY_PYCACHE}test_index_methods.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/tensor/tests/${MODPY_PYCACHE}test_indexed.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/tests/${MODPY_PYCACHE}test_indexed.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/tensor/tests/${MODPY_PYCACHE}test_tensor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/tests/${MODPY_PYCACHE}test_tensor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/tensor/tests/${MODPY_PYCACHE}test_tensor_element.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/tests/${MODPY_PYCACHE}test_tensor_element.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/tensor/tests/${MODPY_PYCACHE}test_tensor_operators.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/tests/${MODPY_PYCACHE}test_tensor_operators.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/tests/test_functions.py
 lib/python${MODPY_VERSION}/site-packages/sympy/tensor/tests/test_index_methods.py
@@ -2896,13 +4182,21 @@ lib/python${MODPY_VERSION}/site-packages/sympy/tensor/toperators.py
 lib/python${MODPY_VERSION}/site-packages/sympy/testing/
 lib/python${MODPY_VERSION}/site-packages/sympy/testing/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/testing/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/testing/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/testing/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/testing/${MODPY_PYCACHE}benchmarking.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/testing/${MODPY_PYCACHE}benchmarking.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/testing/${MODPY_PYCACHE}matrices.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/testing/${MODPY_PYCACHE}matrices.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/testing/${MODPY_PYCACHE}pytest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/testing/${MODPY_PYCACHE}pytest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/testing/${MODPY_PYCACHE}quality_unicode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/testing/${MODPY_PYCACHE}quality_unicode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/testing/${MODPY_PYCACHE}randtest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/testing/${MODPY_PYCACHE}randtest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/testing/${MODPY_PYCACHE}runtests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/testing/${MODPY_PYCACHE}runtests.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/testing/${MODPY_PYCACHE}tmpfiles.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/testing/${MODPY_PYCACHE}tmpfiles.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/testing/benchmarking.py
 lib/python${MODPY_VERSION}/site-packages/sympy/testing/matrices.py
@@ -2913,10 +4207,15 @@ lib/python${MODPY_VERSION}/site-packages/sympy/testing/runtests.py
 lib/python${MODPY_VERSION}/site-packages/sympy/testing/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/testing/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/testing/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/testing/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/testing/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/testing/tests/${MODPY_PYCACHE}diagnose_imports.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/testing/tests/${MODPY_PYCACHE}diagnose_imports.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/testing/tests/${MODPY_PYCACHE}test_code_quality.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/testing/tests/${MODPY_PYCACHE}test_code_quality.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/testing/tests/${MODPY_PYCACHE}test_module_imports.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/testing/tests/${MODPY_PYCACHE}test_module_imports.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/testing/tests/${MODPY_PYCACHE}test_pytest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/testing/tests/${MODPY_PYCACHE}test_pytest.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/testing/tests/diagnose_imports.py
 lib/python${MODPY_VERSION}/site-packages/sympy/testing/tests/test_code_quality.py
@@ -2927,18 +4226,26 @@ lib/python${MODPY_VERSION}/site-packages/sympy/this.py
 lib/python${MODPY_VERSION}/site-packages/sympy/unify/
 lib/python${MODPY_VERSION}/site-packages/sympy/unify/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/unify/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/unify/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/unify/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/unify/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/unify/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/unify/${MODPY_PYCACHE}rewrite.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/unify/${MODPY_PYCACHE}rewrite.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/unify/${MODPY_PYCACHE}usympy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/unify/${MODPY_PYCACHE}usympy.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/unify/core.py
 lib/python${MODPY_VERSION}/site-packages/sympy/unify/rewrite.py
 lib/python${MODPY_VERSION}/site-packages/sympy/unify/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/unify/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/unify/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/unify/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/unify/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/unify/tests/${MODPY_PYCACHE}test_rewrite.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/unify/tests/${MODPY_PYCACHE}test_rewrite.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/unify/tests/${MODPY_PYCACHE}test_sympy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/unify/tests/${MODPY_PYCACHE}test_sympy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/unify/tests/${MODPY_PYCACHE}test_unify.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/unify/tests/${MODPY_PYCACHE}test_unify.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/unify/tests/test_rewrite.py
 lib/python${MODPY_VERSION}/site-packages/sympy/unify/tests/test_sympy.py
@@ -2947,34 +4254,60 @@ lib/python${MODPY_VERSION}/site-packages/sympy/unify/usympy.py
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}autowrap.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}autowrap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}benchmarking.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}benchmarking.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}codegen.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}codegen.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}decorator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}decorator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}enumerative.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}enumerative.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}iterables.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}iterables.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}lambdify.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}lambdify.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}magic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}magic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}matchpy_connector.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}matchpy_connector.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}memoization.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}memoization.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}pkgdata.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}pkgdata.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}pytest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}pytest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}quality_unicode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}quality_unicode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}randtest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}randtest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}runtests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}runtests.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}source.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}source.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}timeutils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}timeutils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}tmpfiles.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/${MODPY_PYCACHE}tmpfiles.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/_compilation/
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/_compilation/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/utilities/_compilation/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/_compilation/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/_compilation/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/_compilation/${MODPY_PYCACHE}availability.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/_compilation/${MODPY_PYCACHE}availability.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/_compilation/${MODPY_PYCACHE}compilation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/_compilation/${MODPY_PYCACHE}compilation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/_compilation/${MODPY_PYCACHE}runners.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/_compilation/${MODPY_PYCACHE}runners.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/_compilation/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/_compilation/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/_compilation/availability.py
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/_compilation/compilation.py
@@ -2982,7 +4315,9 @@ lib/python${MODPY_VERSION}/site-packages/sympy/utilities/_compilation/runners.py
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/_compilation/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/_compilation/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/utilities/_compilation/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/_compilation/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/_compilation/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/_compilation/tests/${MODPY_PYCACHE}test_compilation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/_compilation/tests/${MODPY_PYCACHE}test_compilation.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/_compilation/tests/test_compilation.py
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/_compilation/util.py
@@ -2999,6 +4334,7 @@ lib/python${MODPY_VERSION}/site-packages/sympy/utilities/matchpy_connector.py
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/mathml/
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/mathml/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/utilities/mathml/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/mathml/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/mathml/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/mathml/data/
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/mathml/data/mmlctop.xsl
@@ -3015,21 +4351,37 @@ lib/python${MODPY_VERSION}/site-packages/sympy/utilities/source.py
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_autowrap.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_autowrap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_codegen.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_codegen.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_codegen_julia.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_codegen_julia.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_codegen_octave.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_codegen_octave.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_codegen_rust.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_codegen_rust.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_decorator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_decorator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_deprecated.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_deprecated.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_enumerative.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_enumerative.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_iterables.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_iterables.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_lambdify.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_lambdify.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_misc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_misc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_pickling.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_pickling.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_source.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_source.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_timeutils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_timeutils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_wester.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/${MODPY_PYCACHE}test_wester.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/test_autowrap.py
 lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tests/test_codegen.py
@@ -3051,19 +4403,33 @@ lib/python${MODPY_VERSION}/site-packages/sympy/utilities/tmpfiles.py
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/vector/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/vector/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/vector/${MODPY_PYCACHE}basisdependent.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/${MODPY_PYCACHE}basisdependent.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/vector/${MODPY_PYCACHE}coordsysrect.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/${MODPY_PYCACHE}coordsysrect.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/vector/${MODPY_PYCACHE}deloperator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/${MODPY_PYCACHE}deloperator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/vector/${MODPY_PYCACHE}dyadic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/${MODPY_PYCACHE}dyadic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/vector/${MODPY_PYCACHE}functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/${MODPY_PYCACHE}functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/vector/${MODPY_PYCACHE}implicitregion.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/${MODPY_PYCACHE}implicitregion.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/vector/${MODPY_PYCACHE}integrals.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/${MODPY_PYCACHE}integrals.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/vector/${MODPY_PYCACHE}operators.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/${MODPY_PYCACHE}operators.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/vector/${MODPY_PYCACHE}orienters.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/${MODPY_PYCACHE}orienters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/vector/${MODPY_PYCACHE}parametricregion.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/${MODPY_PYCACHE}parametricregion.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/vector/${MODPY_PYCACHE}point.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/${MODPY_PYCACHE}point.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/vector/${MODPY_PYCACHE}scalar.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/${MODPY_PYCACHE}scalar.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/vector/${MODPY_PYCACHE}vector.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/${MODPY_PYCACHE}vector.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/basisdependent.py
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/coordsysrect.py
@@ -3080,16 +4446,27 @@ lib/python${MODPY_VERSION}/site-packages/sympy/vector/scalar.py
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/tests/
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/sympy/vector/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/sympy/vector/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/vector/tests/${MODPY_PYCACHE}test_coordsysrect.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/tests/${MODPY_PYCACHE}test_coordsysrect.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/vector/tests/${MODPY_PYCACHE}test_dyadic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/tests/${MODPY_PYCACHE}test_dyadic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/vector/tests/${MODPY_PYCACHE}test_field_functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/tests/${MODPY_PYCACHE}test_field_functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/vector/tests/${MODPY_PYCACHE}test_functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/tests/${MODPY_PYCACHE}test_functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/vector/tests/${MODPY_PYCACHE}test_implicitregion.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/tests/${MODPY_PYCACHE}test_implicitregion.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/vector/tests/${MODPY_PYCACHE}test_integrals.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/tests/${MODPY_PYCACHE}test_integrals.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/vector/tests/${MODPY_PYCACHE}test_operators.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/tests/${MODPY_PYCACHE}test_operators.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/vector/tests/${MODPY_PYCACHE}test_parametricregion.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/tests/${MODPY_PYCACHE}test_parametricregion.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/vector/tests/${MODPY_PYCACHE}test_printing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/tests/${MODPY_PYCACHE}test_printing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sympy/vector/tests/${MODPY_PYCACHE}test_vector.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/tests/${MODPY_PYCACHE}test_vector.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/tests/test_coordsysrect.py
 lib/python${MODPY_VERSION}/site-packages/sympy/vector/tests/test_dyadic.py
diff --git a/math/py-tables/Makefile b/math/py-tables/Makefile
index ee69188806a..b5282c93f53 100644
--- a/math/py-tables/Makefile
+++ b/math/py-tables/Makefile
@@ -4,19 +4,19 @@ MODPY_EGG_VERSION=	3.7.0
 DISTNAME=		tables-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
 CATEGORIES=		math
-REVISION=		1
+REVISION=		2
 
-HOMEPAGE=		https://www.pytables.org/
-MAINTAINER=		Martin Reindl <martin@catai.org>
+HOMEPAGE=	https://www.pytables.org/
+MAINTAINER=	Martin Reindl <martin@catai.org>
 
 # BSD
 PERMIT_PACKAGE=	Yes
 
-COMPILER=		base-clang ports-gcc
+COMPILER=	base-clang ports-gcc
 
-MODULES=		lang/python
-MODPY_SETUPTOOLS=	Yes
-MODPY_PI=		Yes
+MODULES=	lang/python
+MODPY_PYBUILD =	setuptools
+MODPY_PI=	Yes
 
 WANTLIB=	pthread ${MODPY_WANTLIB} blosc bz2 hdf5 lzo2
 
@@ -28,6 +28,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 
 BUILD_DEPENDS+=	lang/cython${MODPY_FLAVOR} \
 		math/py-numpy${MODPY_FLAVOR} \
+		math/py-oldest-supported-numpy${MODPY_FLAVOR} \
 		sysutils/py-packaging${MODPY_FLAVOR}
 
 LIB_DEPENDS+=	archivers/lzo2 \
diff --git a/math/py-tables/pkg/PLIST b/math/py-tables/pkg/PLIST
index 947d6e54e30..7f75b146078 100644
--- a/math/py-tables/pkg/PLIST
+++ b/math/py-tables/pkg/PLIST
@@ -4,44 +4,72 @@ bin/ptdump
 bin/ptrepack
 bin/pttree
 lib/python${MODPY_VERSION}/site-packages/tables/
-lib/python${MODPY_VERSION}/site-packages/tables-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/tables-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/tables-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/tables-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/tables-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/tables-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/tables-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/tables-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/tables-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/tables-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/tables-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/tables-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/tables-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/tables-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/tables-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/tables/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}array.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}array.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}atom.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}atom.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}attributeset.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}attributeset.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}carray.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}carray.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}conditions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}conditions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}description.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}description.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}earray.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}earray.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}expression.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}expression.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}file.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}file.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}filters.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}filters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}flavor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}flavor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}group.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}group.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}idxutils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}idxutils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}index.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}index.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}indexes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}indexes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}leaf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}leaf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}link.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}link.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}node.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}node.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}parameters.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}parameters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}path.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}path.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}registry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}registry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}req_versions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}req_versions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}table.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}table.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}undoredo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}undoredo.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}unimplemented.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}unimplemented.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}vlarray.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/${MODPY_PYCACHE}vlarray.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/tables/_comp_bzip2.c
 @so lib/python${MODPY_VERSION}/site-packages/tables/_comp_bzip2.${MODPY_PYC_MAGIC_TAG}so
@@ -85,8 +113,11 @@ lib/python${MODPY_VERSION}/site-packages/tables/lrucacheextension.pyx
 lib/python${MODPY_VERSION}/site-packages/tables/misc/
 lib/python${MODPY_VERSION}/site-packages/tables/misc/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/tables/misc/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/tables/misc/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/misc/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/misc/${MODPY_PYCACHE}enum.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/misc/${MODPY_PYCACHE}enum.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/misc/${MODPY_PYCACHE}proxydict.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/misc/${MODPY_PYCACHE}proxydict.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/tables/misc/enum.py
 lib/python${MODPY_VERSION}/site-packages/tables/misc/proxydict.py
@@ -94,13 +125,17 @@ lib/python${MODPY_VERSION}/site-packages/tables/node.py
 lib/python${MODPY_VERSION}/site-packages/tables/nodes/
 lib/python${MODPY_VERSION}/site-packages/tables/nodes/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/tables/nodes/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/tables/nodes/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/nodes/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/nodes/${MODPY_PYCACHE}filenode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/nodes/${MODPY_PYCACHE}filenode.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/tables/nodes/filenode.py
 lib/python${MODPY_VERSION}/site-packages/tables/nodes/tests/
 lib/python${MODPY_VERSION}/site-packages/tables/nodes/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/tables/nodes/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/tables/nodes/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/nodes/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/nodes/tests/${MODPY_PYCACHE}test_filenode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/nodes/tests/${MODPY_PYCACHE}test_filenode.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/tables/nodes/tests/test_filenode.dat
 lib/python${MODPY_VERSION}/site-packages/tables/nodes/tests/test_filenode.py
@@ -113,10 +148,15 @@ lib/python${MODPY_VERSION}/site-packages/tables/req_versions.py
 lib/python${MODPY_VERSION}/site-packages/tables/scripts/
 lib/python${MODPY_VERSION}/site-packages/tables/scripts/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/tables/scripts/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/tables/scripts/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/scripts/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/scripts/${MODPY_PYCACHE}pt2to3.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/scripts/${MODPY_PYCACHE}pt2to3.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/scripts/${MODPY_PYCACHE}ptdump.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/scripts/${MODPY_PYCACHE}ptdump.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/scripts/${MODPY_PYCACHE}ptrepack.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/scripts/${MODPY_PYCACHE}ptrepack.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/scripts/${MODPY_PYCACHE}pttree.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/scripts/${MODPY_PYCACHE}pttree.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/tables/scripts/pt2to3.py
 lib/python${MODPY_VERSION}/site-packages/tables/scripts/ptdump.py
@@ -134,40 +174,75 @@ lib/python${MODPY_VERSION}/site-packages/tables/tests/Tables_lzo2.h5
 lib/python${MODPY_VERSION}/site-packages/tables/tests/Tables_lzo2_shuffle.h5
 lib/python${MODPY_VERSION}/site-packages/tables/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}check_leaks.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}check_leaks.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}create_backcompat_indexes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}create_backcompat_indexes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_all.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_all.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_array.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_array.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_attributes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_attributes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_aux.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_aux.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_backcompat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_backcompat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_basics.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_basics.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_carray.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_carray.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_create.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_create.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_do_undo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_do_undo.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_earray.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_earray.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_enum.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_enum.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_expression.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_expression.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_garbage.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_garbage.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_hdf5compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_hdf5compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_index_backcompat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_index_backcompat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_indexes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_indexes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_indexvalues.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_indexvalues.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_links.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_links.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_lists.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_lists.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_nestedtypes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_nestedtypes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_numpy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_numpy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_queries.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_queries.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_suite.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_suite.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_tables.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_tables.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_tablesMD.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_tablesMD.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_timestamps.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_timestamps.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_timetype.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_timetype.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_tree.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_tree.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_types.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_types.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_vlarray.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/tables/tests/${MODPY_PYCACHE}test_vlarray.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/tables/tests/array_mdatom.h5
 lib/python${MODPY_VERSION}/site-packages/tables/tests/attr-u16.h5
diff --git a/security/ROPgadget/Makefile b/security/ROPgadget/Makefile
index e1eaa9932d6..1696b1b4e06 100644
--- a/security/ROPgadget/Makefile
+++ b/security/ROPgadget/Makefile
@@ -5,7 +5,7 @@ GH_TAGNAME =	v${MODPY_EGG_VERSION}
 GH_PROJECT =	ROPGadget
 GH_ACCOUNT =	JonathanSalwan
 DISTNAME =	ROPGadget-${MODPY_EGG_VERSION}
-REVISION =	0
+REVISION =	1
 
 CATEGORIES =	security
 
@@ -17,7 +17,7 @@ MAINTAINER =	Jasper Lievisse Adriaanse <jasper@openbsd.org>
 PERMIT_PACKAGE =	Yes
 
 MODULES =	lang/python
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 
 RUN_DEPENDS =	devel/capstone/python${MODPY_FLAVOR}
 
diff --git a/security/ROPgadget/pkg/PLIST b/security/ROPgadget/pkg/PLIST
index b34c343938f..946bec52a75 100644
--- a/security/ROPgadget/pkg/PLIST
+++ b/security/ROPgadget/pkg/PLIST
@@ -1,21 +1,31 @@
 bin/ROPgadget
-lib/python${MODPY_VERSION}/site-packages/ROPGadget-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/ROPGadget-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/ROPGadget-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/ROPGadget-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/ROPGadget-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/ROPGadget-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/ROPGadget-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/ROPGadget-${MODPY_EGG_VERSION}.dist-info/AUTHORS
+lib/python${MODPY_VERSION}/site-packages/ROPGadget-${MODPY_EGG_VERSION}.dist-info/LICENSE_BSD.txt
+lib/python${MODPY_VERSION}/site-packages/ROPGadget-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/ROPGadget-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/ROPGadget-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/ROPGadget-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/ropgadget/
 lib/python${MODPY_VERSION}/site-packages/ropgadget/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ropgadget/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ropgadget/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropgadget/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropgadget/${MODPY_PYCACHE}args.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropgadget/${MODPY_PYCACHE}args.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropgadget/${MODPY_PYCACHE}binary.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropgadget/${MODPY_PYCACHE}binary.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropgadget/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropgadget/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropgadget/${MODPY_PYCACHE}gadgets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropgadget/${MODPY_PYCACHE}gadgets.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropgadget/${MODPY_PYCACHE}options.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropgadget/${MODPY_PYCACHE}options.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropgadget/${MODPY_PYCACHE}rgutils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropgadget/${MODPY_PYCACHE}rgutils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropgadget/${MODPY_PYCACHE}updateAlert.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropgadget/${MODPY_PYCACHE}updateAlert.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropgadget/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropgadget/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ropgadget/args.py
 lib/python${MODPY_VERSION}/site-packages/ropgadget/binary.py
@@ -24,11 +34,17 @@ lib/python${MODPY_VERSION}/site-packages/ropgadget/gadgets.py
 lib/python${MODPY_VERSION}/site-packages/ropgadget/loaders/
 lib/python${MODPY_VERSION}/site-packages/ropgadget/loaders/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ropgadget/loaders/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ropgadget/loaders/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropgadget/loaders/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropgadget/loaders/${MODPY_PYCACHE}elf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropgadget/loaders/${MODPY_PYCACHE}elf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropgadget/loaders/${MODPY_PYCACHE}macho.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropgadget/loaders/${MODPY_PYCACHE}macho.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropgadget/loaders/${MODPY_PYCACHE}pe.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropgadget/loaders/${MODPY_PYCACHE}pe.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropgadget/loaders/${MODPY_PYCACHE}raw.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropgadget/loaders/${MODPY_PYCACHE}raw.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropgadget/loaders/${MODPY_PYCACHE}universal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropgadget/loaders/${MODPY_PYCACHE}universal.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ropgadget/loaders/elf.py
 lib/python${MODPY_VERSION}/site-packages/ropgadget/loaders/macho.py
@@ -40,13 +56,18 @@ lib/python${MODPY_VERSION}/site-packages/ropgadget/rgutils.py
 lib/python${MODPY_VERSION}/site-packages/ropgadget/ropchain/
 lib/python${MODPY_VERSION}/site-packages/ropgadget/ropchain/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ropgadget/ropchain/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ropgadget/ropchain/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropgadget/ropchain/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropgadget/ropchain/${MODPY_PYCACHE}ropmaker.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropgadget/ropchain/${MODPY_PYCACHE}ropmaker.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ropgadget/ropchain/arch/
 lib/python${MODPY_VERSION}/site-packages/ropgadget/ropchain/arch/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ropgadget/ropchain/arch/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ropgadget/ropchain/arch/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropgadget/ropchain/arch/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropgadget/ropchain/arch/${MODPY_PYCACHE}ropmakerx64.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropgadget/ropchain/arch/${MODPY_PYCACHE}ropmakerx64.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropgadget/ropchain/arch/${MODPY_PYCACHE}ropmakerx86.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropgadget/ropchain/arch/${MODPY_PYCACHE}ropmakerx86.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ropgadget/ropchain/arch/ropmakerx64.py
 lib/python${MODPY_VERSION}/site-packages/ropgadget/ropchain/arch/ropmakerx86.py
diff --git a/security/angrop/Makefile b/security/angrop/Makefile
index 862d31ea7a1..f30dd593f39 100644
--- a/security/angrop/Makefile
+++ b/security/angrop/Makefile
@@ -5,7 +5,7 @@ COMMENT =		ROP chain builder based off of angr
 
 MODPY_EGG_VERSION =	9.0.6642
 DISTNAME =		angrop-${MODPY_EGG_VERSION}
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		security
 
@@ -16,7 +16,7 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 
 RUN_DEPENDS =		devel/angr/py-angr>=${MODPY_EGG_VERSION} \
 			devel/py-progressbar${MODPY_FLAVOR}
diff --git a/security/angrop/pkg/PLIST b/security/angrop/pkg/PLIST
index 63f6a899f05..80e1d80e09a 100644
--- a/security/angrop/pkg/PLIST
+++ b/security/angrop/pkg/PLIST
@@ -1,20 +1,28 @@
 lib/python${MODPY_VERSION}/site-packages/angrop/
-lib/python${MODPY_VERSION}/site-packages/angrop-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/angrop-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/angrop-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/angrop-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/angrop-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/angrop-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/angrop-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/angrop-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/angrop-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/angrop-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/angrop-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/angrop/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/angrop/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/angrop/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/angrop/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angrop/${MODPY_PYCACHE}chain_builder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/angrop/${MODPY_PYCACHE}chain_builder.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angrop/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/angrop/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angrop/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/angrop/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angrop/${MODPY_PYCACHE}gadget_analyzer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/angrop/${MODPY_PYCACHE}gadget_analyzer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angrop/${MODPY_PYCACHE}rop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/angrop/${MODPY_PYCACHE}rop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angrop/${MODPY_PYCACHE}rop_chain.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/angrop/${MODPY_PYCACHE}rop_chain.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angrop/${MODPY_PYCACHE}rop_gadget.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/angrop/${MODPY_PYCACHE}rop_gadget.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/angrop/${MODPY_PYCACHE}rop_utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/angrop/${MODPY_PYCACHE}rop_utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/angrop/chain_builder.py
 lib/python${MODPY_VERSION}/site-packages/angrop/common.py
diff --git a/security/boofuzz/Makefile b/security/boofuzz/Makefile
index 413de00975d..dfe5ec39512 100644
--- a/security/boofuzz/Makefile
+++ b/security/boofuzz/Makefile
@@ -2,7 +2,7 @@ COMMENT =	extensible network protocol fuzzer
 
 MODPY_EGG_VERSION =	0.2.1
 DISTNAME =	boofuzz-${MODPY_EGG_VERSION}
-REVISION =	2
+REVISION =	3
 
 CATEGORIES =	security
 
@@ -16,7 +16,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 
 RUN_DEPENDS = 		devel/py-attrs${MODPY_FLAVOR} \
 			devel/py-click${MODPY_FLAVOR} \
diff --git a/security/boofuzz/pkg/PLIST b/security/boofuzz/pkg/PLIST
index 0843e133c90..0ea146ea03c 100644
--- a/security/boofuzz/pkg/PLIST
+++ b/security/boofuzz/pkg/PLIST
@@ -1,41 +1,67 @@
 bin/boo
 lib/python${MODPY_VERSION}/site-packages/boofuzz/
-lib/python${MODPY_VERSION}/site-packages/boofuzz-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/boofuzz-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/boofuzz-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/boofuzz-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/boofuzz-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/boofuzz-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/boofuzz-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/boofuzz-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/boofuzz-${MODPY_EGG_VERSION}.dist-info/AUTHORS.txt
+lib/python${MODPY_VERSION}/site-packages/boofuzz-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/boofuzz-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/boofuzz-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/boofuzz-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/boofuzz-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/boofuzz-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/boofuzz/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}data_test_case.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}data_test_case.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}data_test_step.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}data_test_step.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}event_hook.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}event_hook.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}exception.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}exception.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}fuzz_logger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}fuzz_logger.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}fuzz_logger_csv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}fuzz_logger_csv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}fuzz_logger_curses.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}fuzz_logger_curses.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}fuzz_logger_db.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}fuzz_logger_db.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}fuzz_logger_text.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}fuzz_logger_text.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}fuzzers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}fuzzers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}ifuzz_logger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}ifuzz_logger.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}ifuzz_logger_backend.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}ifuzz_logger_backend.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}ifuzzable.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}ifuzzable.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}repeater.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}repeater.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}sessions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/${MODPY_PYCACHE}sessions.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/boofuzz/blocks/
 lib/python${MODPY_VERSION}/site-packages/boofuzz/blocks/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/boofuzz/blocks/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/boofuzz/blocks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/blocks/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/blocks/${MODPY_PYCACHE}block.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/blocks/${MODPY_PYCACHE}block.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/blocks/${MODPY_PYCACHE}checksum.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/blocks/${MODPY_PYCACHE}checksum.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/blocks/${MODPY_PYCACHE}repeat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/blocks/${MODPY_PYCACHE}repeat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/blocks/${MODPY_PYCACHE}request.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/blocks/${MODPY_PYCACHE}request.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/blocks/${MODPY_PYCACHE}size.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/blocks/${MODPY_PYCACHE}size.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/boofuzz/blocks/block.py
 lib/python${MODPY_VERSION}/site-packages/boofuzz/blocks/checksum.py
@@ -46,19 +72,33 @@ lib/python${MODPY_VERSION}/site-packages/boofuzz/cli.py
 lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/
 lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/${MODPY_PYCACHE}base_socket_connection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/${MODPY_PYCACHE}base_socket_connection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/${MODPY_PYCACHE}file_connection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/${MODPY_PYCACHE}file_connection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/${MODPY_PYCACHE}ip_constants.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/${MODPY_PYCACHE}ip_constants.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/${MODPY_PYCACHE}iserial_like.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/${MODPY_PYCACHE}iserial_like.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/${MODPY_PYCACHE}itarget_connection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/${MODPY_PYCACHE}itarget_connection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/${MODPY_PYCACHE}raw_l2_socket_connection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/${MODPY_PYCACHE}raw_l2_socket_connection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/${MODPY_PYCACHE}raw_l3_socket_connection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/${MODPY_PYCACHE}raw_l3_socket_connection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/${MODPY_PYCACHE}serial_connection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/${MODPY_PYCACHE}serial_connection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/${MODPY_PYCACHE}serial_connection_low_level.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/${MODPY_PYCACHE}serial_connection_low_level.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/${MODPY_PYCACHE}socket_connection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/${MODPY_PYCACHE}socket_connection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/${MODPY_PYCACHE}ssl_socket_connection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/${MODPY_PYCACHE}ssl_socket_connection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/${MODPY_PYCACHE}tcp_socket_connection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/${MODPY_PYCACHE}tcp_socket_connection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/${MODPY_PYCACHE}udp_socket_connection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/${MODPY_PYCACHE}udp_socket_connection.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/base_socket_connection.py
 lib/python${MODPY_VERSION}/site-packages/boofuzz/connections/file_connection.py
@@ -91,10 +131,15 @@ lib/python${MODPY_VERSION}/site-packages/boofuzz/ifuzzable.py
 lib/python${MODPY_VERSION}/site-packages/boofuzz/legos/
 lib/python${MODPY_VERSION}/site-packages/boofuzz/legos/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/boofuzz/legos/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/boofuzz/legos/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/legos/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/legos/${MODPY_PYCACHE}ber.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/legos/${MODPY_PYCACHE}ber.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/legos/${MODPY_PYCACHE}dcerpc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/legos/${MODPY_PYCACHE}dcerpc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/legos/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/legos/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/legos/${MODPY_PYCACHE}xdr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/legos/${MODPY_PYCACHE}xdr.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/boofuzz/legos/ber.py
 lib/python${MODPY_VERSION}/site-packages/boofuzz/legos/dcerpc.py
@@ -103,12 +148,19 @@ lib/python${MODPY_VERSION}/site-packages/boofuzz/legos/xdr.py
 lib/python${MODPY_VERSION}/site-packages/boofuzz/monitors/
 lib/python${MODPY_VERSION}/site-packages/boofuzz/monitors/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/boofuzz/monitors/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/boofuzz/monitors/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/monitors/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/monitors/${MODPY_PYCACHE}base_monitor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/monitors/${MODPY_PYCACHE}base_monitor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/monitors/${MODPY_PYCACHE}callback_monitor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/monitors/${MODPY_PYCACHE}callback_monitor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/monitors/${MODPY_PYCACHE}external_monitor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/monitors/${MODPY_PYCACHE}external_monitor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/monitors/${MODPY_PYCACHE}network_monitor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/monitors/${MODPY_PYCACHE}network_monitor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/monitors/${MODPY_PYCACHE}pedrpc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/monitors/${MODPY_PYCACHE}pedrpc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/monitors/${MODPY_PYCACHE}process_monitor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/monitors/${MODPY_PYCACHE}process_monitor.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/boofuzz/monitors/base_monitor.py
 lib/python${MODPY_VERSION}/site-packages/boofuzz/monitors/callback_monitor.py
@@ -119,10 +171,15 @@ lib/python${MODPY_VERSION}/site-packages/boofuzz/monitors/process_monitor.py
 lib/python${MODPY_VERSION}/site-packages/boofuzz/pgraph/
 lib/python${MODPY_VERSION}/site-packages/boofuzz/pgraph/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/boofuzz/pgraph/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/boofuzz/pgraph/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/pgraph/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/pgraph/${MODPY_PYCACHE}cluster.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/pgraph/${MODPY_PYCACHE}cluster.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/pgraph/${MODPY_PYCACHE}edge.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/pgraph/${MODPY_PYCACHE}edge.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/pgraph/${MODPY_PYCACHE}graph.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/pgraph/${MODPY_PYCACHE}graph.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/pgraph/${MODPY_PYCACHE}node.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/pgraph/${MODPY_PYCACHE}node.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/boofuzz/pgraph/cluster.py
 lib/python${MODPY_VERSION}/site-packages/boofuzz/pgraph/edge.py
@@ -131,20 +188,35 @@ lib/python${MODPY_VERSION}/site-packages/boofuzz/pgraph/node.py
 lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/
 lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}base_primitive.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}base_primitive.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}bit_field.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}bit_field.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}byte.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}byte.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}bytes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}bytes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}delim.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}delim.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}dword.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}dword.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}from_file.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}from_file.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}group.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}group.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}mirror.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}mirror.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}qword.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}qword.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}random_data.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}random_data.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}static.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}static.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}string.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}string.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}word.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/${MODPY_PYCACHE}word.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/base_primitive.py
 lib/python${MODPY_VERSION}/site-packages/boofuzz/primitives/bit_field.py
@@ -165,12 +237,19 @@ lib/python${MODPY_VERSION}/site-packages/boofuzz/sessions.py
 lib/python${MODPY_VERSION}/site-packages/boofuzz/utils/
 lib/python${MODPY_VERSION}/site-packages/boofuzz/utils/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/boofuzz/utils/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/boofuzz/utils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/utils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/utils/${MODPY_PYCACHE}crash_binning.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/utils/${MODPY_PYCACHE}crash_binning.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/utils/${MODPY_PYCACHE}dcerpc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/utils/${MODPY_PYCACHE}dcerpc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/utils/${MODPY_PYCACHE}debugger_thread_pydbg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/utils/${MODPY_PYCACHE}debugger_thread_pydbg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/utils/${MODPY_PYCACHE}debugger_thread_simple.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/utils/${MODPY_PYCACHE}debugger_thread_simple.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/utils/${MODPY_PYCACHE}process_monitor_pedrpc_server.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/utils/${MODPY_PYCACHE}process_monitor_pedrpc_server.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/utils/${MODPY_PYCACHE}scada.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/utils/${MODPY_PYCACHE}scada.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/boofuzz/utils/crash_binning.py
 lib/python${MODPY_VERSION}/site-packages/boofuzz/utils/dcerpc.py
@@ -181,7 +260,9 @@ lib/python${MODPY_VERSION}/site-packages/boofuzz/utils/scada.py
 lib/python${MODPY_VERSION}/site-packages/boofuzz/web/
 lib/python${MODPY_VERSION}/site-packages/boofuzz/web/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/boofuzz/web/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/boofuzz/web/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/web/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/boofuzz/web/${MODPY_PYCACHE}app.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/boofuzz/web/${MODPY_PYCACHE}app.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/boofuzz/web/app.py
 lib/python${MODPY_VERSION}/site-packages/boofuzz/web/static/
diff --git a/security/fierce/Makefile b/security/fierce/Makefile
index 0e79730a9ef..f27c4f172ac 100644
--- a/security/fierce/Makefile
+++ b/security/fierce/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	1.4.0
 GH_ACCOUNT =		mschwager
 GH_PROJECT =		fierce
 GH_TAGNAME =		${MODPY_EGG_VERSION}
-REVISION =		3
+REVISION =		4
 
 CATEGORIES =		security
 
@@ -14,7 +14,7 @@ MAINTAINER =		Jasper Lievisse Adriaanse <jasper@openbsd.org>
 PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 
 RUN_DEPENDS =		net/py-dnspython${MODPY_FLAVOR}
 
diff --git a/security/fierce/pkg/PLIST b/security/fierce/pkg/PLIST
index 68c3cce1b9d..54e2d61f7e7 100644
--- a/security/fierce/pkg/PLIST
+++ b/security/fierce/pkg/PLIST
@@ -1,15 +1,17 @@
 bin/fierce
 lib/python${MODPY_VERSION}/site-packages/fierce/
-lib/python${MODPY_VERSION}/site-packages/fierce-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/fierce-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/fierce-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/fierce-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/fierce-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/fierce-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/fierce-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/fierce-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/fierce-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/fierce-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/fierce-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/fierce-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/fierce-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/fierce-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/fierce/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/fierce/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/fierce/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fierce/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fierce/${MODPY_PYCACHE}fierce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fierce/${MODPY_PYCACHE}fierce.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/fierce/fierce.py
 lib/python${MODPY_VERSION}/site-packages/fierce/lists/
diff --git a/security/hashid/Makefile b/security/hashid/Makefile
index ed4ab88dde1..0b0a2742d21 100644
--- a/security/hashid/Makefile
+++ b/security/hashid/Makefile
@@ -2,7 +2,7 @@ COMMENT =	Identify the different types of cryptographic hashes
 
 MODPY_EGG_VERSION = 3.1.4
 DISTNAME =	hashid-${MODPY_EGG_VERSION}
-REVISION =	1
+REVISION =	2
 
 GH_ACCOUNT =    psypanda
 GH_PROJECT =    hashID
@@ -18,6 +18,6 @@ MAINTAINER =	Sebastian Reitenbach <sebastia@openbsd.org>
 PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 
 .include <bsd.port.mk>
diff --git a/security/hashid/pkg/PLIST b/security/hashid/pkg/PLIST
index 4dd13b8daa8..33b6340bb97 100644
--- a/security/hashid/pkg/PLIST
+++ b/security/hashid/pkg/PLIST
@@ -1,9 +1,11 @@
 bin/hashid
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}hashid.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}hashid.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/hashID-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/hashID-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/hashID-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/hashID-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/hashID-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/hashID-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/hashID-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/hashID-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/hashID-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/hashID-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/hashID-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/hashID-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/hashid.py
diff --git a/security/knockpy/Makefile b/security/knockpy/Makefile
index 32aa0524f3f..7a42ba07854 100644
--- a/security/knockpy/Makefile
+++ b/security/knockpy/Makefile
@@ -3,7 +3,7 @@ COMMENT =	subdomain scanner
 MODPY_EGG_VERSION =	5.3.0
 
 DISTNAME =	knockpy-${MODPY_EGG_VERSION}
-REVISION =	0
+REVISION =	1
 
 GH_ACCOUNT =	guelfoweb
 GH_PROJECT =	knock
@@ -18,7 +18,7 @@ PERMIT_PACKAGE=	Yes
 
 MODULES =		lang/python
 
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 
 RUN_DEPENDS =		devel/py-colorama${MODPY_FLAVOR} \
 			graphics/py-matplotlib${MODPY_FLAVOR} \
diff --git a/security/knockpy/pkg/PLIST b/security/knockpy/pkg/PLIST
index 444d4d34b6d..e77e1a71568 100644
--- a/security/knockpy/pkg/PLIST
+++ b/security/knockpy/pkg/PLIST
@@ -1,16 +1,19 @@
 bin/knockpy
 lib/python${MODPY_VERSION}/site-packages/knockpy/
-lib/python${MODPY_VERSION}/site-packages/knockpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/knockpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/knockpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/knockpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/knockpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/knockpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/knockpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/knockpy-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/knockpy-${MODPY_EGG_VERSION}.dist-info/LICENSE.md
+lib/python${MODPY_VERSION}/site-packages/knockpy-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/knockpy-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/knockpy-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/knockpy-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/knockpy-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/knockpy/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/knockpy/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/knockpy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/knockpy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/knockpy/${MODPY_PYCACHE}dns_socket.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/knockpy/${MODPY_PYCACHE}dns_socket.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/knockpy/${MODPY_PYCACHE}knockpy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/knockpy/${MODPY_PYCACHE}knockpy.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/knockpy/config.json
 lib/python${MODPY_VERSION}/site-packages/knockpy/dns_socket.py
diff --git a/security/plaso/Makefile b/security/plaso/Makefile
index 57bfb661a71..6ce7fea37b3 100644
--- a/security/plaso/Makefile
+++ b/security/plaso/Makefile
@@ -1,7 +1,7 @@
 COMMENT =		engine and tools to automate creation of super timeline
 
 MODPY_EGG_VERSION =	20200717
-REVISION =		2
+REVISION =		3
 DISTNAME =		plaso-${MODPY_EGG_VERSION}
 
 CATEGORIES =		security
@@ -18,7 +18,7 @@ DISTNAME =	plaso-${MODPY_EGG_VERSION}
 MASTER_SITES =	https://github.com/log2timeline/plaso/releases/download/${MODPY_EGG_VERSION}/
 
 MODULES =		lang/python
-MODPY_SETUPTOOLS = Yes
+MODPY_PYBUILD =	setuptools
 
 RUN_DEPENDS +=	archivers/py-lz4${MODPY_FLAVOR} \
 		databases/py-redis${MODPY_FLAVOR} \
diff --git a/security/plaso/pkg/PLIST b/security/plaso/pkg/PLIST
index 5b4b118dc78..8dfcabbaa19 100644
--- a/security/plaso/pkg/PLIST
+++ b/security/plaso/pkg/PLIST
@@ -5,34 +5,52 @@ bin/pinfo.py
 bin/psort.py
 bin/psteal.py
 lib/python${MODPY_VERSION}/site-packages/plaso/
-lib/python${MODPY_VERSION}/site-packages/plaso-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/plaso-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/plaso-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/plaso-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/plaso-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/plaso-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/plaso-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/plaso-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/plaso-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/plaso-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/plaso-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/plaso-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/plaso/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/${MODPY_PYCACHE}dependencies.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/${MODPY_PYCACHE}dependencies.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/analysis/
 lib/python${MODPY_VERSION}/site-packages/plaso/analysis/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}browser_search.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}browser_search.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}chrome_extension.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}chrome_extension.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}definitions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}definitions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}file_hashes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}file_hashes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}mediator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}mediator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}nsrlsvr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}nsrlsvr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}sessionize.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}sessionize.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}tagging.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}tagging.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}unique_domains_visited.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}unique_domains_visited.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}viper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}viper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}virustotal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}virustotal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}windows_services.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/analysis/${MODPY_PYCACHE}windows_services.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/analysis/browser_search.py
 lib/python${MODPY_VERSION}/site-packages/plaso/analysis/chrome_extension.py
@@ -52,21 +70,34 @@ lib/python${MODPY_VERSION}/site-packages/plaso/analysis/windows_services.py
 lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/
 lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/${MODPY_PYCACHE}hashing_analyzer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/${MODPY_PYCACHE}hashing_analyzer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/${MODPY_PYCACHE}yara_analyzer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/${MODPY_PYCACHE}yara_analyzer.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/hashers/
 lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/hashers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/hashers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/hashers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/hashers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/hashers/${MODPY_PYCACHE}entropy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/hashers/${MODPY_PYCACHE}entropy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/hashers/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/hashers/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/hashers/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/hashers/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/hashers/${MODPY_PYCACHE}md5.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/hashers/${MODPY_PYCACHE}md5.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/hashers/${MODPY_PYCACHE}sha1.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/hashers/${MODPY_PYCACHE}sha1.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/hashers/${MODPY_PYCACHE}sha256.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/hashers/${MODPY_PYCACHE}sha256.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/hashers/entropy.py
 lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/hashers/interface.py
@@ -82,60 +113,111 @@ lib/python${MODPY_VERSION}/site-packages/plaso/analyzers/yara_analyzer.py
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/cli/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/${MODPY_PYCACHE}extraction_tool.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/${MODPY_PYCACHE}extraction_tool.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/${MODPY_PYCACHE}image_export_tool.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/${MODPY_PYCACHE}image_export_tool.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/${MODPY_PYCACHE}log2timeline_tool.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/${MODPY_PYCACHE}log2timeline_tool.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/${MODPY_PYCACHE}pinfo_tool.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/${MODPY_PYCACHE}pinfo_tool.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/${MODPY_PYCACHE}psort_tool.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/${MODPY_PYCACHE}psort_tool.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/${MODPY_PYCACHE}psteal_tool.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/${MODPY_PYCACHE}psteal_tool.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/${MODPY_PYCACHE}status_view.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/${MODPY_PYCACHE}status_view.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/${MODPY_PYCACHE}storage_media_tool.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/${MODPY_PYCACHE}storage_media_tool.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/${MODPY_PYCACHE}time_slices.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/${MODPY_PYCACHE}time_slices.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/${MODPY_PYCACHE}tool_options.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/${MODPY_PYCACHE}tool_options.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/${MODPY_PYCACHE}tools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/${MODPY_PYCACHE}tools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/${MODPY_PYCACHE}views.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/${MODPY_PYCACHE}views.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/extraction_tool.py
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}analysis_plugins.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}analysis_plugins.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}artifact_definitions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}artifact_definitions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}artifact_filters.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}artifact_filters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}data_location.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}data_location.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}database_config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}database_config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}date_filters.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}date_filters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}dynamic_output.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}dynamic_output.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}elastic_output.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}elastic_output.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}event_filters.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}event_filters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}extraction.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}extraction.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}filter_file.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}filter_file.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}hashers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}hashers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}language.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}language.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}nsrlsvr_analysis.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}nsrlsvr_analysis.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}output_modules.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}output_modules.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}parsers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}parsers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}process_resources.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}process_resources.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}profiling.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}profiling.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}server_config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}server_config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}sessionize_analysis.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}sessionize_analysis.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}status_view.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}status_view.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}storage_file.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}storage_file.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}storage_format.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}storage_format.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}tagging_analysis.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}tagging_analysis.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}temporary_directory.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}temporary_directory.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}text_prepend.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}text_prepend.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}timesketch_output.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}timesketch_output.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}vfs_backend.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}vfs_backend.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}viper_analysis.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}viper_analysis.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}virustotal_analysis.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}virustotal_analysis.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}windows_services_analysis.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}windows_services_analysis.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}workers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}workers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}xlsx_output.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}xlsx_output.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}yara_rules.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/${MODPY_PYCACHE}yara_rules.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/analysis_plugins.py
 lib/python${MODPY_VERSION}/site-packages/plaso/cli/helpers/artifact_definitions.py
@@ -188,21 +270,37 @@ lib/python${MODPY_VERSION}/site-packages/plaso/cli/views.py
 lib/python${MODPY_VERSION}/site-packages/plaso/containers/
 lib/python${MODPY_VERSION}/site-packages/plaso/containers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}analyzer_result.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}analyzer_result.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}artifacts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}artifacts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}event_sources.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}event_sources.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}events.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}events.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}plist_event.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}plist_event.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}reports.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}reports.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}sessions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}sessions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}shell_item_events.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}shell_item_events.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}storage_media.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}storage_media.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}tasks.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}tasks.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}time_events.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}time_events.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}warnings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}warnings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}windows_events.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/containers/${MODPY_PYCACHE}windows_events.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/containers/analyzer_result.py
 lib/python${MODPY_VERSION}/site-packages/plaso/containers/artifacts.py
@@ -223,25 +321,45 @@ lib/python${MODPY_VERSION}/site-packages/plaso/dependencies.py
 lib/python${MODPY_VERSION}/site-packages/plaso/engine/
 lib/python${MODPY_VERSION}/site-packages/plaso/engine/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}artifact_filters.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}artifact_filters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}configurations.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}configurations.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}engine.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}engine.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}extractors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}extractors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}filter_file.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}filter_file.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}filters_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}filters_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}knowledge_base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}knowledge_base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}path_filters.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}path_filters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}path_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}path_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}plaso_queue.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}plaso_queue.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}process_info.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}process_info.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}processing_status.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}processing_status.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}profilers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}profilers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}single_process.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}single_process.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}tagging_file.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}tagging_file.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}worker.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}worker.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}yaml_filter_file.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}yaml_filter_file.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}zeromq_queue.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/engine/${MODPY_PYCACHE}zeromq_queue.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/engine/artifact_filters.py
 lib/python${MODPY_VERSION}/site-packages/plaso/engine/configurations.py
@@ -265,14 +383,23 @@ lib/python${MODPY_VERSION}/site-packages/plaso/engine/zeromq_queue.py
 lib/python${MODPY_VERSION}/site-packages/plaso/filters/
 lib/python${MODPY_VERSION}/site-packages/plaso/filters/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/filters/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/filters/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/filters/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/filters/${MODPY_PYCACHE}event_filter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/filters/${MODPY_PYCACHE}event_filter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/filters/${MODPY_PYCACHE}expression_parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/filters/${MODPY_PYCACHE}expression_parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/filters/${MODPY_PYCACHE}expressions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/filters/${MODPY_PYCACHE}expressions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/filters/${MODPY_PYCACHE}file_entry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/filters/${MODPY_PYCACHE}file_entry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/filters/${MODPY_PYCACHE}filters.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/filters/${MODPY_PYCACHE}filters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/filters/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/filters/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/filters/${MODPY_PYCACHE}parser_filter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/filters/${MODPY_PYCACHE}parser_filter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/filters/${MODPY_PYCACHE}path_filter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/filters/${MODPY_PYCACHE}path_filter.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/filters/event_filter.py
 lib/python${MODPY_VERSION}/site-packages/plaso/filters/expression_parser.py
@@ -285,47 +412,89 @@ lib/python${MODPY_VERSION}/site-packages/plaso/filters/path_filter.py
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}asl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}asl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}bsm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}bsm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}chrome.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}chrome.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}chrome_extension_activity.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}chrome_extension_activity.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}chrome_preferences.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}chrome_preferences.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}default.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}default.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}file_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}file_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}firefox.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}firefox.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}fseventsd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}fseventsd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}gdrive.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}gdrive.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}hangouts_messages.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}hangouts_messages.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}imessage.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}imessage.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}kik_ios.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}kik_ios.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}mac_notificationcenter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}mac_notificationcenter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}macos_tcc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}macos_tcc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}mediator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}mediator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}msiecf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}msiecf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}olecf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}olecf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}recycler.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}recycler.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}safari_cookies.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}safari_cookies.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}services.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}services.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}shell_items.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}shell_items.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}symantec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}symantec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}tango_android.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}tango_android.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}trendmicroav.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}trendmicroav.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}twitter_android.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}twitter_android.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}twitter_ios.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}twitter_ios.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}utmp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}utmp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}utmpx.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}utmpx.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}winevt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}winevt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}winevt_rc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}winevt_rc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}winevtx.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}winevtx.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}winjob.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}winjob.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}winlnk.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}winlnk.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}winprefetch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}winprefetch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}winreg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}winreg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}winrestore.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}winrestore.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}yaml_formatters_file.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/${MODPY_PYCACHE}yaml_formatters_file.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/asl.py
 lib/python${MODPY_VERSION}/site-packages/plaso/formatters/bsm.py
@@ -371,15 +540,25 @@ lib/python${MODPY_VERSION}/site-packages/plaso/formatters/yaml_formatters_file.p
 lib/python${MODPY_VERSION}/site-packages/plaso/lib/
 lib/python${MODPY_VERSION}/site-packages/plaso/lib/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/lib/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/lib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/lib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/lib/${MODPY_PYCACHE}bufferlib.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/lib/${MODPY_PYCACHE}bufferlib.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/lib/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/lib/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/lib/${MODPY_PYCACHE}definitions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/lib/${MODPY_PYCACHE}definitions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/lib/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/lib/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/lib/${MODPY_PYCACHE}line_reader_file.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/lib/${MODPY_PYCACHE}line_reader_file.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/lib/${MODPY_PYCACHE}loggers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/lib/${MODPY_PYCACHE}loggers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/lib/${MODPY_PYCACHE}plist.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/lib/${MODPY_PYCACHE}plist.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/lib/${MODPY_PYCACHE}specification.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/lib/${MODPY_PYCACHE}specification.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/lib/${MODPY_PYCACHE}timelib.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/lib/${MODPY_PYCACHE}timelib.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/lib/bufferlib.py
 lib/python${MODPY_VERSION}/site-packages/plaso/lib/decorators.py
@@ -393,16 +572,27 @@ lib/python${MODPY_VERSION}/site-packages/plaso/lib/timelib.py
 lib/python${MODPY_VERSION}/site-packages/plaso/multi_processing/
 lib/python${MODPY_VERSION}/site-packages/plaso/multi_processing/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/multi_processing/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/multi_processing/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/multi_processing/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/multi_processing/${MODPY_PYCACHE}analysis_process.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/multi_processing/${MODPY_PYCACHE}analysis_process.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/multi_processing/${MODPY_PYCACHE}base_process.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/multi_processing/${MODPY_PYCACHE}base_process.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/multi_processing/${MODPY_PYCACHE}engine.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/multi_processing/${MODPY_PYCACHE}engine.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/multi_processing/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/multi_processing/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/multi_processing/${MODPY_PYCACHE}plaso_xmlrpc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/multi_processing/${MODPY_PYCACHE}plaso_xmlrpc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/multi_processing/${MODPY_PYCACHE}psort.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/multi_processing/${MODPY_PYCACHE}psort.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/multi_processing/${MODPY_PYCACHE}rpc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/multi_processing/${MODPY_PYCACHE}rpc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/multi_processing/${MODPY_PYCACHE}task_engine.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/multi_processing/${MODPY_PYCACHE}task_engine.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/multi_processing/${MODPY_PYCACHE}task_manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/multi_processing/${MODPY_PYCACHE}task_manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/multi_processing/${MODPY_PYCACHE}worker_process.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/multi_processing/${MODPY_PYCACHE}worker_process.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/multi_processing/analysis_process.py
 lib/python${MODPY_VERSION}/site-packages/plaso/multi_processing/base_process.py
@@ -417,25 +607,45 @@ lib/python${MODPY_VERSION}/site-packages/plaso/multi_processing/worker_process.p
 lib/python${MODPY_VERSION}/site-packages/plaso/output/
 lib/python${MODPY_VERSION}/site-packages/plaso/output/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}dynamic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}dynamic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}elastic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}elastic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}formatting_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}formatting_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}json_line.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}json_line.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}json_out.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}json_out.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}kml.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}kml.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}l2t_csv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}l2t_csv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}mediator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}mediator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}null.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}null.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}rawpy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}rawpy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}shared_dsv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}shared_dsv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}shared_elastic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}shared_elastic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}shared_json.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}shared_json.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}timesketch_out.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}timesketch_out.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}tln.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}tln.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}xlsx.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/output/${MODPY_PYCACHE}xlsx.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/output/dynamic.py
 lib/python${MODPY_VERSION}/site-packages/plaso/output/elastic.py
@@ -459,80 +669,155 @@ lib/python${MODPY_VERSION}/site-packages/plaso/output/xlsx.py
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}amcache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}amcache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}android_app_usage.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}android_app_usage.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}apache_access.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}apache_access.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}apt_history.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}apt_history.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}asl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}asl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}bash_history.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}bash_history.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}bencode_parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}bencode_parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}bsm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}bsm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}chrome_cache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}chrome_cache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}chrome_preferences.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}chrome_preferences.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}cups_ipp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}cups_ipp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}custom_destinations.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}custom_destinations.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}czip.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}czip.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}docker.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}docker.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}dpkg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}dpkg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}dsv_parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}dsv_parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}dtfabric_parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}dtfabric_parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}esedb.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}esedb.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}filestat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}filestat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}firefox_cache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}firefox_cache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}fseventsd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}fseventsd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}gdrive_synclog.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}gdrive_synclog.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}google_logging.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}google_logging.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}iis.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}iis.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}java_idx.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}java_idx.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}mac_appfirewall.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}mac_appfirewall.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}mac_keychain.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}mac_keychain.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}mac_securityd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}mac_securityd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}mac_wifi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}mac_wifi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}mactime.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}mactime.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}mcafeeav.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}mcafeeav.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}mediator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}mediator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}msiecf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}msiecf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}networkminer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}networkminer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}ntfs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}ntfs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}olecf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}olecf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}opera.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}opera.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}pe.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}pe.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}plist.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}plist.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}pls_recall.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}pls_recall.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}plugins.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}plugins.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}popcontest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}popcontest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}presets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}presets.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}recycler.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}recycler.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}safari_cookies.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}safari_cookies.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}santa.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}santa.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}sccm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}sccm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}selinux.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}selinux.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}setupapi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}setupapi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}skydrivelog.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}skydrivelog.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}sophos_av.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}sophos_av.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}sqlite.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}sqlite.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}symantec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}symantec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}syslog.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}syslog.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}systemd_journal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}systemd_journal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}text_parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}text_parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}trendmicroav.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}trendmicroav.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}utmp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}utmp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}utmpx.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}utmpx.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}vsftpd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}vsftpd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}winevt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}winevt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}winevtx.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}winevtx.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}winfirewall.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}winfirewall.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}winjob.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}winjob.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}winlnk.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}winlnk.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}winprefetch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}winprefetch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}winreg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}winreg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}winrestore.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}winrestore.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}xchatlog.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}xchatlog.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}xchatscrollback.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}xchatscrollback.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}zsh_extended_history.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/${MODPY_PYCACHE}zsh_extended_history.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/amcache.py
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/android_app_usage.py
@@ -545,9 +830,13 @@ lib/python${MODPY_VERSION}/site-packages/plaso/parsers/bencode_parser.py
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/bencode_plugins/
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/bencode_plugins/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/parsers/bencode_plugins/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/bencode_plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/bencode_plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/bencode_plugins/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/bencode_plugins/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/bencode_plugins/${MODPY_PYCACHE}transmission.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/bencode_plugins/${MODPY_PYCACHE}transmission.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/bencode_plugins/${MODPY_PYCACHE}utorrent.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/bencode_plugins/${MODPY_PYCACHE}utorrent.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/bencode_plugins/interface.py
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/bencode_plugins/transmission.py
@@ -560,9 +849,13 @@ lib/python${MODPY_VERSION}/site-packages/plaso/parsers/chrome_preferences.py
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/cookie_plugins/
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/cookie_plugins/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/parsers/cookie_plugins/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/cookie_plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/cookie_plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/cookie_plugins/${MODPY_PYCACHE}ganalytics.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/cookie_plugins/${MODPY_PYCACHE}ganalytics.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/cookie_plugins/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/cookie_plugins/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/cookie_plugins/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/cookie_plugins/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/cookie_plugins/ganalytics.py
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/cookie_plugins/interface.py
@@ -575,8 +868,11 @@ lib/python${MODPY_VERSION}/site-packages/plaso/parsers/czip.py
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/czip_plugins/
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/czip_plugins/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/parsers/czip_plugins/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/czip_plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/czip_plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/czip_plugins/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/czip_plugins/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/czip_plugins/${MODPY_PYCACHE}oxml.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/czip_plugins/${MODPY_PYCACHE}oxml.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/czip_plugins/interface.py
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/czip_plugins/oxml.py
@@ -588,10 +884,15 @@ lib/python${MODPY_VERSION}/site-packages/plaso/parsers/esedb.py
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/esedb_plugins/
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/esedb_plugins/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/parsers/esedb_plugins/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/esedb_plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/esedb_plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/esedb_plugins/${MODPY_PYCACHE}file_history.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/esedb_plugins/${MODPY_PYCACHE}file_history.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/esedb_plugins/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/esedb_plugins/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/esedb_plugins/${MODPY_PYCACHE}msie_webcache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/esedb_plugins/${MODPY_PYCACHE}msie_webcache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/esedb_plugins/${MODPY_PYCACHE}srum.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/esedb_plugins/${MODPY_PYCACHE}srum.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/esedb_plugins/file_history.py
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/esedb_plugins/interface.py
@@ -627,11 +928,17 @@ lib/python${MODPY_VERSION}/site-packages/plaso/parsers/olecf.py
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/olecf_plugins/
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/olecf_plugins/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/parsers/olecf_plugins/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/olecf_plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/olecf_plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/olecf_plugins/${MODPY_PYCACHE}automatic_destinations.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/olecf_plugins/${MODPY_PYCACHE}automatic_destinations.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/olecf_plugins/${MODPY_PYCACHE}default.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/olecf_plugins/${MODPY_PYCACHE}default.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/olecf_plugins/${MODPY_PYCACHE}dtfabric_plugin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/olecf_plugins/${MODPY_PYCACHE}dtfabric_plugin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/olecf_plugins/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/olecf_plugins/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/olecf_plugins/${MODPY_PYCACHE}summary.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/olecf_plugins/${MODPY_PYCACHE}summary.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/olecf_plugins/automatic_destinations.py
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/olecf_plugins/automatic_destinations.yaml
@@ -645,21 +952,37 @@ lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist.py
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}airport.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}airport.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}appleaccount.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}appleaccount.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}bluetooth.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}bluetooth.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}default.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}default.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}dtfabric_plugin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}dtfabric_plugin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}install_history.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}install_history.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}ipod.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}ipod.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}launchd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}launchd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}macuser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}macuser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}safari.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}safari.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}softwareupdate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}softwareupdate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}spotlight.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}spotlight.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}spotlight_volume.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}spotlight_volume.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}timemachine.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/${MODPY_PYCACHE}timemachine.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/airport.py
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/plist_plugins/appleaccount.py
@@ -693,7 +1016,9 @@ lib/python${MODPY_VERSION}/site-packages/plaso/parsers/setupapi.py
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/shared/
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/shared/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/parsers/shared/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/shared/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/shared/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/shared/${MODPY_PYCACHE}shell_items.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/shared/${MODPY_PYCACHE}shell_items.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/shared/shell_items.py
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/skydrivelog.py
@@ -702,37 +1027,69 @@ lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite.py
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}android_calls.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}android_calls.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}android_sms.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}android_sms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}android_webview.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}android_webview.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}android_webviewcache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}android_webviewcache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}appusage.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}appusage.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}chrome.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}chrome.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}chrome_autofill.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}chrome_autofill.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}chrome_cookies.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}chrome_cookies.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}chrome_extension_activity.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}chrome_extension_activity.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}firefox.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}firefox.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}firefox_cookies.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}firefox_cookies.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}gdrive.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}gdrive.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}hangouts_messages.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}hangouts_messages.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}imessage.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}imessage.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}kik_ios.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}kik_ios.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}kodi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}kodi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}ls_quarantine.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}ls_quarantine.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}mac_document_versions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}mac_document_versions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}mac_knowledgec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}mac_knowledgec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}mac_notes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}mac_notes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}mac_notificationcenter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}mac_notificationcenter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}mackeeper_cache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}mackeeper_cache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}macos_tcc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}macos_tcc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}safari.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}safari.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}skype.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}skype.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}tango_android.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}tango_android.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}twitter_android.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}twitter_android.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}twitter_ios.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}twitter_ios.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}windows_timeline.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}windows_timeline.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}zeitgeist.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/${MODPY_PYCACHE}zeitgeist.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/android_calls.py
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/sqlite_plugins/android_sms.py
@@ -770,9 +1127,13 @@ lib/python${MODPY_VERSION}/site-packages/plaso/parsers/syslog.py
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/syslog_plugins/
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/syslog_plugins/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/parsers/syslog_plugins/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/syslog_plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/syslog_plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/syslog_plugins/${MODPY_PYCACHE}cron.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/syslog_plugins/${MODPY_PYCACHE}cron.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/syslog_plugins/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/syslog_plugins/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/syslog_plugins/${MODPY_PYCACHE}ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/syslog_plugins/${MODPY_PYCACHE}ssh.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/syslog_plugins/cron.py
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/syslog_plugins/interface.py
@@ -796,37 +1157,69 @@ lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg.py
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}appcompatcache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}appcompatcache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}bagmru.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}bagmru.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}bam.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}bam.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}ccleaner.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}ccleaner.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}default.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}default.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}dtfabric_plugin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}dtfabric_plugin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}lfu.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}lfu.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}mountpoints.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}mountpoints.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}mrulist.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}mrulist.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}mrulistex.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}mrulistex.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}msie_zones.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}msie_zones.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}network_drives.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}network_drives.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}networks.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}networks.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}officemru.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}officemru.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}outlook.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}outlook.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}programscache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}programscache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}run.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}run.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}sam_users.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}sam_users.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}services.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}services.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}shutdown.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}shutdown.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}task_scheduler.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}task_scheduler.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}terminal_server.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}terminal_server.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}timezone.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}timezone.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}typedurls.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}typedurls.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}usb.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}usb.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}usbstor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}usbstor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}userassist.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}userassist.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}windows_version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}windows_version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}winlogon.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}winlogon.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}winrar.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/${MODPY_PYCACHE}winrar.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/appcompatcache.py
 lib/python${MODPY_VERSION}/site-packages/plaso/parsers/winreg_plugins/appcompatcache.yaml
@@ -875,12 +1268,19 @@ lib/python${MODPY_VERSION}/site-packages/plaso/parsers/zsh_extended_history.py
 lib/python${MODPY_VERSION}/site-packages/plaso/preprocessors/
 lib/python${MODPY_VERSION}/site-packages/plaso/preprocessors/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/preprocessors/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/preprocessors/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/preprocessors/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/preprocessors/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/preprocessors/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/preprocessors/${MODPY_PYCACHE}linux.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/preprocessors/${MODPY_PYCACHE}linux.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/preprocessors/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/preprocessors/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/preprocessors/${MODPY_PYCACHE}macos.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/preprocessors/${MODPY_PYCACHE}macos.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/preprocessors/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/preprocessors/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/preprocessors/${MODPY_PYCACHE}windows.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/preprocessors/${MODPY_PYCACHE}windows.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/preprocessors/interface.py
 lib/python${MODPY_VERSION}/site-packages/plaso/preprocessors/linux.py
@@ -891,9 +1291,13 @@ lib/python${MODPY_VERSION}/site-packages/plaso/preprocessors/windows.py
 lib/python${MODPY_VERSION}/site-packages/plaso/serializer/
 lib/python${MODPY_VERSION}/site-packages/plaso/serializer/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/serializer/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/serializer/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/serializer/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/serializer/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/serializer/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/serializer/${MODPY_PYCACHE}json_serializer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/serializer/${MODPY_PYCACHE}json_serializer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/serializer/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/serializer/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/serializer/interface.py
 lib/python${MODPY_VERSION}/site-packages/plaso/serializer/json_serializer.py
@@ -901,14 +1305,23 @@ lib/python${MODPY_VERSION}/site-packages/plaso/serializer/logger.py
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/storage/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/storage/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/storage/${MODPY_PYCACHE}event_heaps.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/${MODPY_PYCACHE}event_heaps.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/storage/${MODPY_PYCACHE}event_tag_index.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/${MODPY_PYCACHE}event_tag_index.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/storage/${MODPY_PYCACHE}factory.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/${MODPY_PYCACHE}factory.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/storage/${MODPY_PYCACHE}file_interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/${MODPY_PYCACHE}file_interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/storage/${MODPY_PYCACHE}identifiers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/${MODPY_PYCACHE}identifiers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/storage/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/storage/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/storage/${MODPY_PYCACHE}time_range.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/${MODPY_PYCACHE}time_range.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/event_heaps.py
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/event_tag_index.py
@@ -916,7 +1329,9 @@ lib/python${MODPY_VERSION}/site-packages/plaso/storage/factory.py
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/fake/
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/fake/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/storage/fake/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/storage/fake/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/fake/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/storage/fake/${MODPY_PYCACHE}writer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/fake/${MODPY_PYCACHE}writer.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/fake/writer.py
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/file_interface.py
@@ -926,10 +1341,15 @@ lib/python${MODPY_VERSION}/site-packages/plaso/storage/logger.py
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/redis/
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/redis/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/storage/redis/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/storage/redis/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/redis/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/storage/redis/${MODPY_PYCACHE}merge_reader.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/redis/${MODPY_PYCACHE}merge_reader.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/storage/redis/${MODPY_PYCACHE}reader.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/redis/${MODPY_PYCACHE}reader.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/storage/redis/${MODPY_PYCACHE}redis_store.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/redis/${MODPY_PYCACHE}redis_store.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/storage/redis/${MODPY_PYCACHE}writer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/redis/${MODPY_PYCACHE}writer.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/redis/merge_reader.py
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/redis/reader.py
@@ -938,10 +1358,15 @@ lib/python${MODPY_VERSION}/site-packages/plaso/storage/redis/writer.py
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/sqlite/
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/sqlite/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/storage/sqlite/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/storage/sqlite/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/sqlite/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/storage/sqlite/${MODPY_PYCACHE}merge_reader.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/sqlite/${MODPY_PYCACHE}merge_reader.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/storage/sqlite/${MODPY_PYCACHE}reader.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/sqlite/${MODPY_PYCACHE}reader.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/storage/sqlite/${MODPY_PYCACHE}sqlite_file.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/sqlite/${MODPY_PYCACHE}sqlite_file.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/storage/sqlite/${MODPY_PYCACHE}writer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/sqlite/${MODPY_PYCACHE}writer.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/sqlite/merge_reader.py
 lib/python${MODPY_VERSION}/site-packages/plaso/storage/sqlite/reader.py
@@ -951,17 +1376,25 @@ lib/python${MODPY_VERSION}/site-packages/plaso/storage/time_range.py
 lib/python${MODPY_VERSION}/site-packages/plaso/unix/
 lib/python${MODPY_VERSION}/site-packages/plaso/unix/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/unix/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/unix/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/unix/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/unix/${MODPY_PYCACHE}bsmtoken.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/unix/${MODPY_PYCACHE}bsmtoken.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/unix/bsmtoken.py
 lib/python${MODPY_VERSION}/site-packages/plaso/winnt/
 lib/python${MODPY_VERSION}/site-packages/plaso/winnt/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/plaso/winnt/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/plaso/winnt/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/winnt/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/winnt/${MODPY_PYCACHE}human_readable_service_enums.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/winnt/${MODPY_PYCACHE}human_readable_service_enums.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/winnt/${MODPY_PYCACHE}known_folder_ids.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/winnt/${MODPY_PYCACHE}known_folder_ids.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/winnt/${MODPY_PYCACHE}language_ids.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/winnt/${MODPY_PYCACHE}language_ids.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/winnt/${MODPY_PYCACHE}shell_folder_ids.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/winnt/${MODPY_PYCACHE}shell_folder_ids.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/plaso/winnt/${MODPY_PYCACHE}time_zones.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/plaso/winnt/${MODPY_PYCACHE}time_zones.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/plaso/winnt/human_readable_service_enums.py
 lib/python${MODPY_VERSION}/site-packages/plaso/winnt/known_folder_ids.py
diff --git a/security/pwntools/Makefile b/security/pwntools/Makefile
index 74bbb5fc134..5972afe9b96 100644
--- a/security/pwntools/Makefile
+++ b/security/pwntools/Makefile
@@ -2,7 +2,7 @@ COMMENT =	Pwntools CTF framework and exploit development library
 
 MODPY_EGG_VERSION =	4.3.1
 DISTNAME =	pwntools-${MODPY_EGG_VERSION}
-REVISION =	3
+REVISION =	4
 
 CATEGORIES =	security
 
@@ -15,7 +15,7 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 
 RUN_DEPENDS =		devel/capstone/python${MODPY_FLAVOR} \
 			devel/py-dateutil${MODPY_FLAVOR} \
diff --git a/security/pwntools/pkg/PLIST b/security/pwntools/pkg/PLIST
index 172f6e3bb95..af558de6e5c 100644
--- a/security/pwntools/pkg/PLIST
+++ b/security/pwntools/pkg/PLIST
@@ -7,48 +7,83 @@ bin/pwn
 lib/python${MODPY_VERSION}/site-packages/pwn/
 lib/python${MODPY_VERSION}/site-packages/pwn/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwn/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwn/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwn/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwn/${MODPY_PYCACHE}toplevel.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwn/${MODPY_PYCACHE}toplevel.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwn/toplevel.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}abi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}abi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}args.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}args.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}asm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}asm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}atexception.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}atexception.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}atexit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}atexit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}device.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}device.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}dynelf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}dynelf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}exception.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}exception.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}filepointer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}filepointer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}fmtstr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}fmtstr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}gdb.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}gdb.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}gdb_faketerminal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}gdb_faketerminal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}lexer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}lexer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}libcdb.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}libcdb.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}memleak.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}memleak.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}pep237.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}pep237.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}qemu.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}qemu.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}regsort.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}regsort.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}replacements.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}replacements.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}runner.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}runner.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}testexample.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}testexample.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}timeout.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}timeout.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}ui.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}ui.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}useragents.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}useragents.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/abi.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/adb/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/adb/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/adb/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/adb/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/adb/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/adb/${MODPY_PYCACHE}adb.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/adb/${MODPY_PYCACHE}adb.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/adb/${MODPY_PYCACHE}bootimg.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/adb/${MODPY_PYCACHE}bootimg.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/adb/${MODPY_PYCACHE}bootloader.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/adb/${MODPY_PYCACHE}bootloader.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/adb/${MODPY_PYCACHE}protocol.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/adb/${MODPY_PYCACHE}protocol.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/adb/adb.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/adb/bootimg.py
@@ -61,27 +96,49 @@ lib/python${MODPY_VERSION}/site-packages/pwnlib/atexit.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}asm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}asm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}checksec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}checksec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}constgrep.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}constgrep.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}cyclic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}cyclic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}debug.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}debug.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}disablenx.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}disablenx.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}disasm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}disasm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}elfdiff.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}elfdiff.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}elfpatch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}elfpatch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}errno.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}errno.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}hex.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}hex.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}phd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}phd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}pwnstrip.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}pwnstrip.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}scramble.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}scramble.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}shellcraft.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}shellcraft.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}template.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}template.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}unhex.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}unhex.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}update.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}update.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/asm.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/commandline/checksec.py
@@ -108,26 +165,44 @@ lib/python${MODPY_VERSION}/site-packages/pwnlib/config.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/${MODPY_PYCACHE}constant.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/${MODPY_PYCACHE}constant.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/${MODPY_PYCACHE}freebsd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/${MODPY_PYCACHE}freebsd.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}aarch64.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}aarch64.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}alpha.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}alpha.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}amd64.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}amd64.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}arm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}arm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}i386.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}i386.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}ia64.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}ia64.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}mips.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}mips.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}powerpc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}powerpc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}powerpc64.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}powerpc64.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}s390.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}s390.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}s390x.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}s390x.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}sparc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}sparc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}sparc64.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}sparc64.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}thumb.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/${MODPY_PYCACHE}thumb.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/aarch64.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/alpha.py
@@ -146,20 +221,35 @@ lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/android/thumb.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}aarch64.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}aarch64.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}alpha.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}alpha.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}amd64.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}amd64.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}arm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}arm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}i386.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}i386.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}ia64.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}ia64.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}mips.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}mips.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}powerpc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}powerpc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}powerpc64.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}powerpc64.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}s390.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}s390.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}s390x.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}s390x.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}sparc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}sparc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}sparc64.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}sparc64.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}thumb.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/${MODPY_PYCACHE}thumb.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/aarch64.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/cgc/alpha.py
@@ -180,20 +270,35 @@ lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/freebsd.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}aarch64.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}aarch64.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}alpha.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}alpha.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}amd64.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}amd64.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}arm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}arm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}i386.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}i386.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}ia64.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}ia64.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}mips.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}mips.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}powerpc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}powerpc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}powerpc64.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}powerpc64.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}s390.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}s390.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}s390x.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}s390x.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}sparc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}sparc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}sparc64.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}sparc64.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}thumb.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/${MODPY_PYCACHE}thumb.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/aarch64.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/alpha.py
@@ -212,27 +317,33 @@ lib/python${MODPY_VERSION}/site-packages/pwnlib/constants/linux/thumb.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/context/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/context/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/context/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/context/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/context/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/data/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/data/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/data/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/data/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/data/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/data/crcsums.txt
 lib/python${MODPY_VERSION}/site-packages/pwnlib/data/elf/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/data/elf/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/data/elf/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/data/elf/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/data/elf/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/data/elf/fmtstr/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/data/elf/fmtstr/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/data/elf/fmtstr/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/data/elf/fmtstr/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/data/elf/fmtstr/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/data/elf/relro/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/data/elf/relro/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/data/elf/relro/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/data/elf/relro/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/data/elf/relro/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/data/elf/ret2dlresolve/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/data/elf/ret2dlresolve/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/data/elf/ret2dlresolve/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/data/elf/ret2dlresolve/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/data/elf/ret2dlresolve/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/data/includes/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/data/includes/android/
@@ -305,12 +416,19 @@ lib/python${MODPY_VERSION}/site-packages/pwnlib/dynelf.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/elf/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/elf/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/elf/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/elf/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/elf/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/elf/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/elf/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/elf/${MODPY_PYCACHE}corefile.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/elf/${MODPY_PYCACHE}corefile.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/elf/${MODPY_PYCACHE}datatypes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/elf/${MODPY_PYCACHE}datatypes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/elf/${MODPY_PYCACHE}elf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/elf/${MODPY_PYCACHE}elf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/elf/${MODPY_PYCACHE}maps.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/elf/${MODPY_PYCACHE}maps.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/elf/${MODPY_PYCACHE}plt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/elf/${MODPY_PYCACHE}plt.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/elf/config.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/elf/corefile.py
@@ -321,28 +439,40 @@ lib/python${MODPY_VERSION}/site-packages/pwnlib/elf/plt.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/${MODPY_PYCACHE}encoder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/${MODPY_PYCACHE}encoder.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/amd64/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/amd64/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/amd64/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/amd64/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/amd64/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/amd64/${MODPY_PYCACHE}delta.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/amd64/${MODPY_PYCACHE}delta.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/amd64/delta.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/arm/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/arm/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/arm/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/arm/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/arm/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/arm/${MODPY_PYCACHE}xor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/arm/${MODPY_PYCACHE}xor.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/arm/alphanumeric/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/arm/alphanumeric/ARM_Instructions.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/arm/alphanumeric/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/arm/alphanumeric/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/arm/alphanumeric/${MODPY_PYCACHE}ARM_Instructions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/arm/alphanumeric/${MODPY_PYCACHE}ARM_Instructions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/arm/alphanumeric/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/arm/alphanumeric/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/arm/alphanumeric/${MODPY_PYCACHE}alphanum_byte.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/arm/alphanumeric/${MODPY_PYCACHE}alphanum_byte.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/arm/alphanumeric/${MODPY_PYCACHE}alphanumeric.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/arm/alphanumeric/${MODPY_PYCACHE}alphanumeric.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/arm/alphanumeric/${MODPY_PYCACHE}builder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/arm/alphanumeric/${MODPY_PYCACHE}builder.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/arm/alphanumeric/${MODPY_PYCACHE}random_funcs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/arm/alphanumeric/${MODPY_PYCACHE}random_funcs.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/arm/alphanumeric/alphanum_byte.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/arm/alphanumeric/alphanumeric.py
@@ -353,15 +483,20 @@ lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/encoder.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/i386/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/i386/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/i386/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/i386/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/i386/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/i386/${MODPY_PYCACHE}delta.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/i386/${MODPY_PYCACHE}delta.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/i386/${MODPY_PYCACHE}xor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/i386/${MODPY_PYCACHE}xor.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/i386/delta.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/i386/xor.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/mips/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/mips/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/mips/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/mips/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/mips/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/mips/${MODPY_PYCACHE}xor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/mips/${MODPY_PYCACHE}xor.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/encoders/mips/xor.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/exception.py
@@ -369,7 +504,9 @@ lib/python${MODPY_VERSION}/site-packages/pwnlib/filepointer.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/flag/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/flag/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/flag/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/flag/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/flag/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/flag/${MODPY_PYCACHE}flag.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/flag/${MODPY_PYCACHE}flag.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/flag/flag.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/fmtstr.py
@@ -378,7 +515,9 @@ lib/python${MODPY_VERSION}/site-packages/pwnlib/gdb_faketerminal.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/internal/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/internal/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/internal/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/internal/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/internal/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/internal/${MODPY_PYCACHE}dochelper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/internal/${MODPY_PYCACHE}dochelper.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/internal/dochelper.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/lexer.py
@@ -389,10 +528,12 @@ lib/python${MODPY_VERSION}/site-packages/pwnlib/pep237.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/protocols/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/protocols/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/protocols/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/protocols/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/protocols/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/protocols/adb/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/protocols/adb/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/protocols/adb/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/protocols/adb/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/protocols/adb/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/qemu.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/regsort.py
@@ -400,11 +541,17 @@ lib/python${MODPY_VERSION}/site-packages/pwnlib/replacements.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/rop/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/rop/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/rop/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/rop/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/rop/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/rop/${MODPY_PYCACHE}call.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/rop/${MODPY_PYCACHE}call.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/rop/${MODPY_PYCACHE}gadgets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/rop/${MODPY_PYCACHE}gadgets.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/rop/${MODPY_PYCACHE}ret2dlresolve.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/rop/${MODPY_PYCACHE}ret2dlresolve.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/rop/${MODPY_PYCACHE}rop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/rop/${MODPY_PYCACHE}rop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/rop/${MODPY_PYCACHE}srop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/rop/${MODPY_PYCACHE}srop.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/rop/call.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/rop/gadgets.py
@@ -415,8 +562,11 @@ lib/python${MODPY_VERSION}/site-packages/pwnlib/runner.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/shellcraft/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/shellcraft/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/shellcraft/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/shellcraft/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/shellcraft/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/shellcraft/${MODPY_PYCACHE}internal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/shellcraft/${MODPY_PYCACHE}internal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/shellcraft/${MODPY_PYCACHE}registers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/shellcraft/${MODPY_PYCACHE}registers.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/shellcraft/internal.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/shellcraft/registers.py
@@ -6936,17 +7086,29 @@ lib/python${MODPY_VERSION}/site-packages/pwnlib/shellcraft/templates/thumb/udiv_
 lib/python${MODPY_VERSION}/site-packages/pwnlib/term/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/term/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/term/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/term/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/term/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/term/${MODPY_PYCACHE}completer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/term/${MODPY_PYCACHE}completer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/term/${MODPY_PYCACHE}key.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/term/${MODPY_PYCACHE}key.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/term/${MODPY_PYCACHE}keyconsts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/term/${MODPY_PYCACHE}keyconsts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/term/${MODPY_PYCACHE}keymap.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/term/${MODPY_PYCACHE}keymap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/term/${MODPY_PYCACHE}readline.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/term/${MODPY_PYCACHE}readline.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/term/${MODPY_PYCACHE}spinners.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/term/${MODPY_PYCACHE}spinners.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/term/${MODPY_PYCACHE}term.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/term/${MODPY_PYCACHE}term.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/term/${MODPY_PYCACHE}termcap.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/term/${MODPY_PYCACHE}termcap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/term/${MODPY_PYCACHE}text.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/term/${MODPY_PYCACHE}text.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/term/${MODPY_PYCACHE}unix_termcap.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/term/${MODPY_PYCACHE}unix_termcap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/term/${MODPY_PYCACHE}windows_termcap.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/term/${MODPY_PYCACHE}windows_termcap.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/term/completer.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/term/key.py
@@ -6964,15 +7126,25 @@ lib/python${MODPY_VERSION}/site-packages/pwnlib/timeout.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/tubes/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/tubes/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/tubes/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/tubes/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/tubes/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/tubes/${MODPY_PYCACHE}buffer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/tubes/${MODPY_PYCACHE}buffer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/tubes/${MODPY_PYCACHE}listen.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/tubes/${MODPY_PYCACHE}listen.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/tubes/${MODPY_PYCACHE}process.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/tubes/${MODPY_PYCACHE}process.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/tubes/${MODPY_PYCACHE}remote.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/tubes/${MODPY_PYCACHE}remote.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/tubes/${MODPY_PYCACHE}serialtube.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/tubes/${MODPY_PYCACHE}serialtube.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/tubes/${MODPY_PYCACHE}server.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/tubes/${MODPY_PYCACHE}server.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/tubes/${MODPY_PYCACHE}sock.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/tubes/${MODPY_PYCACHE}sock.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/tubes/${MODPY_PYCACHE}ssh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/tubes/${MODPY_PYCACHE}ssh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/tubes/${MODPY_PYCACHE}tube.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/tubes/${MODPY_PYCACHE}tube.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/tubes/buffer.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/tubes/listen.py
@@ -6988,25 +7160,42 @@ lib/python${MODPY_VERSION}/site-packages/pwnlib/useragents.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/util/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/util/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}cyclic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}cyclic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}fiddling.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}fiddling.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}getdents.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}getdents.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}hashes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}hashes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}iters.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}iters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}lists.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}lists.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}net.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}net.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}packing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}packing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}proc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}proc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}safeeval.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}safeeval.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}sh_string.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}sh_string.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}splash.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}splash.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}web.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/util/${MODPY_PYCACHE}web.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/util/crc/
 lib/python${MODPY_VERSION}/site-packages/pwnlib/util/crc/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pwnlib/util/crc/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pwnlib/util/crc/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/util/crc/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pwnlib/util/crc/${MODPY_PYCACHE}known.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pwnlib/util/crc/${MODPY_PYCACHE}known.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pwnlib/util/crc/known.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/util/cyclic.py
@@ -7024,11 +7213,11 @@ lib/python${MODPY_VERSION}/site-packages/pwnlib/util/sh_string.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/util/splash.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/util/web.py
 lib/python${MODPY_VERSION}/site-packages/pwnlib/version.py
-lib/python${MODPY_VERSION}/site-packages/pwntools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pwntools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pwntools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pwntools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pwntools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/pwntools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pwntools-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pwntools-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pwntools-${MODPY_EGG_VERSION}.dist-info/LICENSE-pwntools.txt
+lib/python${MODPY_VERSION}/site-packages/pwntools-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pwntools-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pwntools-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pwntools-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/pwntools-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 @comment requirements.txt
diff --git a/security/py-M2Crypto/Makefile b/security/py-M2Crypto/Makefile
index a16a5c7de20..5c207254b44 100644
--- a/security/py-M2Crypto/Makefile
+++ b/security/py-M2Crypto/Makefile
@@ -3,7 +3,7 @@ COMMENT =		crypto and ssl toolkit for python
 MODPY_EGG_VERSION =	0.38.0
 DISTNAME =		M2Crypto-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		3
+REVISION =		4
 
 CATEGORIES =		security
 
@@ -17,7 +17,7 @@ WANTLIB +=		crypto pthread ssl ${MODPY_WANTLIB}
 MODPY_PI =		Yes
 
 MODULES =		lang/python
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/security/py-M2Crypto/pkg/PLIST b/security/py-M2Crypto/pkg/PLIST
index fc3cabdf660..082d5939c9b 100644
--- a/security/py-M2Crypto/pkg/PLIST
+++ b/security/py-M2Crypto/pkg/PLIST
@@ -1,11 +1,11 @@
 @pkgpath security/py-M2Crypto
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/
-lib/python${MODPY_VERSION}/site-packages/M2Crypto-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/M2Crypto-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/M2Crypto-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/M2Crypto-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/M2Crypto-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/M2Crypto-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/M2Crypto-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/M2Crypto-${MODPY_EGG_VERSION}.dist-info/LICENCE
+lib/python${MODPY_VERSION}/site-packages/M2Crypto-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/M2Crypto-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/M2Crypto-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/M2Crypto-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/ASN1.py
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/AuthCookie.py
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/BIO.py
@@ -30,16 +30,27 @@ lib/python${MODPY_VERSION}/site-packages/M2Crypto/SSL/Session.py
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/SSL/TwistedProtocolWrapper.py
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/SSL/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/M2Crypto/SSL/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/SSL/${MODPY_PYCACHE}Checker.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/SSL/${MODPY_PYCACHE}Checker.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/SSL/${MODPY_PYCACHE}Cipher.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/SSL/${MODPY_PYCACHE}Cipher.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/SSL/${MODPY_PYCACHE}Connection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/SSL/${MODPY_PYCACHE}Connection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/SSL/${MODPY_PYCACHE}Context.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/SSL/${MODPY_PYCACHE}Context.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/SSL/${MODPY_PYCACHE}SSLServer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/SSL/${MODPY_PYCACHE}SSLServer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/SSL/${MODPY_PYCACHE}Session.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/SSL/${MODPY_PYCACHE}Session.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/SSL/${MODPY_PYCACHE}TwistedProtocolWrapper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/SSL/${MODPY_PYCACHE}TwistedProtocolWrapper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/SSL/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/SSL/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/SSL/${MODPY_PYCACHE}cb.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/SSL/${MODPY_PYCACHE}cb.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/SSL/${MODPY_PYCACHE}ssl_dispatcher.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/SSL/${MODPY_PYCACHE}ssl_dispatcher.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/SSL/${MODPY_PYCACHE}timeout.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/SSL/${MODPY_PYCACHE}timeout.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/SSL/cb.py
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/SSL/ssl_dispatcher.py
@@ -47,32 +58,59 @@ lib/python${MODPY_VERSION}/site-packages/M2Crypto/SSL/timeout.py
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/X509.py
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}ASN1.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}ASN1.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}AuthCookie.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}AuthCookie.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}BIO.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}BIO.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}BN.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}BN.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}DH.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}DH.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}DSA.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}DSA.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}EC.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}EC.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}EVP.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}EVP.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}Engine.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}Engine.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}Err.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}Err.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}RC4.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}RC4.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}RSA.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}RSA.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}Rand.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}Rand.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}SMIME.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}SMIME.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}X509.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}X509.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}callback.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}callback.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}ftpslib.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}ftpslib.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}httpslib.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}httpslib.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}m2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}m2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}m2crypto.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}m2crypto.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}m2urllib.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}m2urllib.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}m2urllib2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}m2urllib2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}m2xmlrpclib.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}m2xmlrpclib.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}six.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}six.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}threading.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}threading.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
 @so lib/python${MODPY_VERSION}/site-packages/M2Crypto/_m2crypto.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/M2Crypto/callback.py
diff --git a/security/py-artifacts/Makefile b/security/py-artifacts/Makefile
index 8bf011e5dbe..5e3777fdbe9 100644
--- a/security/py-artifacts/Makefile
+++ b/security/py-artifacts/Makefile
@@ -3,7 +3,7 @@ COMMENT =	ForensicArtifacts.com Artifact Repository
 MODPY_EGG_VERSION = 20200118
 DISTNAME =	artifacts-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
-REVISION =	2
+REVISION =	3
 
 CATEGORIES =	security
 
@@ -16,8 +16,7 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =	setuptools
 
 FLAVORS =	python3
 FLAVOR =	python3
diff --git a/security/py-artifacts/pkg/PLIST b/security/py-artifacts/pkg/PLIST
index e4502158cd5..22f959475c7 100644
--- a/security/py-artifacts/pkg/PLIST
+++ b/security/py-artifacts/pkg/PLIST
@@ -1,23 +1,32 @@
-@pkgpath security/py-artifacts
 @conflict py-artifacts-*
-@conflict py3-artifacts-*
+@conflict ${MODPY_PY_PREFIX}artifacts-*
+@pkgpath security/py-artifacts
 bin/stats.py
 bin/validator.py
 lib/python${MODPY_VERSION}/site-packages/artifacts/
-lib/python${MODPY_VERSION}/site-packages/artifacts-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/artifacts-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/artifacts-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/artifacts-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/artifacts-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/artifacts-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/artifacts-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/artifacts-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/artifacts-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/artifacts-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/artifacts-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/artifacts/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/artifacts/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/artifacts/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/artifacts/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/artifacts/${MODPY_PYCACHE}artifact.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/artifacts/${MODPY_PYCACHE}artifact.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/artifacts/${MODPY_PYCACHE}definitions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/artifacts/${MODPY_PYCACHE}definitions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/artifacts/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/artifacts/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/artifacts/${MODPY_PYCACHE}reader.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/artifacts/${MODPY_PYCACHE}reader.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/artifacts/${MODPY_PYCACHE}registry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/artifacts/${MODPY_PYCACHE}registry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/artifacts/${MODPY_PYCACHE}source_type.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/artifacts/${MODPY_PYCACHE}source_type.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/artifacts/${MODPY_PYCACHE}writer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/artifacts/${MODPY_PYCACHE}writer.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/artifacts/artifact.py
 lib/python${MODPY_VERSION}/site-packages/artifacts/definitions.py
diff --git a/security/py-asn1crypto/Makefile b/security/py-asn1crypto/Makefile
index 22f2d6d9682..d617157a609 100644
--- a/security/py-asn1crypto/Makefile
+++ b/security/py-asn1crypto/Makefile
@@ -5,7 +5,7 @@ GH_TAGNAME =	${MODPY_EGG_VERSION}
 GH_ACCOUNT =	wbond
 GH_PROJECT =	asn1crypto
 PKGNAME =	py-${DISTNAME}
-REVISION =	2
+REVISION =	3
 
 CATEGORIES =	security
 
@@ -19,7 +19,7 @@ MODULES =	lang/python
 FLAVORS =	python3
 FLAVOR =	python3
 
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 
 # pypi tarball has no tests
 
diff --git a/security/py-asn1crypto/pkg/PLIST b/security/py-asn1crypto/pkg/PLIST
index 2a5ca92054a..d8348d6432c 100644
--- a/security/py-asn1crypto/pkg/PLIST
+++ b/security/py-asn1crypto/pkg/PLIST
@@ -1,35 +1,58 @@
 @pkgpath security/py-asn1crypto
 lib/python${MODPY_VERSION}/site-packages/asn1crypto/
-lib/python${MODPY_VERSION}/site-packages/asn1crypto-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/asn1crypto-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/LICENSE
-lib/python${MODPY_VERSION}/site-packages/asn1crypto-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/asn1crypto-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/asn1crypto-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/asn1crypto-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/asn1crypto-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/asn1crypto-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/asn1crypto-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/asn1crypto-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/asn1crypto-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/asn1crypto-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/asn1crypto/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}_errors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}_errors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}_inet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}_inet.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}_int.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}_int.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}_iri.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}_iri.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}_ordereddict.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}_ordereddict.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}_teletex_codec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}_teletex_codec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}_types.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}_types.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}algos.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}algos.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}cms.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}cms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}crl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}crl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}csr.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}csr.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}keys.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}keys.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}ocsp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}ocsp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}pdf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}pdf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}pem.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}pem.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}pkcs12.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}pkcs12.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}tsp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}tsp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}x509.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/asn1crypto/${MODPY_PYCACHE}x509.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/asn1crypto/_errors.py
 lib/python${MODPY_VERSION}/site-packages/asn1crypto/_inet.py
diff --git a/security/py-axolotl-curve25519/Makefile b/security/py-axolotl-curve25519/Makefile
index 2d41d2e51f0..40e9a0cc987 100644
--- a/security/py-axolotl-curve25519/Makefile
+++ b/security/py-axolotl-curve25519/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	0.4.1
 POST =			2
 DISTNAME =		python-axolotl-curve25519-${MODPY_EGG_VERSION}.post${POST}
 PKGNAME =		py-axolotl-curve25519-${MODPY_EGG_VERSION}pl${POST}
-REVISION =		6
+REVISION =		7
 
 CATEGORIES =		security
 
@@ -18,7 +18,7 @@ WANTLIB += pthread ${MODPY_WANTLIB}
 MODULES =		lang/python
 MODPY_PI =		Yes
 MODPY_PI_DIR =		p/python-axolotl-curve25519
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 
 FLAVORS =		python3
 FLAVOR =	python3
diff --git a/security/py-axolotl-curve25519/pkg/PLIST b/security/py-axolotl-curve25519/pkg/PLIST
index 23998ddc535..0e0778ebe68 100644
--- a/security/py-axolotl-curve25519/pkg/PLIST
+++ b/security/py-axolotl-curve25519/pkg/PLIST
@@ -1,7 +1,7 @@
 @pkgpath security/py-axolotl-curve25519
 @so lib/python${MODPY_VERSION}/site-packages/axolotl_curve25519.${MODPY_PYC_MAGIC_TAG}so
-lib/python${MODPY_VERSION}/site-packages/python_axolotl_curve25519-${MODPY_EGG_VERSION}.post2-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/python_axolotl_curve25519-${MODPY_EGG_VERSION}.post2-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/python_axolotl_curve25519-${MODPY_EGG_VERSION}.post2-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/python_axolotl_curve25519-${MODPY_EGG_VERSION}.post2-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/python_axolotl_curve25519-${MODPY_EGG_VERSION}.post2-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/python_axolotl_curve25519-${MODPY_EGG_VERSION}.post2.dist-info/
+lib/python${MODPY_VERSION}/site-packages/python_axolotl_curve25519-${MODPY_EGG_VERSION}.post2.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/python_axolotl_curve25519-${MODPY_EGG_VERSION}.post2.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/python_axolotl_curve25519-${MODPY_EGG_VERSION}.post2.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/python_axolotl_curve25519-${MODPY_EGG_VERSION}.post2.dist-info/top_level.txt
diff --git a/security/py-axolotl/Makefile b/security/py-axolotl/Makefile
index 5143eba6ffc..532c558ae6c 100644
--- a/security/py-axolotl/Makefile
+++ b/security/py-axolotl/Makefile
@@ -3,7 +3,7 @@ COMMENT =		Python port of libaxolotl
 MODPY_EGG_VERSION =	0.2.3
 DISTNAME =		python-axolotl-${MODPY_EGG_VERSION}
 PKGNAME =		py-axolotl-${MODPY_EGG_VERSION}
-REVISION =		3
+REVISION =		4
 
 CATEGORIES =		security
 
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/security/py-axolotl/pkg/PLIST b/security/py-axolotl/pkg/PLIST
index 09b396ef85c..618c8485782 100644
--- a/security/py-axolotl/pkg/PLIST
+++ b/security/py-axolotl/pkg/PLIST
@@ -3,30 +3,50 @@
 lib/python${MODPY_VERSION}/site-packages/axolotl/
 lib/python${MODPY_VERSION}/site-packages/axolotl/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}axolotladdress.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}axolotladdress.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}duplicatemessagexception.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}duplicatemessagexception.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}identitykey.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}identitykey.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}identitykeypair.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}identitykeypair.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}invalidkeyexception.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}invalidkeyexception.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}invalidkeyidexception.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}invalidkeyidexception.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}invalidmessageexception.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}invalidmessageexception.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}invalidversionexception.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}invalidversionexception.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}legacymessageexception.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}legacymessageexception.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}nosessionexception.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}nosessionexception.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}sessionbuilder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}sessionbuilder.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}sessioncipher.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}sessioncipher.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}statekeyexchangeexception.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}statekeyexchangeexception.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}untrustedidentityexception.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/${MODPY_PYCACHE}untrustedidentityexception.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/axolotl/axolotladdress.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/duplicatemessagexception.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/ecc/
 lib/python${MODPY_VERSION}/site-packages/axolotl/ecc/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/ecc/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/axolotl/ecc/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/ecc/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/ecc/${MODPY_PYCACHE}curve.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/ecc/${MODPY_PYCACHE}curve.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/ecc/${MODPY_PYCACHE}djbec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/ecc/${MODPY_PYCACHE}djbec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/ecc/${MODPY_PYCACHE}ec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/ecc/${MODPY_PYCACHE}ec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/ecc/${MODPY_PYCACHE}eckeypair.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/ecc/${MODPY_PYCACHE}eckeypair.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/axolotl/ecc/curve.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/ecc/djbec.py
@@ -35,17 +55,24 @@ lib/python${MODPY_VERSION}/site-packages/axolotl/ecc/eckeypair.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/groups/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/axolotl/groups/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/groups/${MODPY_PYCACHE}groupcipher.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/${MODPY_PYCACHE}groupcipher.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/groups/${MODPY_PYCACHE}groupsessionbuilder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/${MODPY_PYCACHE}groupsessionbuilder.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/groups/${MODPY_PYCACHE}senderkeyname.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/${MODPY_PYCACHE}senderkeyname.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/groupcipher.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/groupsessionbuilder.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/ratchet/
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/ratchet/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/groups/ratchet/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/axolotl/groups/ratchet/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/ratchet/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/groups/ratchet/${MODPY_PYCACHE}senderchainkey.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/ratchet/${MODPY_PYCACHE}senderchainkey.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/groups/ratchet/${MODPY_PYCACHE}sendermessagekey.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/ratchet/${MODPY_PYCACHE}sendermessagekey.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/ratchet/senderchainkey.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/ratchet/sendermessagekey.py
@@ -53,9 +80,13 @@ lib/python${MODPY_VERSION}/site-packages/axolotl/groups/senderkeyname.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/state/
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/state/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/groups/state/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/axolotl/groups/state/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/state/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/groups/state/${MODPY_PYCACHE}senderkeyrecord.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/state/${MODPY_PYCACHE}senderkeyrecord.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/groups/state/${MODPY_PYCACHE}senderkeystate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/state/${MODPY_PYCACHE}senderkeystate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/groups/state/${MODPY_PYCACHE}senderkeystore.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/state/${MODPY_PYCACHE}senderkeystore.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/state/senderkeyrecord.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/groups/state/senderkeystate.py
@@ -69,12 +100,19 @@ lib/python${MODPY_VERSION}/site-packages/axolotl/invalidversionexception.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/kdf/
 lib/python${MODPY_VERSION}/site-packages/axolotl/kdf/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/kdf/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/axolotl/kdf/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/kdf/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/kdf/${MODPY_PYCACHE}derivedmessagesecrets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/kdf/${MODPY_PYCACHE}derivedmessagesecrets.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/kdf/${MODPY_PYCACHE}derivedrootsecrets.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/kdf/${MODPY_PYCACHE}derivedrootsecrets.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/kdf/${MODPY_PYCACHE}hkdf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/kdf/${MODPY_PYCACHE}hkdf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/kdf/${MODPY_PYCACHE}hkdfv2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/kdf/${MODPY_PYCACHE}hkdfv2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/kdf/${MODPY_PYCACHE}hkdfv3.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/kdf/${MODPY_PYCACHE}hkdfv3.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/kdf/${MODPY_PYCACHE}messagekeys.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/kdf/${MODPY_PYCACHE}messagekeys.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/axolotl/kdf/derivedmessagesecrets.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/kdf/derivedrootsecrets.py
@@ -87,13 +125,21 @@ lib/python${MODPY_VERSION}/site-packages/axolotl/nosessionexception.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/
 lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/${MODPY_PYCACHE}ciphertextmessage.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/${MODPY_PYCACHE}ciphertextmessage.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/${MODPY_PYCACHE}keyexchangemessage.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/${MODPY_PYCACHE}keyexchangemessage.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/${MODPY_PYCACHE}prekeywhispermessage.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/${MODPY_PYCACHE}prekeywhispermessage.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/${MODPY_PYCACHE}senderkeydistributionmessage.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/${MODPY_PYCACHE}senderkeydistributionmessage.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/${MODPY_PYCACHE}senderkeymessage.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/${MODPY_PYCACHE}senderkeymessage.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/${MODPY_PYCACHE}whispermessage.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/${MODPY_PYCACHE}whispermessage.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/${MODPY_PYCACHE}whisperprotos_pb2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/${MODPY_PYCACHE}whisperprotos_pb2.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/ciphertextmessage.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/keyexchangemessage.py
@@ -105,12 +151,19 @@ lib/python${MODPY_VERSION}/site-packages/axolotl/protocol/whisperprotos_pb2.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/ratchet/
 lib/python${MODPY_VERSION}/site-packages/axolotl/ratchet/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/ratchet/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/axolotl/ratchet/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/ratchet/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/ratchet/${MODPY_PYCACHE}aliceaxolotlparameters.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/ratchet/${MODPY_PYCACHE}aliceaxolotlparameters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/ratchet/${MODPY_PYCACHE}bobaxolotlparamaters.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/ratchet/${MODPY_PYCACHE}bobaxolotlparamaters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/ratchet/${MODPY_PYCACHE}chainkey.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/ratchet/${MODPY_PYCACHE}chainkey.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/ratchet/${MODPY_PYCACHE}ratchetingsession.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/ratchet/${MODPY_PYCACHE}ratchetingsession.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/ratchet/${MODPY_PYCACHE}rootkey.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/ratchet/${MODPY_PYCACHE}rootkey.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/ratchet/${MODPY_PYCACHE}symmetricaxolotlparameters.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/ratchet/${MODPY_PYCACHE}symmetricaxolotlparameters.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/axolotl/ratchet/aliceaxolotlparameters.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/ratchet/bobaxolotlparamaters.py
@@ -123,17 +176,29 @@ lib/python${MODPY_VERSION}/site-packages/axolotl/sessioncipher.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/state/
 lib/python${MODPY_VERSION}/site-packages/axolotl/state/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}axolotlstore.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}axolotlstore.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}identitykeystore.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}identitykeystore.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}prekeybundle.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}prekeybundle.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}prekeyrecord.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}prekeyrecord.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}prekeystore.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}prekeystore.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}sessionrecord.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}sessionrecord.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}sessionstate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}sessionstate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}sessionstore.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}sessionstore.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}signedprekeyrecord.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}signedprekeyrecord.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}signedprekeystore.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}signedprekeystore.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}storageprotos_pb2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/state/${MODPY_PYCACHE}storageprotos_pb2.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/axolotl/state/axolotlstore.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/state/identitykeystore.py
@@ -150,20 +215,32 @@ lib/python${MODPY_VERSION}/site-packages/axolotl/statekeyexchangeexception.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/axolotl/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/tests/${MODPY_PYCACHE}inmemoryaxolotlstore.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/${MODPY_PYCACHE}inmemoryaxolotlstore.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/tests/${MODPY_PYCACHE}inmemoryidentitykeystore.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/${MODPY_PYCACHE}inmemoryidentitykeystore.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/tests/${MODPY_PYCACHE}inmemoryprekeystore.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/${MODPY_PYCACHE}inmemoryprekeystore.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/tests/${MODPY_PYCACHE}inmemorysessionstore.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/${MODPY_PYCACHE}inmemorysessionstore.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/tests/${MODPY_PYCACHE}inmemorysignedprekeystore.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/${MODPY_PYCACHE}inmemorysignedprekeystore.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/tests/${MODPY_PYCACHE}test_sessionbuilder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/${MODPY_PYCACHE}test_sessionbuilder.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/tests/${MODPY_PYCACHE}test_sessioncipher.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/${MODPY_PYCACHE}test_sessioncipher.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/tests/${MODPY_PYCACHE}test_sigs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/${MODPY_PYCACHE}test_sigs.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/groups/
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/groups/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/tests/groups/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/axolotl/tests/groups/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/groups/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/tests/groups/${MODPY_PYCACHE}inmemorysenderkeystore.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/groups/${MODPY_PYCACHE}inmemorysenderkeystore.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/tests/groups/${MODPY_PYCACHE}test_groupcipher.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/groups/${MODPY_PYCACHE}test_groupcipher.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/groups/inmemorysenderkeystore.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/groups/test_groupcipher.py
@@ -175,15 +252,21 @@ lib/python${MODPY_VERSION}/site-packages/axolotl/tests/inmemorysignedprekeystore
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/kdf/
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/kdf/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/tests/kdf/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/axolotl/tests/kdf/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/kdf/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/tests/kdf/${MODPY_PYCACHE}test_hkdf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/kdf/${MODPY_PYCACHE}test_hkdf.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/kdf/test_hkdf.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/ratchet/
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/ratchet/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/tests/ratchet/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/axolotl/tests/ratchet/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/ratchet/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/tests/ratchet/${MODPY_PYCACHE}test_chainkey.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/ratchet/${MODPY_PYCACHE}test_chainkey.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/tests/ratchet/${MODPY_PYCACHE}test_ratchetingsession.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/ratchet/${MODPY_PYCACHE}test_ratchetingsession.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/tests/ratchet/${MODPY_PYCACHE}test_rootkey.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/ratchet/${MODPY_PYCACHE}test_rootkey.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/ratchet/test_chainkey.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/ratchet/test_ratchetingsession.py
@@ -194,25 +277,31 @@ lib/python${MODPY_VERSION}/site-packages/axolotl/tests/test_sigs.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/util/
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/util/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/tests/util/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/axolotl/tests/util/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/util/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/tests/util/${MODPY_PYCACHE}test_byteutil.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/util/${MODPY_PYCACHE}test_byteutil.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/axolotl/tests/util/test_byteutil.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/untrustedidentityexception.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/util/
 lib/python${MODPY_VERSION}/site-packages/axolotl/util/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/axolotl/util/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/axolotl/util/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/util/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/util/${MODPY_PYCACHE}byteutil.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/util/${MODPY_PYCACHE}byteutil.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/util/${MODPY_PYCACHE}hexutil.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/util/${MODPY_PYCACHE}hexutil.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/util/${MODPY_PYCACHE}keyhelper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/util/${MODPY_PYCACHE}keyhelper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/axolotl/util/${MODPY_PYCACHE}medium.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/axolotl/util/${MODPY_PYCACHE}medium.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/axolotl/util/byteutil.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/util/hexutil.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/util/keyhelper.py
 lib/python${MODPY_VERSION}/site-packages/axolotl/util/medium.py
-lib/python${MODPY_VERSION}/site-packages/python_axolotl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/python_axolotl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/python_axolotl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/python_axolotl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/python_axolotl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/python_axolotl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/python_axolotl-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/python_axolotl-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/python_axolotl-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/python_axolotl-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/python_axolotl-${MODPY_EGG_VERSION}.dist-info/top_level.txt
diff --git a/security/py-cryptodome-test-vectors/Makefile b/security/py-cryptodome-test-vectors/Makefile
index 95b9bfb9041..a8fd30e9e13 100644
--- a/security/py-cryptodome-test-vectors/Makefile
+++ b/security/py-cryptodome-test-vectors/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	1.0.10
 DISTNAME =	pycryptodome-test-vectors-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME:S/py//}
 EXTRACT_SUFX =	.zip
-REVISION =	0
+REVISION =	1
 
 CATEGORIES =	security
 
@@ -20,7 +20,7 @@ FLAVORS =		python3
 FLAVOR =		python3
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 NO_TEST =		Yes
 
 .include <bsd.port.mk>
diff --git a/security/py-cryptodome-test-vectors/pkg/PLIST b/security/py-cryptodome-test-vectors/pkg/PLIST
index 9661d0230e5..ee47be4f426 100644
--- a/security/py-cryptodome-test-vectors/pkg/PLIST
+++ b/security/py-cryptodome-test-vectors/pkg/PLIST
@@ -1,10 +1,10 @@
 lib/python${MODPY_VERSION}/site-packages/pycryptodome_test_vectors/
-lib/python${MODPY_VERSION}/site-packages/pycryptodome_test_vectors-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pycryptodome_test_vectors-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pycryptodome_test_vectors-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pycryptodome_test_vectors-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pycryptodome_test_vectors-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/pycryptodome_test_vectors-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pycryptodome_test_vectors-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pycryptodome_test_vectors-${MODPY_EGG_VERSION}.dist-info/LICENSE.rst
+lib/python${MODPY_VERSION}/site-packages/pycryptodome_test_vectors-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pycryptodome_test_vectors-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pycryptodome_test_vectors-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pycryptodome_test_vectors-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pycryptodome_test_vectors/Cipher/
 lib/python${MODPY_VERSION}/site-packages/pycryptodome_test_vectors/Cipher/AES/
 lib/python${MODPY_VERSION}/site-packages/pycryptodome_test_vectors/Cipher/AES/CBCGFSbox128.rsp
@@ -436,4 +436,5 @@ lib/python${MODPY_VERSION}/site-packages/pycryptodome_test_vectors/Signature/wyc
 lib/python${MODPY_VERSION}/site-packages/pycryptodome_test_vectors/Signature/wycheproof/rsa_signature_test.json
 lib/python${MODPY_VERSION}/site-packages/pycryptodome_test_vectors/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pycryptodome_test_vectors/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pycryptodome_test_vectors/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pycryptodome_test_vectors/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
diff --git a/security/py-dfdatetime/Makefile b/security/py-dfdatetime/Makefile
index 21edaf35824..dc09ee64a2a 100644
--- a/security/py-dfdatetime/Makefile
+++ b/security/py-dfdatetime/Makefile
@@ -3,7 +3,7 @@ COMMENT =	Digital Forensics date and time
 MODPY_EGG_VERSION = 20200824
 DISTNAME =	dfdatetime-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	security devel
 
@@ -17,7 +17,7 @@ MASTER_SITES =	https://github.com/log2timeline/dfdatetime/releases/download/${MO
 PERMIT_PACKAGE =	Yes
 
 MODULES =	lang/python
-MODPY_SETUPTOOLS = Yes
+MODPY_PYBUILD =	setuptools
 
 FLAVORS =	python3
 FLAVOR =	python3
diff --git a/security/py-dfdatetime/pkg/PLIST b/security/py-dfdatetime/pkg/PLIST
index ec78b6d92c1..157c95fcc35 100644
--- a/security/py-dfdatetime/pkg/PLIST
+++ b/security/py-dfdatetime/pkg/PLIST
@@ -1,33 +1,56 @@
 @pkgpath security/py-dfdatetime
 lib/python${MODPY_VERSION}/site-packages/dfdatetime/
-lib/python${MODPY_VERSION}/site-packages/dfdatetime-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/dfdatetime-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/dfdatetime-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/dfdatetime-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/dfdatetime-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/dfdatetime-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/dfdatetime-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/dfdatetime-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/dfdatetime-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/dfdatetime-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/dfdatetime-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/dfdatetime/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}apfs_time.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}apfs_time.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}cocoa_time.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}cocoa_time.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}definitions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}definitions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}delphi_date_time.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}delphi_date_time.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}factory.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}factory.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}fake_time.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}fake_time.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}fat_date_time.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}fat_date_time.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}filetime.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}filetime.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}hfs_time.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}hfs_time.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}java_time.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}java_time.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}ole_automation_date.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}ole_automation_date.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}posix_time.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}posix_time.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}precisions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}precisions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}rfc2579_date_time.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}rfc2579_date_time.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}semantic_time.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}semantic_time.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}systemtime.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}systemtime.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}time_elements.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}time_elements.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}uuid_time.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}uuid_time.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}webkit_time.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfdatetime/${MODPY_PYCACHE}webkit_time.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/dfdatetime/apfs_time.py
 lib/python${MODPY_VERSION}/site-packages/dfdatetime/cocoa_time.py
diff --git a/security/py-dfvfs/Makefile b/security/py-dfvfs/Makefile
index fcbc661aea7..1e7ec28adc1 100644
--- a/security/py-dfvfs/Makefile
+++ b/security/py-dfvfs/Makefile
@@ -3,7 +3,7 @@ COMMENT =	Digital Forensics Virtual File System (dfVFS)
 MODPY_EGG_VERSION = 20200625
 DISTNAME =	dfvfs-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	security
 
@@ -21,7 +21,7 @@ MODULES =	lang/python
 FLAVORS =	python3
 FLAVOR =	python3
 
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 RUN_DEPENDS +=	devel/py-construct${MODPY_FLAVOR} \
 		security/py-cryptography${MODPY_FLAVOR} \
 		security/py-dfdatetime${MODPY_FLAVOR} \
diff --git a/security/py-dfvfs/pkg/PLIST b/security/py-dfvfs/pkg/PLIST
index 90da70603f3..876145e9ab1 100644
--- a/security/py-dfvfs/pkg/PLIST
+++ b/security/py-dfvfs/pkg/PLIST
@@ -1,40 +1,65 @@
 @pkgpath security/py-dfvfs
 lib/python${MODPY_VERSION}/site-packages/dfvfs/
-lib/python${MODPY_VERSION}/site-packages/dfvfs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/dfvfs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/dfvfs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/dfvfs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/dfvfs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/dfvfs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/dfvfs-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/dfvfs-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/dfvfs-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/dfvfs-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/dfvfs-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/dfvfs-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/dfvfs/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dfvfs/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/dfvfs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/
 lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}analyzer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}analyzer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}analyzer_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}analyzer_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}apfs_analyzer_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}apfs_analyzer_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}apfs_container_analyzer_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}apfs_container_analyzer_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}bde_analyzer_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}bde_analyzer_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}bzip2_analyzer_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}bzip2_analyzer_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}cpio_analyzer_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}cpio_analyzer_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}ewf_analyzer_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}ewf_analyzer_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}fvde_analyzer_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}fvde_analyzer_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}gzip_analyzer_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}gzip_analyzer_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}luksde_analyzer_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}luksde_analyzer_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}lvm_analyzer_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}lvm_analyzer_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}ntfs_analyzer_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}ntfs_analyzer_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}qcow_analyzer_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}qcow_analyzer_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}specification.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}specification.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}tar_analyzer_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}tar_analyzer_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}tsk_analyzer_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}tsk_analyzer_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}tsk_partition_analyzer_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}tsk_partition_analyzer_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}vhdi_analyzer_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}vhdi_analyzer_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}vmdk_analyzer_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}vmdk_analyzer_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}vshadow_analyzer_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}vshadow_analyzer_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}xz_analyzer_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}xz_analyzer_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}zip_analyzer_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/${MODPY_PYCACHE}zip_analyzer_helper.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/analyzer.py
 lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/analyzer_helper.py
@@ -62,11 +87,17 @@ lib/python${MODPY_VERSION}/site-packages/dfvfs/analyzer/zip_analyzer_helper.py
 lib/python${MODPY_VERSION}/site-packages/dfvfs/compression/
 lib/python${MODPY_VERSION}/site-packages/dfvfs/compression/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dfvfs/compression/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/dfvfs/compression/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/compression/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/compression/${MODPY_PYCACHE}bzip2_decompressor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/compression/${MODPY_PYCACHE}bzip2_decompressor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/compression/${MODPY_PYCACHE}decompressor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/compression/${MODPY_PYCACHE}decompressor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/compression/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/compression/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/compression/${MODPY_PYCACHE}xz_decompressor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/compression/${MODPY_PYCACHE}xz_decompressor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/compression/${MODPY_PYCACHE}zlib_decompressor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/compression/${MODPY_PYCACHE}zlib_decompressor.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/dfvfs/compression/bzip2_decompressor.py
 lib/python${MODPY_VERSION}/site-packages/dfvfs/compression/decompressor.py
@@ -76,14 +107,23 @@ lib/python${MODPY_VERSION}/site-packages/dfvfs/compression/zlib_decompressor.py
 lib/python${MODPY_VERSION}/site-packages/dfvfs/credentials/
 lib/python${MODPY_VERSION}/site-packages/dfvfs/credentials/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dfvfs/credentials/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/dfvfs/credentials/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/credentials/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/credentials/${MODPY_PYCACHE}apfs_credentials.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/credentials/${MODPY_PYCACHE}apfs_credentials.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/credentials/${MODPY_PYCACHE}bde_credentials.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/credentials/${MODPY_PYCACHE}bde_credentials.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/credentials/${MODPY_PYCACHE}credentials.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/credentials/${MODPY_PYCACHE}credentials.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/credentials/${MODPY_PYCACHE}encrypted_stream_credentials.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/credentials/${MODPY_PYCACHE}encrypted_stream_credentials.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/credentials/${MODPY_PYCACHE}fvde_credentials.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/credentials/${MODPY_PYCACHE}fvde_credentials.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/credentials/${MODPY_PYCACHE}keychain.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/credentials/${MODPY_PYCACHE}keychain.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/credentials/${MODPY_PYCACHE}luksde_credentials.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/credentials/${MODPY_PYCACHE}luksde_credentials.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/credentials/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/credentials/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/dfvfs/credentials/apfs_credentials.py
 lib/python${MODPY_VERSION}/site-packages/dfvfs/credentials/bde_credentials.py
@@ -96,11 +136,17 @@ lib/python${MODPY_VERSION}/site-packages/dfvfs/credentials/manager.py
 lib/python${MODPY_VERSION}/site-packages/dfvfs/encoding/
 lib/python${MODPY_VERSION}/site-packages/dfvfs/encoding/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dfvfs/encoding/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/dfvfs/encoding/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/encoding/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/encoding/${MODPY_PYCACHE}base16_decoder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/encoding/${MODPY_PYCACHE}base16_decoder.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/encoding/${MODPY_PYCACHE}base32_decoder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/encoding/${MODPY_PYCACHE}base32_decoder.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/encoding/${MODPY_PYCACHE}base64_decoder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/encoding/${MODPY_PYCACHE}base64_decoder.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/encoding/${MODPY_PYCACHE}decoder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/encoding/${MODPY_PYCACHE}decoder.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/encoding/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/encoding/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/dfvfs/encoding/base16_decoder.py
 lib/python${MODPY_VERSION}/site-packages/dfvfs/encoding/base32_decoder.py
@@ -110,12 +156,19 @@ lib/python${MODPY_VERSION}/site-packages/dfvfs/encoding/manager.py
 lib/python${MODPY_VERSION}/site-packages/dfvfs/encryption/
 lib/python${MODPY_VERSION}/site-packages/dfvfs/encryption/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dfvfs/encryption/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/dfvfs/encryption/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/encryption/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/encryption/${MODPY_PYCACHE}aes_decrypter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/encryption/${MODPY_PYCACHE}aes_decrypter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/encryption/${MODPY_PYCACHE}blowfish_decrypter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/encryption/${MODPY_PYCACHE}blowfish_decrypter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/encryption/${MODPY_PYCACHE}decrypter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/encryption/${MODPY_PYCACHE}decrypter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/encryption/${MODPY_PYCACHE}des3_decrypter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/encryption/${MODPY_PYCACHE}des3_decrypter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/encryption/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/encryption/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/encryption/${MODPY_PYCACHE}rc4_decrypter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/encryption/${MODPY_PYCACHE}rc4_decrypter.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/dfvfs/encryption/aes_decrypter.py
 lib/python${MODPY_VERSION}/site-packages/dfvfs/encryption/blowfish_decrypter.py
@@ -126,33 +179,61 @@ lib/python${MODPY_VERSION}/site-packages/dfvfs/encryption/rc4_decrypter.py
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}apfs_file_io.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}apfs_file_io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}bde_file_io.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}bde_file_io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}compressed_stream_io.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}compressed_stream_io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}cpio_file_io.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}cpio_file_io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}data_range_io.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}data_range_io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}encoded_stream_io.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}encoded_stream_io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}encrypted_stream_io.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}encrypted_stream_io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}ewf_file_io.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}ewf_file_io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}fake_file_io.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}fake_file_io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}file_io.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}file_io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}file_object_io.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}file_object_io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}fvde_file_io.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}fvde_file_io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}gzip_file_io.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}gzip_file_io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}luksde_file_io.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}luksde_file_io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}lvm_file_io.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}lvm_file_io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}ntfs_file_io.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}ntfs_file_io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}os_file_io.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}os_file_io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}qcow_file_io.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}qcow_file_io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}raw_file_io.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}raw_file_io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}sqlite_blob_file_io.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}sqlite_blob_file_io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}tar_file_io.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}tar_file_io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}tsk_file_io.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}tsk_file_io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}tsk_partition_file_io.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}tsk_partition_file_io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}vhdi_file_io.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}vhdi_file_io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}vmdk_file_io.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}vmdk_file_io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}vshadow_file_io.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}vshadow_file_io.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}zip_file_io.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/${MODPY_PYCACHE}zip_file_io.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/apfs_file_io.py
 lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/bde_file_io.py
@@ -184,14 +265,23 @@ lib/python${MODPY_VERSION}/site-packages/dfvfs/file_io/zip_file_io.py
 lib/python${MODPY_VERSION}/site-packages/dfvfs/helpers/
 lib/python${MODPY_VERSION}/site-packages/dfvfs/helpers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dfvfs/helpers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/dfvfs/helpers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/helpers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/helpers/${MODPY_PYCACHE}command_line.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/helpers/${MODPY_PYCACHE}command_line.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/helpers/${MODPY_PYCACHE}data_slice.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/helpers/${MODPY_PYCACHE}data_slice.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/helpers/${MODPY_PYCACHE}fake_file_system_builder.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/helpers/${MODPY_PYCACHE}fake_file_system_builder.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/helpers/${MODPY_PYCACHE}file_system_searcher.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/helpers/${MODPY_PYCACHE}file_system_searcher.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/helpers/${MODPY_PYCACHE}source_scanner.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/helpers/${MODPY_PYCACHE}source_scanner.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/helpers/${MODPY_PYCACHE}text_file.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/helpers/${MODPY_PYCACHE}text_file.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/helpers/${MODPY_PYCACHE}volume_scanner.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/helpers/${MODPY_PYCACHE}volume_scanner.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/helpers/${MODPY_PYCACHE}windows_path_resolver.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/helpers/${MODPY_PYCACHE}windows_path_resolver.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/dfvfs/helpers/command_line.py
 lib/python${MODPY_VERSION}/site-packages/dfvfs/helpers/data_slice.py
@@ -204,24 +294,43 @@ lib/python${MODPY_VERSION}/site-packages/dfvfs/helpers/windows_path_resolver.py
 lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/
 lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}apfs_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}apfs_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}bde.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}bde.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}cpio.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}cpio.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}data_format.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}data_format.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}definitions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}definitions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}ewf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}ewf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}fvde.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}fvde.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}glob2regex.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}glob2regex.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}gzipfile.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}gzipfile.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}luksde.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}luksde.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}lvm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}lvm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}raw.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}raw.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}sqlite_database.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}sqlite_database.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}tsk_image.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}tsk_image.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}tsk_partition.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}tsk_partition.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}vshadow.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/${MODPY_PYCACHE}vshadow.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/apfs_helper.py
 lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/bde.py
@@ -246,42 +355,75 @@ lib/python${MODPY_VERSION}/site-packages/dfvfs/lib/vshadow.py
 lib/python${MODPY_VERSION}/site-packages/dfvfs/mount/
 lib/python${MODPY_VERSION}/site-packages/dfvfs/mount/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dfvfs/mount/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/dfvfs/mount/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/mount/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/mount/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/mount/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/dfvfs/mount/manager.py
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}apfs_container_path_spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}apfs_container_path_spec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}apfs_path_spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}apfs_path_spec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}bde_path_spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}bde_path_spec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}compressed_stream_path_spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}compressed_stream_path_spec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}cpio_path_spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}cpio_path_spec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}data_range_path_spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}data_range_path_spec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}encoded_stream_path_spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}encoded_stream_path_spec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}encrypted_stream_path_spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}encrypted_stream_path_spec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}ewf_path_spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}ewf_path_spec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}factory.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}factory.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}fake_path_spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}fake_path_spec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}fvde_path_spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}fvde_path_spec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}gzip_path_spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}gzip_path_spec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}location_path_spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}location_path_spec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}luksde_path_spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}luksde_path_spec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}lvm_path_spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}lvm_path_spec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}mount_path_spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}mount_path_spec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}ntfs_path_spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}ntfs_path_spec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}os_path_spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}os_path_spec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}path_spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}path_spec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}qcow_path_spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}qcow_path_spec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}raw_path_spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}raw_path_spec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}sqlite_blob_path_spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}sqlite_blob_path_spec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}tar_path_spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}tar_path_spec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}tsk_partition_path_spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}tsk_partition_path_spec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}tsk_path_spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}tsk_path_spec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}vhdi_path_spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}vhdi_path_spec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}vmdk_path_spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}vmdk_path_spec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}vshadow_path_spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}vshadow_path_spec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}zip_path_spec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/${MODPY_PYCACHE}zip_path_spec.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/apfs_container_path_spec.py
 lib/python${MODPY_VERSION}/site-packages/dfvfs/path/apfs_path_spec.py
@@ -316,9 +458,13 @@ lib/python${MODPY_VERSION}/site-packages/dfvfs/path/zip_path_spec.py
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver/
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver/${MODPY_PYCACHE}context.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver/${MODPY_PYCACHE}context.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver/${MODPY_PYCACHE}resolver.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver/${MODPY_PYCACHE}resolver.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver/cache.py
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver/context.py
@@ -326,34 +472,63 @@ lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver/resolver.py
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}apfs_container_resolver_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}apfs_container_resolver_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}apfs_resolver_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}apfs_resolver_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}bde_resolver_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}bde_resolver_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}compressed_stream_resolver_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}compressed_stream_resolver_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}cpio_resolver_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}cpio_resolver_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}data_range_resolver_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}data_range_resolver_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}encoded_stream_resolver_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}encoded_stream_resolver_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}encrypted_stream_resolver_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}encrypted_stream_resolver_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}ewf_resolver_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}ewf_resolver_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}fake_resolver_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}fake_resolver_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}fvde_resolver_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}fvde_resolver_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}gzip_resolver_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}gzip_resolver_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}luksde_resolver_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}luksde_resolver_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}lvm_resolver_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}lvm_resolver_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}ntfs_resolver_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}ntfs_resolver_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}os_resolver_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}os_resolver_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}qcow_resolver_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}qcow_resolver_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}raw_resolver_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}raw_resolver_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}resolver_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}resolver_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}sqlite_blob_resolver_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}sqlite_blob_resolver_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}tar_resolver_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}tar_resolver_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}tsk_partition_resolver_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}tsk_partition_resolver_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}tsk_resolver_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}tsk_resolver_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}vhdi_resolver_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}vhdi_resolver_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}vmdk_resolver_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}vmdk_resolver_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}vshadow_resolver_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}vshadow_resolver_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}zip_resolver_helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/${MODPY_PYCACHE}zip_resolver_helper.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/apfs_container_resolver_helper.py
 lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/apfs_resolver_helper.py
@@ -386,61 +561,112 @@ lib/python${MODPY_VERSION}/site-packages/dfvfs/resolver_helpers/zip_resolver_hel
 lib/python${MODPY_VERSION}/site-packages/dfvfs/serializer/
 lib/python${MODPY_VERSION}/site-packages/dfvfs/serializer/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dfvfs/serializer/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/dfvfs/serializer/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/serializer/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/serializer/${MODPY_PYCACHE}json_serializer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/serializer/${MODPY_PYCACHE}json_serializer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/serializer/${MODPY_PYCACHE}serializer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/serializer/${MODPY_PYCACHE}serializer.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/dfvfs/serializer/json_serializer.py
 lib/python${MODPY_VERSION}/site-packages/dfvfs/serializer/serializer.py
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}apfs_container_file_entry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}apfs_container_file_entry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}apfs_container_file_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}apfs_container_file_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}apfs_file_entry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}apfs_file_entry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}apfs_file_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}apfs_file_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}bde_file_entry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}bde_file_entry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}bde_file_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}bde_file_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}compressed_stream_file_entry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}compressed_stream_file_entry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}compressed_stream_file_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}compressed_stream_file_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}cpio_file_entry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}cpio_file_entry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}cpio_file_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}cpio_file_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}data_range_file_entry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}data_range_file_entry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}data_range_file_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}data_range_file_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}encoded_stream_file_entry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}encoded_stream_file_entry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}encoded_stream_file_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}encoded_stream_file_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}encrypted_stream_file_entry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}encrypted_stream_file_entry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}encrypted_stream_file_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}encrypted_stream_file_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}fake_file_entry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}fake_file_entry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}fake_file_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}fake_file_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}file_entry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}file_entry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}file_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}file_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}fvde_file_entry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}fvde_file_entry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}fvde_file_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}fvde_file_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}gzip_file_entry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}gzip_file_entry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}gzip_file_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}gzip_file_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}luksde_file_entry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}luksde_file_entry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}luksde_file_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}luksde_file_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}lvm_file_entry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}lvm_file_entry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}lvm_file_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}lvm_file_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}ntfs_file_entry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}ntfs_file_entry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}ntfs_file_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}ntfs_file_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}os_file_entry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}os_file_entry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}os_file_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}os_file_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}root_only_file_entry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}root_only_file_entry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}root_only_file_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}root_only_file_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}sqlite_blob_file_entry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}sqlite_blob_file_entry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}sqlite_blob_file_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}sqlite_blob_file_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}tar_file_entry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}tar_file_entry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}tar_file_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}tar_file_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}tsk_file_entry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}tsk_file_entry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}tsk_file_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}tsk_file_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}tsk_partition_file_entry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}tsk_partition_file_entry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}tsk_partition_file_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}tsk_partition_file_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}vfs_stat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}vfs_stat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}vshadow_file_entry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}vshadow_file_entry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}vshadow_file_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}vshadow_file_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}zip_file_entry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}zip_file_entry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}zip_file_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/${MODPY_PYCACHE}zip_file_system.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/apfs_container_file_entry.py
 lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/apfs_container_file_system.py
@@ -492,11 +718,17 @@ lib/python${MODPY_VERSION}/site-packages/dfvfs/vfs/zip_file_system.py
 lib/python${MODPY_VERSION}/site-packages/dfvfs/volume/
 lib/python${MODPY_VERSION}/site-packages/dfvfs/volume/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dfvfs/volume/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/dfvfs/volume/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/volume/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/volume/${MODPY_PYCACHE}apfs_volume_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/volume/${MODPY_PYCACHE}apfs_volume_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/volume/${MODPY_PYCACHE}lvm_volume_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/volume/${MODPY_PYCACHE}lvm_volume_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/volume/${MODPY_PYCACHE}tsk_volume_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/volume/${MODPY_PYCACHE}tsk_volume_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/volume/${MODPY_PYCACHE}volume_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/volume/${MODPY_PYCACHE}volume_system.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfvfs/volume/${MODPY_PYCACHE}vshadow_volume_system.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfvfs/volume/${MODPY_PYCACHE}vshadow_volume_system.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/dfvfs/volume/apfs_volume_system.py
 lib/python${MODPY_VERSION}/site-packages/dfvfs/volume/lvm_volume_system.py
diff --git a/security/py-dfwinreg/Makefile b/security/py-dfwinreg/Makefile
index 9e3a7b17a58..b7589347084 100644
--- a/security/py-dfwinreg/Makefile
+++ b/security/py-dfwinreg/Makefile
@@ -3,7 +3,7 @@ COMMENT =	Digital Forensics Windows Registry (dfWinReg)
 MODPY_EGG_VERSION = 20200415
 DISTNAME =	dfwinreg-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	security
 
@@ -21,7 +21,7 @@ MODULES =	lang/python
 FLAVORS =	python3
 FLAVOR =	python3
 
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 RUN_DEPENDS =		devel/py-construct${MODPY_FLAVOR} \
 			devel/py-dtfabric${MODPY_FLAVOR} \
 			devel/py-six${MODPY_FLAVOR} \
diff --git a/security/py-dfwinreg/pkg/PLIST b/security/py-dfwinreg/pkg/PLIST
index 88c2f2a53aa..95216762ea4 100644
--- a/security/py-dfwinreg/pkg/PLIST
+++ b/security/py-dfwinreg/pkg/PLIST
@@ -1,25 +1,38 @@
 @pkgpath security/py-dfwinreg
 lib/python${MODPY_VERSION}/site-packages/dfwinreg/
-lib/python${MODPY_VERSION}/site-packages/dfwinreg-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/dfwinreg-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/dfwinreg-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/dfwinreg-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/dfwinreg-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/dfwinreg-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/dfwinreg-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/dfwinreg-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/dfwinreg-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/dfwinreg-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/dfwinreg-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/dfwinreg-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/dfwinreg/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dfwinreg/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/dfwinreg/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfwinreg/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfwinreg/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfwinreg/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfwinreg/${MODPY_PYCACHE}definitions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfwinreg/${MODPY_PYCACHE}definitions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfwinreg/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfwinreg/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfwinreg/${MODPY_PYCACHE}fake.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfwinreg/${MODPY_PYCACHE}fake.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfwinreg/${MODPY_PYCACHE}glob2regex.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfwinreg/${MODPY_PYCACHE}glob2regex.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfwinreg/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfwinreg/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfwinreg/${MODPY_PYCACHE}key_paths.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfwinreg/${MODPY_PYCACHE}key_paths.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfwinreg/${MODPY_PYCACHE}py2to3.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfwinreg/${MODPY_PYCACHE}py2to3.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfwinreg/${MODPY_PYCACHE}regf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfwinreg/${MODPY_PYCACHE}regf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfwinreg/${MODPY_PYCACHE}registry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfwinreg/${MODPY_PYCACHE}registry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfwinreg/${MODPY_PYCACHE}registry_searcher.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfwinreg/${MODPY_PYCACHE}registry_searcher.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/dfwinreg/${MODPY_PYCACHE}virtual.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/dfwinreg/${MODPY_PYCACHE}virtual.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/dfwinreg/decorators.py
 lib/python${MODPY_VERSION}/site-packages/dfwinreg/definitions.py
diff --git a/security/py-ecdsa/Makefile b/security/py-ecdsa/Makefile
index ec6452f40b3..c86dca4a080 100644
--- a/security/py-ecdsa/Makefile
+++ b/security/py-ecdsa/Makefile
@@ -1,7 +1,7 @@
 COMMENT =		Python implementation of ECDSA cryptography
 
 MODPY_EGG_VERSION = 	0.18.0
-REVISION =		1
+REVISION =		2
 DISTNAME = 		ecdsa-${MODPY_EGG_VERSION}
 PKGNAME = 		py-${DISTNAME}
 CATEGORIES = 		security
@@ -16,8 +16,7 @@ PERMIT_PACKAGE =	Yes
 MODPY_PI =		Yes
 
 MODULES =		lang/python
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =		setuptools
 MODPY_PYTEST_ARGS =	src/ecdsa
 
 FLAVORS =		python3
diff --git a/security/py-ecdsa/pkg/PLIST b/security/py-ecdsa/pkg/PLIST
index b86a8e7b9ab..06346562c02 100644
--- a/security/py-ecdsa/pkg/PLIST
+++ b/security/py-ecdsa/pkg/PLIST
@@ -1,41 +1,70 @@
 @pkgpath security/py-ecdsa
 lib/python${MODPY_VERSION}/site-packages/ecdsa/
-lib/python${MODPY_VERSION}/site-packages/ecdsa-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/ecdsa-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/ecdsa-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/ecdsa-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/ecdsa-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/ecdsa-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/ecdsa-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/ecdsa-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/ecdsa-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/ecdsa-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/ecdsa-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/ecdsa-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/ecdsa/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}_rwlock.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}_rwlock.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}_sha3.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}_sha3.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}curves.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}curves.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}der.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}der.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}ecdh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}ecdh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}ecdsa.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}ecdsa.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}eddsa.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}eddsa.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}ellipticcurve.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}ellipticcurve.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}keys.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}keys.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}numbertheory.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}numbertheory.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}rfc6979.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}rfc6979.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}test_curves.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}test_curves.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}test_der.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}test_der.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}test_ecdh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}test_ecdh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}test_ecdsa.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}test_ecdsa.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}test_eddsa.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}test_eddsa.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}test_ellipticcurve.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}test_ellipticcurve.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}test_jacobi.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}test_jacobi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}test_keys.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}test_keys.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}test_malformed_sigs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}test_malformed_sigs.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}test_numbertheory.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}test_numbertheory.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}test_pyecdsa.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}test_pyecdsa.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}test_rw_lock.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}test_rw_lock.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}test_sha3.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}test_sha3.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ecdsa/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ecdsa/_compat.py
 lib/python${MODPY_VERSION}/site-packages/ecdsa/_rwlock.py
diff --git a/security/py-fickling/Makefile b/security/py-fickling/Makefile
index 6de3c81a249..db9d5b1dce0 100644
--- a/security/py-fickling/Makefile
+++ b/security/py-fickling/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION = 0.0.4
 DISTNAME =	fickling-${MODPY_EGG_VERSION}
 PKGNAME =       py-${DISTNAME}
 CATEGORIES =	security
-REVISION =      0
+REVISION =      1
 
 MAINTAINER =		Sebastian Reitenbach <sebastia@openbsd.org>
 
@@ -12,7 +12,7 @@ MAINTAINER =		Sebastian Reitenbach <sebastia@openbsd.org>
 PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 MODPY_PI =		Yes
 
 FLAVORS =		python3
@@ -21,6 +21,5 @@ FLAVOR =		python3
 # Only needed for python3.8, it's part of python3.9
 RUN_DEPENDS +=		devel/py-astunparse${MODPY_FLAVOR}
 
-MODPY_PYTEST =		Yes
 
 .include <bsd.port.mk>
diff --git a/security/py-fickling/pkg/PLIST b/security/py-fickling/pkg/PLIST
index bbcea049614..5b13a53f7a6 100644
--- a/security/py-fickling/pkg/PLIST
+++ b/security/py-fickling/pkg/PLIST
@@ -1,20 +1,26 @@
 bin/fickling
 lib/python${MODPY_VERSION}/site-packages/fickling/
-lib/python${MODPY_VERSION}/site-packages/fickling-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/fickling-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/fickling-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/fickling-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/fickling-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/fickling-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/fickling-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/fickling-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/fickling-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/fickling-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/fickling-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/fickling-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/fickling-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/fickling-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/fickling/__init__.py
 lib/python${MODPY_VERSION}/site-packages/fickling/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/fickling/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/fickling/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fickling/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fickling/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fickling/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fickling/${MODPY_PYCACHE}analysis.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fickling/${MODPY_PYCACHE}analysis.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fickling/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fickling/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fickling/${MODPY_PYCACHE}pickle.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fickling/${MODPY_PYCACHE}pickle.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/fickling/${MODPY_PYCACHE}tracing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/fickling/${MODPY_PYCACHE}tracing.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/fickling/analysis.py
 lib/python${MODPY_VERSION}/site-packages/fickling/cli.py
diff --git a/security/py-hkdf/Makefile b/security/py-hkdf/Makefile
index 8132968389d..090d2b7d272 100644
--- a/security/py-hkdf/Makefile
+++ b/security/py-hkdf/Makefile
@@ -3,7 +3,7 @@ COMMENT =	HMAC-based Extract-and-Expand Key Derivation Function (HKDF)
 MODPY_EGG_VERSION =	0.0.3
 DISTNAME =		hkdf-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		security
 
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/security/py-hkdf/pkg/PLIST b/security/py-hkdf/pkg/PLIST
index 5c5ddaea29f..22ccf8aa2b1 100644
--- a/security/py-hkdf/pkg/PLIST
+++ b/security/py-hkdf/pkg/PLIST
@@ -1,8 +1,9 @@
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}hkdf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}hkdf.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/hkdf-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/hkdf-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/hkdf-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/hkdf-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/hkdf-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/hkdf-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/hkdf-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/hkdf-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/hkdf-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/hkdf-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/hkdf.py
diff --git a/security/py-hvac/Makefile b/security/py-hvac/Makefile
index d64b714bc50..b1936e57779 100644
--- a/security/py-hvac/Makefile
+++ b/security/py-hvac/Makefile
@@ -3,7 +3,7 @@ COMMENT =		Python client library for Hashicorp Vault
 MODPY_EGG_VERSION =	0.11.2
 DISTNAME =		hvac-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		0
+REVISION =		1
 
 MAINTAINER =		Mikolaj Kucharski <mikolaj@kucharski.name>
 
@@ -15,7 +15,7 @@ HOMEPAGE =		https://github.com/hvac/hvac
 PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 MODPY_PI =		Yes
 
 RUN_DEPENDS =		devel/py-six${MODPY_FLAVOR} \
diff --git a/security/py-hvac/pkg/PLIST b/security/py-hvac/pkg/PLIST
index a1df22b22e5..54798f39dcd 100644
--- a/security/py-hvac/pkg/PLIST
+++ b/security/py-hvac/pkg/PLIST
@@ -1,42 +1,66 @@
 lib/python${MODPY_VERSION}/site-packages/hvac/
-lib/python${MODPY_VERSION}/site-packages/hvac-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/hvac-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/hvac-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/hvac-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/hvac-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/hvac-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/hvac-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/hvac-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/hvac-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/hvac-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/hvac-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/hvac-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/hvac/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/hvac/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/hvac/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/${MODPY_PYCACHE}adapters.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/${MODPY_PYCACHE}adapters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/${MODPY_PYCACHE}aws_utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/${MODPY_PYCACHE}aws_utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/hvac/adapters.py
 lib/python${MODPY_VERSION}/site-packages/hvac/api/
 lib/python${MODPY_VERSION}/site-packages/hvac/api/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/hvac/api/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/hvac/api/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/${MODPY_PYCACHE}vault_api_base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/${MODPY_PYCACHE}vault_api_base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/${MODPY_PYCACHE}vault_api_category.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/${MODPY_PYCACHE}vault_api_category.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/
 lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}approle.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}approle.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}aws.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}aws.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}azure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}azure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}cert.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}cert.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}gcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}gcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}github.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}github.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}jwt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}jwt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}kubernetes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}kubernetes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}ldap.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}ldap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}mfa.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}mfa.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}oidc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}oidc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}okta.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}okta.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}radius.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}radius.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}token.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}token.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}userpass.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/${MODPY_PYCACHE}userpass.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/approle.py
 lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/aws.py
@@ -56,20 +80,35 @@ lib/python${MODPY_VERSION}/site-packages/hvac/api/auth_methods/userpass.py
 lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/
 lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}active_directory.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}active_directory.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}aws.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}aws.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}azure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}azure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}consul.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}consul.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}database.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}database.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}gcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}gcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}identity.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}identity.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}kv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}kv.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}kv_v1.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}kv_v1.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}kv_v2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}kv_v2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}pki.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}pki.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}rabbitmq.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}rabbitmq.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}transform.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}transform.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}transit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/${MODPY_PYCACHE}transit.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/active_directory.py
 lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/aws.py
@@ -88,21 +127,37 @@ lib/python${MODPY_VERSION}/site-packages/hvac/api/secrets_engines/transit.py
 lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/
 lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}audit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}audit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}capabilities.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}capabilities.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}health.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}health.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}init.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}key.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}key.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}leader.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}leader.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}lease.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}lease.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}mount.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}mount.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}namespace.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}namespace.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}policy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}policy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}raft.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}raft.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}seal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}seal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}system_backend_mixin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}system_backend_mixin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}wrapping.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/${MODPY_PYCACHE}wrapping.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/audit.py
 lib/python${MODPY_VERSION}/site-packages/hvac/api/system_backend/auth.py
@@ -125,13 +180,21 @@ lib/python${MODPY_VERSION}/site-packages/hvac/aws_utils.py
 lib/python${MODPY_VERSION}/site-packages/hvac/constants/
 lib/python${MODPY_VERSION}/site-packages/hvac/constants/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/hvac/constants/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/hvac/constants/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/constants/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/constants/${MODPY_PYCACHE}approle.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/constants/${MODPY_PYCACHE}approle.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/constants/${MODPY_PYCACHE}aws.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/constants/${MODPY_PYCACHE}aws.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/constants/${MODPY_PYCACHE}azure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/constants/${MODPY_PYCACHE}azure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/constants/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/constants/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/constants/${MODPY_PYCACHE}gcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/constants/${MODPY_PYCACHE}gcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/constants/${MODPY_PYCACHE}identity.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/constants/${MODPY_PYCACHE}identity.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/hvac/constants/${MODPY_PYCACHE}transit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/constants/${MODPY_PYCACHE}transit.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/hvac/constants/approle.py
 lib/python${MODPY_VERSION}/site-packages/hvac/constants/aws.py
@@ -145,4 +208,5 @@ lib/python${MODPY_VERSION}/site-packages/hvac/utils.py
 lib/python${MODPY_VERSION}/site-packages/hvac/v1/
 lib/python${MODPY_VERSION}/site-packages/hvac/v1/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/hvac/v1/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/hvac/v1/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/hvac/v1/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
diff --git a/security/py-josepy/Makefile b/security/py-josepy/Makefile
index 821062f532d..5224815507a 100644
--- a/security/py-josepy/Makefile
+++ b/security/py-josepy/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	security devel
 MODPY_EGG_VERSION= 1.13.0
 DISTNAME=	josepy-${MODPY_EGG_VERSION}
 PKGNAME=	py-${DISTNAME}
-REVISION=	0
+REVISION=	1
 
 # Apache 2.0
 PERMIT_PACKAGE= Yes
@@ -15,7 +15,7 @@ FLAVOR=		python3
 
 MODULES=	lang/python
 MODPY_PI=	Yes
-MODPY_SETUPTOOLS= Yes
+MODPY_PYBUILD =	setuptools
 SUBST_VARS=	MODPY_FLAVOR
 
 RUN_DEPENDS=	security/py-cryptography${MODPY_FLAVOR} \
@@ -24,6 +24,5 @@ RUN_DEPENDS=	security/py-cryptography${MODPY_FLAVOR} \
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
 # patched to disable flake8 tests as we don't have pytest-flake8 yet
-MODPY_PYTEST=	Yes
 
 .include <bsd.port.mk>
diff --git a/security/py-josepy/pkg/PLIST b/security/py-josepy/pkg/PLIST
index 42943688a89..da04fa24628 100644
--- a/security/py-josepy/pkg/PLIST
+++ b/security/py-josepy/pkg/PLIST
@@ -3,24 +3,34 @@
 @pkgpath security/py-josepy
 bin/jws
 lib/python${MODPY_VERSION}/site-packages/josepy/
-lib/python${MODPY_VERSION}/site-packages/josepy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/josepy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/josepy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/josepy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/josepy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/josepy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/josepy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/josepy-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/josepy-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/josepy-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/josepy-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/josepy-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/josepy-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/josepy-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/josepy/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/josepy/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/josepy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/josepy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/josepy/${MODPY_PYCACHE}b64.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/josepy/${MODPY_PYCACHE}b64.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/josepy/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/josepy/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/josepy/${MODPY_PYCACHE}interfaces.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/josepy/${MODPY_PYCACHE}interfaces.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/josepy/${MODPY_PYCACHE}json_util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/josepy/${MODPY_PYCACHE}json_util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/josepy/${MODPY_PYCACHE}jwa.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/josepy/${MODPY_PYCACHE}jwa.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/josepy/${MODPY_PYCACHE}jwk.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/josepy/${MODPY_PYCACHE}jwk.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/josepy/${MODPY_PYCACHE}jws.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/josepy/${MODPY_PYCACHE}jws.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/josepy/${MODPY_PYCACHE}magic_typing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/josepy/${MODPY_PYCACHE}magic_typing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/josepy/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/josepy/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/josepy/b64.py
 lib/python${MODPY_VERSION}/site-packages/josepy/errors.py
diff --git a/security/py-libnacl/Makefile b/security/py-libnacl/Makefile
index d627d166938..effba47b346 100644
--- a/security/py-libnacl/Makefile
+++ b/security/py-libnacl/Makefile
@@ -3,7 +3,7 @@ COMMENT=		python bindings for libsodium/tweetnacl based on ctypes
 MODPY_EGG_VERSION=	1.6.1
 DISTNAME=		libnacl-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
-REVISION=		6
+REVISION=		7
 
 CATEGORIES=		security
 
@@ -17,8 +17,7 @@ PERMIT_PACKAGE=	Yes
 MODULES=		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =	setuptools
 FLAVORS =		python3
 FLAVOR =		python3
 
diff --git a/security/py-libnacl/pkg/PLIST b/security/py-libnacl/pkg/PLIST
index 38b82c50b53..e4cd5576bf1 100644
--- a/security/py-libnacl/pkg/PLIST
+++ b/security/py-libnacl/pkg/PLIST
@@ -1,22 +1,36 @@
 lib/python${MODPY_VERSION}/site-packages/libnacl/
-lib/python${MODPY_VERSION}/site-packages/libnacl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/libnacl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/libnacl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/libnacl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/libnacl-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/libnacl-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/libnacl-${MODPY_EGG_VERSION}.dist-info/AUTHORS
+lib/python${MODPY_VERSION}/site-packages/libnacl-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/libnacl-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/libnacl-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/libnacl-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/libnacl-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/libnacl/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}aead.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}aead.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}blake.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}blake.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}dual.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}dual.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}encode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}encode.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}public.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}public.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}sealed.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}sealed.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}secret.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}secret.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}sign.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}sign.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/libnacl/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/libnacl/aead.py
 lib/python${MODPY_VERSION}/site-packages/libnacl/base.py
diff --git a/security/py-oauthlib/Makefile b/security/py-oauthlib/Makefile
index 9f3ab6f945e..49e49256f7d 100644
--- a/security/py-oauthlib/Makefile
+++ b/security/py-oauthlib/Makefile
@@ -7,7 +7,7 @@ GH_PROJECT =	oauthlib
 GH_TAGNAME =	v${MODPY_EGG_VERSION}
 
 PKGNAME =	py-oauthlib-${MODPY_EGG_VERSION}
-REVISION =	0
+REVISION =	1
 
 CATEGORIES =	security
 MAINTAINER =	Johan Huldtgren <jhuldtgren@gmail.com>
@@ -16,8 +16,7 @@ MAINTAINER =	Johan Huldtgren <jhuldtgren@gmail.com>
 PERMIT_PACKAGE =	Yes
 
 MODULES =	lang/python
-MODPY_SETUPTOOLS = Yes
-MODPY_PYTEST =	Yes
+MODPY_PYBUILD =	setuptools
 
 RUN_DEPENDS =	devel/py-blinker${MODPY_FLAVOR} \
 		security/py-cryptography${MODPY_FLAVOR} \
diff --git a/security/py-oauthlib/pkg/PLIST b/security/py-oauthlib/pkg/PLIST
index e628e6c7f63..6593d660974 100644
--- a/security/py-oauthlib/pkg/PLIST
+++ b/security/py-oauthlib/pkg/PLIST
@@ -1,42 +1,61 @@
 @conflict py-oauthlib-*
 @pkgpath security/py-oauthlib
 lib/python${MODPY_VERSION}/site-packages/oauthlib/
-lib/python${MODPY_VERSION}/site-packages/oauthlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/oauthlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/oauthlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/oauthlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/oauthlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/oauthlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/oauthlib-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/oauthlib-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/oauthlib-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/oauthlib-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/oauthlib-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/oauthlib-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/oauthlib/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/${MODPY_PYCACHE}signals.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/${MODPY_PYCACHE}signals.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/${MODPY_PYCACHE}uri_validate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/${MODPY_PYCACHE}uri_validate.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/oauthlib/common.py
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/${MODPY_PYCACHE}parameters.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/${MODPY_PYCACHE}parameters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/${MODPY_PYCACHE}request_validator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/${MODPY_PYCACHE}request_validator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/${MODPY_PYCACHE}signature.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/${MODPY_PYCACHE}signature.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/endpoints/
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/endpoints/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/endpoints/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/endpoints/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/endpoints/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/endpoints/${MODPY_PYCACHE}access_token.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/endpoints/${MODPY_PYCACHE}access_token.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/endpoints/${MODPY_PYCACHE}authorization.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/endpoints/${MODPY_PYCACHE}authorization.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/endpoints/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/endpoints/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/endpoints/${MODPY_PYCACHE}pre_configured.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/endpoints/${MODPY_PYCACHE}pre_configured.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/endpoints/${MODPY_PYCACHE}request_token.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/endpoints/${MODPY_PYCACHE}request_token.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/endpoints/${MODPY_PYCACHE}resource.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/endpoints/${MODPY_PYCACHE}resource.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/endpoints/${MODPY_PYCACHE}signature_only.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/endpoints/${MODPY_PYCACHE}signature_only.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/endpoints/access_token.py
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/endpoints/authorization.py
@@ -53,25 +72,39 @@ lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/utils.py
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/${MODPY_PYCACHE}parameters.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/${MODPY_PYCACHE}parameters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/${MODPY_PYCACHE}request_validator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/${MODPY_PYCACHE}request_validator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/${MODPY_PYCACHE}tokens.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/${MODPY_PYCACHE}tokens.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/clients/
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/clients/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/clients/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/clients/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/clients/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/clients/${MODPY_PYCACHE}backend_application.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/clients/${MODPY_PYCACHE}backend_application.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/clients/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/clients/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/clients/${MODPY_PYCACHE}legacy_application.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/clients/${MODPY_PYCACHE}legacy_application.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/clients/${MODPY_PYCACHE}mobile_application.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/clients/${MODPY_PYCACHE}mobile_application.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/clients/${MODPY_PYCACHE}service_application.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/clients/${MODPY_PYCACHE}service_application.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/clients/${MODPY_PYCACHE}web_application.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/clients/${MODPY_PYCACHE}web_application.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/clients/backend_application.py
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/clients/base.py
@@ -82,14 +115,23 @@ lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/clients/web_app
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}authorization.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}authorization.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}introspect.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}introspect.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}metadata.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}metadata.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}pre_configured.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}pre_configured.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}resource.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}resource.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}revocation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}revocation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}token.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}token.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/authorization.py
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/base.py
@@ -103,12 +145,19 @@ lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/errors.py
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}authorization_code.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}authorization_code.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}client_credentials.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}client_credentials.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}implicit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}implicit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}refresh_token.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}refresh_token.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}resource_owner_password_credentials.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}resource_owner_password_credentials.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/authorization_code.py
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/base.py
@@ -123,33 +172,45 @@ lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/utils.py
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc8628/
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc8628/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc8628/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc8628/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc8628/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc8628/clients/
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc8628/clients/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc8628/clients/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc8628/clients/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc8628/clients/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc8628/clients/${MODPY_PYCACHE}device.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc8628/clients/${MODPY_PYCACHE}device.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc8628/clients/device.py
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/${MODPY_PYCACHE}request_validator.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/${MODPY_PYCACHE}request_validator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/${MODPY_PYCACHE}tokens.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/${MODPY_PYCACHE}tokens.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/${MODPY_PYCACHE}pre_configured.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/${MODPY_PYCACHE}pre_configured.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/${MODPY_PYCACHE}userinfo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/${MODPY_PYCACHE}userinfo.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/pre_configured.py
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/userinfo.py
@@ -157,12 +218,19 @@ lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/exceptions
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}authorization_code.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}authorization_code.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}dispatchers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}dispatchers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}hybrid.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}hybrid.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}implicit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}implicit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}refresh_token.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}refresh_token.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/authorization_code.py
 lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/base.py
diff --git a/security/py-passlib/Makefile b/security/py-passlib/Makefile
index cba0a7bdf30..c44358db023 100644
--- a/security/py-passlib/Makefile
+++ b/security/py-passlib/Makefile
@@ -3,7 +3,7 @@ COMMENT=	Python module providing a password hashing framework
 MODPY_EGG_VERSION= 1.7.4
 DISTNAME=	passlib-${MODPY_EGG_VERSION}
 PKGNAME=	py-passlib-${MODPY_EGG_VERSION}
-REVISION=	1
+REVISION=	2
 
 CATEGORIES=	security
 
@@ -14,8 +14,7 @@ PERMIT_PACKAGE=	Yes
 
 MODULES=		lang/python
 MODPY_PI=		Yes
-MODPY_SETUPTOOLS=	Yes
-MODPY_PYTEST=		Yes
+MODPY_PYBUILD =	setuptools
 MODPY_PYTEST_ARGS=	passlib
 
 PATCHORIG=	.orig.port
diff --git a/security/py-passlib/pkg/PLIST b/security/py-passlib/pkg/PLIST
index 29f140df1fb..8920bb803d5 100644
--- a/security/py-passlib/pkg/PLIST
+++ b/security/py-passlib/pkg/PLIST
@@ -1,25 +1,37 @@
 @pkgpath security/py-passlib
 lib/python${MODPY_VERSION}/site-packages/passlib/
-lib/python${MODPY_VERSION}/site-packages/passlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/passlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/passlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/passlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/passlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/passlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
-lib/python${MODPY_VERSION}/site-packages/passlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/zip-safe
+lib/python${MODPY_VERSION}/site-packages/passlib-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/passlib-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/passlib-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/passlib-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/passlib-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/passlib-${MODPY_EGG_VERSION}.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/passlib-${MODPY_EGG_VERSION}.dist-info/zip-safe
 lib/python${MODPY_VERSION}/site-packages/passlib/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/passlib/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/passlib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/${MODPY_PYCACHE}apache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/${MODPY_PYCACHE}apache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/${MODPY_PYCACHE}apps.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/${MODPY_PYCACHE}apps.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/${MODPY_PYCACHE}context.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/${MODPY_PYCACHE}context.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/${MODPY_PYCACHE}exc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/${MODPY_PYCACHE}exc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/${MODPY_PYCACHE}hash.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/${MODPY_PYCACHE}hash.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/${MODPY_PYCACHE}hosts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/${MODPY_PYCACHE}hosts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/${MODPY_PYCACHE}ifc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/${MODPY_PYCACHE}ifc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/${MODPY_PYCACHE}pwd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/${MODPY_PYCACHE}pwd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/${MODPY_PYCACHE}registry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/${MODPY_PYCACHE}registry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/${MODPY_PYCACHE}totp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/${MODPY_PYCACHE}totp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/${MODPY_PYCACHE}win32.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/${MODPY_PYCACHE}win32.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/passlib/_data/
 lib/python${MODPY_VERSION}/site-packages/passlib/_data/wordsets/
@@ -30,7 +42,9 @@ lib/python${MODPY_VERSION}/site-packages/passlib/_data/wordsets/eff_short.txt
 lib/python${MODPY_VERSION}/site-packages/passlib/_setup/
 lib/python${MODPY_VERSION}/site-packages/passlib/_setup/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/passlib/_setup/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/passlib/_setup/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/_setup/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/_setup/${MODPY_PYCACHE}stamp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/_setup/${MODPY_PYCACHE}stamp.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/passlib/_setup/stamp.py
 lib/python${MODPY_VERSION}/site-packages/passlib/apache.py
@@ -39,16 +53,24 @@ lib/python${MODPY_VERSION}/site-packages/passlib/context.py
 lib/python${MODPY_VERSION}/site-packages/passlib/crypto/
 lib/python${MODPY_VERSION}/site-packages/passlib/crypto/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/passlib/crypto/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/passlib/crypto/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/crypto/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/crypto/${MODPY_PYCACHE}_md4.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/crypto/${MODPY_PYCACHE}_md4.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/crypto/${MODPY_PYCACHE}des.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/crypto/${MODPY_PYCACHE}des.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/crypto/${MODPY_PYCACHE}digest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/crypto/${MODPY_PYCACHE}digest.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/passlib/crypto/_blowfish/
 lib/python${MODPY_VERSION}/site-packages/passlib/crypto/_blowfish/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/passlib/crypto/_blowfish/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/passlib/crypto/_blowfish/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/crypto/_blowfish/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/crypto/_blowfish/${MODPY_PYCACHE}_gen_files.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/crypto/_blowfish/${MODPY_PYCACHE}_gen_files.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/crypto/_blowfish/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/crypto/_blowfish/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/crypto/_blowfish/${MODPY_PYCACHE}unrolled.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/crypto/_blowfish/${MODPY_PYCACHE}unrolled.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/passlib/crypto/_blowfish/_gen_files.py
 lib/python${MODPY_VERSION}/site-packages/passlib/crypto/_blowfish/base.py
@@ -59,9 +81,13 @@ lib/python${MODPY_VERSION}/site-packages/passlib/crypto/digest.py
 lib/python${MODPY_VERSION}/site-packages/passlib/crypto/scrypt/
 lib/python${MODPY_VERSION}/site-packages/passlib/crypto/scrypt/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/passlib/crypto/scrypt/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/passlib/crypto/scrypt/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/crypto/scrypt/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/crypto/scrypt/${MODPY_PYCACHE}_builtin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/crypto/scrypt/${MODPY_PYCACHE}_builtin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/crypto/scrypt/${MODPY_PYCACHE}_gen_files.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/crypto/scrypt/${MODPY_PYCACHE}_gen_files.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/crypto/scrypt/${MODPY_PYCACHE}_salsa.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/crypto/scrypt/${MODPY_PYCACHE}_salsa.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/passlib/crypto/scrypt/_builtin.py
 lib/python${MODPY_VERSION}/site-packages/passlib/crypto/scrypt/_gen_files.py
@@ -70,41 +96,69 @@ lib/python${MODPY_VERSION}/site-packages/passlib/exc.py
 lib/python${MODPY_VERSION}/site-packages/passlib/ext/
 lib/python${MODPY_VERSION}/site-packages/passlib/ext/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/passlib/ext/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/passlib/ext/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/ext/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/passlib/ext/django/
 lib/python${MODPY_VERSION}/site-packages/passlib/ext/django/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/passlib/ext/django/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/passlib/ext/django/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/ext/django/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/ext/django/${MODPY_PYCACHE}models.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/ext/django/${MODPY_PYCACHE}models.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/ext/django/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/ext/django/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/passlib/ext/django/models.py
 lib/python${MODPY_VERSION}/site-packages/passlib/ext/django/utils.py
 lib/python${MODPY_VERSION}/site-packages/passlib/handlers/
 lib/python${MODPY_VERSION}/site-packages/passlib/handlers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}argon2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}argon2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}bcrypt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}bcrypt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}cisco.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}cisco.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}des_crypt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}des_crypt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}digests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}digests.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}django.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}django.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}fshp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}fshp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}ldap_digests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}ldap_digests.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}md5_crypt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}md5_crypt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}misc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}mssql.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}mssql.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}mysql.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}mysql.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}oracle.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}oracle.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}pbkdf2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}pbkdf2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}phpass.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}phpass.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}postgres.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}postgres.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}roundup.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}roundup.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}scram.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}scram.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}scrypt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}scrypt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}sha1_crypt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}sha1_crypt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}sha2_crypt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}sha2_crypt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}sun_md5_crypt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}sun_md5_crypt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}windows.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/handlers/${MODPY_PYCACHE}windows.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/passlib/handlers/argon2.py
 lib/python${MODPY_VERSION}/site-packages/passlib/handlers/bcrypt.py
@@ -138,37 +192,69 @@ lib/python${MODPY_VERSION}/site-packages/passlib/tests/
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/__init__.py
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}_test_bad_register.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}_test_bad_register.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}backports.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}backports.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_apache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_apache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_apps.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_apps.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_context.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_context.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_context_deprecated.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_context_deprecated.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_crypto_builtin_md4.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_crypto_builtin_md4.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_crypto_des.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_crypto_des.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_crypto_digest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_crypto_digest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_crypto_scrypt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_crypto_scrypt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_ext_django.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_ext_django.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_ext_django_source.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_ext_django_source.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_handlers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_handlers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_handlers_argon2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_handlers_argon2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_handlers_bcrypt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_handlers_bcrypt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_handlers_cisco.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_handlers_cisco.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_handlers_django.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_handlers_django.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_handlers_pbkdf2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_handlers_pbkdf2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_handlers_scrypt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_handlers_scrypt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_hosts.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_hosts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_pwd.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_pwd.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_registry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_registry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_totp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_totp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_utils_handlers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_utils_handlers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_utils_md4.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_utils_md4.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_utils_pbkdf2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_utils_pbkdf2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_win32.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}test_win32.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}tox_support.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}tox_support.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/_test_bad_register.py
 lib/python${MODPY_VERSION}/site-packages/passlib/tests/backports.py
@@ -208,18 +294,27 @@ lib/python${MODPY_VERSION}/site-packages/passlib/totp.py
 lib/python${MODPY_VERSION}/site-packages/passlib/utils/
 lib/python${MODPY_VERSION}/site-packages/passlib/utils/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/passlib/utils/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/passlib/utils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/utils/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/utils/${MODPY_PYCACHE}binary.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/utils/${MODPY_PYCACHE}binary.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/utils/${MODPY_PYCACHE}decor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/utils/${MODPY_PYCACHE}decor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/utils/${MODPY_PYCACHE}des.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/utils/${MODPY_PYCACHE}des.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/utils/${MODPY_PYCACHE}handlers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/utils/${MODPY_PYCACHE}handlers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/utils/${MODPY_PYCACHE}md4.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/utils/${MODPY_PYCACHE}md4.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/utils/${MODPY_PYCACHE}pbkdf2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/utils/${MODPY_PYCACHE}pbkdf2.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/passlib/utils/binary.py
 lib/python${MODPY_VERSION}/site-packages/passlib/utils/compat/
 lib/python${MODPY_VERSION}/site-packages/passlib/utils/compat/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/passlib/utils/compat/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/passlib/utils/compat/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/utils/compat/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/passlib/utils/compat/${MODPY_PYCACHE}_ordered_dict.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/passlib/utils/compat/${MODPY_PYCACHE}_ordered_dict.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/passlib/utils/compat/_ordered_dict.py
 lib/python${MODPY_VERSION}/site-packages/passlib/utils/decor.py
diff --git a/security/py-pbkdf2/Makefile b/security/py-pbkdf2/Makefile
index e53e65ed18a..d0b7b5c99ca 100644
--- a/security/py-pbkdf2/Makefile
+++ b/security/py-pbkdf2/Makefile
@@ -1,7 +1,7 @@
 COMMENT =	Python implementation of PBKDF2
 
 MODPY_EGG_VERSION =	1.3
-REVISION =		9
+REVISION =		10
 DISTNAME =		pbkdf2-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		security devel
@@ -15,7 +15,7 @@ PERMIT_PACKAGE =	Yes
 
 MODPY_PI = 		Yes
 MODULES =		lang/python
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/security/py-pbkdf2/pkg/PLIST b/security/py-pbkdf2/pkg/PLIST
index 9ee75da25f2..87d7f776892 100644
--- a/security/py-pbkdf2/pkg/PLIST
+++ b/security/py-pbkdf2/pkg/PLIST
@@ -1,8 +1,10 @@
 @pkgpath security/py-pbkdf2
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}pbkdf2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}pbkdf2.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pbkdf2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pbkdf2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pbkdf2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pbkdf2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pbkdf2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pbkdf2-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pbkdf2-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pbkdf2-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pbkdf2-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pbkdf2-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pbkdf2.py
diff --git a/security/py-potr/Makefile b/security/py-potr/Makefile
index e616a50cd0b..e74fa0d76e0 100644
--- a/security/py-potr/Makefile
+++ b/security/py-potr/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	1.0.1
 DISTNAME =		python-potr-${MODPY_EGG_VERSION}
 PKGNAME =		py-potr-${MODPY_EGG_VERSION}
 CATEGORIES =		security net
-REVISION =		9
+REVISION =		10
 
 # LGPLv3
 PERMIT_PACKAGE =	Yes
@@ -14,7 +14,7 @@ EXTRACT_SUFX =		.zip
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/security/py-potr/pkg/PLIST b/security/py-potr/pkg/PLIST
index 081fa65ec33..560327571d8 100644
--- a/security/py-potr/pkg/PLIST
+++ b/security/py-potr/pkg/PLIST
@@ -2,16 +2,24 @@
 lib/python${MODPY_VERSION}/site-packages/potr/
 lib/python${MODPY_VERSION}/site-packages/potr/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/potr/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/potr/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/potr/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/potr/${MODPY_PYCACHE}context.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/potr/${MODPY_PYCACHE}context.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/potr/${MODPY_PYCACHE}crypt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/potr/${MODPY_PYCACHE}crypt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/potr/${MODPY_PYCACHE}proto.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/potr/${MODPY_PYCACHE}proto.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/potr/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/potr/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/potr/compatcrypto/
 lib/python${MODPY_VERSION}/site-packages/potr/compatcrypto/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/potr/compatcrypto/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/potr/compatcrypto/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/potr/compatcrypto/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/potr/compatcrypto/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/potr/compatcrypto/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/potr/compatcrypto/${MODPY_PYCACHE}pycrypto.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/potr/compatcrypto/${MODPY_PYCACHE}pycrypto.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/potr/compatcrypto/common.py
 lib/python${MODPY_VERSION}/site-packages/potr/compatcrypto/pycrypto.py
@@ -19,9 +27,9 @@ lib/python${MODPY_VERSION}/site-packages/potr/context.py
 lib/python${MODPY_VERSION}/site-packages/potr/crypt.py
 lib/python${MODPY_VERSION}/site-packages/potr/proto.py
 lib/python${MODPY_VERSION}/site-packages/potr/utils.py
-lib/python${MODPY_VERSION}/site-packages/python_potr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/python_potr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/python_potr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/python_potr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/python_potr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/python_potr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/python_potr-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/python_potr-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/python_potr-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/python_potr-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/python_potr-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/python_potr-${MODPY_EGG_VERSION}.dist-info/top_level.txt
diff --git a/security/py-pykeepass/Makefile b/security/py-pykeepass/Makefile
index c6020d14287..4b9fb4430b3 100644
--- a/security/py-pykeepass/Makefile
+++ b/security/py-pykeepass/Makefile
@@ -5,7 +5,7 @@ MODPY_EGG_VERSION =	4.0.3
 DISTNAME =	pykeepass-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
 CATEGORIES =	security
-REVISION =	0
+REVISION =	1
 
 HOMEPAGE =	https://github.com/libkeepass/pykeepass
 
@@ -18,7 +18,7 @@ FLAVORS =	python3
 FLAVOR =	python3
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 NO_TEST =		Yes
 # tests are not included in pypi tarballs; with a git checkout you can use
 #MODPY_PYTEST_ARGS =tests/tests.py
diff --git a/security/py-pykeepass/pkg/PLIST b/security/py-pykeepass/pkg/PLIST
index 993d7343286..87a73c9cc6a 100644
--- a/security/py-pykeepass/pkg/PLIST
+++ b/security/py-pykeepass/pkg/PLIST
@@ -1,22 +1,33 @@
 lib/python${MODPY_VERSION}/site-packages/pykeepass/
-lib/python${MODPY_VERSION}/site-packages/pykeepass-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pykeepass-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pykeepass-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pykeepass-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pykeepass-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pykeepass-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pykeepass-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/pykeepass-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/pykeepass-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/pykeepass-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/pykeepass-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/pykeepass-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pykeepass/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pykeepass/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pykeepass/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pykeepass/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pykeepass/${MODPY_PYCACHE}attachment.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pykeepass/${MODPY_PYCACHE}attachment.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pykeepass/${MODPY_PYCACHE}baseelement.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pykeepass/${MODPY_PYCACHE}baseelement.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pykeepass/${MODPY_PYCACHE}entry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pykeepass/${MODPY_PYCACHE}entry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pykeepass/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pykeepass/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pykeepass/${MODPY_PYCACHE}group.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pykeepass/${MODPY_PYCACHE}group.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pykeepass/${MODPY_PYCACHE}icons.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pykeepass/${MODPY_PYCACHE}icons.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pykeepass/${MODPY_PYCACHE}pykeepass.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pykeepass/${MODPY_PYCACHE}pykeepass.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pykeepass/${MODPY_PYCACHE}setters.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pykeepass/${MODPY_PYCACHE}setters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pykeepass/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pykeepass/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pykeepass/${MODPY_PYCACHE}xpath.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pykeepass/${MODPY_PYCACHE}xpath.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pykeepass/attachment.py
 lib/python${MODPY_VERSION}/site-packages/pykeepass/baseelement.py
@@ -28,12 +39,19 @@ lib/python${MODPY_VERSION}/site-packages/pykeepass/icons.py
 lib/python${MODPY_VERSION}/site-packages/pykeepass/kdbx_parsing/
 lib/python${MODPY_VERSION}/site-packages/pykeepass/kdbx_parsing/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pykeepass/kdbx_parsing/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/pykeepass/kdbx_parsing/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pykeepass/kdbx_parsing/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pykeepass/kdbx_parsing/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pykeepass/kdbx_parsing/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pykeepass/kdbx_parsing/${MODPY_PYCACHE}kdbx.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pykeepass/kdbx_parsing/${MODPY_PYCACHE}kdbx.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pykeepass/kdbx_parsing/${MODPY_PYCACHE}kdbx3.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pykeepass/kdbx_parsing/${MODPY_PYCACHE}kdbx3.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pykeepass/kdbx_parsing/${MODPY_PYCACHE}kdbx4.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pykeepass/kdbx_parsing/${MODPY_PYCACHE}kdbx4.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pykeepass/kdbx_parsing/${MODPY_PYCACHE}pytwofish.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pykeepass/kdbx_parsing/${MODPY_PYCACHE}pytwofish.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/pykeepass/kdbx_parsing/${MODPY_PYCACHE}twofish.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/pykeepass/kdbx_parsing/${MODPY_PYCACHE}twofish.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pykeepass/kdbx_parsing/common.py
 lib/python${MODPY_VERSION}/site-packages/pykeepass/kdbx_parsing/kdbx.py
diff --git a/security/py-requests-aws4auth/Makefile b/security/py-requests-aws4auth/Makefile
index 68a51fa7f9a..bb4450d405d 100644
--- a/security/py-requests-aws4auth/Makefile
+++ b/security/py-requests-aws4auth/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	1.1.1
 
 DISTNAME =		requests-aws4auth-${MODPY_EGG_VERSION}
 PKGNAME =		${MODPY_PY_PREFIX}requests-aws4auth-${MODPY_EGG_VERSION}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		security
 
@@ -15,7 +15,7 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 
 RUN_DEPENDS =		www/py-requests${MODPY_FLAVOR}
 BUILD_DEPENDS =		${RUN_DEPENDS}
diff --git a/security/py-requests-aws4auth/pkg/PLIST b/security/py-requests-aws4auth/pkg/PLIST
index 2a01de0e682..1ee5fc845e4 100644
--- a/security/py-requests-aws4auth/pkg/PLIST
+++ b/security/py-requests-aws4auth/pkg/PLIST
@@ -3,17 +3,21 @@
 @comment lib/python${MODPY_VERSION}/site-packages/LICENSE
 @comment lib/python${MODPY_VERSION}/site-packages/README.md
 lib/python${MODPY_VERSION}/site-packages/requests_aws4auth/
-lib/python${MODPY_VERSION}/site-packages/requests_aws4auth-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/requests_aws4auth-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/requests_aws4auth-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/requests_aws4auth-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/requests_aws4auth-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/requests_aws4auth-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/requests_aws4auth-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/requests_aws4auth-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/requests_aws4auth-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/requests_aws4auth-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/requests_aws4auth-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/requests_aws4auth-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/requests_aws4auth/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/requests_aws4auth/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/requests_aws4auth/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/requests_aws4auth/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_aws4auth/${MODPY_PYCACHE}aws4auth.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/requests_aws4auth/${MODPY_PYCACHE}aws4auth.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_aws4auth/${MODPY_PYCACHE}aws4signingkey.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/requests_aws4auth/${MODPY_PYCACHE}aws4signingkey.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_aws4auth/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/requests_aws4auth/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/requests_aws4auth/aws4auth.py
 lib/python${MODPY_VERSION}/site-packages/requests_aws4auth/aws4signingkey.py
diff --git a/security/py-ropper/Makefile b/security/py-ropper/Makefile
index ae332deb76b..0502f340c7d 100644
--- a/security/py-ropper/Makefile
+++ b/security/py-ropper/Makefile
@@ -3,7 +3,7 @@ COMMENT =	rop gadget finder and binary information tool
 MODPY_EGG_VERSION =	1.12.5
 DISTNAME =	ropper-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
-REVISION =	4
+REVISION =	5
 
 CATEGORIES =	security
 
@@ -15,7 +15,7 @@ MAINTAINER =	Remi Pointel <rpointel@openbsd.org>
 PERMIT_PACKAGE =	Yes
 
 MODULES =	lang/python
-MODPY_SETUPTOOLS = Yes
+MODPY_PYBUILD =	setuptools
 MODPY_PI =	Yes
 
 RUN_DEPENDS =	devel/py-filebytes${MODPY_FLAVOR} \
diff --git a/security/py-ropper/pkg/PLIST b/security/py-ropper/pkg/PLIST
index 4e96963994e..db8b014a207 100644
--- a/security/py-ropper/pkg/PLIST
+++ b/security/py-ropper/pkg/PLIST
@@ -1,36 +1,52 @@
-@conflict py3-ropper-<1.12.5p2
+@conflict ${MODPY_PY_PREFIX}ropper-<1.12.5p2
 bin/ropper${MODPY_BIN_SUFFIX}
 lib/python${MODPY_VERSION}/site-packages/ropper/
-lib/python${MODPY_VERSION}/site-packages/ropper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/ropper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/ropper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/ropper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/ropper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/ropper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/ropper-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/ropper-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/ropper-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/ropper-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/ropper-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/ropper-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/ropper-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/ropper/__init__.py
 lib/python${MODPY_VERSION}/site-packages/ropper/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ropper/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ropper/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropper/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropper/${MODPY_PYCACHE}arch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/${MODPY_PYCACHE}arch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropper/${MODPY_PYCACHE}console.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/${MODPY_PYCACHE}console.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropper/${MODPY_PYCACHE}gadget.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/${MODPY_PYCACHE}gadget.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropper/${MODPY_PYCACHE}options.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/${MODPY_PYCACHE}options.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropper/${MODPY_PYCACHE}rop.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/${MODPY_PYCACHE}rop.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropper/${MODPY_PYCACHE}search.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/${MODPY_PYCACHE}search.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropper/${MODPY_PYCACHE}semantic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/${MODPY_PYCACHE}semantic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropper/${MODPY_PYCACHE}service.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/${MODPY_PYCACHE}service.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropper/${MODPY_PYCACHE}z3helper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/${MODPY_PYCACHE}z3helper.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ropper/arch.py
 lib/python${MODPY_VERSION}/site-packages/ropper/common/
 lib/python${MODPY_VERSION}/site-packages/ropper/common/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ropper/common/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ropper/common/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/common/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropper/common/${MODPY_PYCACHE}abstract.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/common/${MODPY_PYCACHE}abstract.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropper/common/${MODPY_PYCACHE}coloredstring.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/common/${MODPY_PYCACHE}coloredstring.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropper/common/${MODPY_PYCACHE}enum.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/common/${MODPY_PYCACHE}enum.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropper/common/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/common/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropper/common/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/common/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ropper/common/abstract.py
 lib/python${MODPY_VERSION}/site-packages/ropper/common/coloredstring.py
@@ -42,11 +58,17 @@ lib/python${MODPY_VERSION}/site-packages/ropper/gadget.py
 lib/python${MODPY_VERSION}/site-packages/ropper/loaders/
 lib/python${MODPY_VERSION}/site-packages/ropper/loaders/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ropper/loaders/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ropper/loaders/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/loaders/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropper/loaders/${MODPY_PYCACHE}elf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/loaders/${MODPY_PYCACHE}elf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropper/loaders/${MODPY_PYCACHE}loader.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/loaders/${MODPY_PYCACHE}loader.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropper/loaders/${MODPY_PYCACHE}mach_o.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/loaders/${MODPY_PYCACHE}mach_o.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropper/loaders/${MODPY_PYCACHE}pe.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/loaders/${MODPY_PYCACHE}pe.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropper/loaders/${MODPY_PYCACHE}raw.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/loaders/${MODPY_PYCACHE}raw.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ropper/loaders/elf.py
 lib/python${MODPY_VERSION}/site-packages/ropper/loaders/loader.py
@@ -57,11 +79,17 @@ lib/python${MODPY_VERSION}/site-packages/ropper/options.py
 lib/python${MODPY_VERSION}/site-packages/ropper/printer/
 lib/python${MODPY_VERSION}/site-packages/ropper/printer/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ropper/printer/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ropper/printer/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/printer/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropper/printer/${MODPY_PYCACHE}elfprinter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/printer/${MODPY_PYCACHE}elfprinter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropper/printer/${MODPY_PYCACHE}machprinter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/printer/${MODPY_PYCACHE}machprinter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropper/printer/${MODPY_PYCACHE}peprinter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/printer/${MODPY_PYCACHE}peprinter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropper/printer/${MODPY_PYCACHE}printer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/printer/${MODPY_PYCACHE}printer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropper/printer/${MODPY_PYCACHE}rawprinter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/printer/${MODPY_PYCACHE}rawprinter.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ropper/printer/elfprinter.py
 lib/python${MODPY_VERSION}/site-packages/ropper/printer/machprinter.py
@@ -72,13 +100,18 @@ lib/python${MODPY_VERSION}/site-packages/ropper/rop.py
 lib/python${MODPY_VERSION}/site-packages/ropper/ropchain/
 lib/python${MODPY_VERSION}/site-packages/ropper/ropchain/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ropper/ropchain/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ropper/ropchain/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/ropchain/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropper/ropchain/${MODPY_PYCACHE}ropchain.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/ropchain/${MODPY_PYCACHE}ropchain.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ropper/ropchain/arch/
 lib/python${MODPY_VERSION}/site-packages/ropper/ropchain/arch/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ropper/ropchain/arch/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ropper/ropchain/arch/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/ropchain/arch/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropper/ropchain/arch/${MODPY_PYCACHE}ropchainx86.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/ropchain/arch/${MODPY_PYCACHE}ropchainx86.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ropper/ropchain/arch/${MODPY_PYCACHE}ropchainx86_64.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ropper/ropchain/arch/${MODPY_PYCACHE}ropchainx86_64.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ropper/ropchain/arch/ropchainx86.py
 lib/python${MODPY_VERSION}/site-packages/ropper/ropchain/arch/ropchainx86_64.py
diff --git a/security/py-rsa/Makefile b/security/py-rsa/Makefile
index 9bde9e9ce7f..cc104ab2211 100644
--- a/security/py-rsa/Makefile
+++ b/security/py-rsa/Makefile
@@ -5,7 +5,7 @@ COMMENT=		Python RSA implementation
 MODPY_EGG_VERSION=	4.7.2
 DISTNAME=		rsa-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
-REVISION=		1
+REVISION=		2
 
 CATEGORIES=		security
 
@@ -17,8 +17,7 @@ PERMIT_PACKAGE=	Yes
 MODULES=		lang/python
 
 MODPY_PI=		Yes
-MODPY_SETUPTOOLS=	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =	setuptools
 
 RUN_DEPENDS=		devel/py-asn1${MODPY_FLAVOR}
 
diff --git a/security/py-rsa/pkg/PLIST b/security/py-rsa/pkg/PLIST
index c4a1b22546f..9f731520359 100644
--- a/security/py-rsa/pkg/PLIST
+++ b/security/py-rsa/pkg/PLIST
@@ -7,29 +7,44 @@ bin/pyrsa-priv2pub
 bin/pyrsa-sign
 bin/pyrsa-verify
 lib/python${MODPY_VERSION}/site-packages/rsa/
-lib/python${MODPY_VERSION}/site-packages/rsa-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/rsa-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/rsa-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/rsa-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/rsa-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/rsa-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/rsa-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/rsa-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/rsa-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/rsa-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/rsa-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/rsa-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/rsa-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/rsa-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/rsa/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}asn1.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}asn1.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}key.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}key.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}parallel.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}parallel.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}pem.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}pem.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}pkcs1.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}pkcs1.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}pkcs1_v2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}pkcs1_v2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}prime.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}prime.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}randnum.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}randnum.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}transform.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}transform.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/rsa/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/rsa/_compat.py
 lib/python${MODPY_VERSION}/site-packages/rsa/asn1.py
diff --git a/security/py-scp/Makefile b/security/py-scp/Makefile
index c177f809de7..5623e077a82 100644
--- a/security/py-scp/Makefile
+++ b/security/py-scp/Makefile
@@ -3,7 +3,7 @@ COMMENT =		scp module for Paramiko
 MODPY_EGG_VERSION =	0.13.6
 DISTNAME =		scp-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		security
 
@@ -15,7 +15,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 
 FLAVORS =		python3
 FLAVOR =		python3
diff --git a/security/py-scp/pkg/PLIST b/security/py-scp/pkg/PLIST
index c0a860eb2d8..684f17f3803 100644
--- a/security/py-scp/pkg/PLIST
+++ b/security/py-scp/pkg/PLIST
@@ -1,10 +1,11 @@
 @pkgpath security/py-scp
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}scp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}scp.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/scp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/scp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/scp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/scp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/scp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/scp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/scp-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/scp-${MODPY_EGG_VERSION}.dist-info/LICENSE.txt
+lib/python${MODPY_VERSION}/site-packages/scp-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/scp-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/scp-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/scp-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/scp.py
diff --git a/security/py-scrypt/Makefile b/security/py-scrypt/Makefile
index af09f5b9b7b..96c0c7480d2 100644
--- a/security/py-scrypt/Makefile
+++ b/security/py-scrypt/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	0.8.20
 
 DISTNAME =	scrypt-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
-REVISION =	0
+REVISION =	1
 
 CATEGORIES =	security
 
@@ -18,7 +18,7 @@ WANTLIB +=	crypto pthread
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 MODPY_PYTEST_ARGS =	scrypt/tests
 
 FLAVORS =	python3
diff --git a/security/py-scrypt/pkg/PLIST b/security/py-scrypt/pkg/PLIST
index b8cae4c8804..4ebf25546c3 100644
--- a/security/py-scrypt/pkg/PLIST
+++ b/security/py-scrypt/pkg/PLIST
@@ -1,23 +1,31 @@
 @pkgpath security/py-scrypt
 @so lib/python${MODPY_VERSION}/site-packages/_scrypt.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/scrypt/
-lib/python${MODPY_VERSION}/site-packages/scrypt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/scrypt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/scrypt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/scrypt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/scrypt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/scrypt-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/scrypt-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/scrypt-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/scrypt-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/scrypt-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/scrypt-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/scrypt/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scrypt/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scrypt/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scrypt/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scrypt/${MODPY_PYCACHE}scrypt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scrypt/${MODPY_PYCACHE}scrypt.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/scrypt/scrypt.py
 lib/python${MODPY_VERSION}/site-packages/scrypt/tests/
 lib/python${MODPY_VERSION}/site-packages/scrypt/tests/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scrypt/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scrypt/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scrypt/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scrypt/tests/${MODPY_PYCACHE}test_scrypt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scrypt/tests/${MODPY_PYCACHE}test_scrypt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scrypt/tests/${MODPY_PYCACHE}test_scrypt_c_module.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scrypt/tests/${MODPY_PYCACHE}test_scrypt_c_module.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scrypt/tests/${MODPY_PYCACHE}test_scrypt_py2x.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scrypt/tests/${MODPY_PYCACHE}test_scrypt_py2x.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scrypt/tests/${MODPY_PYCACHE}test_scrypt_py3x.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/scrypt/tests/${MODPY_PYCACHE}test_scrypt_py3x.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/scrypt/tests/ciphertexts.csv
 lib/python${MODPY_VERSION}/site-packages/scrypt/tests/hashvectors.csv
diff --git a/security/py-secretstorage/Makefile b/security/py-secretstorage/Makefile
index d9274085036..e1812fa56f2 100644
--- a/security/py-secretstorage/Makefile
+++ b/security/py-secretstorage/Makefile
@@ -3,7 +3,7 @@ COMMENT=		secure storing of passwords using the SecretService DBus API
 MODPY_EGG_VERSION=	3.3.3
 DISTNAME=		SecretStorage-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME:L}
-REVISION=		0
+REVISION=		1
 
 CATEGORIES=		security
 
@@ -13,10 +13,9 @@ PERMIT_PACKAGE=	Yes
 MODULES=		lang/python
 
 MODPY_PI=		Yes
-MODPY_SETUPTOOLS=	Yes
+MODPY_PYBUILD =	setuptools
 
 # there are various tests, but pretty much all need dbus
-#MODPY_PYTEST=		Yes
 NO_TEST=		Yes
 
 RUN_DEPENDS=		devel/py-jeepney${MODPY_FLAVOR} \
diff --git a/security/py-secretstorage/pkg/PLIST b/security/py-secretstorage/pkg/PLIST
index b2b149e4a8b..5067d2f40a5 100644
--- a/security/py-secretstorage/pkg/PLIST
+++ b/security/py-secretstorage/pkg/PLIST
@@ -1,20 +1,27 @@
 @conflict py-secretstorage-*
 @pkgpath security/py-secretstorage
-lib/python${MODPY_VERSION}/site-packages/SecretStorage-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/SecretStorage-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/SecretStorage-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/SecretStorage-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/SecretStorage-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/SecretStorage-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/SecretStorage-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/SecretStorage-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/SecretStorage-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/SecretStorage-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/SecretStorage-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/SecretStorage-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/secretstorage/
 lib/python${MODPY_VERSION}/site-packages/secretstorage/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/secretstorage/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/secretstorage/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/secretstorage/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/secretstorage/${MODPY_PYCACHE}collection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/secretstorage/${MODPY_PYCACHE}collection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/secretstorage/${MODPY_PYCACHE}defines.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/secretstorage/${MODPY_PYCACHE}defines.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/secretstorage/${MODPY_PYCACHE}dhcrypto.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/secretstorage/${MODPY_PYCACHE}dhcrypto.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/secretstorage/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/secretstorage/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/secretstorage/${MODPY_PYCACHE}item.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/secretstorage/${MODPY_PYCACHE}item.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/secretstorage/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/secretstorage/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/secretstorage/collection.py
 lib/python${MODPY_VERSION}/site-packages/secretstorage/defines.py
diff --git a/security/py-service_identity/Makefile b/security/py-service_identity/Makefile
index ee7afd1228e..f1281fd7ae3 100644
--- a/security/py-service_identity/Makefile
+++ b/security/py-service_identity/Makefile
@@ -2,7 +2,7 @@ COMMENT =		service identity verification for pyOpenSSL/py-cryptography
 
 MODPY_EGG_VERSION =	21.1.0
 PKGNAME =		py-${DISTNAME:S/-/_/}
-REVISION =		0
+REVISION =		1
 
 # also on pypi, but no tests present
 GH_ACCOUNT =		pyca
@@ -15,8 +15,7 @@ CATEGORIES =		security
 PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =	setuptools
 
 RUN_DEPENDS =		devel/py-asn1${MODPY_FLAVOR} \
 			devel/py-asn1-modules${MODPY_FLAVOR} \
diff --git a/security/py-service_identity/pkg/PLIST b/security/py-service_identity/pkg/PLIST
index b6830e35de7..e47a1ec325e 100644
--- a/security/py-service_identity/pkg/PLIST
+++ b/security/py-service_identity/pkg/PLIST
@@ -1,19 +1,25 @@
 @pkgpath security/py-service_identity
 lib/python${MODPY_VERSION}/site-packages/service_identity/
-lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}.dist-info/AUTHORS.rst
+lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/service_identity-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/service_identity/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}_common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}_common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}cryptography.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}cryptography.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}pyopenssl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/service_identity/${MODPY_PYCACHE}pyopenssl.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/service_identity/_common.py
 lib/python${MODPY_VERSION}/site-packages/service_identity/_compat.py
diff --git a/security/py-spake2/Makefile b/security/py-spake2/Makefile
index 74e064a4c11..0cd1a8a9508 100644
--- a/security/py-spake2/Makefile
+++ b/security/py-spake2/Makefile
@@ -3,7 +3,7 @@ COMMENT =	SPAKE2 password-authenticated key exchange (pure python)
 MODPY_EGG_VERSION =	0.8
 DISTNAME =		spake2-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		security
 
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 
 RUN_DEPENDS =		security/py-hkdf${MODPY_FLAVOR}
 
diff --git a/security/py-spake2/pkg/PLIST b/security/py-spake2/pkg/PLIST
index f1794f91b43..b8a6bb5576d 100644
--- a/security/py-spake2/pkg/PLIST
+++ b/security/py-spake2/pkg/PLIST
@@ -1,20 +1,29 @@
 lib/python${MODPY_VERSION}/site-packages/spake2/
-lib/python${MODPY_VERSION}/site-packages/spake2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/spake2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/spake2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/spake2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/spake2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/spake2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/spake2-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/spake2-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/spake2-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/spake2-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/spake2-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/spake2-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/spake2/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/spake2/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/spake2/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/spake2/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/spake2/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/spake2/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/spake2/${MODPY_PYCACHE}ed25519_basic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/spake2/${MODPY_PYCACHE}ed25519_basic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/spake2/${MODPY_PYCACHE}ed25519_group.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/spake2/${MODPY_PYCACHE}ed25519_group.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/spake2/${MODPY_PYCACHE}groups.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/spake2/${MODPY_PYCACHE}groups.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/spake2/${MODPY_PYCACHE}params.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/spake2/${MODPY_PYCACHE}params.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/spake2/${MODPY_PYCACHE}six.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/spake2/${MODPY_PYCACHE}six.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/spake2/${MODPY_PYCACHE}spake2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/spake2/${MODPY_PYCACHE}spake2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/spake2/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/spake2/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/spake2/_version.py
 lib/python${MODPY_VERSION}/site-packages/spake2/ed25519_basic.py
@@ -23,11 +32,17 @@ lib/python${MODPY_VERSION}/site-packages/spake2/groups.py
 lib/python${MODPY_VERSION}/site-packages/spake2/parameters/
 lib/python${MODPY_VERSION}/site-packages/spake2/parameters/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/spake2/parameters/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/spake2/parameters/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/spake2/parameters/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/spake2/parameters/${MODPY_PYCACHE}all.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/spake2/parameters/${MODPY_PYCACHE}all.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/spake2/parameters/${MODPY_PYCACHE}ed25519.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/spake2/parameters/${MODPY_PYCACHE}ed25519.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/spake2/parameters/${MODPY_PYCACHE}i1024.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/spake2/parameters/${MODPY_PYCACHE}i1024.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/spake2/parameters/${MODPY_PYCACHE}i2048.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/spake2/parameters/${MODPY_PYCACHE}i2048.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/spake2/parameters/${MODPY_PYCACHE}i3072.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/spake2/parameters/${MODPY_PYCACHE}i3072.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/spake2/parameters/all.py
 lib/python${MODPY_VERSION}/site-packages/spake2/parameters/ed25519.py
@@ -40,12 +55,19 @@ lib/python${MODPY_VERSION}/site-packages/spake2/spake2.py
 lib/python${MODPY_VERSION}/site-packages/spake2/test/
 lib/python${MODPY_VERSION}/site-packages/spake2/test/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/spake2/test/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/spake2/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/spake2/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/spake2/test/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/spake2/test/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/spake2/test/${MODPY_PYCACHE}myhkdf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/spake2/test/${MODPY_PYCACHE}myhkdf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/spake2/test/${MODPY_PYCACHE}test_compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/spake2/test/${MODPY_PYCACHE}test_compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/spake2/test/${MODPY_PYCACHE}test_group.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/spake2/test/${MODPY_PYCACHE}test_group.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/spake2/test/${MODPY_PYCACHE}test_spake2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/spake2/test/${MODPY_PYCACHE}test_spake2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/spake2/test/${MODPY_PYCACHE}test_utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/spake2/test/${MODPY_PYCACHE}test_utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/spake2/test/common.py
 lib/python${MODPY_VERSION}/site-packages/spake2/test/myhkdf.py
diff --git a/security/py-trustme/Makefile b/security/py-trustme/Makefile
index f1605c6558f..8c88b3a8162 100644
--- a/security/py-trustme/Makefile
+++ b/security/py-trustme/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	0.7.0
 
 DISTNAME =	trustme-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	security devel
 
@@ -16,8 +16,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PYBUILD =	setuptools
 
 FLAVORS =	python3
 FLAVOR =	python3
diff --git a/security/py-trustme/pkg/PLIST b/security/py-trustme/pkg/PLIST
index 7ab1a59c347..7dae4875876 100644
--- a/security/py-trustme/pkg/PLIST
+++ b/security/py-trustme/pkg/PLIST
@@ -1,17 +1,23 @@
 @pkgpath security/py-trustme
 lib/python${MODPY_VERSION}/site-packages/trustme/
-lib/python${MODPY_VERSION}/site-packages/trustme-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/trustme-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/trustme-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/trustme-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/trustme-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/trustme-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/trustme-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/trustme-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/trustme-${MODPY_EGG_VERSION}.dist-info/LICENSE.APACHE2
+lib/python${MODPY_VERSION}/site-packages/trustme-${MODPY_EGG_VERSION}.dist-info/LICENSE.MIT
+lib/python${MODPY_VERSION}/site-packages/trustme-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/trustme-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/trustme-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/trustme-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/trustme/__init__.py
 lib/python${MODPY_VERSION}/site-packages/trustme/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/trustme/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/trustme/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/trustme/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/trustme/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/trustme/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/trustme/${MODPY_PYCACHE}_cli.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/trustme/${MODPY_PYCACHE}_cli.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/trustme/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/trustme/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/trustme/_cli.py
 lib/python${MODPY_VERSION}/site-packages/trustme/_version.py
diff --git a/security/routersploit/Makefile b/security/routersploit/Makefile
index 053d086fcf7..959b0624b34 100644
--- a/security/routersploit/Makefile
+++ b/security/routersploit/Makefile
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION = 3.4.0
 GH_ACCOUNT =	threat9
 GH_PROJECT =	routersploit
 GH_TAGNAME =	v${MODPY_EGG_VERSION}
-REVISION =	4
+REVISION =	5
 
 CATEGORIES =	security net
 
@@ -14,7 +14,7 @@ MAINTAINER =		Sebastian Reitenbach <sebastia@openbsd.org>
 PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 RUN_DEPENDS =		devel/py-future${MODPY_FLAVOR} \
 			net/py-snmp${MODPY_FLAVOR} \
 			security/py-cryptodome${MODPY_FLAVOR} \
diff --git a/security/routersploit/pkg/PLIST b/security/routersploit/pkg/PLIST
index ecd12d6197f..bfe807573ee 100644
--- a/security/routersploit/pkg/PLIST
+++ b/security/routersploit/pkg/PLIST
@@ -1,29 +1,37 @@
 bin/rsf.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/
-lib/python${MODPY_VERSION}/site-packages/routersploit-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/routersploit-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/routersploit-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/routersploit-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/routersploit-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/routersploit-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/routersploit-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/routersploit-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/routersploit-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/routersploit-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/routersploit-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/routersploit-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/routersploit/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/${MODPY_PYCACHE}interpreter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/${MODPY_PYCACHE}interpreter.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/core/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/core/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/bluetooth/
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/bluetooth/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/core/bluetooth/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/core/bluetooth/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/bluetooth/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/core/bluetooth/${MODPY_PYCACHE}btle_client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/bluetooth/${MODPY_PYCACHE}btle_client.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/bluetooth/btle/
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/bluetooth/btle/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/core/bluetooth/btle/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/core/bluetooth/btle/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/bluetooth/btle/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/core/bluetooth/btle/${MODPY_PYCACHE}btle_device.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/bluetooth/btle/${MODPY_PYCACHE}btle_device.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/core/bluetooth/btle/${MODPY_PYCACHE}btle_scanner.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/bluetooth/btle/${MODPY_PYCACHE}btle_scanner.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/bluetooth/btle/btle_device.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/bluetooth/btle/btle_scanner.py
@@ -31,14 +39,23 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/core/bluetooth/btle_client
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/exploit/
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/exploit/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/core/exploit/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/core/exploit/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/exploit/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/core/exploit/${MODPY_PYCACHE}encoders.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/exploit/${MODPY_PYCACHE}encoders.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/core/exploit/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/exploit/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/core/exploit/${MODPY_PYCACHE}exploit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/exploit/${MODPY_PYCACHE}exploit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/core/exploit/${MODPY_PYCACHE}option.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/exploit/${MODPY_PYCACHE}option.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/core/exploit/${MODPY_PYCACHE}payloads.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/exploit/${MODPY_PYCACHE}payloads.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/core/exploit/${MODPY_PYCACHE}printer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/exploit/${MODPY_PYCACHE}printer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/core/exploit/${MODPY_PYCACHE}shell.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/exploit/${MODPY_PYCACHE}shell.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/core/exploit/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/exploit/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/exploit/encoders.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/exploit/exceptions.py
@@ -51,81 +68,108 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/core/exploit/utils.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/ftp/
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/ftp/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/core/ftp/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/core/ftp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/ftp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/core/ftp/${MODPY_PYCACHE}ftp_client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/ftp/${MODPY_PYCACHE}ftp_client.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/ftp/ftp_client.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/http/
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/http/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/core/http/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/core/http/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/http/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/core/http/${MODPY_PYCACHE}http_client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/http/${MODPY_PYCACHE}http_client.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/http/http_client.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/snmp/
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/snmp/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/core/snmp/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/core/snmp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/snmp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/core/snmp/${MODPY_PYCACHE}snmp_client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/snmp/${MODPY_PYCACHE}snmp_client.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/snmp/snmp_client.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/ssh/
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/ssh/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/core/ssh/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/core/ssh/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/ssh/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/core/ssh/${MODPY_PYCACHE}ssh_client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/ssh/${MODPY_PYCACHE}ssh_client.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/ssh/ssh_client.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/tcp/
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/tcp/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/core/tcp/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/core/tcp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/tcp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/core/tcp/${MODPY_PYCACHE}tcp_client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/tcp/${MODPY_PYCACHE}tcp_client.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/tcp/tcp_client.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/telnet/
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/telnet/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/core/telnet/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/core/telnet/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/telnet/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/core/telnet/${MODPY_PYCACHE}telnet_client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/telnet/${MODPY_PYCACHE}telnet_client.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/telnet/telnet_client.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/udp/
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/udp/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/core/udp/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/core/udp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/udp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/core/udp/${MODPY_PYCACHE}udp_client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/udp/${MODPY_PYCACHE}udp_client.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/core/udp/udp_client.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/interpreter.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/libs/
 lib/python${MODPY_VERSION}/site-packages/routersploit/libs/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/libs/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/libs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/libs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/libs/apiros/
 lib/python${MODPY_VERSION}/site-packages/routersploit/libs/apiros/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/libs/apiros/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/libs/apiros/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/libs/apiros/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/libs/apiros/${MODPY_PYCACHE}apiros_client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/libs/apiros/${MODPY_PYCACHE}apiros_client.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/libs/apiros/apiros_client.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/libs/lzs/
 lib/python${MODPY_VERSION}/site-packages/routersploit/libs/lzs/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/libs/lzs/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/libs/lzs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/libs/lzs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/libs/lzs/${MODPY_PYCACHE}lzs.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/libs/lzs/${MODPY_PYCACHE}lzs.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/libs/lzs/lzs.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/acti/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/acti/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/acti/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/acti/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/acti/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/acti/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/acti/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/acti/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/acti/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/acti/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/acti/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/acti/${MODPY_PYCACHE}webinterface_http_form_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/acti/${MODPY_PYCACHE}webinterface_http_form_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/acti/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/acti/ssh_default_creds.py
@@ -134,9 +178,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/acti
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/american_dynamics/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/american_dynamics/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/american_dynamics/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/american_dynamics/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/american_dynamics/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/american_dynamics/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/american_dynamics/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/american_dynamics/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/american_dynamics/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/american_dynamics/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/american_dynamics/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/american_dynamics/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/american_dynamics/ssh_default_creds.py
@@ -144,9 +192,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/amer
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/arecont/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/arecont/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/arecont/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/arecont/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/arecont/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/arecont/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/arecont/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/arecont/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/arecont/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/arecont/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/arecont/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/arecont/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/arecont/ssh_default_creds.py
@@ -154,9 +206,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/arec
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/avigilon/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/avigilon/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/avigilon/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/avigilon/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/avigilon/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/avigilon/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/avigilon/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/avigilon/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/avigilon/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/avigilon/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/avigilon/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/avigilon/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/avigilon/ssh_default_creds.py
@@ -164,9 +220,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/avig
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/avtech/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/avtech/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/avtech/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/avtech/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/avtech/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/avtech/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/avtech/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/avtech/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/avtech/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/avtech/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/avtech/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/avtech/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/avtech/ssh_default_creds.py
@@ -174,10 +234,15 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/avte
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/axis/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/axis/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/axis/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/axis/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/axis/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/axis/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/axis/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/axis/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/axis/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/axis/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/axis/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/axis/${MODPY_PYCACHE}webinterface_http_auth_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/axis/${MODPY_PYCACHE}webinterface_http_auth_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/axis/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/axis/ssh_default_creds.py
@@ -186,10 +251,15 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/axis
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/basler/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/basler/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/basler/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/basler/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/basler/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/basler/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/basler/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/basler/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/basler/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/basler/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/basler/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/basler/${MODPY_PYCACHE}webinterface_http_form_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/basler/${MODPY_PYCACHE}webinterface_http_form_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/basler/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/basler/ssh_default_creds.py
@@ -198,10 +268,15 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/basl
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/brickcom/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/brickcom/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/brickcom/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/brickcom/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/brickcom/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/brickcom/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/brickcom/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/brickcom/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/brickcom/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/brickcom/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/brickcom/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/brickcom/${MODPY_PYCACHE}webinterface_http_auth_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/brickcom/${MODPY_PYCACHE}webinterface_http_auth_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/brickcom/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/brickcom/ssh_default_creds.py
@@ -210,10 +285,15 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/bric
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/canon/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/canon/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/canon/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/canon/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/canon/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/canon/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/canon/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/canon/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/canon/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/canon/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/canon/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/canon/${MODPY_PYCACHE}webinterface_http_auth_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/canon/${MODPY_PYCACHE}webinterface_http_auth_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/canon/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/canon/ssh_default_creds.py
@@ -222,9 +302,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/cano
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/cisco/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/cisco/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/cisco/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/cisco/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/cisco/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/cisco/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/cisco/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/cisco/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/cisco/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/cisco/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/cisco/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/cisco/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/cisco/ssh_default_creds.py
@@ -232,9 +316,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/cisc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/dlink/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/dlink/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/dlink/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/dlink/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/dlink/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/dlink/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/dlink/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/dlink/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/dlink/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/dlink/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/dlink/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/dlink/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/dlink/ssh_default_creds.py
@@ -242,9 +330,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/dlin
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/geovision/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/geovision/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/geovision/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/geovision/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/geovision/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/geovision/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/geovision/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/geovision/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/geovision/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/geovision/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/geovision/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/geovision/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/geovision/ssh_default_creds.py
@@ -252,9 +344,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/geov
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/grandstream/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/grandstream/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/grandstream/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/grandstream/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/grandstream/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/grandstream/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/grandstream/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/grandstream/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/grandstream/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/grandstream/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/grandstream/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/grandstream/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/grandstream/ssh_default_creds.py
@@ -262,9 +358,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/gran
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/hikvision/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/hikvision/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/hikvision/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/hikvision/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/hikvision/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/hikvision/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/hikvision/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/hikvision/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/hikvision/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/hikvision/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/hikvision/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/hikvision/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/hikvision/ssh_default_creds.py
@@ -272,9 +372,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/hikv
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/honeywell/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/honeywell/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/honeywell/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/honeywell/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/honeywell/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/honeywell/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/honeywell/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/honeywell/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/honeywell/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/honeywell/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/honeywell/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/honeywell/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/honeywell/ssh_default_creds.py
@@ -282,9 +386,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/hone
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/iqinvision/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/iqinvision/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/iqinvision/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/iqinvision/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/iqinvision/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/iqinvision/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/iqinvision/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/iqinvision/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/iqinvision/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/iqinvision/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/iqinvision/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/iqinvision/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/iqinvision/ssh_default_creds.py
@@ -292,9 +400,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/iqin
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/jvc/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/jvc/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/jvc/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/jvc/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/jvc/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/jvc/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/jvc/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/jvc/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/jvc/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/jvc/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/jvc/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/jvc/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/jvc/ssh_default_creds.py
@@ -302,9 +414,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/jvc/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/mobotix/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/mobotix/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/mobotix/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/mobotix/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/mobotix/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/mobotix/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/mobotix/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/mobotix/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/mobotix/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/mobotix/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/mobotix/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/mobotix/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/mobotix/ssh_default_creds.py
@@ -312,9 +428,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/mobo
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/samsung/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/samsung/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/samsung/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/samsung/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/samsung/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/samsung/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/samsung/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/samsung/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/samsung/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/samsung/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/samsung/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/samsung/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/samsung/ssh_default_creds.py
@@ -322,9 +442,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/sams
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/sentry360/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/sentry360/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/sentry360/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/sentry360/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/sentry360/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/sentry360/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/sentry360/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/sentry360/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/sentry360/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/sentry360/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/sentry360/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/sentry360/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/sentry360/ssh_default_creds.py
@@ -332,9 +456,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/sent
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/siemens/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/siemens/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/siemens/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/siemens/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/siemens/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/siemens/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/siemens/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/siemens/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/siemens/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/siemens/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/siemens/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/siemens/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/siemens/ssh_default_creds.py
@@ -342,9 +470,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/siem
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/speco/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/speco/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/speco/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/speco/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/speco/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/speco/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/speco/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/speco/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/speco/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/speco/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/speco/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/speco/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/speco/ssh_default_creds.py
@@ -352,9 +484,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/spec
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/stardot/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/stardot/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/stardot/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/stardot/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/stardot/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/stardot/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/stardot/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/stardot/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/stardot/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/stardot/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/stardot/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/stardot/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/stardot/ssh_default_creds.py
@@ -362,9 +498,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/star
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/vacron/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/vacron/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/vacron/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/vacron/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/vacron/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/vacron/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/vacron/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/vacron/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/vacron/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/vacron/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/vacron/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/vacron/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/vacron/ssh_default_creds.py
@@ -372,9 +512,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/vacr
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/videoiq/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/videoiq/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/videoiq/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/videoiq/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/videoiq/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/videoiq/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/videoiq/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/videoiq/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/videoiq/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/videoiq/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/videoiq/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/videoiq/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/videoiq/ssh_default_creds.py
@@ -382,15 +526,25 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/cameras/vide
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/generic/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/generic/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/generic/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/generic/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/generic/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/generic/${MODPY_PYCACHE}ftp_bruteforce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/generic/${MODPY_PYCACHE}ftp_bruteforce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/generic/${MODPY_PYCACHE}ftp_default.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/generic/${MODPY_PYCACHE}ftp_default.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/generic/${MODPY_PYCACHE}http_basic_digest_bruteforce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/generic/${MODPY_PYCACHE}http_basic_digest_bruteforce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/generic/${MODPY_PYCACHE}http_basic_digest_default.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/generic/${MODPY_PYCACHE}http_basic_digest_default.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/generic/${MODPY_PYCACHE}snmp_bruteforce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/generic/${MODPY_PYCACHE}snmp_bruteforce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/generic/${MODPY_PYCACHE}ssh_bruteforce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/generic/${MODPY_PYCACHE}ssh_bruteforce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/generic/${MODPY_PYCACHE}ssh_default.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/generic/${MODPY_PYCACHE}ssh_default.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/generic/${MODPY_PYCACHE}telnet_bruteforce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/generic/${MODPY_PYCACHE}telnet_bruteforce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/generic/${MODPY_PYCACHE}telnet_default.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/generic/${MODPY_PYCACHE}telnet_default.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/generic/ftp_bruteforce.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/generic/ftp_default.py
@@ -404,18 +558,25 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/generic/teln
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/printers/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/printers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/printers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/printers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/printers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asmax/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asmax/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asmax/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asmax/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asmax/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asmax/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asmax/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asmax/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asmax/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asmax/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asmax/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asmax/${MODPY_PYCACHE}webinterface_http_auth_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asmax/${MODPY_PYCACHE}webinterface_http_auth_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asmax/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asmax/ssh_default_creds.py
@@ -424,9 +585,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asma
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asus/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asus/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asus/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asus/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asus/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asus/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asus/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asus/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asus/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asus/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asus/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asus/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asus/ssh_default_creds.py
@@ -434,9 +599,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/asus
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/belkin/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/belkin/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/belkin/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/belkin/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/belkin/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/belkin/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/belkin/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/belkin/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/belkin/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/belkin/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/belkin/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/belkin/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/belkin/ssh_default_creds.py
@@ -444,9 +613,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/belk
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/bhu/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/bhu/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/bhu/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/bhu/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/bhu/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/bhu/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/bhu/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/bhu/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/bhu/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/bhu/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/bhu/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/bhu/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/bhu/ssh_default_creds.py
@@ -454,9 +627,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/bhu/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/billion/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/billion/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/billion/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/billion/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/billion/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/billion/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/billion/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/billion/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/billion/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/billion/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/billion/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/billion/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/billion/ssh_default_creds.py
@@ -464,9 +641,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/bill
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/cisco/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/cisco/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/cisco/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/cisco/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/cisco/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/cisco/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/cisco/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/cisco/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/cisco/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/cisco/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/cisco/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/cisco/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/cisco/ssh_default_creds.py
@@ -474,9 +655,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/cisc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/comtrend/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/comtrend/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/comtrend/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/comtrend/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/comtrend/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/comtrend/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/comtrend/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/comtrend/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/comtrend/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/comtrend/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/comtrend/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/comtrend/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/comtrend/ssh_default_creds.py
@@ -484,9 +669,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/comt
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/dlink/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/dlink/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/dlink/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/dlink/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/dlink/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/dlink/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/dlink/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/dlink/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/dlink/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/dlink/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/dlink/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/dlink/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/dlink/ssh_default_creds.py
@@ -494,9 +683,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/dlin
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/fortinet/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/fortinet/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/fortinet/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/fortinet/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/fortinet/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/fortinet/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/fortinet/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/fortinet/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/fortinet/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/fortinet/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/fortinet/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/fortinet/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/fortinet/ssh_default_creds.py
@@ -504,9 +697,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/fort
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/huawei/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/huawei/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/huawei/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/huawei/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/huawei/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/huawei/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/huawei/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/huawei/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/huawei/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/huawei/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/huawei/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/huawei/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/huawei/ssh_default_creds.py
@@ -514,9 +711,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/huaw
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/ipfire/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/ipfire/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/ipfire/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/ipfire/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/ipfire/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/ipfire/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/ipfire/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/ipfire/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/ipfire/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/ipfire/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/ipfire/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/ipfire/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/ipfire/ssh_default_creds.py
@@ -524,9 +725,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/ipfi
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/juniper/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/juniper/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/juniper/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/juniper/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/juniper/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/juniper/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/juniper/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/juniper/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/juniper/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/juniper/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/juniper/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/juniper/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/juniper/ssh_default_creds.py
@@ -534,9 +739,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/juni
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/linksys/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/linksys/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/linksys/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/linksys/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/linksys/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/linksys/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/linksys/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/linksys/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/linksys/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/linksys/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/linksys/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/linksys/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/linksys/ssh_default_creds.py
@@ -544,10 +753,15 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/link
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/mikrotik/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/mikrotik/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/mikrotik/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/mikrotik/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/mikrotik/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/mikrotik/${MODPY_PYCACHE}api_ros_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/mikrotik/${MODPY_PYCACHE}api_ros_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/mikrotik/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/mikrotik/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/mikrotik/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/mikrotik/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/mikrotik/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/mikrotik/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/mikrotik/api_ros_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/mikrotik/ftp_default_creds.py
@@ -556,9 +770,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/mikr
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/movistar/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/movistar/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/movistar/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/movistar/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/movistar/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/movistar/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/movistar/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/movistar/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/movistar/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/movistar/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/movistar/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/movistar/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/movistar/ssh_default_creds.py
@@ -566,9 +784,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/movi
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netcore/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netcore/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netcore/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netcore/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netcore/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netcore/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netcore/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netcore/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netcore/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netcore/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netcore/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netcore/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netcore/ssh_default_creds.py
@@ -576,9 +798,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netgear/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netgear/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netgear/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netgear/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netgear/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netgear/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netgear/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netgear/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netgear/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netgear/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netgear/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netgear/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netgear/ssh_default_creds.py
@@ -586,9 +812,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netg
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netsys/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netsys/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netsys/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netsys/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netsys/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netsys/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netsys/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netsys/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netsys/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netsys/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netsys/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netsys/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/netsys/ssh_default_creds.py
@@ -596,17 +826,24 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/nets
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/pfsense/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/pfsense/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/pfsense/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/pfsense/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/pfsense/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/pfsense/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/pfsense/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/pfsense/${MODPY_PYCACHE}webinterface_http_form_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/pfsense/${MODPY_PYCACHE}webinterface_http_form_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/pfsense/ssh_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/pfsense/webinterface_http_form_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/technicolor/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/technicolor/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/technicolor/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/technicolor/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/technicolor/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/technicolor/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/technicolor/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/technicolor/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/technicolor/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/technicolor/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/technicolor/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/technicolor/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/technicolor/ssh_default_creds.py
@@ -614,9 +851,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/tech
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/thomson/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/thomson/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/thomson/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/thomson/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/thomson/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/thomson/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/thomson/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/thomson/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/thomson/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/thomson/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/thomson/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/thomson/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/thomson/ssh_default_creds.py
@@ -624,9 +865,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/thom
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/tplink/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/tplink/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/tplink/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/tplink/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/tplink/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/tplink/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/tplink/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/tplink/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/tplink/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/tplink/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/tplink/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/tplink/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/tplink/ssh_default_creds.py
@@ -634,9 +879,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/tpli
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/ubiquiti/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/ubiquiti/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/ubiquiti/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/ubiquiti/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/ubiquiti/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/ubiquiti/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/ubiquiti/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/ubiquiti/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/ubiquiti/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/ubiquiti/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/ubiquiti/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/ubiquiti/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/ubiquiti/ssh_default_creds.py
@@ -644,9 +893,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/ubiq
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/zte/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/zte/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/zte/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/zte/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/zte/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/zte/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/zte/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/zte/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/zte/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/zte/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/zte/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/zte/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/zte/ssh_default_creds.py
@@ -654,9 +907,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/zte/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/zyxel/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/zyxel/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/zyxel/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/zyxel/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/zyxel/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/zyxel/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/zyxel/${MODPY_PYCACHE}ftp_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/zyxel/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/zyxel/${MODPY_PYCACHE}ssh_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/zyxel/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/zyxel/${MODPY_PYCACHE}telnet_default_creds.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/zyxel/ftp_default_creds.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/zyxel/ssh_default_creds.py
@@ -664,69 +921,92 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/creds/routers/zyxe
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/encoders/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/encoders/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/encoders/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/encoders/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/encoders/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/encoders/php/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/encoders/php/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/encoders/php/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/encoders/php/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/encoders/php/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/encoders/php/${MODPY_PYCACHE}base64.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/encoders/php/${MODPY_PYCACHE}base64.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/encoders/php/${MODPY_PYCACHE}hex.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/encoders/php/${MODPY_PYCACHE}hex.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/encoders/php/base64.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/encoders/php/hex.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/encoders/python/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/encoders/python/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/encoders/python/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/encoders/python/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/encoders/python/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/encoders/python/${MODPY_PYCACHE}base64.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/encoders/python/${MODPY_PYCACHE}base64.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/encoders/python/${MODPY_PYCACHE}hex.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/encoders/python/${MODPY_PYCACHE}hex.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/encoders/python/base64.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/encoders/python/hex.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/avigilon/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/avigilon/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/avigilon/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/avigilon/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/avigilon/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/avigilon/${MODPY_PYCACHE}videoiq_camera_path_traversal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/avigilon/${MODPY_PYCACHE}videoiq_camera_path_traversal.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/avigilon/videoiq_camera_path_traversal.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/brickcom/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/brickcom/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/brickcom/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/brickcom/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/brickcom/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/brickcom/${MODPY_PYCACHE}corp_network_cameras_conf_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/brickcom/${MODPY_PYCACHE}corp_network_cameras_conf_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/brickcom/${MODPY_PYCACHE}users_cgi_creds_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/brickcom/${MODPY_PYCACHE}users_cgi_creds_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/brickcom/corp_network_cameras_conf_disclosure.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/brickcom/users_cgi_creds_disclosure.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/cisco/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/cisco/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/cisco/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/cisco/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/cisco/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/cisco/${MODPY_PYCACHE}video_surv_path_traversal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/cisco/${MODPY_PYCACHE}video_surv_path_traversal.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/cisco/video_surv_path_traversal.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/dlink/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/dlink/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/dlink/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/dlink/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/dlink/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/dlink/${MODPY_PYCACHE}dcs_930l_932l_auth_bypass.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/dlink/${MODPY_PYCACHE}dcs_930l_932l_auth_bypass.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/dlink/dcs_930l_932l_auth_bypass.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/grandstream/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/grandstream/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/grandstream/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/grandstream/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/grandstream/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/grandstream/${MODPY_PYCACHE}gxv3611hd_ip_camera_backdoor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/grandstream/${MODPY_PYCACHE}gxv3611hd_ip_camera_backdoor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/grandstream/${MODPY_PYCACHE}gxv3611hd_ip_camera_sqli.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/grandstream/${MODPY_PYCACHE}gxv3611hd_ip_camera_sqli.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/grandstream/gxv3611hd_ip_camera_backdoor.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/grandstream/gxv3611hd_ip_camera_sqli.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/honeywell/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/honeywell/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/honeywell/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/honeywell/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/honeywell/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/honeywell/${MODPY_PYCACHE}hicc_1100pt_password_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/honeywell/${MODPY_PYCACHE}hicc_1100pt_password_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/honeywell/hicc_1100pt_password_disclosure.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/multi/
@@ -734,11 +1014,17 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/m
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/multi/P2P_wificam_rce.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/multi/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/multi/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/multi/${MODPY_PYCACHE}P2P_wificam_credential_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/multi/${MODPY_PYCACHE}P2P_wificam_credential_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/multi/${MODPY_PYCACHE}P2P_wificam_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/multi/${MODPY_PYCACHE}P2P_wificam_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/multi/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/multi/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/multi/${MODPY_PYCACHE}dvr_creds_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/multi/${MODPY_PYCACHE}dvr_creds_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/multi/${MODPY_PYCACHE}jvc_vanderbilt_honeywell_path_traversal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/multi/${MODPY_PYCACHE}jvc_vanderbilt_honeywell_path_traversal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/multi/${MODPY_PYCACHE}netwave_ip_camera_information_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/multi/${MODPY_PYCACHE}netwave_ip_camera_information_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/multi/dvr_creds_disclosure.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/multi/jvc_vanderbilt_honeywell_path_traversal.py
@@ -746,27 +1032,37 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/m
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/mvpower/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/mvpower/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/mvpower/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/mvpower/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/mvpower/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/mvpower/${MODPY_PYCACHE}dvr_jaws_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/mvpower/${MODPY_PYCACHE}dvr_jaws_rce.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/mvpower/dvr_jaws_rce.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/siemens/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/siemens/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/siemens/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/siemens/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/siemens/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/siemens/${MODPY_PYCACHE}cvms2025_credentials_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/siemens/${MODPY_PYCACHE}cvms2025_credentials_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/siemens/cvms2025_credentials_disclosure.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/xiongmai/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/xiongmai/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/xiongmai/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/xiongmai/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/xiongmai/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/xiongmai/${MODPY_PYCACHE}uc_httpd_path_traversal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/xiongmai/${MODPY_PYCACHE}uc_httpd_path_traversal.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/cameras/xiongmai/uc_httpd_path_traversal.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/generic/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/generic/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/generic/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/generic/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/generic/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/generic/${MODPY_PYCACHE}heartbleed.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/generic/${MODPY_PYCACHE}heartbleed.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/generic/${MODPY_PYCACHE}shellshock.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/generic/${MODPY_PYCACHE}shellshock.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/generic/${MODPY_PYCACHE}ssh_auth_keys.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/generic/${MODPY_PYCACHE}ssh_auth_keys.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/generic/heartbleed.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/generic/shellshock.py
@@ -774,23 +1070,30 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/generic/s
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/misc/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/misc/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/misc/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/misc/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/misc/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/misc/asus/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/misc/asus/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/misc/asus/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/misc/asus/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/misc/asus/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/misc/asus/${MODPY_PYCACHE}b1m_projector_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/misc/asus/${MODPY_PYCACHE}b1m_projector_rce.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/misc/asus/b1m_projector_rce.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/misc/miele/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/misc/miele/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/misc/miele/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/misc/miele/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/misc/miele/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/misc/miele/${MODPY_PYCACHE}pg8528_path_traversal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/misc/miele/${MODPY_PYCACHE}pg8528_path_traversal.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/misc/miele/pg8528_path_traversal.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/misc/wepresent/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/misc/wepresent/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/misc/wepresent/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/misc/wepresent/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/misc/wepresent/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/misc/wepresent/${MODPY_PYCACHE}wipg1000_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/misc/wepresent/${MODPY_PYCACHE}wipg1000_rce.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/misc/wepresent/wipg1000_rce.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/
@@ -798,18 +1101,27 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/2
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/2wire/4011g_5012nv_path_traversal.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/2wire/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/2wire/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/2wire/${MODPY_PYCACHE}4011g_5012nv_path_traversal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/2wire/${MODPY_PYCACHE}4011g_5012nv_path_traversal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/2wire/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/2wire/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/2wire/${MODPY_PYCACHE}gateway_auth_bypass.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/2wire/${MODPY_PYCACHE}gateway_auth_bypass.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/2wire/gateway_auth_bypass.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/3com/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/3com/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/3com/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/3com/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/3com/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/3com/${MODPY_PYCACHE}ap8760_password_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/3com/${MODPY_PYCACHE}ap8760_password_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/3com/${MODPY_PYCACHE}imc_info_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/3com/${MODPY_PYCACHE}imc_info_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/3com/${MODPY_PYCACHE}imc_path_traversal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/3com/${MODPY_PYCACHE}imc_path_traversal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/3com/${MODPY_PYCACHE}officeconnect_info_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/3com/${MODPY_PYCACHE}officeconnect_info_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/3com/${MODPY_PYCACHE}officeconnect_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/3com/${MODPY_PYCACHE}officeconnect_rce.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/3com/ap8760_password_disclosure.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/3com/imc_info_disclosure.py
@@ -818,21 +1130,29 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/3
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/3com/officeconnect_rce.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/asmax/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/asmax/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/asmax/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/asmax/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/asmax/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/asmax/${MODPY_PYCACHE}ar_1004g_password_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/asmax/${MODPY_PYCACHE}ar_1004g_password_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/asmax/${MODPY_PYCACHE}ar_804_gu_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/asmax/${MODPY_PYCACHE}ar_804_gu_rce.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/asmax/ar_1004g_password_disclosure.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/asmax/ar_804_gu_rce.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/asus/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/asus/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/asus/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/asus/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/asus/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/asus/${MODPY_PYCACHE}asuswrt_lan_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/asus/${MODPY_PYCACHE}asuswrt_lan_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/asus/${MODPY_PYCACHE}infosvr_backdoor_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/asus/${MODPY_PYCACHE}infosvr_backdoor_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/asus/${MODPY_PYCACHE}rt_n16_password_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/asus/${MODPY_PYCACHE}rt_n16_password_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/asus/asuswrt_lan_rce.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/asus/infosvr_backdoor_rce.py
@@ -840,12 +1160,19 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/a
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/belkin/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/belkin/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/belkin/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/belkin/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/belkin/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/belkin/${MODPY_PYCACHE}auth_bypass.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/belkin/${MODPY_PYCACHE}auth_bypass.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/belkin/${MODPY_PYCACHE}g_n150_password_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/belkin/${MODPY_PYCACHE}g_n150_password_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/belkin/${MODPY_PYCACHE}g_plus_info_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/belkin/${MODPY_PYCACHE}g_plus_info_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/belkin/${MODPY_PYCACHE}n150_path_traversal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/belkin/${MODPY_PYCACHE}n150_path_traversal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/belkin/${MODPY_PYCACHE}n750_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/belkin/${MODPY_PYCACHE}n750_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/belkin/${MODPY_PYCACHE}play_max_prce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/belkin/${MODPY_PYCACHE}play_max_prce.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/belkin/auth_bypass.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/belkin/g_n150_password_disclosure.py
@@ -856,29 +1183,44 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/b
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/bhu/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/bhu/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/bhu/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/bhu/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/bhu/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/bhu/${MODPY_PYCACHE}bhu_urouter_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/bhu/${MODPY_PYCACHE}bhu_urouter_rce.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/bhu/bhu_urouter_rce.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/billion/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/billion/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/billion/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/billion/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/billion/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/billion/${MODPY_PYCACHE}billion_5200w_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/billion/${MODPY_PYCACHE}billion_5200w_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/billion/${MODPY_PYCACHE}billion_7700nr4_password_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/billion/${MODPY_PYCACHE}billion_7700nr4_password_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/billion/billion_5200w_rce.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/billion/billion_7700nr4_password_disclosure.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/cisco/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/cisco/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/cisco/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/cisco/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/cisco/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/cisco/${MODPY_PYCACHE}catalyst_2960_rocem.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/cisco/${MODPY_PYCACHE}catalyst_2960_rocem.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/cisco/${MODPY_PYCACHE}dpc2420_info_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/cisco/${MODPY_PYCACHE}dpc2420_info_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/cisco/${MODPY_PYCACHE}firepower_management60_path_traversal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/cisco/${MODPY_PYCACHE}firepower_management60_path_traversal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/cisco/${MODPY_PYCACHE}firepower_management60_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/cisco/${MODPY_PYCACHE}firepower_management60_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/cisco/${MODPY_PYCACHE}ios_http_authorization_bypass.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/cisco/${MODPY_PYCACHE}ios_http_authorization_bypass.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/cisco/${MODPY_PYCACHE}secure_acs_bypass.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/cisco/${MODPY_PYCACHE}secure_acs_bypass.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/cisco/${MODPY_PYCACHE}ucm_info_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/cisco/${MODPY_PYCACHE}ucm_info_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/cisco/${MODPY_PYCACHE}ucs_manager_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/cisco/${MODPY_PYCACHE}ucs_manager_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/cisco/${MODPY_PYCACHE}unified_multi_path_traversal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/cisco/${MODPY_PYCACHE}unified_multi_path_traversal.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/cisco/catalyst_2960_rocem.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/cisco/dpc2420_info_disclosure.py
@@ -892,38 +1234,67 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/c
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/comtrend/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/comtrend/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/comtrend/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/comtrend/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/comtrend/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/comtrend/${MODPY_PYCACHE}ct_5361t_password_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/comtrend/${MODPY_PYCACHE}ct_5361t_password_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/comtrend/ct_5361t_password_disclosure.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dcs_930l_auth_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dcs_930l_auth_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dgs_1510_add_user.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dgs_1510_add_user.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dir_300_320_600_615_info_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dir_300_320_600_615_info_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dir_300_320_615_auth_bypass.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dir_300_320_615_auth_bypass.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dir_300_600_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dir_300_600_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dir_300_645_815_upnp_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dir_300_645_815_upnp_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dir_645_815_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dir_645_815_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dir_645_password_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dir_645_password_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dir_815_850l_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dir_815_850l_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dir_825_path_traversal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dir_825_path_traversal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dir_850l_creds_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dir_850l_creds_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dir_8xx_password_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dir_8xx_password_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dns_320l_327l_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dns_320l_327l_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dsl_2640b_dns_change.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dsl_2640b_dns_change.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dsl_2730_2750_path_traversal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dsl_2730_2750_path_traversal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dsl_2730b_2780b_526b_dns_change.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dsl_2730b_2780b_526b_dns_change.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dsl_2740r_dns_change.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dsl_2740r_dns_change.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dsl_2750b_info_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dsl_2750b_info_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dsl_2750b_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dsl_2750b_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dsp_w110_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dsp_w110_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dvg_n5402sp_path_traversal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dvg_n5402sp_path_traversal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dwl_3200ap_password_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dwl_3200ap_password_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dwr_932_info_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dwr_932_info_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dwr_932b_backdoor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}dwr_932b_backdoor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}multi_hedwig_cgi_exec.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}multi_hedwig_cgi_exec.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}multi_hnap_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/${MODPY_PYCACHE}multi_hnap_rce.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/dcs_930l_auth_rce.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/dlink/dgs_1510_add_user.py
@@ -954,16 +1325,23 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/d
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/fortinet/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/fortinet/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/fortinet/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/fortinet/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/fortinet/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/fortinet/${MODPY_PYCACHE}fortigate_os_backdoor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/fortinet/${MODPY_PYCACHE}fortigate_os_backdoor.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/fortinet/fortigate_os_backdoor.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/huawei/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/huawei/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/huawei/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/huawei/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/huawei/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/huawei/${MODPY_PYCACHE}e5331_mifi_info_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/huawei/${MODPY_PYCACHE}e5331_mifi_info_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/huawei/${MODPY_PYCACHE}hg520_info_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/huawei/${MODPY_PYCACHE}hg520_info_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/huawei/${MODPY_PYCACHE}hg530_hg520b_password_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/huawei/${MODPY_PYCACHE}hg530_hg520b_password_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/huawei/${MODPY_PYCACHE}hg866_password_change.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/huawei/${MODPY_PYCACHE}hg866_password_change.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/huawei/e5331_mifi_info_disclosure.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/huawei/hg520_info_disclosure.py
@@ -972,9 +1350,13 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/h
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/ipfire/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/ipfire/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/ipfire/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/ipfire/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/ipfire/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/ipfire/${MODPY_PYCACHE}ipfire_oinkcode_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/ipfire/${MODPY_PYCACHE}ipfire_oinkcode_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/ipfire/${MODPY_PYCACHE}ipfire_proxy_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/ipfire/${MODPY_PYCACHE}ipfire_proxy_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/ipfire/${MODPY_PYCACHE}ipfire_shellshock.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/ipfire/${MODPY_PYCACHE}ipfire_shellshock.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/ipfire/ipfire_oinkcode_rce.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/ipfire/ipfire_proxy_rce.py
@@ -983,11 +1365,17 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/l
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/linksys/1500_2500_rce.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/linksys/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/linksys/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/linksys/${MODPY_PYCACHE}1500_2500_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/linksys/${MODPY_PYCACHE}1500_2500_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/linksys/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/linksys/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/linksys/${MODPY_PYCACHE}eseries_themoon_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/linksys/${MODPY_PYCACHE}eseries_themoon_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/linksys/${MODPY_PYCACHE}smartwifi_password_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/linksys/${MODPY_PYCACHE}smartwifi_password_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/linksys/${MODPY_PYCACHE}wap54gv3_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/linksys/${MODPY_PYCACHE}wap54gv3_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/linksys/${MODPY_PYCACHE}wrt100_110_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/linksys/${MODPY_PYCACHE}wrt100_110_rce.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/linksys/eseries_themoon_rce.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/linksys/smartwifi_password_disclosure.py
@@ -996,25 +1384,36 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/l
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/mikrotik/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/mikrotik/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/mikrotik/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/mikrotik/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/mikrotik/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/mikrotik/${MODPY_PYCACHE}routeros_jailbreak.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/mikrotik/${MODPY_PYCACHE}routeros_jailbreak.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/mikrotik/${MODPY_PYCACHE}winbox_auth_bypass_creds_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/mikrotik/${MODPY_PYCACHE}winbox_auth_bypass_creds_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/mikrotik/routeros_jailbreak.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/mikrotik/winbox_auth_bypass_creds_disclosure.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/movistar/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/movistar/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/movistar/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/movistar/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/movistar/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/movistar/${MODPY_PYCACHE}adsl_router_bhs_rta_path_traversal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/movistar/${MODPY_PYCACHE}adsl_router_bhs_rta_path_traversal.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/movistar/adsl_router_bhs_rta_path_traversal.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/multi/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/multi/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/multi/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/multi/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/multi/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/multi/${MODPY_PYCACHE}gpon_home_gateway_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/multi/${MODPY_PYCACHE}gpon_home_gateway_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/multi/${MODPY_PYCACHE}misfortune_cookie.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/multi/${MODPY_PYCACHE}misfortune_cookie.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/multi/${MODPY_PYCACHE}rom0.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/multi/${MODPY_PYCACHE}rom0.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/multi/${MODPY_PYCACHE}tcp_32764_info_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/multi/${MODPY_PYCACHE}tcp_32764_info_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/multi/${MODPY_PYCACHE}tcp_32764_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/multi/${MODPY_PYCACHE}tcp_32764_rce.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/multi/gpon_home_gateway_rce.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/multi/misfortune_cookie.py
@@ -1024,21 +1423,33 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/m
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netcore/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netcore/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netcore/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netcore/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netcore/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netcore/${MODPY_PYCACHE}udp_53413_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netcore/${MODPY_PYCACHE}udp_53413_rce.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netcore/udp_53413_rce.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netgear/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netgear/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netgear/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netgear/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netgear/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netgear/${MODPY_PYCACHE}dgn2200_dnslookup_cgi_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netgear/${MODPY_PYCACHE}dgn2200_dnslookup_cgi_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netgear/${MODPY_PYCACHE}dgn2200_ping_cgi_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netgear/${MODPY_PYCACHE}dgn2200_ping_cgi_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netgear/${MODPY_PYCACHE}jnr1010_path_traversal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netgear/${MODPY_PYCACHE}jnr1010_path_traversal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netgear/${MODPY_PYCACHE}multi_password_disclosure-2017-5521.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netgear/${MODPY_PYCACHE}multi_password_disclosure-2017-5521.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netgear/${MODPY_PYCACHE}multi_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netgear/${MODPY_PYCACHE}multi_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netgear/${MODPY_PYCACHE}n300_auth_bypass.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netgear/${MODPY_PYCACHE}n300_auth_bypass.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netgear/${MODPY_PYCACHE}prosafe_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netgear/${MODPY_PYCACHE}prosafe_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netgear/${MODPY_PYCACHE}r7000_r6400_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netgear/${MODPY_PYCACHE}r7000_r6400_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netgear/${MODPY_PYCACHE}wnr500_612v3_jnr1010_2010_path_traversal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netgear/${MODPY_PYCACHE}wnr500_612v3_jnr1010_2010_path_traversal.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netgear/dgn2200_dnslookup_cgi_rce.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netgear/dgn2200_ping_cgi_rce.py
@@ -1052,22 +1463,31 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/n
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netsys/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netsys/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netsys/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netsys/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netsys/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netsys/${MODPY_PYCACHE}multi_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netsys/${MODPY_PYCACHE}multi_rce.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/netsys/multi_rce.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/shuttle/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/shuttle/915wm_dns_change.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/shuttle/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/shuttle/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/shuttle/${MODPY_PYCACHE}915wm_dns_change.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/shuttle/${MODPY_PYCACHE}915wm_dns_change.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/shuttle/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/shuttle/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/technicolor/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/technicolor/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/technicolor/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/technicolor/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/technicolor/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/technicolor/${MODPY_PYCACHE}dwg855_authbypass.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/technicolor/${MODPY_PYCACHE}dwg855_authbypass.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/technicolor/${MODPY_PYCACHE}tc7200_password_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/technicolor/${MODPY_PYCACHE}tc7200_password_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/technicolor/${MODPY_PYCACHE}tc7200_password_disclosure_v2.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/technicolor/${MODPY_PYCACHE}tc7200_password_disclosure_v2.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/technicolor/${MODPY_PYCACHE}tg784_authbypass.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/technicolor/${MODPY_PYCACHE}tg784_authbypass.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/technicolor/dwg855_authbypass.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/technicolor/tc7200_password_disclosure.py
@@ -1076,18 +1496,26 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/t
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/thomson/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/thomson/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/thomson/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/thomson/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/thomson/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/thomson/${MODPY_PYCACHE}twg849_info_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/thomson/${MODPY_PYCACHE}twg849_info_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/thomson/${MODPY_PYCACHE}twg850_password_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/thomson/${MODPY_PYCACHE}twg850_password_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/thomson/twg849_info_disclosure.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/thomson/twg850_password_disclosure.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/tplink/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/tplink/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/tplink/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/tplink/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/tplink/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/tplink/${MODPY_PYCACHE}archer_c2_c20i_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/tplink/${MODPY_PYCACHE}archer_c2_c20i_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/tplink/${MODPY_PYCACHE}wdr740nd_wdr740n_backdoor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/tplink/${MODPY_PYCACHE}wdr740nd_wdr740n_backdoor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/tplink/${MODPY_PYCACHE}wdr740nd_wdr740n_path_traversal.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/tplink/${MODPY_PYCACHE}wdr740nd_wdr740n_path_traversal.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/tplink/${MODPY_PYCACHE}wdr842nd_wdr842n_configure_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/tplink/${MODPY_PYCACHE}wdr842nd_wdr842n_configure_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/tplink/archer_c2_c20i_rce.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/tplink/wdr740nd_wdr740n_backdoor.py
@@ -1096,25 +1524,36 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/t
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/ubiquiti/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/ubiquiti/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/ubiquiti/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/ubiquiti/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/ubiquiti/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/ubiquiti/${MODPY_PYCACHE}airos_6_x.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/ubiquiti/${MODPY_PYCACHE}airos_6_x.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/ubiquiti/airos_6_x.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/zte/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/zte/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/zte/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/zte/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/zte/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/zte/${MODPY_PYCACHE}f460_f660_backdoor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/zte/${MODPY_PYCACHE}f460_f660_backdoor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/zte/${MODPY_PYCACHE}zxv10_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/zte/${MODPY_PYCACHE}zxv10_rce.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/zte/f460_f660_backdoor.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/zte/zxv10_rce.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/zyxel/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/zyxel/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/zyxel/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/zyxel/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/zyxel/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/zyxel/${MODPY_PYCACHE}d1000_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/zyxel/${MODPY_PYCACHE}d1000_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/zyxel/${MODPY_PYCACHE}d1000_wifi_password_disclosure.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/zyxel/${MODPY_PYCACHE}d1000_wifi_password_disclosure.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/zyxel/${MODPY_PYCACHE}p660hn_t_v1_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/zyxel/${MODPY_PYCACHE}p660hn_t_v1_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/zyxel/${MODPY_PYCACHE}p660hn_t_v2_rce.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/zyxel/${MODPY_PYCACHE}p660hn_t_v2_rce.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/zyxel/${MODPY_PYCACHE}zywall_usg_extract_hashes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/zyxel/${MODPY_PYCACHE}zywall_usg_extract_hashes.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/zyxel/d1000_rce.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/zyxel/d1000_wifi_password_disclosure.py
@@ -1124,13 +1563,18 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/exploits/routers/z
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/generic/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/generic/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/generic/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/generic/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/generic/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/generic/bluetooth/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/generic/bluetooth/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/generic/bluetooth/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/generic/bluetooth/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/generic/bluetooth/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/generic/bluetooth/${MODPY_PYCACHE}btle_enumerate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/generic/bluetooth/${MODPY_PYCACHE}btle_enumerate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/generic/bluetooth/${MODPY_PYCACHE}btle_scan.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/generic/bluetooth/${MODPY_PYCACHE}btle_scan.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/generic/bluetooth/${MODPY_PYCACHE}btle_write.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/generic/bluetooth/${MODPY_PYCACHE}btle_write.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/generic/bluetooth/btle_enumerate.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/generic/bluetooth/btle_scan.py
@@ -1138,38 +1582,59 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/generic/bluetooth/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/generic/upnp/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/generic/upnp/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/generic/upnp/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/generic/upnp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/generic/upnp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/generic/upnp/${MODPY_PYCACHE}ssdp_msearch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/generic/upnp/${MODPY_PYCACHE}ssdp_msearch.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/generic/upnp/ssdp_msearch.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/armle/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/armle/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/armle/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/armle/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/armle/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/armle/${MODPY_PYCACHE}bind_tcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/armle/${MODPY_PYCACHE}bind_tcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/armle/${MODPY_PYCACHE}reverse_tcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/armle/${MODPY_PYCACHE}reverse_tcp.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/armle/bind_tcp.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/armle/reverse_tcp.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}awk_bind_tcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}awk_bind_tcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}awk_bind_udp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}awk_bind_udp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}awk_reverse_tcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}awk_reverse_tcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}bash_reverse_tcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}bash_reverse_tcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}netcat_bind_tcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}netcat_bind_tcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}netcat_reverse_tcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}netcat_reverse_tcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}perl_bind_tcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}perl_bind_tcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}perl_reverse_tcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}perl_reverse_tcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}php_bind_tcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}php_bind_tcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}php_reverse_tcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}php_reverse_tcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}python_bind_tcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}python_bind_tcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}python_bind_udp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}python_bind_udp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}python_reverse_tcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}python_reverse_tcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}python_reverse_udp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/${MODPY_PYCACHE}python_reverse_udp.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/awk_bind_tcp.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/awk_bind_udp.py
@@ -1188,42 +1653,59 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/cmd/pytho
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/mipsbe/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/mipsbe/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/mipsbe/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/mipsbe/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/mipsbe/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/mipsbe/${MODPY_PYCACHE}bind_tcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/mipsbe/${MODPY_PYCACHE}bind_tcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/mipsbe/${MODPY_PYCACHE}reverse_tcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/mipsbe/${MODPY_PYCACHE}reverse_tcp.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/mipsbe/bind_tcp.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/mipsbe/reverse_tcp.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/mipsle/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/mipsle/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/mipsle/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/mipsle/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/mipsle/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/mipsle/${MODPY_PYCACHE}bind_tcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/mipsle/${MODPY_PYCACHE}bind_tcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/mipsle/${MODPY_PYCACHE}reverse_tcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/mipsle/${MODPY_PYCACHE}reverse_tcp.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/mipsle/bind_tcp.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/mipsle/reverse_tcp.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/perl/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/perl/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/perl/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/perl/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/perl/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/perl/${MODPY_PYCACHE}bind_tcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/perl/${MODPY_PYCACHE}bind_tcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/perl/${MODPY_PYCACHE}reverse_tcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/perl/${MODPY_PYCACHE}reverse_tcp.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/perl/bind_tcp.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/perl/reverse_tcp.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/php/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/php/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/php/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/php/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/php/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/php/${MODPY_PYCACHE}bind_tcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/php/${MODPY_PYCACHE}bind_tcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/php/${MODPY_PYCACHE}reverse_tcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/php/${MODPY_PYCACHE}reverse_tcp.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/php/bind_tcp.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/php/reverse_tcp.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/python/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/python/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/python/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/python/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/python/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/python/${MODPY_PYCACHE}bind_tcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/python/${MODPY_PYCACHE}bind_tcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/python/${MODPY_PYCACHE}bind_udp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/python/${MODPY_PYCACHE}bind_udp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/python/${MODPY_PYCACHE}reverse_tcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/python/${MODPY_PYCACHE}reverse_tcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/python/${MODPY_PYCACHE}reverse_udp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/python/${MODPY_PYCACHE}reverse_udp.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/python/bind_tcp.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/python/bind_udp.py
@@ -1232,46 +1714,61 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/python/re
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/x64/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/x64/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/x64/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/x64/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/x64/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/x64/${MODPY_PYCACHE}bind_tcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/x64/${MODPY_PYCACHE}bind_tcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/x64/${MODPY_PYCACHE}reverse_tcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/x64/${MODPY_PYCACHE}reverse_tcp.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/x64/bind_tcp.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/x64/reverse_tcp.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/x86/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/x86/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/x86/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/x86/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/x86/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/x86/${MODPY_PYCACHE}bind_tcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/x86/${MODPY_PYCACHE}bind_tcp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/x86/${MODPY_PYCACHE}reverse_tcp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/x86/${MODPY_PYCACHE}reverse_tcp.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/x86/bind_tcp.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/payloads/x86/reverse_tcp.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/${MODPY_PYCACHE}autopwn.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/${MODPY_PYCACHE}autopwn.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/autopwn.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/cameras/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/cameras/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/cameras/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/cameras/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/cameras/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/cameras/${MODPY_PYCACHE}camera_scan.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/cameras/${MODPY_PYCACHE}camera_scan.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/cameras/camera_scan.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/misc/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/misc/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/misc/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/misc/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/misc/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/misc/${MODPY_PYCACHE}misc_scan.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/misc/${MODPY_PYCACHE}misc_scan.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/misc/misc_scan.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/routers/
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/routers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/routers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/routers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/routers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/routers/${MODPY_PYCACHE}router_scan.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/routers/${MODPY_PYCACHE}router_scan.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/modules/scanners/routers/router_scan.py
 lib/python${MODPY_VERSION}/site-packages/routersploit/resources/
 lib/python${MODPY_VERSION}/site-packages/routersploit/resources/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/resources/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/resources/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/resources/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/resources/ssh_keys/
 lib/python${MODPY_VERSION}/site-packages/routersploit/resources/ssh_keys/array-networks-vapv-vxag.json
@@ -1297,6 +1794,7 @@ lib/python${MODPY_VERSION}/site-packages/routersploit/resources/vendors/oui.dat
 lib/python${MODPY_VERSION}/site-packages/routersploit/resources/wordlists/
 lib/python${MODPY_VERSION}/site-packages/routersploit/resources/wordlists/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/routersploit/resources/wordlists/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/routersploit/resources/wordlists/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/routersploit/resources/wordlists/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/routersploit/resources/wordlists/defaults.txt
 lib/python${MODPY_VERSION}/site-packages/routersploit/resources/wordlists/passwords.txt
diff --git a/security/ssh-audit/Makefile b/security/ssh-audit/Makefile
index 88d60aef6b4..dd4c892e074 100644
--- a/security/ssh-audit/Makefile
+++ b/security/ssh-audit/Makefile
@@ -3,7 +3,7 @@ COMMENT =		ssh configuration security auditing tool
 MODPY_EGG_VERSION =	2.5.0
 
 DISTNAME =		ssh-audit-${MODPY_EGG_VERSION}
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		security
 
@@ -17,7 +17,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 FLAVORS =		python3
 FLAVOR =		python3
 
diff --git a/security/ssh-audit/pkg/PLIST b/security/ssh-audit/pkg/PLIST
index 2bd6e673d6d..174ae06e82e 100644
--- a/security/ssh-audit/pkg/PLIST
+++ b/security/ssh-audit/pkg/PLIST
@@ -1,44 +1,76 @@
 bin/ssh-audit
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/
-lib/python${MODPY_VERSION}/site-packages/ssh_audit-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/ssh_audit-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/ssh_audit-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/ssh_audit-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/ssh_audit-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/ssh_audit-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/ssh_audit-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/ssh_audit-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/ssh_audit-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/ssh_audit-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/ssh_audit-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/ssh_audit-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/ssh_audit-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/__init__.py
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}algorithm.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}algorithm.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}algorithms.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}algorithms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}auditconf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}auditconf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}banner.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}banner.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}exitcodes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}exitcodes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}fingerprint.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}fingerprint.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}gextest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}gextest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}globals.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}globals.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}hostkeytest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}hostkeytest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}kexdh.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}kexdh.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}outputbuffer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}outputbuffer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}policy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}policy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}product.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}product.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}protocol.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}protocol.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}readbuf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}readbuf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}software.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}software.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}ssh1.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}ssh1.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}ssh1_crc32.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}ssh1_crc32.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}ssh1_kexdb.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}ssh1_kexdb.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}ssh1_publickeymessage.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}ssh1_publickeymessage.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}ssh2_kex.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}ssh2_kex.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}ssh2_kexdb.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}ssh2_kexdb.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}ssh2_kexparty.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}ssh2_kexparty.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}ssh_audit.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}ssh_audit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}ssh_socket.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}ssh_socket.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}timeframe.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}timeframe.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}versionvulnerabilitydb.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}versionvulnerabilitydb.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}writebuf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/${MODPY_PYCACHE}writebuf.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/algorithm.py
 lib/python${MODPY_VERSION}/site-packages/ssh_audit/algorithms.py
diff --git a/security/wfuzz/Makefile b/security/wfuzz/Makefile
index 4079a5b3edf..fe953e1f2ca 100644
--- a/security/wfuzz/Makefile
+++ b/security/wfuzz/Makefile
@@ -2,7 +2,7 @@ COMMENT =	web fuzzer
 
 MODPY_EGG_VERSION =	3.1.0
 DISTNAME =	wfuzz-${MODPY_EGG_VERSION}
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	security www
 
@@ -16,7 +16,7 @@ PERMIT_PACKAGE =	Yes
 MODPY_PI =		Yes
 
 MODULES =		lang/python
-MODPY_SETUPTOOLS =	Yes
+MODPY_PYBUILD =	setuptools
 
 RUN_DEPENDS =		devel/py-parsing${MODPY_FLAVOR} \
 			devel/py-six${MODPY_FLAVOR} \
diff --git a/security/wfuzz/pkg/PLIST b/security/wfuzz/pkg/PLIST
index 8d63ecb490e..d7b5712f754 100644
--- a/security/wfuzz/pkg/PLIST
+++ b/security/wfuzz/pkg/PLIST
@@ -3,30 +3,45 @@ bin/wfpayload
 bin/wfuzz
 bin/wxfuzz
 lib/python${MODPY_VERSION}/site-packages/wfuzz/
-lib/python${MODPY_VERSION}/site-packages/wfuzz-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/wfuzz-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/wfuzz-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/wfuzz-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/wfuzz-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/wfuzz-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/wfuzz-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/wfuzz-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/wfuzz-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/wfuzz-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/wfuzz-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/wfuzz-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/wfuzz-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/wfuzz-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/wfuzz/__init__.py
 lib/python${MODPY_VERSION}/site-packages/wfuzz/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}dictionaries.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}dictionaries.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}exception.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}exception.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}facade.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}facade.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}fuzzobjects.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}fuzzobjects.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}fuzzqueues.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}fuzzqueues.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}fuzzrequest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}fuzzrequest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}mixins.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}mixins.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}myhttp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}myhttp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}myqueues.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}myqueues.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}options.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}options.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}wfuzz.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/${MODPY_PYCACHE}wfuzz.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/wfuzz/api.py
 lib/python${MODPY_VERSION}/site-packages/wfuzz/core.py
@@ -35,14 +50,20 @@ lib/python${MODPY_VERSION}/site-packages/wfuzz/exception.py
 lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/
 lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/moduleman/
 lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/moduleman/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/moduleman/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/moduleman/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/moduleman/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/moduleman/${MODPY_PYCACHE}loader.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/moduleman/${MODPY_PYCACHE}loader.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/moduleman/${MODPY_PYCACHE}modulefilter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/moduleman/${MODPY_PYCACHE}modulefilter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/moduleman/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/moduleman/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/moduleman/${MODPY_PYCACHE}registrant.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/moduleman/${MODPY_PYCACHE}registrant.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/moduleman/loader.py
 lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/moduleman/modulefilter.py
@@ -55,31 +76,47 @@ lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/reqresp/TextParser.py
 lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/reqresp/Variables.py
 lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/reqresp/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/reqresp/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/reqresp/${MODPY_PYCACHE}Request.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/reqresp/${MODPY_PYCACHE}Request.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/reqresp/${MODPY_PYCACHE}Response.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/reqresp/${MODPY_PYCACHE}Response.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/reqresp/${MODPY_PYCACHE}TextParser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/reqresp/${MODPY_PYCACHE}TextParser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/reqresp/${MODPY_PYCACHE}Variables.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/reqresp/${MODPY_PYCACHE}Variables.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/reqresp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/reqresp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/reqresp/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/reqresp/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/reqresp/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/reqresp/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/reqresp/cache.py
 lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/reqresp/exceptions.py
 lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/settings/
 lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/settings/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/settings/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/settings/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/settings/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/settings/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/settings/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/wfuzz/externals/settings/settings.py
 lib/python${MODPY_VERSION}/site-packages/wfuzz/facade.py
 lib/python${MODPY_VERSION}/site-packages/wfuzz/factories/
 lib/python${MODPY_VERSION}/site-packages/wfuzz/factories/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wfuzz/factories/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/wfuzz/factories/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/factories/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/factories/${MODPY_PYCACHE}dictfactory.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/factories/${MODPY_PYCACHE}dictfactory.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/factories/${MODPY_PYCACHE}fuzzfactory.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/factories/${MODPY_PYCACHE}fuzzfactory.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/factories/${MODPY_PYCACHE}fuzzresfactory.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/factories/${MODPY_PYCACHE}fuzzresfactory.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/factories/${MODPY_PYCACHE}payman.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/factories/${MODPY_PYCACHE}payman.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/factories/${MODPY_PYCACHE}plugin_factory.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/factories/${MODPY_PYCACHE}plugin_factory.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/factories/${MODPY_PYCACHE}reqresp_factory.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/factories/${MODPY_PYCACHE}reqresp_factory.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/wfuzz/factories/dictfactory.py
 lib/python${MODPY_VERSION}/site-packages/wfuzz/factories/fuzzfactory.py
@@ -90,8 +127,11 @@ lib/python${MODPY_VERSION}/site-packages/wfuzz/factories/reqresp_factory.py
 lib/python${MODPY_VERSION}/site-packages/wfuzz/filters/
 lib/python${MODPY_VERSION}/site-packages/wfuzz/filters/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wfuzz/filters/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/wfuzz/filters/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/filters/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/filters/${MODPY_PYCACHE}ppfilter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/filters/${MODPY_PYCACHE}ppfilter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/filters/${MODPY_PYCACHE}simplefilter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/filters/${MODPY_PYCACHE}simplefilter.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/wfuzz/filters/ppfilter.py
 lib/python${MODPY_VERSION}/site-packages/wfuzz/filters/simplefilter.py
@@ -101,12 +141,19 @@ lib/python${MODPY_VERSION}/site-packages/wfuzz/fuzzrequest.py
 lib/python${MODPY_VERSION}/site-packages/wfuzz/helpers/
 lib/python${MODPY_VERSION}/site-packages/wfuzz/helpers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wfuzz/helpers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/wfuzz/helpers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/helpers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/helpers/${MODPY_PYCACHE}file_func.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/helpers/${MODPY_PYCACHE}file_func.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/helpers/${MODPY_PYCACHE}obj_dic.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/helpers/${MODPY_PYCACHE}obj_dic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/helpers/${MODPY_PYCACHE}obj_dyn.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/helpers/${MODPY_PYCACHE}obj_dyn.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/helpers/${MODPY_PYCACHE}obj_factory.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/helpers/${MODPY_PYCACHE}obj_factory.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/helpers/${MODPY_PYCACHE}str_func.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/helpers/${MODPY_PYCACHE}str_func.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/helpers/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/helpers/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/wfuzz/helpers/file_func.py
 lib/python${MODPY_VERSION}/site-packages/wfuzz/helpers/obj_dic.py
@@ -121,10 +168,15 @@ lib/python${MODPY_VERSION}/site-packages/wfuzz/options.py
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugin_api/
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugin_api/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wfuzz/plugin_api/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugin_api/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugin_api/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugin_api/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugin_api/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugin_api/${MODPY_PYCACHE}mixins.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugin_api/${MODPY_PYCACHE}mixins.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugin_api/${MODPY_PYCACHE}payloadtools.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugin_api/${MODPY_PYCACHE}payloadtools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugin_api/${MODPY_PYCACHE}urlutils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugin_api/${MODPY_PYCACHE}urlutils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugin_api/base.py
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugin_api/mixins.py
@@ -133,42 +185,68 @@ lib/python${MODPY_VERSION}/site-packages/wfuzz/plugin_api/urlutils.py
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/encoders/
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/encoders/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/encoders/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/encoders/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/encoders/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/encoders/${MODPY_PYCACHE}encoders.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/encoders/${MODPY_PYCACHE}encoders.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/encoders/encoders.py
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/iterators/
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/iterators/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/iterators/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/iterators/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/iterators/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/iterators/${MODPY_PYCACHE}iterations.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/iterators/${MODPY_PYCACHE}iterations.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/iterators/iterations.py
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}autorize.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}autorize.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}bing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}bing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}buffer_overflow.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}buffer_overflow.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}burpitem.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}burpitem.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}burplog.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}burplog.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}burpstate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}burpstate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}dirwalk.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}dirwalk.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}file.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}file.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}guitab.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}guitab.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}hexrand.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}hexrand.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}hexrange.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}hexrange.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}ipnet.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}ipnet.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}iprange.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}iprange.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}list.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}list.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}names.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}names.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}permutation.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}permutation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}range.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}range.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}shodanp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}shodanp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}stdin.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}stdin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}wfuzzp.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/${MODPY_PYCACHE}wfuzzp.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/autorize.py
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/bing.py
@@ -193,27 +271,45 @@ lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/payloads/wfuzzp.py
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/printers/
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/printers/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/printers/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/printers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/printers/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/printers/${MODPY_PYCACHE}printers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/printers/${MODPY_PYCACHE}printers.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/printers/printers.py
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}backups.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}backups.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}cookies.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}cookies.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}cvs_extractor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}cvs_extractor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}grep.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}grep.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}headers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}headers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}links.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}links.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}listing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}listing.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}npm_deps.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}npm_deps.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}robots.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}robots.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}screenshot.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}screenshot.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}sitemap.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}sitemap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}svn_extractor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}svn_extractor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}title.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}title.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}wcdb.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/${MODPY_PYCACHE}wcdb.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/backups.py
 lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/cookies.py
@@ -233,15 +329,22 @@ lib/python${MODPY_VERSION}/site-packages/wfuzz/plugins/scripts/wcdb.py
 lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/
 lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/console/
 lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/console/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/console/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/console/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/console/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/console/${MODPY_PYCACHE}clparser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/console/${MODPY_PYCACHE}clparser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/console/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/console/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/console/${MODPY_PYCACHE}getch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/console/${MODPY_PYCACHE}getch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/console/${MODPY_PYCACHE}mvc.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/console/${MODPY_PYCACHE}mvc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/console/${MODPY_PYCACHE}output.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/console/${MODPY_PYCACHE}output.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/console/clparser.py
 lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/console/common.py
@@ -251,9 +354,13 @@ lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/console/output.py
 lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/gui/
 lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/gui/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/gui/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/gui/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/gui/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/gui/${MODPY_PYCACHE}controller.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/gui/${MODPY_PYCACHE}controller.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/gui/${MODPY_PYCACHE}guicontrols.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/gui/${MODPY_PYCACHE}guicontrols.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/gui/${MODPY_PYCACHE}model.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/gui/${MODPY_PYCACHE}model.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/gui/controller.py
 lib/python${MODPY_VERSION}/site-packages/wfuzz/ui/gui/guicontrols.py
diff --git a/security/yubiserve/Makefile b/security/yubiserve/Makefile
index 055356a897e..8e5b11e8c2c 100644
--- a/security/yubiserve/Makefile
+++ b/security/yubiserve/Makefile
@@ -5,7 +5,7 @@ GH_PROJECT=	yubikeyedup
 GH_COMMIT=	d5044d3fdc10cc59a5213efd53e0f80b2a1096f9
 DISTNAME=	yubikeyedup-0.20201226
 MODPY_EGG_VERSION=0.1
-REVISION=	3
+REVISION=	4
 
 CATEGORIES=	security www
 
@@ -15,7 +15,7 @@ MAINTAINER=	Stuart Henderson <stu.ports@spacehopper.org>
 PERMIT_PACKAGE=	Yes
 
 MODULES=	lang/python
-MODPY_SETUPTOOLS= Yes
+MODPY_PYBUILD =	setuptools
 
 RUN_DEPENDS=	security/py-cryptodome${MODPY_FLAVOR}
 
diff --git a/security/yubiserve/pkg/PLIST b/security/yubiserve/pkg/PLIST
index e225bee307e..5c2acc47293 100644
--- a/security/yubiserve/pkg/PLIST
+++ b/security/yubiserve/pkg/PLIST
@@ -6,29 +6,41 @@ bin/yubikeyedup-dbconf
 bin/yubikeyedup-dbcreate
 bin/yubikeyedup-flash
 lib/python${MODPY_VERSION}/site-packages/yubikeyedup/
-lib/python${MODPY_VERSION}/site-packages/yubikeyedup-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/yubikeyedup-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/yubikeyedup-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/yubikeyedup-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/yubikeyedup-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/yubikeyedup-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/yubikeyedup-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/yubikeyedup-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/yubikeyedup-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/yubikeyedup-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/yubikeyedup-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/yubikeyedup-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/yubikeyedup-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/yubikeyedup/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/yubikeyedup/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/yubikeyedup/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yubikeyedup/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yubikeyedup/${MODPY_PYCACHE}html.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yubikeyedup/${MODPY_PYCACHE}html.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yubikeyedup/${MODPY_PYCACHE}sql.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yubikeyedup/${MODPY_PYCACHE}sql.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yubikeyedup/${MODPY_PYCACHE}validate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yubikeyedup/${MODPY_PYCACHE}validate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yubikeyedup/${MODPY_PYCACHE}yubiserve.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yubikeyedup/${MODPY_PYCACHE}yubiserve.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yubikeyedup/${MODPY_PYCACHE}yubistatus.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yubikeyedup/${MODPY_PYCACHE}yubistatus.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/yubikeyedup/html.py
 lib/python${MODPY_VERSION}/site-packages/yubikeyedup/sql.py
 lib/python${MODPY_VERSION}/site-packages/yubikeyedup/tools/
 lib/python${MODPY_VERSION}/site-packages/yubikeyedup/tools/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/yubikeyedup/tools/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/yubikeyedup/tools/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yubikeyedup/tools/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yubikeyedup/tools/${MODPY_PYCACHE}dbconf.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yubikeyedup/tools/${MODPY_PYCACHE}dbconf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yubikeyedup/tools/${MODPY_PYCACHE}dbcreate.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yubikeyedup/tools/${MODPY_PYCACHE}dbcreate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yubikeyedup/tools/${MODPY_PYCACHE}flash.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yubikeyedup/tools/${MODPY_PYCACHE}flash.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yubikeyedup/tools/${MODPY_PYCACHE}unittests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yubikeyedup/tools/${MODPY_PYCACHE}unittests.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/yubikeyedup/tools/dbconf.py
 lib/python${MODPY_VERSION}/site-packages/yubikeyedup/tools/dbcreate.py