From: Brian Curtin <brian@python.org>
Date: Mon, 13 Jun 2011 21:10:32 +0000 (-0500)
Subject: branch merge?
X-Git-Tag: v3.2.1rc2~87
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a87d586fd6c4a5dfe4ea89fda288ae8eb66b0134;p=thirdparty%2FPython%2Fcpython.git

branch merge?
---

a87d586fd6c4a5dfe4ea89fda288ae8eb66b0134
diff --cc Lib/test/support.py
index 9c8f6d3dcc69,b19c698181af..25aab2e5afb6
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@@ -1487,11 -1487,14 +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):
 +    except (OSError, NotImplementedError, AttributeError):
          can = False
+     else:
+         os.remove(symlink_path)
      _can_symlink = can
      return can