mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-17 22:20:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

merge with 3.3.

Browse source
This commit is contained in:
Georg Brandl 2012-10-01 19:09:00 +02:00
commit a32e8dfe12
4 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Doc/tools/sphinxext/pyspecific.py
View file

@ -149,10 +149,9 @@ class DeprecatedRemoved(Directive):
import re import re
import codecs import codecs
from docutils.statemachine import string2lines
from sphinx.util.nodes import nested_parse_with_titles
issue_re = re.compile('Issue #([0-9]+)') issue_re = re.compile('([Ii])ssue #([0-9]+)')
whatsnew_re = re.compile(r"(?im)^what's new in (.*?)\??$")
class MiscNews(Directive): class MiscNews(Directive):
has_content = False has_content = False
@ -166,8 +165,10 @@ class MiscNews(Directive):
source = self.state_machine.input_lines.source( source = self.state_machine.input_lines.source(
self.lineno - self.state_machine.input_offset - 1) self.lineno - self.state_machine.input_offset - 1)
source_dir = path.dirname(path.abspath(source)) source_dir = path.dirname(path.abspath(source))
fpath = path.join(source_dir, fname)
self.state.document.settings.record_dependencies.add(fpath)
try: try:
fp = codecs.open(path.join(source_dir, fname), encoding='utf-8') fp = codecs.open(fpath, encoding='utf-8')
try: try:
content = fp.read() content = fp.read()
finally: finally:
@ -176,8 +177,9 @@ class MiscNews(Directive):
text = 'The NEWS file is not available.' text = 'The NEWS file is not available.'
node = nodes.strong(text, text) node = nodes.strong(text, text)
return [node] return [node]
content = issue_re.sub(r'`Issue #\1 <http://bugs.python.org/\1>`__', content = issue_re.sub(r'`\1ssue #\2 <http://bugs.python.org/\2>`__',
content) content)
content = whatsnew_re.sub(r'\1', content)
# remove first 3 lines as they are the main heading # remove first 3 lines as they are the main heading
lines = content.splitlines()[3:] lines = content.splitlines()[3:]
self.state_machine.insert_input(lines, fname) self.state_machine.insert_input(lines, fname)

6
Doc/whatsnew/news.rst → Doc/whatsnew/changelog.rst
View file

@ -1,6 +1,6 @@
+++++++++++ +++++++++
Python News Changelog
+++++++++++ +++++++++
.. raw:: html .. raw:: html

8
Doc/whatsnew/index.rst
View file

@ -25,10 +25,10 @@ anyone wishing to stay up-to-date after a new release.
2.1.rst 2.1.rst
2.0.rst 2.0.rst
The "Python News" is a HTML version of the file :source:`Misc/NEWS` which The "Changelog" is a HTML version of the file :source:`Misc/NEWS` which
contains *all* nontrivial changes to Python. contains *all* nontrivial changes to Python for the current version.
.. toctree:: .. toctree::
:maxdepth: 1 :maxdepth: 2
news.rst changelog.rst

2
Misc/NEWS
View file

@ -78,7 +78,7 @@ Library
- Issue #15509: webbrowser.UnixBrowser no longer passes empty arguments to - Issue #15509: webbrowser.UnixBrowser no longer passes empty arguments to
Popen when %action substitutions produce empty strings. Popen when %action substitutions produce empty strings.
- Issues #12776, #11839: call argparse type function (specified by add_argument) - Issue #12776, issue #11839: call argparse type function (specified by add_argument)
only once. Before, the type function was called twice in the case where the only once. Before, the type function was called twice in the case where the
default was specified and the argument was given as well. This was especially default was specified and the argument was given as well. This was especially
problematic for the FileType type, as a default file would always be opened, problematic for the FileType type, as a default file would always be opened,