[py-svn] r36664 - in py/dist/py: apigen apigen/rest/testing doc doc/apigen doc/example doc/future doc/talk documentation misc/testing rest/testing test/rsession/testing test/testing

hpk at codespeak.net hpk at codespeak.net
Sat Jan 13 16:19:46 CET 2007


Author: hpk
Date: Sat Jan 13 16:19:39 2007
New Revision: 36664

Added:
   py/dist/py/doc/
      - copied from r36652, py/dist/py/documentation/
   py/dist/py/doc/TODO.txt
      - copied, changed from r36661, py/dist/py/documentation/TODO.txt
   py/dist/py/doc/__init__.py
      - copied unchanged from r36661, py/dist/py/documentation/__init__.py
   py/dist/py/doc/api.txt
      - copied unchanged from r36661, py/dist/py/documentation/api.txt
   py/dist/py/doc/apigen/
      - copied from r36661, py/dist/py/documentation/apigen/
   py/dist/py/doc/apigen.txt
      - copied unchanged from r36661, py/dist/py/documentation/apigen.txt
   py/dist/py/doc/bin.txt
      - copied unchanged from r36661, py/dist/py/documentation/bin.txt
   py/dist/py/doc/coding-style.txt
      - copied unchanged from r36661, py/dist/py/documentation/coding-style.txt
   py/dist/py/doc/confrest.py
      - copied unchanged from r36661, py/dist/py/documentation/confrest.py
   py/dist/py/doc/conftest.py
      - copied unchanged from r36661, py/dist/py/documentation/conftest.py
   py/dist/py/doc/contact.txt
      - copied unchanged from r36661, py/dist/py/documentation/contact.txt
   py/dist/py/doc/example/
      - copied from r36661, py/dist/py/documentation/example/
   py/dist/py/doc/execnet.txt
      - copied unchanged from r36661, py/dist/py/documentation/execnet.txt
   py/dist/py/doc/future/
      - copied from r36661, py/dist/py/documentation/future/
   py/dist/py/doc/getting-started.txt
      - copied unchanged from r36661, py/dist/py/documentation/getting-started.txt
   py/dist/py/doc/greenlet.txt
      - copied unchanged from r36661, py/dist/py/documentation/greenlet.txt
   py/dist/py/doc/home.txt
      - copied unchanged from r36661, py/dist/py/documentation/home.txt
   py/dist/py/doc/index.txt
      - copied unchanged from r36661, py/dist/py/documentation/index.txt
   py/dist/py/doc/links.txt
      - copied unchanged from r36661, py/dist/py/documentation/links.txt
   py/dist/py/doc/log.txt
      - copied unchanged from r36661, py/dist/py/documentation/log.txt
   py/dist/py/doc/misc.txt
      - copied unchanged from r36661, py/dist/py/documentation/misc.txt
   py/dist/py/doc/releasescheme.txt
      - copied unchanged from r36661, py/dist/py/documentation/releasescheme.txt
   py/dist/py/doc/style.css
      - copied unchanged from r36661, py/dist/py/documentation/style.css
   py/dist/py/doc/talk/
      - copied from r36661, py/dist/py/documentation/talk/
   py/dist/py/doc/test-distributed.txt
      - copied unchanged from r36661, py/dist/py/documentation/test-distributed.txt
   py/dist/py/doc/test.txt
      - copied unchanged from r36661, py/dist/py/documentation/test.txt
   py/dist/py/doc/test_conftest.py
      - copied unchanged from r36661, py/dist/py/documentation/test_conftest.py
   py/dist/py/doc/why_py.txt
      - copied unchanged from r36661, py/dist/py/documentation/why_py.txt
   py/dist/py/doc/xml.txt
      - copied unchanged from r36661, py/dist/py/documentation/xml.txt
Removed:
   py/dist/py/documentation/
Modified:
   py/dist/py/apigen/layout.py
   py/dist/py/apigen/project.py
   py/dist/py/apigen/rest/testing/test_rest.py
   py/dist/py/misc/testing/test_initpkg.py
   py/dist/py/rest/testing/test_rst.py
   py/dist/py/test/rsession/testing/test_slave.py
   py/dist/py/test/testing/test_collect.py
Log:
rename documentation to doc, hopefully catched all
places where it is used within py lib. 



