summaryrefslogtreecommitdiffstats
path: root/Lib/distutils
diff options
context:
space:
mode:
authorTarek Ziadé <ziade.tarek@gmail.com>2010-10-03 14:18:09 (GMT)
committerTarek Ziadé <ziade.tarek@gmail.com>2010-10-03 14:18:09 (GMT)
commit4bcceef5a12b6c00079ab11ecb233a7933f23ca4 (patch)
tree87866dde58bc3ab39fb92214d14afda4e564cd69 /Lib/distutils
parent84060b81e3ea06c7c0752854ef222e7c5fafa58c (diff)
downloadcpython-4bcceef5a12b6c00079ab11ecb233a7933f23ca4.zip
cpython-4bcceef5a12b6c00079ab11ecb233a7933f23ca4.tar.gz
cpython-4bcceef5a12b6c00079ab11ecb233a7933f23ca4.tar.bz2
Fixed #8980: distutils.command.check was failing w/ docutils installed
Diffstat (limited to 'Lib/distutils')
-rw-r--r--Lib/distutils/command/check.py2
-rw-r--r--Lib/distutils/tests/test_register.py12
2 files changed, 7 insertions, 7 deletions
diff --git a/Lib/distutils/command/check.py b/Lib/distutils/command/check.py
index 12844cb..2657c69 100644
--- a/Lib/distutils/command/check.py
+++ b/Lib/distutils/command/check.py
@@ -13,7 +13,7 @@ try:
from docutils.parsers.rst import Parser
from docutils import frontend
from docutils import nodes
- from StringIO import StringIO
+ from io import StringIO
class SilentReporter(Reporter):
diff --git a/Lib/distutils/tests/test_register.py b/Lib/distutils/tests/test_register.py
index c03ad10..7d0ac9e 100644
--- a/Lib/distutils/tests/test_register.py
+++ b/Lib/distutils/tests/test_register.py
@@ -224,24 +224,24 @@ class RegisterTestCase(PyPIRCCommandTestCase):
cmd = self._get_cmd(metadata)
cmd.ensure_finalized()
cmd.strict = 1
- inputs = RawInputs('1', 'tarek', 'y')
- register_module.raw_input = inputs.__call__
+ inputs = Inputs('1', 'tarek', 'y')
+ register_module.input = inputs.__call__
# let's run the command
try:
cmd.run()
finally:
- del register_module.raw_input
+ del register_module.input
# strict is not by default
cmd = self._get_cmd()
cmd.ensure_finalized()
- inputs = RawInputs('1', 'tarek', 'y')
- register_module.raw_input = inputs.__call__
+ inputs = Inputs('1', 'tarek', 'y')
+ register_module.input = inputs.__call__
# let's run the command
try:
cmd.run()
finally:
- del register_module.raw_input
+ del register_module.input
def test_check_metadata_deprecated(self):
# makes sure make_metadata is deprecated