diff options
author | Éric Araujo <merwok@netwok.org> | 2010-11-20 19:45:32 (GMT) |
---|---|---|
committer | Éric Araujo <merwok@netwok.org> | 2010-11-20 19:45:32 (GMT) |
commit | bfa17a562a6dec0fb7886757ca76545335a786de (patch) | |
tree | 19cfc8fe28c91a6481d4b900d5bf25d6a52dc946 /Lib/distutils | |
parent | 60d8684e4f947670d318d3e09f2ceb2fd5bf1b2f (diff) | |
download | cpython-bfa17a562a6dec0fb7886757ca76545335a786de.zip cpython-bfa17a562a6dec0fb7886757ca76545335a786de.tar.gz cpython-bfa17a562a6dec0fb7886757ca76545335a786de.tar.bz2 |
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
........
Diffstat (limited to 'Lib/distutils')
-rw-r--r-- | Lib/distutils/dir_util.py | 1 | ||||
-rw-r--r-- | Lib/distutils/tests/test_sysconfig.py | 1 |
2 files changed, 2 insertions, 0 deletions
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 |