diff options
author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-06-07 10:19:34 (GMT) |
---|---|---|
committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-06-07 10:19:34 (GMT) |
commit | 3adba1ff81c95c61cf460e2ece025a071a13e924 (patch) | |
tree | 9362568cb7ba4ee14313dbfa9fcc5696c0bd20df | |
parent | eb175c473d8a01ddf554fc45c566fc8e65f69ded (diff) | |
parent | 62ec61fb6ad5f1745597017297a455d63a2f97e4 (diff) | |
download | cpython-3adba1ff81c95c61cf460e2ece025a071a13e924.zip cpython-3adba1ff81c95c61cf460e2ece025a071a13e924.tar.gz cpython-3adba1ff81c95c61cf460e2ece025a071a13e924.tar.bz2 |
(Merge 3.2) test.support: don't catch OSError when can_symlink() removes the
temporary symbolic link.
-rw-r--r-- | Lib/test/support.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/support.py b/Lib/test/support.py index ec2378b..f5dbb85 100644 --- a/Lib/test/support.py +++ b/Lib/test/support.py @@ -1561,9 +1561,10 @@ def can_symlink(): try: os.symlink(TESTFN, symlink_path) can = True - os.remove(symlink_path) except (OSError, NotImplementedError): can = False + else: + os.remove(symlink_path) _can_symlink = can return can |