From: Victor Stinner <victor.stinner@gmail.com>
Date: Fri, 15 Nov 2013 22:13:17 +0000 (+0100)
Subject: Issue #19544, #6516: no need to catch AttributeError on import pwd/grp
X-Git-Tag: v3.4.0b1~261
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa32779632270a8286e65f02fcbae2a08419d23a;p=thirdparty%2FPython%2Fcpython.git

Issue #19544, #6516: no need to catch AttributeError on import pwd/grp
---

diff --git a/Lib/distutils/archive_util.py b/Lib/distutils/archive_util.py
index 82046a8ad7c6..4470bb022255 100644
--- a/Lib/distutils/archive_util.py
+++ b/Lib/distutils/archive_util.py
@@ -20,12 +20,12 @@ from distutils import log
 
 try:
     from pwd import getpwnam
-except (ImportError, AttributeError):
+except ImportError:
     getpwnam = None
 
 try:
     from grp import getgrnam
-except (ImportError, AttributeError):
+except ImportError:
     getgrnam = None
 
 def _get_gid(name):