Merged with James's upstream.

Hope I did it right.  If I screwed up, withsqlite is borked.

1 files changed, 0 insertions, 25 deletions

diff --git a/vendor/CherryPy-3.2.0/py3/cherrypy/test/__init__.py b/vendor/CherryPy-3.2.0/py3/cherrypy/test/__init__.py
deleted file mode 100644
index e4c400d..0000000
--- a/vendor/CherryPy-3.2.0/py3/cherrypy/test/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-"""Regression test suite for CherryPy.
-
-Run 'nosetests -s test/' to exercise all tests.
-
-The '-s' flag instructs nose to output stdout messages, wihch is crucial to
-the 'interactive' mode of webtest.py. If you run these tests without the '-s'
-flag, don't be surprised if the test seems to hang: it's waiting for your
-interactive input.
-"""
-
-import sys
-def newexit():
-    raise SystemExit('Exit called')
-
-def setup():
-    # We want to monkey patch sys.exit so that we can get some
-    # information about where exit is being called.
-    newexit._old = sys.exit
-    sys.exit = newexit
-
-def teardown():
-    try:
-        sys.exit = sys.exit._old
-    except AttributeError:
-        sys.exit = sys._exit