From: Brian Curtin <brian@python.org>
Date: Mon, 13 Jun 2011 21:03:01 +0000 (-0500)
Subject: branch merge
X-Git-Tag: v3.3.0a1~2119
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c9d6a501db51db3038995aa014624f83e860ef63;p=python

branch merge
---

c9d6a501db51db3038995aa014624f83e860ef63
diff --cc Lib/test/support.py
index f5dbb85527,739cb7bfb9..a51d943de4
--- a/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 e13f72c7a5,fb7043fd5a..38850c7a51
--- a/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.