Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
562b7cbf
Commit
562b7cbf
authored
Jan 14, 2015
by
Benjamin Peterson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix parsing reST with code or code-block directives (closes #23063)
Patch by Marc Abramowitz.
parent
29ad0111
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
38 additions
and
4 deletions
+38
-4
Lib/distutils/command/check.py
Lib/distutils/command/check.py
+4
-4
Lib/distutils/tests/test_check.py
Lib/distutils/tests/test_check.py
+31
-0
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/distutils/command/check.py
View file @
562b7cbf
...
@@ -122,7 +122,7 @@ class check(Command):
...
@@ -122,7 +122,7 @@ class check(Command):
"""Returns warnings when the provided data doesn't compile."""
"""Returns warnings when the provided data doesn't compile."""
source_path
=
StringIO
()
source_path
=
StringIO
()
parser
=
Parser
()
parser
=
Parser
()
settings
=
frontend
.
OptionParser
().
get_default_values
()
settings
=
frontend
.
OptionParser
(
components
=
(
Parser
,)
).
get_default_values
()
settings
.
tab_width
=
4
settings
.
tab_width
=
4
settings
.
pep_references
=
None
settings
.
pep_references
=
None
settings
.
rfc_references
=
None
settings
.
rfc_references
=
None
...
@@ -138,8 +138,8 @@ class check(Command):
...
@@ -138,8 +138,8 @@ class check(Command):
document
.
note_source
(
source_path
,
-
1
)
document
.
note_source
(
source_path
,
-
1
)
try
:
try
:
parser
.
parse
(
data
,
document
)
parser
.
parse
(
data
,
document
)
except
AttributeError
:
except
AttributeError
as
e
:
reporter
.
messages
.
append
(
(
-
1
,
'Could not finish the parsing.'
,
reporter
.
messages
.
append
(
''
,
{}))
(
-
1
,
'Could not finish the parsing: %s.'
%
e
,
''
,
{}))
return
reporter
.
messages
return
reporter
.
messages
Lib/distutils/tests/test_check.py
View file @
562b7cbf
"""Tests for distutils.command.check."""
"""Tests for distutils.command.check."""
import
textwrap
import
unittest
import
unittest
from
test.support
import
run_unittest
from
test.support
import
run_unittest
...
@@ -92,6 +93,36 @@ class CheckTestCase(support.LoggingSilencer,
...
@@ -92,6 +93,36 @@ class CheckTestCase(support.LoggingSilencer,
cmd
=
self
.
_run
(
metadata
,
strict
=
1
,
restructuredtext
=
1
)
cmd
=
self
.
_run
(
metadata
,
strict
=
1
,
restructuredtext
=
1
)
self
.
assertEqual
(
cmd
.
_warnings
,
0
)
self
.
assertEqual
(
cmd
.
_warnings
,
0
)
@
unittest
.
skipUnless
(
HAS_DOCUTILS
,
"won't test without docutils"
)
def
test_check_restructuredtext_with_syntax_highlight
(
self
):
# Don't fail if there is a `code` or `code-block` directive
example_rst_docs
=
[]
example_rst_docs
.
append
(
textwrap
.
dedent
(
"""
\
Here's some code:
.. code:: python
def foo():
pass
"""
))
example_rst_docs
.
append
(
textwrap
.
dedent
(
"""
\
Here's some code:
.. code-block:: python
def foo():
pass
"""
))
for
rest_with_code
in
example_rst_docs
:
pkg_info
,
dist
=
self
.
create_dist
(
long_description
=
rest_with_code
)
cmd
=
check
(
dist
)
cmd
.
check_restructuredtext
()
self
.
assertEqual
(
cmd
.
_warnings
,
0
)
msgs
=
cmd
.
_check_rst_data
(
rest_with_code
)
self
.
assertEqual
(
len
(
msgs
),
0
)
def
test_check_all
(
self
):
def
test_check_all
(
self
):
metadata
=
{
'url'
:
'xxx'
,
'author'
:
'xxx'
}
metadata
=
{
'url'
:
'xxx'
,
'author'
:
'xxx'
}
...
...
Misc/NEWS
View file @
562b7cbf
...
@@ -44,6 +44,9 @@ Core and Builtins
...
@@ -44,6 +44,9 @@ Core and Builtins
Library
Library
-------
-------
- Issue #23063: In the disutils'
check
command
,
fix
parsing
of
reST
with
code
or
code
-
block
directives
.
-
Issue
#
23209
,
#
23225
:
selectors
.
BaseSelector
.
close
()
now
clears
its
internal
-
Issue
#
23209
,
#
23225
:
selectors
.
BaseSelector
.
close
()
now
clears
its
internal
reference
to
the
selector
mapping
to
break
a
reference
cycle
.
Initial
patch
reference
to
the
selector
mapping
to
break
a
reference
cycle
.
Initial
patch
written
by
Martin
Richard
.
written
by
Martin
Richard
.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment