[py-svn] r34669 - in py/dist/py: apigen/rest apigen/rest/testing rest rest/testing rst

[guido at codespeak.net]

Author: guido
Date: Thu Nov 16 15:04:09 2006
New Revision: 34669

Added:
   py/dist/py/rest/rst.py
      - copied unchanged from r34657, py/dist/py/rst/rst.py
   py/dist/py/rest/testing/test_rst.py
      - copied, changed from r34657, py/dist/py/rst/testing/test_rst.py
   py/dist/py/rest/testing/test_transform.py
      - copied, changed from r34657, py/dist/py/rst/testing/test_transform.py
   py/dist/py/rest/transform.py
      - copied, changed from r34657, py/dist/py/rst/transform.py
Removed:
   py/dist/py/rst/
Modified:
   py/dist/py/apigen/rest/genrest.py
   py/dist/py/apigen/rest/htmlhandlers.py
   py/dist/py/apigen/rest/testing/test_rest.py
Log:
Moved py.rst stuff to py.rest and removed py.rst dir.


Modified: py/dist/py/apigen/rest/genrest.py
==============================================================================
--- py/dist/py/apigen/rest/genrest.py	(original)
+++ py/dist/py/apigen/rest/genrest.py	Thu Nov 16 15:04:09 2006
@@ -8,8 +8,9 @@
 import re
 
 from py.__.apigen.tracer.docstorage import DocStorageAccessor
-from py.__.rst.rst import * # XXX Maybe we should list it here
+from py.__.rest.rst import * # XXX Maybe we should list it here
 from py.__.apigen.tracer import model
+from py.__.rest.transform import RestTransformer
 
 class AbstractLinkWriter(object):
     """ Class implementing writing links to source code.
@@ -123,7 +124,6 @@
             self.directory = py.path.local(directory)
 
     def write_section(self, name, rest):
-        from py.__.rst.transform import RestTransformer
         if name == 'index':
             handler = self.indexhandler
         else:

Modified: py/dist/py/apigen/rest/htmlhandlers.py
==============================================================================
--- py/dist/py/apigen/rest/htmlhandlers.py	(original)
+++ py/dist/py/apigen/rest/htmlhandlers.py	Thu Nov 16 15:04:09 2006
@@ -1,4 +1,4 @@
-from py.__.rst.transform import HTMLHandler, entitize
+from py.__.rest.transform import HTMLHandler, entitize
 
 class PageHandler(HTMLHandler):
     def startDocument(self):

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	Thu Nov 16 15:04:09 2006
@@ -14,7 +14,8 @@
 
 from py.__.apigen.tracer.testing.runtest import cut_pyc
 from py.__.documentation.conftest import genlinkchecks
-from py.__.rst.rst import Rest, Paragraph
+from py.__.rest.rst import Rest, Paragraph
+from py.__.rest.transform import HTMLHandler
 # XXX: UUuuuuuuuuuuuuuuuuuuuuuuu, dangerous import
 
 def setup_module(mod):
@@ -124,7 +125,6 @@
 
 class TestHTMLDirWriter(WriterTest):
     def test_write_section(self):
-        from py.__.rst.transform import HTMLHandler
         tempdir = temppath.ensure('htmldirwriter', dir=1)
         hdw = self.get_filled_writer(HTMLDirWriter, HTMLHandler, HTMLHandler,
                                      tempdir)

Copied: py/dist/py/rest/testing/test_rst.py (from r34657, py/dist/py/rst/testing/test_rst.py)
==============================================================================
--- py/dist/py/rst/testing/test_rst.py	(original)
+++ py/dist/py/rest/testing/test_rst.py	Thu Nov 16 15:04:09 2006
@@ -2,7 +2,7 @@
 """ rst generation tests
 """
 
-from py.__.rst.rst import *
+from py.__.rest.rst import *
 from py.__.documentation.conftest import restcheck
 import traceback
 

Copied: py/dist/py/rest/testing/test_transform.py (from r34657, py/dist/py/rst/testing/test_transform.py)
==============================================================================
--- py/dist/py/rst/testing/test_transform.py	(original)
+++ py/dist/py/rest/testing/test_transform.py	Thu Nov 16 15:04:09 2006
@@ -1,6 +1,6 @@
 import py
-from py.__.rst.rst import *
-from py.__.rst.transform import *
+from py.__.rest.rst import *
+from py.__.rest.transform import *
 
 def convert_to_html(tree):
     handler = HTMLHandler()
@@ -8,7 +8,7 @@
     t.parse(handler)
     return handler.html
 
-class HTMLHandler(py.__.rst.transform.HTMLHandler):
+class HTMLHandler(py.__.rest.transform.HTMLHandler):
     def startDocument(self):
         pass
     endDocument = startDocument

Copied: py/dist/py/rest/transform.py (from r34657, py/dist/py/rst/transform.py)
==============================================================================
--- py/dist/py/rst/transform.py	(original)
+++ py/dist/py/rest/transform.py	Thu Nov 16 15:04:09 2006
@@ -1,5 +1,5 @@
 import py
-from py.__.rst import rst
+from py.__.rest import rst
 
 class RestTransformer(object):
     def __init__(self, tree):