mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-27 05:04:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merged revisions 85197 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85197 | tarek.ziade | 2010-10-03 16:18:09 +0200 (Sun, 03 Oct 2010) | 1 line

  Fixed #8980: distutils.command.check was failing w/ docutils installed
........
This commit is contained in:
Tarek Ziadé 2010-10-03 14:30:11 +00:00
parent 866c74e3d6
commit c9afba853c
3 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/distutils/command/check.py
View file

@ -13,7 +13,7 @@ try:
from docutils.parsers.rst import Parser from docutils.parsers.rst import Parser
from docutils import frontend from docutils import frontend
from docutils import nodes from docutils import nodes
from StringIO import StringIO from io import StringIO
class SilentReporter(Reporter): class SilentReporter(Reporter):

12
Lib/distutils/tests/test_register.py
View file

@ -224,24 +224,24 @@ class RegisterTestCase(PyPIRCCommandTestCase):
cmd = self._get_cmd(metadata) cmd = self._get_cmd(metadata)
cmd.ensure_finalized() cmd.ensure_finalized()
cmd.strict = 1 cmd.strict = 1
inputs = RawInputs('1', 'tarek', 'y') inputs = Inputs('1', 'tarek', 'y')
register_module.raw_input = inputs.__call__ register_module.input = inputs.__call__
# let's run the command # let's run the command
try: try:
cmd.run() cmd.run()
finally: finally:
del register_module.raw_input del register_module.input
# strict is not by default # strict is not by default
cmd = self._get_cmd() cmd = self._get_cmd()
cmd.ensure_finalized() cmd.ensure_finalized()
inputs = RawInputs('1', 'tarek', 'y') inputs = Inputs('1', 'tarek', 'y')
register_module.raw_input = inputs.__call__ register_module.input = inputs.__call__
# let's run the command # let's run the command
try: try:
cmd.run() cmd.run()
finally: finally:
del register_module.raw_input del register_module.input
def test_check_metadata_deprecated(self): def test_check_metadata_deprecated(self):
# makes sure make_metadata is deprecated # makes sure make_metadata is deprecated

3
Misc/NEWS
View file

@ -124,6 +124,9 @@ C-API
Library Library
------- -------
- Issue #8980: Fixed a failure in distutils.command check that was shadowed
by an environment that does not have docutils. Patch by Arferver.
- Issue #1050268: parseaddr now correctly quotes double quote and backslash - Issue #1050268: parseaddr now correctly quotes double quote and backslash
characters that appear inside quoted strings in email addresses. characters that appear inside quoted strings in email addresses.