branch merge

diff --cc Lib/test/support.py
index f5dbb85527a98766199192fadd67d21c516af811,739cb7bfb97a86ed2f5c22a1905efd8ae5dd808f..a51d943de4210c56bd4f27da49415e5f58482468
--- 1/Lib/test/support.py
--- 2/Lib/test/support.py
+++ b/Lib/test/support.py
@@@ -1561,10 -1561,9 +1561,10 @@@ def can_symlink()
      try:
          os.symlink(TESTFN, symlink_path)
          can = True
-     except (OSError, NotImplementedError):
 -        os.remove(symlink_path)
+     except (OSError, NotImplementedError, AttributeError):
          can = False
 +    else:
 +        os.remove(symlink_path)
      _can_symlink = can
      return can
  

diff --cc Misc/NEWS
index e13f72c7a5a3982df15c30705c99a254dea83a3e,fb7043fd5a97197c89e1836c4669216eeeb0f5e5..38850c7a51f3387a1774896690263faf0c600730
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,9 -10,9 +10,12 @@@ What's New in Python 3.3 Alpha 1
  Core and Builtins
  -----------------
  
+ - Issue #12084: os.stat on Windows now works properly with relative symbolic
+   links when called from any directory.
+ 
 +- Loosen type restrictions on the __dir__ method. __dir__ can now return any
 +  sequence, which will be converted to a list and sorted by dir().
 +
  - Issue #12265: Make error messages produced by passing an invalid set of
    arguments to a function more informative.
  

diff --cc Modules/posixmodule.c
Simple merge