From: Tarek Ziadé Date: Sat, 3 Oct 2009 14:54:15 +0000 (+0000) Subject: Merged revisions 75209 via svnmerge from X-Git-Tag: v3.2a1~2457 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=81c9a9575197020f180ad802ec53298bba3a30d7;p=python 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 ........ --- diff --git a/Lib/distutils/archive_util.py b/Lib/distutils/archive_util.py index d4525998fd..d051f917bb 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):