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

[guido at codespeak.net]

Author: guido
Date: Fri Oct 20 13:35:43 2006
New Revision: 33495

Added:
   py/dist/py/apigen/
   py/dist/py/apigen/__init__.py
   py/dist/py/apigen/rest/
   py/dist/py/apigen/tracer/
      - copied from r33482, py/dist/py/test/tracer/
   py/dist/py/apigen/tracer/__init__.py
      - copied unchanged from r33494, py/dist/py/test/tracer/__init__.py
   py/dist/py/apigen/tracer/description.py
      - copied unchanged from r33494, py/dist/py/test/tracer/description.py
   py/dist/py/apigen/tracer/docstorage.py
      - copied, changed from r33494, py/dist/py/test/tracer/docstorage.py
   py/dist/py/apigen/tracer/genrest.py
      - copied, changed from r33494, py/dist/py/test/tracer/genrest.py
   py/dist/py/apigen/tracer/magic.py
      - copied, changed from r33494, py/dist/py/test/tracer/magic.py
   py/dist/py/apigen/tracer/testing/
      - copied from r33494, py/dist/py/test/tracer/testing/
   py/dist/py/apigen/tracer/tracer.py
      - copied, changed from r33494, py/dist/py/test/tracer/tracer.py
Removed:
   py/dist/py/test/tracer/
Modified:
   py/dist/py/apigen/tracer/testing/test_docgen.py
   py/dist/py/apigen/tracer/testing/test_magic.py
   py/dist/py/apigen/tracer/testing/test_rest.py
Log:
Moving tracer out of the test package.


Added: py/dist/py/apigen/__init__.py
==============================================================================

Copied: py/dist/py/apigen/tracer/docstorage.py (from r33494, py/dist/py/test/tracer/docstorage.py)
==============================================================================
--- py/dist/py/test/tracer/docstorage.py	(original)
+++ py/dist/py/apigen/tracer/docstorage.py	Fri Oct 20 13:35:43 2006
@@ -7,8 +7,8 @@
 import sys
 import types
 
-from py.__.test.tracer.description import FunctionDesc, ClassDesc, MethodDesc, \
-    Desc
+from py.__.apigen.tracer.description import FunctionDesc, ClassDesc, \
+                                            MethodDesc, Desc
 
 try:
     from pypy.annotation.policy import AnnotatorPolicy

Copied: py/dist/py/apigen/tracer/genrest.py (from r33494, py/dist/py/test/tracer/genrest.py)
==============================================================================
--- py/dist/py/test/tracer/genrest.py	(original)
+++ py/dist/py/apigen/tracer/genrest.py	Fri Oct 20 13:35:43 2006
@@ -7,7 +7,7 @@
 import sys
 import re
 
-from py.__.test.tracer.docstorage import DocStorageAccessor
+from py.__.apigen.tracer.docstorage import DocStorageAccessor
 from py.__.rst.rst import * # XXX Maybe we should list it here
 
 class AbstractLinkWriter(object):

Copied: py/dist/py/apigen/tracer/magic.py (from r33494, py/dist/py/test/tracer/magic.py)
==============================================================================
--- py/dist/py/test/tracer/magic.py	(original)
+++ py/dist/py/apigen/tracer/magic.py	Fri Oct 20 13:35:43 2006
@@ -9,8 +9,8 @@
 import weakref
 
 import py
-from py.__.test.tracer.docstorage import DocStorage
-from py.__.test.tracer.tracer import Tracer
+from py.__.apigen.tracer.docstorage import DocStorage
+from py.__.apigen.tracer.tracer import Tracer
 import sys
 
 class DocStorageKeeper(object):

Modified: py/dist/py/apigen/tracer/testing/test_docgen.py
==============================================================================
--- py/dist/py/test/tracer/testing/test_docgen.py	(original)
+++ py/dist/py/apigen/tracer/testing/test_docgen.py	Fri Oct 20 13:35:43 2006
@@ -6,9 +6,9 @@
 import sys
 
 try:
-    from py.__.test.tracer.tracer import DocStorage, Tracer
-    from py.__.test.tracer.testing.runtest import cut_pyc
-    from py.__.test.tracer.description import FunctionDesc
+    from py.__.apigen.tracer.tracer import DocStorage, Tracer
+    from py.__.apigen.tracer.testing.runtest import cut_pyc
+    from py.__.apigen.tracer.description import FunctionDesc
     from pypy.annotation import model
 except ImportError, s:
     py.test.skip("Cannot import: %s" % str(s))

Modified: py/dist/py/apigen/tracer/testing/test_magic.py
==============================================================================
--- py/dist/py/test/tracer/testing/test_magic.py	(original)
+++ py/dist/py/apigen/tracer/testing/test_magic.py	Fri Oct 20 13:35:43 2006
@@ -2,9 +2,9 @@
 """ test magic abilities of tracer
 """
 
-from py.__.test.tracer.magic import trace, get_storage, stack_copier, \
+from py.__.apigen.tracer.magic import trace, get_storage, stack_copier, \
     DocStorageKeeper
-from py.__.test.tracer.docstorage import DocStorage
+from py.__.apigen.tracer.docstorage import DocStorage
 from pypy.annotation import model
 
 #def setup_function(f):

Modified: py/dist/py/apigen/tracer/testing/test_rest.py
==============================================================================
--- py/dist/py/test/tracer/testing/test_rest.py	(original)
+++ py/dist/py/apigen/tracer/testing/test_rest.py	Fri Oct 20 13:35:43 2006
@@ -6,12 +6,12 @@
 from StringIO import StringIO
 
 try:
-    from py.__.test.tracer.genrest import ViewVC, RestGen, PipeWriter, \
+    from py.__.apigen.tracer.genrest import ViewVC, RestGen, PipeWriter, \
                                             DirWriter, FileWriter, \
                                             DirectPaste, DirectFS
-    from py.__.test.tracer.tracer import DocStorage, Tracer
+    from py.__.apigen.tracer.tracer import DocStorage, Tracer
 
-    from py.__.test.tracer.testing.runtest import cut_pyc
+    from py.__.apigen.tracer.testing.runtest import cut_pyc
 except ImportError, s:
     py.test.skip("Cannot import: %s" % str(s))
 
@@ -58,7 +58,7 @@
     fname = cut_pyc(__file__)
     title, link = vcview.getlink(fname, 0)
     assert title == '%s:%s' % (fname, 0)
-    assert link == ('http://codespeak.net/viewvc/py/test/tracer/'
+    assert link == ('http://codespeak.net/viewvc/py/apigen/tracer/'
                         'testing/test_rest.py?view=markup')
 
 def test_fs_link():

Copied: py/dist/py/apigen/tracer/tracer.py (from r33494, py/dist/py/test/tracer/tracer.py)
==============================================================================
--- py/dist/py/test/tracer/tracer.py	(original)
+++ py/dist/py/apigen/tracer/tracer.py	Fri Oct 20 13:35:43 2006
@@ -10,8 +10,8 @@
 # from pypy's code.
 # BLAH BLAH BLAH
 
-from py.__.test.tracer.description import FunctionDesc
-from py.__.test.tracer.docstorage import DocStorage
+from py.__.apigen.tracer.description import FunctionDesc
+from py.__.apigen.tracer.docstorage import DocStorage
 
 class UnionError(Exception):
     pass