]> granicus.if.org Git - python/commitdiff
Merged revisions 75209 via svnmerge from
authorTarek Ziadé <ziade.tarek@gmail.com>
Sat, 3 Oct 2009 14:54:15 +0000 (14:54 +0000)
committerTarek Ziadé <ziade.tarek@gmail.com>
Sat, 3 Oct 2009 14:54:15 +0000 (14:54 +0000)
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
........

Lib/distutils/archive_util.py

index d4525998fdf46e01b3b7b29bdd7871a1201a5577..d051f917bb4f37afa414ebb7d62d5cc8d3494e1b 100644 (file)
@@ -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):