branch merge

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

View file

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