branch merge?

This commit is contained in:
Brian Curtin 2011-06-13 16:10:32 -05:00
commit a87d586fd6
27 changed files with 302 additions and 79 deletions

View file

@ -1487,11 +1487,14 @@ def can_symlink():
global _can_symlink
if _can_symlink is not None:
return _can_symlink
symlink_path = TESTFN + "can_symlink"
try:
os.symlink(TESTFN, TESTFN + "can_symlink")
os.symlink(TESTFN, symlink_path)
can = True
except (OSError, NotImplementedError, AttributeError):
can = False
else:
os.remove(symlink_path)
_can_symlink = can
return can