[Python-checkins] cpython (merge 3.3 -> default): Merge with 3.3

Tue May 28 05:53:16 CEST 2013

http://hg.python.org/cpython/rev/eb1025b107c5
changeset: 83946:eb1025b107c5
parent: 83944:138ddf15b220
parent: 83945:8cebe8d537a4
user: Jason R. Coombs <jaraco at jaraco.com>
date: Mon May 27 23:53:02 2013 -0400
summary:
 Merge with 3.3
files:
 Lib/test/test_os.py | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -687,7 +687,7 @@
 f.close()
 if support.can_symlink():
 os.symlink(os.path.abspath(t2_path), link_path)
- symlink_to_dir('broken', broken_link_path, True)
+ os.symlink('broken', broken_link_path, True)
 sub2_tree = (sub2_path, ["link"], ["broken_link", "tmp3"])
 else:
 sub2_tree = (sub2_path, [], ["tmp3"])
-- 
Repository URL: http://hg.python.org/cpython
