From: Éric Araujo <merwok@netwok.org>
Date: Wed, 12 Mar 2014 08:10:51 +0000 (-0400)
Subject: Merge 3.3 (#4931)
X-Git-Tag: v3.4.1rc1~233^2~52
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a0fe1f74f928bec969dad25e8dc97b560748b182;p=thirdparty%2FPython%2Fcpython.git

Merge 3.3 (#4931)
---

a0fe1f74f928bec969dad25e8dc97b560748b182
diff --cc Lib/distutils/core.py
index c811d5bd9c46,25d91baa0f2a..2bfe66aa2f49
--- a/Lib/distutils/core.py
+++ b/Lib/distutils/core.py
@@@ -149,14 -147,12 +148,12 @@@ def setup (**attrs)
              dist.run_commands()
          except KeyboardInterrupt:
              raise SystemExit("interrupted")
 -        except (IOError, os.error) as exc:
 +        except OSError as exc:
-             error = grok_environment_error(exc)
- 
              if DEBUG:
-                 sys.stderr.write(error + "\n")
+                 sys.stderr.write("error: %s\n" % (exc,))
                  raise
              else:
-                 raise SystemExit(error)
+                 raise SystemExit("error: %s" % (exc,))
  
          except (DistutilsError,
                  CCompilerError) as msg:
diff --cc Lib/distutils/dir_util.py
index 2b35aa318e05,6a72bdd4cdc6..9879b0dc07c8
--- a/Lib/distutils/dir_util.py
+++ b/Lib/distutils/dir_util.py
@@@ -198,9 -197,8 +197,8 @@@ def remove_tree(directory, verbose=1, d
              abspath = os.path.abspath(cmd[1])
              if abspath in _path_created:
                  del _path_created[abspath]
 -        except (IOError, OSError) as exc:
 +        except OSError as exc:
-             log.warn(grok_environment_error(
-                     exc, "error removing %s: " % directory))
+             log.warn("error removing %s: %s", directory, exc)
  
  def ensure_relative(path):
      """Take the full path 'path', and make it a relative path.
diff --cc Misc/NEWS
index d1d040165239,1dce0eae5c22..e69874fd42eb
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -20,16 -13,12 +20,19 @@@ Core and Builtin
  Library
  -------
  
 -- Issue #20875: Prevent possible gzip "'read' is not defined" NameError.
 -  Patch by Claudiu Popa.
 +- Issue #19157: Include the broadcast address in the usuable hosts for IPv6
 +  in ipaddress.
  
+ - Issue #4931: distutils should not produce unhelpful "error: None" messages
+   anymore.  distutils.util.grok_environment_error is kept but doc-deprecated.
+ 
 +- Issue #20875: Prevent possible gzip "'read' is not defined" NameError.
 +  Patch by Claudiu Popa.
 +
 +- Issue #11558: ``email.message.Message.attach`` now returns a more
 +  useful error message if ``attach`` is called on a message for which
 +  ``is_multipart`` is False.
 +
  - Issue #20283: RE pattern methods now accept the string keyword parameters
    as documented.  The pattern and source keyword parameters are left as
    deprecated aliases.