pFad - Phone/Frame/Anonymizer/Declutterfier! Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

URL: http://github.com/python/cpython/commit/61bd1dcf9bde6e64408392765d649c057a8fc81b

aa60c69660fa.css" /> Move Doc/tools/sphinxext content to Doc/tools, there is no need for t… · python/cpython@61bd1dc · GitHub
Skip to content

Commit 61bd1dc

Browse files
birkenfeldbirkenfeld
committed
Move Doc/tools/sphinxext content to Doc/tools, there is no need for the nested subdirectory anymore.
1 parent c8da428 commit 61bd1dc

23 files changed

Lines changed: 9 additions & 90 deletions

‎Doc/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ PYTHON = python
88
SPHINXBUILD = sphinx-build
99
PAPER =
1010
SOURCES =
11-
DISTVERSION = $(shell $(PYTHON) tools/sphinxext/patchlevel.py)
11+
DISTVERSION = $(shell $(PYTHON) tools/patchlevel.py)
1212

1313
ALLSPHINXOPTS = -b $(BUILDER) -d build/doctrees -D latex_paper_size=$(PAPER) \
1414
$(SPHINXOPTS) . build/$(BUILDER) $(SOURCES)
@@ -79,7 +79,7 @@ suspicious:
7979
@$(MAKE) build BUILDER=$(BUILDER) || { \
8080
echo "Suspicious check complete; look for any errors in the above output" \
8181
"or in build/$(BUILDER)/suspicious.csv. If all issues are false" \
82-
"positives, append that file to tools/sphinxext/susp-ignored.csv."; \
82+
"positives, append that file to tools/susp-ignored.csv."; \
8383
false; }
8484

8585
coverage: BUILDER = coverage

‎Doc/README.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ Available make targets are:
7979

8080
* "pydoc-topics", which builds a Python module containing a dictionary with
8181
plain text documentation for the labels defined in
82-
`tools/sphinxext/pyspecific.py` -- pydoc needs these to show topic and
83-
keyword help.
82+
`tools/pyspecific.py` -- pydoc needs these to show topic and keyword help.
8483

8584
* "suspicious", which checks the parsed markup for text that looks like
8685
malformed and thus unconverted reST.

‎Doc/conf.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
# that aren't pickleable (module imports are okay, they're removed automatically).
88

99
import sys, os, time
10-
sys.path.append(os.path.abspath('tools/sphinxext'))
10+
sys.path.append(os.path.abspath('tools'))
1111

1212
# General configuration
1313
# ---------------------
1414

1515
extensions = ['sphinx.ext.coverage', 'sphinx.ext.doctest',
1616
'pyspecific', 'c_annotations']
17-
templates_path = ['tools/sphinxext']
17+
templates_path = ['tools']
1818

1919
# General substitutions.
2020
project = 'Python'
@@ -68,7 +68,7 @@
6868
# -----------------------
6969

7070
html_theme = 'pydoctheme'
71-
html_theme_path = ['tools/sphinxext']
71+
html_theme_path = ['tools']
7272
html_theme_options = {'collapsiblesidebar': True}
7373

7474
html_short_title = '%s Documentation' % release
@@ -96,7 +96,7 @@
9696
html_use_opensearch = 'http://docs.python.org/' + version
9797

9898
# Additional static files.
99-
html_static_path = ['tools/sphinxext/static']
99+
html_static_path = ['tools/static']
100100

101101
# Output file base name for HTML help builder.
102102
htmlhelp_basename = 'python' + release.replace('.', '')

‎Doc/make.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if DEFINED ProgramFiles(x86) set _PRGMFLS=%ProgramFiles(x86)%
1212
if NOT DEFINED ProgramFiles(x86) set _PRGMFLS=%ProgramFiles%
1313
if "%HTMLHELP%" EQU "" set HTMLHELP=%_PRGMFLS%\HTML Help Workshop\hhc.exe
1414

15-
if "%DISTVERSION%" EQU "" for /f "usebackq" %%v in (`%PYTHON% tools/sphinxext/patchlevel.py`) do set DISTVERSION=%%v
15+
if "%DISTVERSION%" EQU "" for /f "usebackq" %%v in (`%PYTHON% tools/patchlevel.py`) do set DISTVERSION=%%v
1616

1717
if "%BUILDDIR%" EQU "" set BUILDDIR=build
1818

Doc/tools/sphinxext/c_annotations.py renamed to Doc/tools/c_annotations.py

File renamed without changes.

Doc/tools/sphinxext/download.html renamed to Doc/tools/download.html

File renamed without changes.

Doc/tools/sphinxext/indexcontent.html renamed to Doc/tools/indexcontent.html

File renamed without changes.

Doc/tools/sphinxext/indexsidebar.html renamed to Doc/tools/indexsidebar.html

File renamed without changes.

Doc/tools/sphinxext/layout.html renamed to Doc/tools/layout.html

File renamed without changes.

Doc/tools/sphinxext/opensearch.xml renamed to Doc/tools/opensearch.xml

File renamed without changes.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad © 2024 Your Company Name. All rights reserved.




Check this box to remove all script contents from the fetched content.



Check this box to remove all images from the fetched content.


Check this box to remove all CSS styles from the fetched content.


Check this box to keep images inefficiently compressed and original size.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy