From: Brian Curtin <brian@python.org>
Date: Mon, 13 Jun 2011 21:00:35 +0000 (-0500)
Subject: Merge from 3.2 for Issue #12084.
X-Git-Tag: v3.3.0a1~2119^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3e86c99f9080633283e415f3bd4653285e24c31e;p=python

Merge from 3.2 for Issue #12084.
---

3e86c99f9080633283e415f3bd4653285e24c31e
diff --cc Lib/test/support.py
index ec2378b5b3,9c8f6d3dcc..739cb7bfb9
--- a/Lib/test/support.py
+++ b/Lib/test/support.py
@@@ -1557,12 -1487,10 +1557,12 @@@ 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
 +        os.remove(symlink_path)
-     except (OSError, NotImplementedError):
+     except (OSError, NotImplementedError, AttributeError):
          can = False
      _can_symlink = can
      return can
diff --cc Misc/NEWS
index 650ae608c1,06c08a9c20..fb7043fd5a
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,12 -10,9 +10,15 @@@ 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.
+ 
 +- Issue #12265: Make error messages produced by passing an invalid set of
 +  arguments to a function more informative.
 +
 +- Issue #12225: Still allow Python to build if Python is not in its hg repo or
 +  mercurial is not installed.
 +
  - Issue #1195: my_fgets() now always clears errors before calling fgets(). Fix
    the following case: sys.stdin.read() stopped with CTRL+d (end of file),
    raw_input() interrupted by CTRL+c.