summaryrefslogtreecommitdiffstats
path: root/Lib/test/support.py
diff options
context:
space:
mode:
authorBrian Curtin <brian@python.org>2011-06-13 21:00:35 (GMT)
committerBrian Curtin <brian@python.org>2011-06-13 21:00:35 (GMT)
commit3e86c99f9080633283e415f3bd4653285e24c31e (patch)
treecd25bb5b64f1cbf3a884a481086e9e28689f60bc /Lib/test/support.py
parente67b1eab32f3f0e0b2a5979cc00c2f4605e3b7e4 (diff)
parentd25aef55c8b0025dd2ee7de11b526f34ceed6b66 (diff)
downloadcpython-3e86c99f9080633283e415f3bd4653285e24c31e.zip
cpython-3e86c99f9080633283e415f3bd4653285e24c31e.tar.gz
cpython-3e86c99f9080633283e415f3bd4653285e24c31e.tar.bz2
Merge from 3.2 for Issue #12084.
Diffstat (limited to 'Lib/test/support.py')
-rw-r--r--Lib/test/support.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/support.py b/Lib/test/support.py
index ec2378b..739cb7b 100644
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@ -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