[py-svn] r32917 - in py/branch/apigen/py/test/tracer: . testing

[fijal at codespeak.net]

Author: fijal
Date: Thu Oct  5 20:16:18 2006
New Revision: 32917

Modified:
   py/branch/apigen/py/test/tracer/description.py
   py/branch/apigen/py/test/tracer/genrest.py
   py/branch/apigen/py/test/tracer/testing/test_docgen.py
Log:
Make use of __extend__ (looks cleaner than adding new functions)


Modified: py/branch/apigen/py/test/tracer/description.py
==============================================================================
--- py/branch/apigen/py/test/tracer/description.py	(original)
+++ py/branch/apigen/py/test/tracer/description.py	Thu Oct  5 20:16:18 2006
@@ -11,18 +11,15 @@
     def get_tuple(self):
         return self.filename, self.lineno, self.source
 
-#class __extend__(FunctionDesc):
-def consider_call(self, inputcells):
-    if not hasattr(self, 'inputcells'):
-        self.inputcells = inputcells
-        return
-    for cell_num, cell in enumerate(inputcells):
-        self.inputcells[cell_num] = unionof(cell, self.inputcells[cell_num])
+class __extend__(FunctionDesc):
+    def consider_call(self, inputcells):
+        if not hasattr(self, 'inputcells'):
+            self.inputcells = inputcells
+            return
+        for cell_num, cell in enumerate(inputcells):
+            self.inputcells[cell_num] = unionof(cell, self.inputcells[cell_num])
 
-def consider_call_site(self, frame):
-    if not hasattr(self, 'call_sites'):
-        self.call_sites = []
-    self.call_sites.append(CallSite(frame.code.raw.co_filename, frame.lineno+1, str(frame.statement)))
-
-FunctionDesc.consider_call = consider_call
-FunctionDesc.consider_call_site = consider_call_site
+    def consider_call_site(self, frame):
+        if not hasattr(self, 'call_sites'):
+            self.call_sites = []
+        self.call_sites.append(CallSite(frame.code.raw.co_filename, frame.lineno+1, str(frame.statement)))

Modified: py/branch/apigen/py/test/tracer/genrest.py
==============================================================================
--- py/branch/apigen/py/test/tracer/genrest.py	(original)
+++ py/branch/apigen/py/test/tracer/genrest.py	Thu Oct  5 20:16:18 2006
@@ -6,6 +6,7 @@
 import sys
 
 from py.__.test.tracer.docstorage import DocStorageAccessor
+from py.__.rest import rst
 
 class RestGen(object):
     def __init__(self, ds, output=sys.stdout):

Modified: py/branch/apigen/py/test/tracer/testing/test_docgen.py
==============================================================================
--- py/branch/apigen/py/test/tracer/testing/test_docgen.py	(original)
+++ py/branch/apigen/py/test/tracer/testing/test_docgen.py	Thu Oct  5 20:16:18 2006
@@ -39,3 +39,4 @@
     assert cs[0].lineno == test_basic.func_code.co_firstlineno + 5
     assert cs[1].filename == f_name
     assert cs[1].lineno == test_basic.func_code.co_firstlineno + 6
+