Merge from 3.2 for Issue #12084.

This commit is contained in:
Brian Curtin 2011-06-13 16:00:35 -05:00
commit 3e86c99f90
4 changed files with 193 additions and 98 deletions

View file

@ -1562,7 +1562,7 @@ def can_symlink():
os.symlink(TESTFN, symlink_path)
can = True
os.remove(symlink_path)
except (OSError, NotImplementedError):
except (OSError, NotImplementedError, AttributeError):
can = False
_can_symlink = can
return can