Modified: py/dist/py/apigen/layout.py
==============================================================================
--- py/dist/py/apigen/layout.py	(original)
+++ py/dist/py/apigen/layout.py	Sat Jan 13 16:19:39 2007
@@ -4,7 +4,7 @@
 """
 
 import py
-from py.__.documentation.confrest import Page
+from py.__.doc.confrest import Page
 
 class LayoutPage(Page):
     """ this provides the layout and style information """

Modified: py/dist/py/apigen/project.py
==============================================================================
--- py/dist/py/apigen/project.py	(original)
+++ py/dist/py/apigen/project.py	Sat Jan 13 16:19:39 2007
@@ -8,7 +8,7 @@
 import py
 from layout import LayoutPage
 
-class Project(py.__.documentation.confrest.Project):
+class Project(py.__.doc.confrest.Project):
     """ a full project
 
         this takes care of storing information on the first pass, and building

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	Sat Jan 13 16:19:39 2007
@@ -15,7 +15,7 @@
 import pickle
 
 from py.__.apigen.tracer.testing.runtest import cut_pyc
-from py.__.documentation.conftest import genlinkchecks
+from py.__.doc.conftest import genlinkchecks
 from py.__.rest.rst import Rest, Paragraph
 from py.__.rest.transform import HTMLHandler
 # XXX: UUuuuuuuuuuuuuuuuuuuuuuuu, dangerous import

Copied: py/dist/py/doc/TODO.txt (from r36661, py/dist/py/documentation/TODO.txt)
==============================================================================
--- py/dist/py/documentation/TODO.txt	(original)
+++ py/dist/py/doc/TODO.txt	Sat Jan 13 16:19:39 2007
@@ -16,7 +16,7 @@
 review all py lib documentation
 -------------------------------------
 
-* rename py/documentation to py/doc
+* (hpk, in-progress) rename py/documentation to py/doc
   (check web page and pypy usage of it)
 
 streamline exported API 

Modified: py/dist/py/misc/testing/test_initpkg.py
==============================================================================
--- py/dist/py/misc/testing/test_initpkg.py	(original)
+++ py/dist/py/misc/testing/test_initpkg.py	Sat Jan 13 16:19:39 2007
@@ -43,7 +43,7 @@
         base.join('magic', 'greenlet.py'), 
         base.join('path', 'extpy', 'testing', 'test_data'),
         base.join('path', 'gateway',),
-        base.join('documentation',),
+        base.join('doc',),
         base.join('test', 'testing', 'import_test'),
         base.join('c-extension',), 
         base.join('magic', 'greenlet.py'), 

Modified: py/dist/py/rest/testing/test_rst.py
==============================================================================
--- py/dist/py/rest/testing/test_rst.py	(original)
+++ py/dist/py/rest/testing/test_rst.py	Sat Jan 13 16:19:39 2007
@@ -3,7 +3,7 @@
 """
 
 from py.__.rest.rst import *
-from py.__.documentation.conftest import restcheck
+from py.__.doc.conftest import restcheck
 import traceback
 
 tempdir = py.test.ensuretemp('rest')

Modified: py/dist/py/test/rsession/testing/test_slave.py
==============================================================================
--- py/dist/py/test/rsession/testing/test_slave.py	(original)
+++ py/dist/py/test/rsession/testing/test_slave.py	Sat Jan 13 16:19:39 2007
@@ -123,7 +123,7 @@
 
 def test_slave_run_different_stuff():
     node = gettestnode()
-    node.run("py documentation log.txt".split())
+    node.run("py doc log.txt".split())
 
 def test_slave_setup_fails_on_import_error():
     from py.__.test.rsession.slave import setup 

Modified: py/dist/py/test/testing/test_collect.py
==============================================================================
--- py/dist/py/test/testing/test_collect.py	(original)
+++ py/dist/py/test/testing/test_collect.py	Sat Jan 13 16:19:39 2007
@@ -319,9 +319,9 @@
 
 
 def test_documentation_virtual_collector_interaction():
-    rootdir = py.path.local(py.__file__).dirpath("documentation")
+    rootdir = py.path.local(py.__file__).dirpath("doc")
     # HACK 
-    from py.__.documentation import conftest as conf
+    from py.__.doc import conftest as conf
     old = conf.option.forcegen
     try:
         conf.option.forcegen = 1



More information about the pytest-commit mailing list