- Update to 3.0.1

PR:		ports/113722
Submitted by:	Peter Johnson <johnson.peter@gmail.com>
Approved by:	maintainer timeout (nivit; 1 month)

6 files changed, 234 insertions, 276 deletions

diff --git a/www/py-cherrypy-devel/Makefile b/www/py-cherrypy-devel/Makefile
index a35af7bb96c8..02f05d89adee 100644
--- a/www/py-cherrypy-devel/Makefile
+++ b/www/py-cherrypy-devel/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	cherrypy
-PORTVERSION=	2.2.1
+PORTVERSION=	3.0.1
 CATEGORIES=	www python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://download.cherrypy.org/cherrypy/${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	CherryPy-${PORTVERSION:C/\.b$/beta/}
 
diff --git a/www/py-cherrypy-devel/distinfo b/www/py-cherrypy-devel/distinfo
index 0055b499e977..c3400ba17428 100644
--- a/www/py-cherrypy-devel/distinfo
+++ b/www/py-cherrypy-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (CherryPy-2.2.1.tar.gz) = 14bf17b0706bc480342cb8fcfaed74cd
-SHA256 (CherryPy-2.2.1.tar.gz) = af83ef4f7b6ffabfccea2794cc61ca0f6fabf24c95901b22ea36e5407ffb794b
-SIZE (CherryPy-2.2.1.tar.gz) = 219932
+MD5 (CherryPy-3.0.1.tar.gz) = 13b80dbdd9b0491a71b30d4916950968
+SHA256 (CherryPy-3.0.1.tar.gz) = c2d58d02d9b0b5772a52355136c1085fbaf14f6689f849eea41f4fe8bd573886
+SIZE (CherryPy-3.0.1.tar.gz) = 262276
diff --git a/www/py-cherrypy-devel/pkg-plist b/www/py-cherrypy-devel/pkg-plist
index 7a920973b35c..b2199ef47cd8 100644
--- a/www/py-cherrypy-devel/pkg-plist
+++ b/www/py-cherrypy-devel/pkg-plist
@@ -5,206 +5,187 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpcgifs.py
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpcgifs.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpcgifs.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpchecker.py
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpchecker.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpchecker.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpconfig.py
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpconfig.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpconfig.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpdispatch.py
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpdispatch.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpdispatch.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpengine.py
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpengine.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpengine.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/_cperror.py
 %%PYTHON_SITELIBDIR%%/cherrypy/_cperror.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/_cperror.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/_cphttptools.py
-%%PYTHON_SITELIBDIR%%/cherrypy/_cphttptools.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/_cphttptools.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/_cplogging.py
+%%PYTHON_SITELIBDIR%%/cherrypy/_cplogging.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/_cplogging.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpmodpy.py
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpmodpy.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpmodpy.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/_cprequest.py
+%%PYTHON_SITELIBDIR%%/cherrypy/_cprequest.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/_cprequest.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpserver.py
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpserver.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpserver.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpthreadinglocal.py
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpthreadinglocal.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpthreadinglocal.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/_cptools.py
+%%PYTHON_SITELIBDIR%%/cherrypy/_cptools.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/_cptools.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/_cptree.py
 %%PYTHON_SITELIBDIR%%/cherrypy/_cptree.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/_cptree.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/_cputil.py
