- Update to 2.1.0

- Update pkg-plist
- Remove pygments from TEST_DEPENDS (not required anymore)
- Remove TESTS option

Changelog: http://circuits.readthedocs.org/en/latest/changes.html

Approved by:	rm (mentor)

3 files changed, 58 insertions, 35 deletions

diff --git a/devel/py-circuits/Makefile b/devel/py-circuits/Makefile
index 0991476f42f2..53023b0d48d3 100644
--- a/devel/py-circuits/Makefile
+++ b/devel/py-circuits/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	circuits
-PORTVERSION=	2.0.1
+PORTVERSION=	2.1.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,23 +10,16 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Asynchronous Component-based Event Application Framework
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest \
-		${PYTHON_PKGNAMEPREFIX}pygments>0:${PORTSDIR}/textproc/py-pygments
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
 
 USE_PYTHON=		yes
 USE_PYDISTUTILS=	easy_install
 
-OPTIONS_DEFINE=	TESTS
-TESTS_DESC=	Install tools for unit tests
 # Bypass ports infrastructure bug
 OPTIONSFILE?=	${PORT_DBDIR}/py-${PORTNAME}/options
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MTESTS}
-BUILD_DEPENDS:=	${TEST_DEPENDS}
-.endif
-
 regression-test: build
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
 
diff --git a/devel/py-circuits/distinfo b/devel/py-circuits/distinfo
index 9e277681262e..ec0af190b076 100644
--- a/devel/py-circuits/distinfo
+++ b/devel/py-circuits/distinfo
@@ -1,2 +1,2 @@
-SHA256 (circuits-2.0.1.tar.gz) = 357b54e2262e9f918de3864e6f1099dec42059db4f9078e48eb367f00ef043cb
-SIZE (circuits-2.0.1.tar.gz) = 211253
+SHA256 (circuits-2.1.0.tar.gz) = 9da4b1a92bc12d5a56b72f2c345847e8991595003a3a0076e55ac9f1b52404e6
+SIZE (circuits-2.1.0.tar.gz) = 1346805
diff --git a/devel/py-circuits/pkg-plist b/devel/py-circuits/pkg-plist
index 228447ec50b6..2001250765bc 100644
--- a/devel/py-circuits/pkg-plist
+++ b/devel/py-circuits/pkg-plist
@@ -32,6 +32,9 @@ bin/circuits.web
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/core/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/core/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/core/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/core/bridge.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/core/bridge.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/core/bridge.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/core/components.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/core/components.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/core/components.pyo
@@ -41,9 +44,6 @@ bin/circuits.web
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/core/events.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/core/events.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/core/events.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/core/futures.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/core/futures.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/core/futures.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/core/handlers.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/core/handlers.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/core/handlers.pyo
@@ -59,9 +59,6 @@ bin/circuits.web
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/core/pollers.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/core/pollers.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/core/pollers.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/core/pools.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/core/pools.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/core/pools.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/core/timers.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/core/timers.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/core/timers.pyo
@@ -86,6 +83,9 @@ bin/circuits.web
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/io/notify.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/io/notify.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/io/notify.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/io/process.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/io/process.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/io/process.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/io/serial.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/io/serial.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/io/serial.pyo
@@ -104,6 +104,9 @@ bin/circuits.web
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/net/protocols/line.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/net/protocols/line.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/net/protocols/line.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/net/protocols/websocket.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/net/protocols/websocket.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/net/protocols/websocket.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/net/sockets.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/net/sockets.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/net/sockets.pyo
@@ -125,6 +128,9 @@ bin/circuits.web
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/node/utils.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/node/utils.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/node/utils.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/six.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/six.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/six.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/tools/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/tools/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/tools/__init__.pyo
@@ -209,6 +215,9 @@ bin/circuits.web
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/web/utils.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/web/utils.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/web/utils.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/web/websocket.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/web/websocket.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/web/websocket.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/web/wrappers.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/web/wrappers.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/circuits/web/wrappers.pyo
@@ -248,6 +257,9 @@ bin/circuits.web
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/signalapp.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/signalapp.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/signalapp.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_bridge.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_bridge.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_bridge.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_call_wait.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_call_wait.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_call_wait.pyo
@@ -263,6 +275,9 @@ bin/circuits.web
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_component_setup.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_component_setup.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_component_setup.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_component_targeting.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_component_targeting.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_component_targeting.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_core.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_core.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_core.pyo
@@ -287,9 +302,9 @@ bin/circuits.web
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_filters.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_filters.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_filters.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_future.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_future.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_future.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_generate_events.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_generate_events.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_generate_events.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_generator_value.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_generator_value.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_generator_value.pyo
@@ -302,15 +317,15 @@ bin/circuits.web
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_inheritence.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_inheritence.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_inheritence.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_interface_query.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_interface_query.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_interface_query.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_loader.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_loader.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_loader.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_manager_repr.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_manager_repr.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_manager_repr.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_pools.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_pools.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_pools.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_priority.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_priority.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_priority.pyo
@@ -329,18 +344,24 @@ bin/circuits.web
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_value.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_value.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_value.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_workers.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_workers.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_workers.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_worker_process.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_worker_process.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_worker_process.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_worker_thread.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_worker_thread.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/core/test_worker_thread.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/io/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/io/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/io/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/io/test_io.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/io/test_io.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/io/test_io.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/io/test_file.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/io/test_file.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/io/test_file.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/io/test_notify.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/io/test_notify.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/io/test_notify.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/io/test_process.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/io/test_process.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/io/test_process.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/main.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/main.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/main.pyo
@@ -428,6 +449,9 @@ bin/circuits.web
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_dispatcher2.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_dispatcher2.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_dispatcher2.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_dispatcher3.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_dispatcher3.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_dispatcher3.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_disps.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_disps.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_disps.pyo
@@ -443,15 +467,15 @@ bin/circuits.web
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_expose.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_expose.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_expose.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_future.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_future.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_future.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_generator.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_generator.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_generator.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_gzip.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_gzip.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_gzip.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_headers.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_headers.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_headers.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_http.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_http.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_http.pyo
@@ -467,9 +491,6 @@ bin/circuits.web
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_logger.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_logger.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_logger.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_main.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_main.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_main.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_multipartformdata.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_multipartformdata.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_multipartformdata.pyo
@@ -527,6 +548,15 @@ bin/circuits.web
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_wsgi_gateway_generator.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_wsgi_gateway_generator.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_wsgi_gateway_generator.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_wsgi_gateway_multiple_apps.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_wsgi_gateway_multiple_apps.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_wsgi_gateway_multiple_apps.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_wsgi_gateway_null_response.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_wsgi_gateway_null_response.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_wsgi_gateway_null_response.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_wsgi_gateway_write.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_wsgi_gateway_write.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_wsgi_gateway_write.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_wsgi_gateway_yield.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_wsgi_gateway_yield.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/web/test_wsgi_gateway_yield.pyo