From: Tarek Ziadé <ziade.tarek@gmail.com>
Date: Sun, 3 Oct 2010 14:30:11 +0000 (+0000)
Subject: Merged revisions 85197 via svnmerge from
X-Git-Tag: v3.1.3rc1~174
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c9afba853ca4884d3be01e2da6ba5e3cc61cd75c;p=python

Merged revisions 85197 via svnmerge from
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
........
---

diff --git a/Lib/distutils/command/check.py b/Lib/distutils/command/check.py
index 12844cbf9f..2657c696e5 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 c03ad10147..7d0ac9ee3a 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
diff --git a/Misc/NEWS b/Misc/NEWS
index 58417615b8..b3137856ec 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -124,6 +124,9 @@ C-API
 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
   characters that appear inside quoted strings in email addresses.