Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support "bpo-" in Misc/NEWS #1

Merged
merged 3 commits into from
Feb 10, 2017
Merged

Support "bpo-" in Misc/NEWS #1

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1900740
Support "bpo-" in Misc/NEWS
brettcannon Feb 10, 2017
5401164
Fix up the match and substitution regexes
brettcannon Feb 10, 2017
02a87ce
Address reviewer comments
brettcannon Feb 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Doc/tools/extensions/pyspecific.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@


ISSUE_URI = 'https://bugs.python.org/issue%s'
SOURCE_URI = 'https://hg.python.org/cpython/file/3.6/%s'
SOURCE_URI = 'https://github.com/python/cpython/tree/3.6/%s'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't it be master rather than 3.6 on this branch?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My patch for another issue will address this, I think 🤔

http://bugs.python.org/file45904/issue28941.patch

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I went ahead and updated here since I'm already changing it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok :)


# monkey-patch reST parser to disable alphabetic and roman enumerated lists
from docutils.parsers.rst.states import Body
Expand Down Expand Up @@ -79,7 +79,7 @@ def new_depart_literal_block(self, node):

def issue_role(typ, rawtext, text, lineno, inliner, options={}, content=[]):
issue = utils.unescape(text)
text = 'issue ' + issue
text = 'bpo-' + issue
refnode = nodes.reference(text, text, refuri=ISSUE_URI % issue)
return [refnode], []

Expand Down Expand Up @@ -225,7 +225,7 @@ def run(self):

# Support for including Misc/NEWS

issue_re = re.compile('([Ii])ssue #([0-9]+)')
issue_re = re.compile('([Ii]ssue #|bpo-)([0-9]+)')
whatsnew_re = re.compile(r"(?im)^what's new in (.*?)\??$")


Expand Down Expand Up @@ -253,7 +253,7 @@ def run(self):
text = 'The NEWS file is not available.'
node = nodes.strong(text, text)
return [node]
content = issue_re.sub(r'`\1ssue #\2 <https://bugs.python.org/\2>`__',
content = issue_re.sub(r'`\bpo-\2 <https://bugs.python.org/\2>`__',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

\b ? I think you overwrote the \1 :-)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's on purpose as the first capture group is the prefix which doesn't matter. Probably should change the regex to use a non-capture group.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, you can either you use \1 or insert bpo-. But here you overwrote half the capture group by only deleting the 1 and not the \.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, you're right. Now fixed.

content)
content = whatsnew_re.sub(r'\1', content)
# remove first 3 lines as they are the main heading
Expand Down