diff options
author | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-10-03 14:54:15 (GMT) |
---|---|---|
committer | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-10-03 14:54:15 (GMT) |
commit | 81c9a9575197020f180ad802ec53298bba3a30d7 (patch) | |
tree | 6780da0e6377f524206a8e4fbc7a2d6f37a3d4a4 | |
parent | 36cea39b225e9814abcebb0f96088cfdb5b9d36c (diff) | |
download | cpython-81c9a9575197020f180ad802ec53298bba3a30d7.zip cpython-81c9a9575197020f180ad802ec53298bba3a30d7.tar.gz cpython-81c9a9575197020f180ad802ec53298bba3a30d7.tar.bz2 |
Merged revisions 75209 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r75209 | tarek.ziade | 2009-10-03 16:52:33 +0200 (Sat, 03 Oct 2009) | 1 line
now uses the right exception type
........
-rw-r--r-- | Lib/distutils/archive_util.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/distutils/archive_util.py b/Lib/distutils/archive_util.py index d452599..d051f91 100644 --- a/Lib/distutils/archive_util.py +++ b/Lib/distutils/archive_util.py @@ -16,12 +16,12 @@ from distutils import log try: from pwd import getpwnam -except AttributeError: +except ImportError: getpwnam = None try: from grp import getgrnam -except AttributeError: +except ImportError: getgrnam = None def _get_gid(name): |