[Python-checkins] r75210 - in python/branches/py3k: Lib/distutils/archive_util.py

Sat Oct 3 16:54:15 CEST 2009

Author: tarek.ziade
Date: Sat Oct  3 16:54:15 2009
New Revision: 75210

Log:
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
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/distutils/archive_util.py

Modified: python/branches/py3k/Lib/distutils/archive_util.py
==============================================================================

--- python/branches/py3k/Lib/distutils/archive_util.py	(original)
+++ python/branches/py3k/Lib/distutils/archive_util.py	Sat Oct  3 16:54:15 2009
@@ -16,12 +16,12 @@
 
 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):
