diff options
| author | Georg Brandl <georg@python.org> | 2009-04-27 16:28:57 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-04-27 16:28:57 (GMT) |
| commit | 5617db86c39fa92f4acd2b2b93e9890791469f9f (patch) | |
| tree | 6c01aac783bbaa512e761bd1dd115a9419b124cc /Doc | |
| parent | 4e869c7e5b007b4f215eccdf6b2e42ac944c05a4 (diff) | |
| download | cpython-5617db86c39fa92f4acd2b2b93e9890791469f9f.zip cpython-5617db86c39fa92f4acd2b2b93e9890791469f9f.tar.gz cpython-5617db86c39fa92f4acd2b2b93e9890791469f9f.tar.bz2 | |
Merged revisions 71960 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r71960 | georg.brandl | 2009-04-26 11:56:44 +0200 (So, 26 Apr 2009) | 1 line
Move pydoc_topics module to its own subdirectory, so that no generated code is in Lib/.
........
Diffstat (limited to 'Doc')
| -rw-r--r-- | Doc/Makefile | 7 | ||||
| -rw-r--r-- | Doc/tools/sphinxext/pyspecific.py | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Doc/Makefile b/Doc/Makefile index 317fcb0..c9f3ed6 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -28,6 +28,7 @@ help: @echo " coverage to check documentation coverage for library and C API" @echo " dist to create a \"dist\" directory with archived docs for download" +# Note: if you update versions here, do the same in make.bat and README.txt checkout: @if [ ! -d tools/sphinx ]; then \ echo "Checking out Sphinx..."; \ @@ -101,8 +102,8 @@ doctest: build pydoc-topics: BUILDER = pydoc-topics pydoc-topics: build - @echo "Building finished; now copy build/pydoc-topics/pydoc_topics.py " \ - "into the Lib/ directory" + @echo "Building finished; now copy build/pydoc-topics/topics.py " \ + "to Lib/pydoc_data/topics.py" htmlview: html $(PYTHON) -c "import webbrowser; webbrowser.open('build/html/index.html')" @@ -132,7 +133,7 @@ dist: (cd dist; zip -q -r -9 python-$(DISTVERSION)-docs-text.zip python-$(DISTVERSION)-docs-text) rm -r dist/python-$(DISTVERSION)-docs-text rm dist/python-$(DISTVERSION)-docs-text.tar - + # archive the A4 latex -rm -r build/latex make latex PAPER=a4 diff --git a/Doc/tools/sphinxext/pyspecific.py b/Doc/tools/sphinxext/pyspecific.py index 024a5fa..2ed36b2 100644 --- a/Doc/tools/sphinxext/pyspecific.py +++ b/Doc/tools/sphinxext/pyspecific.py @@ -5,7 +5,7 @@ Sphinx extension with Python doc-specific markup. - :copyright: 2008 by Georg Brandl. + :copyright: 2008, 2009 by Georg Brandl. :license: Python license. """ @@ -87,7 +87,7 @@ class PydocTopicsBuilder(Builder): self.topics[label] = str(writer.output) def finish(self): - f = open(path.join(self.outdir, 'pydoc_topics.py'), 'w') + f = open(path.join(self.outdir, 'topics.py'), 'w') try: f.write('# Autogenerated by Sphinx on %s\n' % asctime()) f.write('topics = ' + pformat(self.topics) + '\n') |