]> granicus.if.org Git - python/commitdiff
Merge from 3.2 for Issue #12084.
authorBrian Curtin <brian@python.org>
Mon, 13 Jun 2011 21:00:35 +0000 (16:00 -0500)
committerBrian Curtin <brian@python.org>
Mon, 13 Jun 2011 21:00:35 +0000 (16:00 -0500)
1  2 
Lib/test/support.py
Lib/test/test_os.py
Misc/NEWS
Modules/posixmodule.c

index ec2378b5b394835e025f20dabba085b3a4bd9de6,9c8f6d3dcc69096690928f50e0564130eae55716..739cb7bfb97a86ed2f5c22a1905efd8ae5dd808f
@@@ -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
-     except (OSError, NotImplementedError):
 +        os.remove(symlink_path)
+     except (OSError, NotImplementedError, AttributeError):
          can = False
      _can_symlink = can
      return can
Simple merge
diff --cc Misc/NEWS
index 650ae608c1e43fac91edbbfaa84cb92bd78bd49d,06c08a9c20afd857d2150161a70cb6a59e93507a..fb7043fd5a97197c89e1836c4669216eeeb0f5e5
+++ 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.
Simple merge