From bfa17a562a6dec0fb7886757ca76545335a786de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Araujo?= Date: Sat, 20 Nov 2010 19:45:32 +0000 Subject: Merged revisions 86601,86605 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r86601 | eric.araujo | 2010-11-20 20:35:27 +0100 (sam., 20 nov. 2010) | 2 lines Fix two NameErrors in distutils (#10407) ........ r86605 | eric.araujo | 2010-11-20 20:37:28 +0100 (sam., 20 nov. 2010) | 2 lines Add entry for r86601 ........ --- Lib/distutils/dir_util.py | 1 + Lib/distutils/tests/test_sysconfig.py | 1 + Misc/NEWS | 2 ++ 3 files changed, 4 insertions(+) diff --git a/Lib/distutils/dir_util.py b/Lib/distutils/dir_util.py index c7c9fcc..5b005f0 100644 --- a/Lib/distutils/dir_util.py +++ b/Lib/distutils/dir_util.py @@ -5,6 +5,7 @@ Utility functions for manipulating directories and directory trees.""" __revision__ = "$Id$" import os, sys +import errno from distutils.errors import DistutilsFileError, DistutilsInternalError from distutils import log diff --git a/Lib/distutils/tests/test_sysconfig.py b/Lib/distutils/tests/test_sysconfig.py index 78bce94..309be7b 100644 --- a/Lib/distutils/tests/test_sysconfig.py +++ b/Lib/distutils/tests/test_sysconfig.py @@ -1,5 +1,6 @@ """Tests for distutils.sysconfig.""" import os +import shutil import test import unittest diff --git a/Misc/NEWS b/Misc/NEWS index 7794521..efa0018 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -16,6 +16,8 @@ Core and Builtins Library ------- +- Issue #10407: Fix two NameErrors in distutils. + - Issue #10198: fix duplicate header written to wave files when writeframes() is called without data. -- cgit v0.12