Webware for Python

Author: ianb
Date: 2005-04-21 21:38:04 -0600 (Thu, 21 Apr 2005)
New Revision: 2369

Modified:
   Paste/trunk/paste/pyconfig.py
   Paste/trunk/paste/tests/fixture.py
   Paste/trunk/paste/tests/test_pyconfig.py
Log:
Picked up some missed renames

Modified: Paste/trunk/paste/pyconfig.py
===================================================================
--- Paste/trunk/paste/pyconfig.py	2005-04-22 03:21:08 UTC (rev 2368)
+++ Paste/trunk/paste/pyconfig.py	2005-04-22 03:38:04 UTC (rev 2369)
@@ -15,7 +15,7 @@
 
 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):

Modified: Paste/trunk/paste/tests/fixture.py
===================================================================
--- Paste/trunk/paste/tests/fixture.py	2005-04-22 03:21:08 UTC (rev 2368)
+++ Paste/trunk/paste/tests/fixture.py	2005-04-22 03:38:04 UTC (rev 2369)
@@ -5,7 +5,7 @@
     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 @@
     def __call__(self, *args, **kw):
         return self.return_value
 
-class ParamCollector(PyCollector):
+# These have to be rewritten, since py.test has changed;
+# but we're not using them now anyway.
 
-    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 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):
+# 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 __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 __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)
+#     def __iter__(self):
+#         finder = doctest.DocTestFinder()
+#         tests = finder.find(self.module)
+#         for t in tests:
+#             yield DoctestItem(self.extpy, t)
 
-class DoctestItem(DoctestCollector.Item):
+# class DoctestItem(DoctestCollector.Item):
 
-    def __init__(self, extpy, doctestitem, *args):
-        self.extpy = extpy
-        self.doctestitem = doctestitem
-        self.name = extpy.basename
-        self.args = args
+#     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)
+#     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()

Modified: Paste/trunk/paste/tests/test_pyconfig.py
===================================================================
--- Paste/trunk/paste/tests/test_pyconfig.py	2005-04-22 03:21:08 UTC (rev 2368)
+++ Paste/trunk/paste/tests/test_pyconfig.py	2005-04-22 03:38:04 UTC (rev 2369)
@@ -1,5 +1,5 @@
 import os
-from wsgikit import pyconfig
+from paste import pyconfig
 from py.test import raises
 
 def path(name):