-%%PYTHON_SITELIBDIR%%/cherrypy/_cputil.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/_cputil.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgi.py
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgi.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgi.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgiserver.py
-%%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgiserver.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgiserver.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/config.py
-%%PYTHON_SITELIBDIR%%/cherrypy/config.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/config.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/favicon.ico
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/__init__.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/__init__.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/__init__.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/basefilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/basefilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/basefilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/baseurlfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/baseurlfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/baseurlfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/cachefilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/cachefilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/cachefilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/decodingfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/decodingfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/decodingfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/encodingfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/encodingfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/encodingfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/gzipfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/gzipfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/gzipfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/logdebuginfofilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/logdebuginfofilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/logdebuginfofilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/nsgmlsfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/nsgmlsfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/nsgmlsfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/responseheadersfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/responseheadersfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/responseheadersfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/sessionauthenticatefilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/sessionauthenticatefilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/sessionauthenticatefilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/sessionfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/sessionfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/sessionfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/staticfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/staticfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/staticfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/tidyfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/tidyfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/tidyfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/virtualhostfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/virtualhostfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/virtualhostfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/wsgiappfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/wsgiappfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/wsgiappfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/xmlrpcfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/xmlrpcfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/xmlrpcfilter.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/__init__.py
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/__init__.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/autoreload.py
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/autoreload.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/autoreload.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/auth.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/auth.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/auth.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/caching.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/caching.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/caching.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/covercp.py
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/covercp.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/covercp.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/cptools.py
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/cptools.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/cptools.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/defaultformmask.py
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/defaultformmask.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/defaultformmask.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/__init__.py
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/__init__.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/__init__.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/form.py
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/form.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/form.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/httptools.py
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/httptools.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/httptools.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/encoding.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/encoding.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/encoding.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/http.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/http.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/http.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/httpauth.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/httpauth.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/httpauth.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/profiler.py
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/profiler.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/profiler.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/sessions.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/sessions.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/sessions.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/static.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/static.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/static.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/tidy.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/tidy.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/tidy.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/wsgiapp.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/wsgiapp.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/wsgiapp.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/xmlrpc.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/xmlrpc.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/xmlrpc.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/__init__.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/__init__.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/__init__.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/benchmark.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/benchmark.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/benchmark.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/checkerdemo.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/checkerdemo.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/checkerdemo.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/helper.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/helper.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/helper.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/modpy.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/modpy.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/modpy.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/standalone_test_alt_script_name.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/standalone_test_alt_script_name.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/standalone_test_alt_script_name.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/static/dirback.jpg
-%%PYTHON_SITELIBDIR%%/cherrypy/test/static/has space.html
 %%PYTHON_SITELIBDIR%%/cherrypy/test/static/index.html
 %%PYTHON_SITELIBDIR%%/cherrypy/test/style.css
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_baseurl_filter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_baseurl_filter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_baseurl_filter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_cache_filter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_cache_filter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_cache_filter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_combinedfilters.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_combinedfilters.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_combinedfilters.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_caching.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_caching.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_caching.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_config.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_config.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_config.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_conn.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_conn.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_conn.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_core.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_core.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_core.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_custom_filters.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_custom_filters.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_custom_filters.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_decodingencoding_filter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_decodingencoding_filter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_decodingencoding_filter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_gzip_filter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_gzip_filter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_gzip_filter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_encoding.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_encoding.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_encoding.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_etags.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_etags.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_etags.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_http.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_http.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_http.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_logdebuginfo_filter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_logdebuginfo_filter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_logdebuginfo_filter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_noserver.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_noserver.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_noserver.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_httpauth.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_httpauth.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_httpauth.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_misc_tools.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_misc_tools.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_misc_tools.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_objectmapping.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_objectmapping.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_objectmapping.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_response_headers_filter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_response_headers_filter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_response_headers_filter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session_concurrency.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session_concurrency.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session_concurrency.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session_filter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session_filter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session_filter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_sessionauthenticate_filter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_sessionauthenticate_filter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_sessionauthenticate_filter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_proxy.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_proxy.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_proxy.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_routes.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_routes.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_routes.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_sessionauthenticate.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_sessionauthenticate.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_sessionauthenticate.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_states.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_states.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_states.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_static_filter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_static_filter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_static_filter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_states_demo.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_states_demo.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_states_demo.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_static.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_static.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_static.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_tidy.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_tidy.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_tidy.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_tools.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_tools.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_tools.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_tutorials.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_tutorials.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_tutorials.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_virtualhost_filter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_virtualhost_filter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_virtualhost_filter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgiapp_filter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgiapp_filter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgiapp_filter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_xmlrpc_filter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_xmlrpc_filter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_xmlrpc_filter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_virtualhost.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_virtualhost.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_virtualhost.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgi_ns.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgi_ns.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgi_ns.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgiapps.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgiapps.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgiapps.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_xmlrpc.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_xmlrpc.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_xmlrpc.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/webtest.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/webtest.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/webtest.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/wsgiserver/__init__.py
+%%PYTHON_SITELIBDIR%%/cherrypy/wsgiserver/__init__.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/wsgiserver/__init__.pyo
 %%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/__init__.py
@@ -246,8 +227,7 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut10_http_errors.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut10_http_errors.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial.conf
-@dirrm %%PYTHON_SITELIBDIR%%/cherrypy/filters
-@dirrm %%PYTHON_SITELIBDIR%%/cherrypy/lib/filter
+@dirrm %%PYTHON_SITELIBDIR%%/cherrypy/wsgiserver
 @dirrm %%PYTHON_SITELIBDIR%%/cherrypy/lib
 @dirrm %%PYTHON_SITELIBDIR%%/cherrypy/test/static
 @dirrm %%PYTHON_SITELIBDIR%%/cherrypy/test
