branch merge?

diff --cc Lib/test/support.py
index 9c8f6d3dcc69096690928f50e0564130eae55716,b19c698181af9812bec7f7ef6527131183c6e7ff..25aab2e5afb603e9f81d3b80eb302315bded0bf0
--- 1/Lib/test/support.py
--- 2/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
  

diff --cc Misc/NEWS
Simple merge

diff --cc Modules/posixmodule.c
Simple merge