Our version of www/py-CherryPy in ports hasn't been updated since 2013.
More important to me is that it doesn't support python3. Diff below
brings our port to the latest version that supports python2 as well as
python3. The rather long changelog can be found at
https://github.com/cherrypy/cherrypy/blob/v17.4.2/CHANGES.rst.
Note that as of v18.0.0 support for Python 2.7 has been dropped.
CherryPy 17 will remain an LTS release for bug and security fixes.
This update relies on a newer version of www/py-cheroot, and several new
ports, which will be send to ports@ in separate mails.
Build tested all consumers, and run tested in combination with
news/sabnzbd.
While here change HOMEPAGE to use https.
Comments/OK?
diff --git Makefile Makefile
index 8fa7933e0f0..1fcc33c185b 100644
--- Makefile
+++ Makefile
@@ -2,33 +2,37 @@
COMMENT= pythonic, object-oriented web development framework
-MODPY_EGG_VERSION= 3.2.2
+MODPY_EGG_VERSION= 17.4.2
DISTNAME= CherryPy-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
CATEGORIES= www
-REVISION= 0
-HOMEPAGE= http://www.cherrypy.org/
+HOMEPAGE= https://www.cherrypy.org/
# BSD
PERMIT_PACKAGE= Yes
-MASTER_SITES= http://download.cherrypy.org/cherrypy/${MODPY_EGG_VERSION}/
-
-MODULES= lang/python
-
-TEST_DEPENDS = devel/py-nose \
- www/py-routes
-
-MODPY_SETUPTOOLS = Yes
-
-# test_antistampede requires higher file descriptor limit
-# test_cache_control requires higher SECONDS variable
-# test_states requires signal handling fixed
-TEST_IS_INTERACTIVE =Yes
-
-do-test:
- @cd ${WRKSRC} && ${LOCALBASE}/bin/nosetests -s -v \
- lib/cherrypy/test
+MODULES= lang/python
+MODPY_PI= Yes
+MODPY_PYTEST= Yes
+MODPY_SETUPTOOLS= Yes
+MODPY_PYTEST_ARGS= cherrypy/
+
+BUILD_DEPENDS= devel/py-setuptools_scm${MODPY_FLAVOR}
+RUN_DEPENDS= devel/py-contextlib2${MODPY_FLAVOR} \
+ devel/py-more-itertools${MODPY_FLAVOR} \
+ devel/py-six${MODPY_FLAVOR}>=1.11.0 \
+ devel/py-zc-lockfile${MODPY_FLAVOR} \
+ net/py-portend${MODPY_FLAVOR}>=2.1.1 \
+ www/py-cheroot${MODPY_FLAVOR}>=6.2.4
+TEST_DEPENDS= devel/py-path.py${MODPY_FLAVOR} \
+ devel/py-test-cov${MODPY_FLAVOR} \
+ www/py-requests-toolbelt${MODPY_FLAVOR}
+
+FLAVORS= python3
+FLAVOR?=
+
+post-install:
+ mv ${PREFIX}/bin/cherryd ${PREFIX}/bin/cherryd${MODPY_BIN_SUFFIX}
.include <bsd.port.mk>
diff --git distinfo distinfo
index a98fea8ae0d..2de05eec3e2 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (CherryPy-3.2.2.tar.gz) = 3FqIVieVwu5GLaxbN6uhz0808+JygewRBJInA5MItpE=
-SIZE (CherryPy-3.2.2.tar.gz) = 414099
+SHA256 (CherryPy-17.4.2.tar.gz) = 7xYZrRYfUmdF1PDk5Rd1PZ2YWBTxKA4zBmEzPSugXN8=
+SIZE (CherryPy-17.4.2.tar.gz) = 684366
diff --git pkg/PLIST pkg/PLIST
index 767b16d8662..1098283afe9 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,241 +1,250 @@
@comment $OpenBSD: PLIST,v 1.11 2013/01/02 11:50:17 gonzalo Exp $
@conflict py-cherrypy2-*
-bin/cherryd
+bin/cherryd${MODPY_BIN_SUFFIX}
lib/python${MODPY_VERSION}/site-packages/CherryPy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/CherryPy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/CherryPy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/CherryPy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/CherryPy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/CherryPy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/CherryPy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/cherrypy/
-lib/python${MODPY_VERSION}/site-packages/cherrypy/LICENSE.txt
lib/python${MODPY_VERSION}/site-packages/cherrypy/__init__.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/__main__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}_cpchecker.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}_cpcompat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}_cpconfig.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}_cpdispatch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}_cperror.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}_cplogging.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}_cpmodpy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}_cpnative_server.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}_cpreqbody.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}_cprequest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}_cpserver.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}_cptools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}_cptree.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}_cpwsgi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}_cpwsgi_server.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}_helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/${MODPY_PYCACHE}daemon.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpchecker.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpchecker.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpcompat.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpcompat.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpconfig.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpconfig.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpdispatch.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpdispatch.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/_cperror.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/_cperror.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/_cplogging.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/_cplogging.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpmodpy.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpmodpy.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpnative_server.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpnative_server.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpreqbody.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpreqbody.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/_cprequest.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/_cprequest.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpserver.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpserver.pyc
-lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpthreadinglocal.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpthreadinglocal.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/_cptools.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/_cptools.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/_cptree.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/_cptree.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpwsgi.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpwsgi.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpwsgi_server.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/_cpwsgi_server.pyc
-lib/python${MODPY_VERSION}/site-packages/cherrypy/cherryd
+lib/python${MODPY_VERSION}/site-packages/cherrypy/_helper.py
+lib/python${MODPY_VERSION}/site-packages/cherrypy/daemon.py
lib/python${MODPY_VERSION}/site-packages/cherrypy/favicon.ico
lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/
lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/__init__.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/auth.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/auth.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/${MODPY_PYCACHE}auth_basic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/${MODPY_PYCACHE}auth_digest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/${MODPY_PYCACHE}caching.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/${MODPY_PYCACHE}covercp.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/${MODPY_PYCACHE}cpstats.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/${MODPY_PYCACHE}cptools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/${MODPY_PYCACHE}encoding.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/${MODPY_PYCACHE}gctools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/${MODPY_PYCACHE}httputil.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/${MODPY_PYCACHE}jsontools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/${MODPY_PYCACHE}locking.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/${MODPY_PYCACHE}profiler.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/${MODPY_PYCACHE}reprconf.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/${MODPY_PYCACHE}sessions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/${MODPY_PYCACHE}static.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/${MODPY_PYCACHE}xmlrpcutil.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/auth_basic.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/auth_basic.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/auth_digest.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/auth_digest.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/caching.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/caching.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/covercp.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/covercp.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/cpstats.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/cpstats.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/cptools.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/cptools.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/encoding.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/encoding.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/gctools.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/gctools.pyc
-lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/http.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/http.pyc
-lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/httpauth.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/httpauth.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/httputil.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/httputil.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/jsontools.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/jsontools.pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/locking.py
lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/profiler.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/profiler.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/reprconf.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/reprconf.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/sessions.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/sessions.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/static.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/static.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/xmlrpcutil.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/lib/xmlrpcutil.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/process/
lib/python${MODPY_VERSION}/site-packages/cherrypy/process/__init__.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/process/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/cherrypy/process/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/cherrypy/process/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/process/${MODPY_PYCACHE}plugins.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/process/${MODPY_PYCACHE}servers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/process/${MODPY_PYCACHE}win32.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/process/${MODPY_PYCACHE}wspbus.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/process/plugins.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/process/plugins.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/process/servers.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/process/servers.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/process/win32.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/process/win32.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/process/wspbus.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/process/wspbus.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/scaffold/
lib/python${MODPY_VERSION}/site-packages/cherrypy/scaffold/__init__.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/scaffold/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/cherrypy/scaffold/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/cherrypy/scaffold/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/scaffold/apache-fcgi.conf
lib/python${MODPY_VERSION}/site-packages/cherrypy/scaffold/example.conf
lib/python${MODPY_VERSION}/site-packages/cherrypy/scaffold/site.conf
lib/python${MODPY_VERSION}/site-packages/cherrypy/scaffold/static/
lib/python${MODPY_VERSION}/site-packages/cherrypy/scaffold/static/made_with_cherrypy_small.png
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/__init__.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}_test_decorators.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}_test_states_demo.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}benchmark.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}checkerdemo.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}helper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}logtest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}modfastcgi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}modfcgid.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}modpy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}modwsgi.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}sessiondemo.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_auth_basic.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_auth_digest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_bus.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_caching.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_config_server.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_conn.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_core.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_dynamicobjectmapping.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_encoding.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_etags.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_http.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_httputil.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_iterator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_json.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_logging.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_mime.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_misc_tools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_native.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_objectmapping.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_params.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_plugins.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_proxy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_refleaks.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_request_obj.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_routes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_session.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_sessionauthenticate.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_states.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_static.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_tools.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_tutorials.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_virtualhost.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_wsgi_ns.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_wsgi_unix_socket.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_wsgi_vhost.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_wsgiapps.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}test_xmlrpc.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/${MODPY_PYCACHE}webtest.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/_test_decorators.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/_test_decorators.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/_test_states_demo.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/_test_states_demo.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/benchmark.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/benchmark.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/checkerdemo.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/checkerdemo.pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/fastcgi.conf
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/fcgi.conf
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/helper.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/helper.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/logtest.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/logtest.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/modfastcgi.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/modfastcgi.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/modfcgid.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/modfcgid.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/modpy.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/modpy.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/modwsgi.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/modwsgi.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/sessiondemo.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/sessiondemo.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/static/
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/static/404.html
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/static/dirback.jpg
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/static/index.html
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/style.css
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test.pem
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_auth_basic.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_auth_basic.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_auth_digest.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_auth_digest.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_bus.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_bus.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_caching.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_caching.pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_compat.py
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_config.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_config.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_config_server.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_config_server.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_conn.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_conn.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_core.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_core.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_dynamicobjectmapping.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_dynamicobjectmapping.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_encoding.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_encoding.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_etags.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_etags.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_http.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_http.pyc
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_httpauth.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_httpauth.pyc
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_httplib.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_httplib.pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_httputil.py
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_iterator.py
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_json.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_json.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_logging.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_logging.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_mime.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_mime.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_misc_tools.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_misc_tools.pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_native.py
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_objectmapping.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_objectmapping.pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_params.py
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_plugins.py
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_proxy.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_proxy.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_refleaks.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_refleaks.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_request_obj.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_request_obj.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_routes.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_routes.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_session.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_session.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_sessionauthenticate.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_sessionauthenticate.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_states.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_states.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_static.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_static.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_tools.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_tools.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_tutorials.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_tutorials.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_virtualhost.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_virtualhost.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_wsgi_ns.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_wsgi_ns.pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_wsgi_unix_socket.py
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_wsgi_vhost.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_wsgi_vhost.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_wsgiapps.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_wsgiapps.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_xmlrpc.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/test_xmlrpc.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/test/webtest.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/test/webtest.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/
-lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/README.txt
+lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/README.rst
lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/__init__.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/bonus-sqlobject.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/bonus-sqlobject.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/${MODPY_PYCACHE}tut01_helloworld.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/${MODPY_PYCACHE}tut02_expose_methods.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/${MODPY_PYCACHE}tut03_get_and_post.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/${MODPY_PYCACHE}tut04_complex_site.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/${MODPY_PYCACHE}tut05_derived_objects.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/${MODPY_PYCACHE}tut06_default_method.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/${MODPY_PYCACHE}tut07_sessions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/${MODPY_PYCACHE}tut08_generators_and_yield.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/${MODPY_PYCACHE}tut09_files.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/${MODPY_PYCACHE}tut10_http_errors.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/custom_error.html
lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/pdf_file.pdf
lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/tut01_helloworld.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/tut01_helloworld.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/tut02_expose_methods.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/tut02_expose_methods.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/tut03_get_and_post.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/tut03_get_and_post.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/tut04_complex_site.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/tut04_complex_site.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/tut05_derived_objects.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/tut05_derived_objects.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/tut06_default_method.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/tut06_default_method.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/tut07_sessions.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/tut07_sessions.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/tut08_generators_and_yield.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/tut08_generators_and_yield.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/tut09_files.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/tut09_files.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/tut10_http_errors.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/tut10_http_errors.pyc
lib/python${MODPY_VERSION}/site-packages/cherrypy/tutorial/tutorial.conf
-lib/python${MODPY_VERSION}/site-packages/cherrypy/wsgiserver/
-lib/python${MODPY_VERSION}/site-packages/cherrypy/wsgiserver/__init__.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/wsgiserver/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/cherrypy/wsgiserver/ssl_builtin.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/wsgiserver/ssl_builtin.pyc
-lib/python${MODPY_VERSION}/site-packages/cherrypy/wsgiserver/ssl_pyopenssl.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/wsgiserver/ssl_pyopenssl.pyc
-lib/python${MODPY_VERSION}/site-packages/cherrypy/wsgiserver/wsgiserver2.py
-lib/python${MODPY_VERSION}/site-packages/cherrypy/wsgiserver/wsgiserver2.pyc
