[py-svn] r33498 - in py/dist/py/apigen: rest/testing tracer tracer/testing

[guido at codespeak.net]

Author: guido
Date: Fri Oct 20 14:14:13 2006
New Revision: 33498

Modified:
   py/dist/py/apigen/rest/testing/test_rest.py
   py/dist/py/apigen/tracer/testing/test_docgen.py
   py/dist/py/apigen/tracer/tracer.py
Log:
Removed useless import, whitespace, indentation, typo.


Modified: py/dist/py/apigen/rest/testing/test_rest.py
==============================================================================
--- py/dist/py/apigen/rest/testing/test_rest.py	(original)
+++ py/dist/py/apigen/rest/testing/test_rest.py	Fri Oct 20 14:14:13 2006
@@ -9,7 +9,8 @@
     from py.__.apigen.rest.genrest import ViewVC, RestGen, PipeWriter, \
                                             DirWriter, FileWriter, \
                                             DirectPaste, DirectFS
-    from py.__.apigen.tracer.tracer import DocStorage, Tracer
+    from py.__.apigen.tracer.tracer import Tracer
+    from py.__.apigen.tracer.docstorage import DocStorage
 
     from py.__.apigen.tracer.testing.runtest import cut_pyc
 except ImportError, s:

Modified: py/dist/py/apigen/tracer/testing/test_docgen.py
==============================================================================
--- py/dist/py/apigen/tracer/testing/test_docgen.py	(original)
+++ py/dist/py/apigen/tracer/testing/test_docgen.py	Fri Oct 20 14:14:13 2006
@@ -6,7 +6,8 @@
 import sys
 
 try:
-    from py.__.apigen.tracer.tracer import DocStorage, Tracer
+    from py.__.apigen.tracer.docstorage import DocStorage
+    from py.__.apigen.tracer.tracer import Tracer
     from py.__.apigen.tracer.testing.runtest import cut_pyc
     from py.__.apigen.tracer.description import FunctionDesc
     from pypy.annotation import model

Modified: py/dist/py/apigen/tracer/tracer.py
==============================================================================
--- py/dist/py/apigen/tracer/tracer.py	(original)
+++ py/dist/py/apigen/tracer/tracer.py	Fri Oct 20 14:14:13 2006
@@ -10,9 +10,6 @@
 # from pypy's code.
 # BLAH BLAH BLAH
 
-from py.__.apigen.tracer.description import FunctionDesc
-from py.__.apigen.tracer.docstorage import DocStorage
-
 class UnionError(Exception):
     pass
 
@@ -26,11 +23,12 @@
     
     def _tracer(self, frame, event, arg):
         
-        # perform actuall tracing
+        # perform actual tracing
         frame = py.code.Frame(frame)
         if event == 'call':
             assert arg is None
-            self.docstorage.consider_call(frame, py.code.Frame(sys._getframe(2)))
+            self.docstorage.consider_call(frame,
+                                          py.code.Frame(sys._getframe(2)))
         elif event == 'return':
             self.docstorage.consider_return(frame, arg)