diff --git a/www/py-cherrypy/Makefile b/www/py-cherrypy/Makefile
index a35af7bb96c8..02f05d89adee 100644
--- a/www/py-cherrypy/Makefile
+++ b/www/py-cherrypy/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	cherrypy
-PORTVERSION=	2.2.1
+PORTVERSION=	3.0.1
 CATEGORIES=	www python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	http://download.cherrypy.org/cherrypy/${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	CherryPy-${PORTVERSION:C/\.b$/beta/}
 
diff --git a/www/py-cherrypy/distinfo b/www/py-cherrypy/distinfo
index 0055b499e977..c3400ba17428 100644
--- a/www/py-cherrypy/distinfo
+++ b/www/py-cherrypy/distinfo
@@ -1,3 +1,3 @@
-MD5 (CherryPy-2.2.1.tar.gz) = 14bf17b0706bc480342cb8fcfaed74cd
-SHA256 (CherryPy-2.2.1.tar.gz) = af83ef4f7b6ffabfccea2794cc61ca0f6fabf24c95901b22ea36e5407ffb794b
-SIZE (CherryPy-2.2.1.tar.gz) = 219932
+MD5 (CherryPy-3.0.1.tar.gz) = 13b80dbdd9b0491a71b30d4916950968
+SHA256 (CherryPy-3.0.1.tar.gz) = c2d58d02d9b0b5772a52355136c1085fbaf14f6689f849eea41f4fe8bd573886
+SIZE (CherryPy-3.0.1.tar.gz) = 262276
diff --git a/www/py-cherrypy/pkg-plist b/www/py-cherrypy/pkg-plist
index 7a920973b35c..b2199ef47cd8 100644
--- a/www/py-cherrypy/pkg-plist
+++ b/www/py-cherrypy/pkg-plist
@@ -5,206 +5,187 @@
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpcgifs.py
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpcgifs.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpcgifs.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpchecker.py
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpchecker.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpchecker.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpconfig.py
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpconfig.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpconfig.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpdispatch.py
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpdispatch.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpdispatch.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpengine.py
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpengine.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpengine.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/_cperror.py
 %%PYTHON_SITELIBDIR%%/cherrypy/_cperror.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/_cperror.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/_cphttptools.py
-%%PYTHON_SITELIBDIR%%/cherrypy/_cphttptools.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/_cphttptools.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/_cplogging.py
+%%PYTHON_SITELIBDIR%%/cherrypy/_cplogging.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/_cplogging.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpmodpy.py
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpmodpy.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/_cpmodpy.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/_cprequest.py
+%%PYTHON_SITELIBDIR%%/cherrypy/_cprequest.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/_cprequest.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpserver.py
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpserver.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpserver.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpthreadinglocal.py
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpthreadinglocal.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpthreadinglocal.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/_cptools.py
+%%PYTHON_SITELIBDIR%%/cherrypy/_cptools.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/_cptools.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/_cptree.py
 %%PYTHON_SITELIBDIR%%/cherrypy/_cptree.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/_cptree.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/_cputil.py
