diff options
| -rw-r--r-- | paste/pyconfig.py | 2 | ||||
| -rw-r--r-- | paste/tests/fixture.py | 117 | ||||
| -rw-r--r-- | paste/tests/test_pyconfig.py | 2 |
3 files changed, 62 insertions, 59 deletions
diff --git a/paste/pyconfig.py b/paste/pyconfig.py index c3715a7..783461e 100644 --- a/paste/pyconfig.py +++ b/paste/pyconfig.py @@ -15,7 +15,7 @@ or dictionary access to get values. import types import os -from wsgikit.util import thirdparty +from paste.util import thirdparty UserDict = thirdparty.load_new_module('UserDict', (2, 3)) def load(filename): diff --git a/paste/tests/fixture.py b/paste/tests/fixture.py index b69c88c..9cb1d62 100644 --- a/paste/tests/fixture.py +++ b/paste/tests/fixture.py @@ -5,7 +5,7 @@ except ImportError: from StringIO import StringIO import types import re -from py.test.collect import Module, PyCollector +#from py.test.collect import Module, PyCollector from paste.util import thirdparty doctest = thirdparty.load_new_module('doctest', (2, 4)) from paste import wsgilib @@ -31,64 +31,67 @@ class DummyMethod(object): def __call__(self, *args, **kw): return self.return_value -class ParamCollector(PyCollector): - - def collect_function(self, extpy): - if not extpy.check(func=1, basestarts='test_'): - return - func = extpy.resolve() - if hasattr(func, 'params'): - params = func.params - for i, param in enumerate(params): - item = self.Item(extpy, *param) - item.name = item.name + '.%i' % i - yield item - else: - yield self.Item(extpy) +# These have to be rewritten, since py.test has changed; +# but we're not using them now anyway. + +# class ParamCollector(PyCollector): + +# def collect_function(self, extpy): +# if not extpy.check(func=1, basestarts='test_'): +# return +# func = extpy.resolve() +# if hasattr(func, 'params'): +# params = func.params +# for i, param in enumerate(params): +# item = self.Item(extpy, *param) +# item.name = item.name + '.%i' % i +# yield item +# else: +# yield self.Item(extpy) -class DoctestCollector(PyCollector): - - def __init__(self, extpy_or_module): - if isinstance(extpy_or_module, types.ModuleType): - self.module = extpy_or_module - self.extpy = None - else: - self.extpy = extpy_or_module - self.module = self.extpy.getpymodule() - - def __call__(self, extpy): - # we throw it away, because this has been set up to explicitly - # check another module; maybe this isn't clean - if self.extpy is None: - self.extpy = extpy - return self - - def __iter__(self): - finder = doctest.DocTestFinder() - tests = finder.find(self.module) - for t in tests: - yield DoctestItem(self.extpy, t) - -class DoctestItem(DoctestCollector.Item): - - def __init__(self, extpy, doctestitem, *args): - self.extpy = extpy - self.doctestitem = doctestitem - self.name = extpy.basename - self.args = args - - def execute(self, driver): - runner = doctest.DocTestRunner() - driver.setup_path(self.extpy) - target, teardown = driver.setup_method(self.extpy) - try: - (failed, tried), run_output = capture_stdout(runner.run, self.doctestitem) - if failed: - raise self.Failed(msg=run_output, tbindex=-2) +# class DoctestCollector(PyCollector): + +# def __init__(self, extpy_or_module): +# if isinstance(extpy_or_module, types.ModuleType): +# self.module = extpy_or_module +# self.extpy = None +# else: +# self.extpy = extpy_or_module +# self.module = self.extpy.getpymodule() + +# def __call__(self, extpy): +# # we throw it away, because this has been set up to explicitly +# # check another module; maybe this isn't clean +# if self.extpy is None: +# self.extpy = extpy +# return self + +# def __iter__(self): +# finder = doctest.DocTestFinder() +# tests = finder.find(self.module) +# for t in tests: +# yield DoctestItem(self.extpy, t) + +# class DoctestItem(DoctestCollector.Item): + +# def __init__(self, extpy, doctestitem, *args): +# self.extpy = extpy +# self.doctestitem = doctestitem +# self.name = extpy.basename +# self.args = args + +# def execute(self, driver): +# runner = doctest.DocTestRunner() +# driver.setup_path(self.extpy) +# target, teardown = driver.setup_method(self.extpy) +# try: +# (failed, tried), run_output = capture_stdout(runner.run, self.doctestitem) +# if failed: +# raise self.Failed(msg=run_output, tbindex=-2) - finally: - if teardown: - teardown(target) +# finally: +# if teardown: +# teardown(target) def capture_stdout(func, *args, **kw): newstdout = StringIO() diff --git a/paste/tests/test_pyconfig.py b/paste/tests/test_pyconfig.py index 1b93d02..66d2e91 100644 --- a/paste/tests/test_pyconfig.py +++ b/paste/tests/test_pyconfig.py @@ -1,5 +1,5 @@ import os -from wsgikit import pyconfig +from paste import pyconfig from py.test import raises def path(name): |