-%%PYTHON_SITELIBDIR%%/cherrypy/_cputil.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/_cputil.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgi.py
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgi.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgi.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgiserver.py
-%%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgiserver.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/_cpwsgiserver.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/config.py
-%%PYTHON_SITELIBDIR%%/cherrypy/config.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/config.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/favicon.ico
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/__init__.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/__init__.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/__init__.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/basefilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/basefilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/basefilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/baseurlfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/baseurlfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/baseurlfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/cachefilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/cachefilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/cachefilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/decodingfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/decodingfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/decodingfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/encodingfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/encodingfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/encodingfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/gzipfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/gzipfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/gzipfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/logdebuginfofilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/logdebuginfofilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/logdebuginfofilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/nsgmlsfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/nsgmlsfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/nsgmlsfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/responseheadersfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/responseheadersfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/responseheadersfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/sessionauthenticatefilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/sessionauthenticatefilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/sessionauthenticatefilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/sessionfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/sessionfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/sessionfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/staticfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/staticfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/staticfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/tidyfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/tidyfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/tidyfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/virtualhostfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/virtualhostfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/virtualhostfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/wsgiappfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/wsgiappfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/wsgiappfilter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/xmlrpcfilter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/xmlrpcfilter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/filters/xmlrpcfilter.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/__init__.py
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/__init__.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/__init__.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/autoreload.py
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/autoreload.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/autoreload.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/auth.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/auth.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/auth.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/caching.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/caching.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/caching.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/covercp.py
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/covercp.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/covercp.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/cptools.py
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/cptools.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/cptools.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/defaultformmask.py
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/defaultformmask.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/defaultformmask.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/__init__.py
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/__init__.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/filter/__init__.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/form.py
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/form.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/form.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/httptools.py
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/httptools.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/lib/httptools.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/encoding.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/encoding.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/encoding.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/http.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/http.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/http.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/httpauth.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/httpauth.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/httpauth.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/profiler.py
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/profiler.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/lib/profiler.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/sessions.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/sessions.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/sessions.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/static.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/static.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/static.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/tidy.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/tidy.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/tidy.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/wsgiapp.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/wsgiapp.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/wsgiapp.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/xmlrpc.py
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/xmlrpc.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/lib/xmlrpc.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/__init__.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/__init__.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/__init__.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/benchmark.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/benchmark.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/benchmark.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/checkerdemo.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/checkerdemo.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/checkerdemo.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/helper.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/helper.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/helper.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/modpy.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/modpy.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/modpy.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/standalone_test_alt_script_name.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/standalone_test_alt_script_name.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/standalone_test_alt_script_name.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/static/dirback.jpg
-%%PYTHON_SITELIBDIR%%/cherrypy/test/static/has space.html
 %%PYTHON_SITELIBDIR%%/cherrypy/test/static/index.html
 %%PYTHON_SITELIBDIR%%/cherrypy/test/style.css
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_baseurl_filter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_baseurl_filter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_baseurl_filter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_cache_filter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_cache_filter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_cache_filter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_combinedfilters.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_combinedfilters.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_combinedfilters.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_caching.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_caching.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_caching.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_config.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_config.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_config.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_conn.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_conn.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_conn.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_core.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_core.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_core.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_custom_filters.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_custom_filters.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_custom_filters.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_decodingencoding_filter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_decodingencoding_filter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_decodingencoding_filter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_gzip_filter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_gzip_filter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_gzip_filter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_encoding.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_encoding.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_encoding.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_etags.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_etags.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_etags.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_http.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_http.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_http.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_logdebuginfo_filter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_logdebuginfo_filter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_logdebuginfo_filter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_noserver.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_noserver.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_noserver.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_httpauth.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_httpauth.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_httpauth.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_misc_tools.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_misc_tools.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_misc_tools.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_objectmapping.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_objectmapping.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_objectmapping.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_response_headers_filter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_response_headers_filter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_response_headers_filter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session_concurrency.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session_concurrency.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session_concurrency.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session_filter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session_filter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session_filter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_sessionauthenticate_filter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_sessionauthenticate_filter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_sessionauthenticate_filter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_proxy.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_proxy.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_proxy.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_routes.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_routes.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_routes.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_session.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_sessionauthenticate.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_sessionauthenticate.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_sessionauthenticate.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_states.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_states.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_states.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_static_filter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_static_filter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_static_filter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_states_demo.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_states_demo.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_states_demo.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_static.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_static.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_static.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_tidy.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_tidy.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_tidy.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_tools.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_tools.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_tools.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_tutorials.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_tutorials.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/test_tutorials.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_virtualhost_filter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_virtualhost_filter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_virtualhost_filter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgiapp_filter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgiapp_filter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgiapp_filter.pyo
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_xmlrpc_filter.py
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_xmlrpc_filter.pyc
-%%PYTHON_SITELIBDIR%%/cherrypy/test/test_xmlrpc_filter.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_virtualhost.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_virtualhost.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_virtualhost.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgi_ns.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgi_ns.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgi_ns.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgiapps.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgiapps.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_wsgiapps.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_xmlrpc.py
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_xmlrpc.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/test/test_xmlrpc.pyo
 %%PYTHON_SITELIBDIR%%/cherrypy/test/webtest.py
 %%PYTHON_SITELIBDIR%%/cherrypy/test/webtest.pyc
 %%PYTHON_SITELIBDIR%%/cherrypy/test/webtest.pyo
+%%PYTHON_SITELIBDIR%%/cherrypy/wsgiserver/__init__.py
+%%PYTHON_SITELIBDIR%%/cherrypy/wsgiserver/__init__.pyc
+%%PYTHON_SITELIBDIR%%/cherrypy/wsgiserver/__init__.pyo
 %%PORTEXAMPLES%%%%PYTHON_SITELIBDIR%%/cherrypy/tutorial
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/__init__.py
@@ -246,8 +227,7 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut10_http_errors.pyc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tut10_http_errors.pyo
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tutorial.conf
-@dirrm %%PYTHON_SITELIBDIR%%/cherrypy/filters
-@dirrm %%PYTHON_SITELIBDIR%%/cherrypy/lib/filter
+@dirrm %%PYTHON_SITELIBDIR%%/cherrypy/wsgiserver
 @dirrm %%PYTHON_SITELIBDIR%%/cherrypy/lib
 @dirrm %%PYTHON_SITELIBDIR%%/cherrypy/test/static
 @dirrm %%PYTHON_SITELIBDIR%%/cherrypy/test