summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-07-20 17:24:30 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-07-20 17:24:30 (GMT)
commita2514f4ce9b8333659aae057b3e9f38147151b54 (patch)
treebceb8215ccf753d0d6a1df8998f438fe0b927151 /Lib
parent840077cd319716a1c135dd4facfaea1eff05d929 (diff)
downloadcpython-a2514f4ce9b8333659aae057b3e9f38147151b54.zip
cpython-a2514f4ce9b8333659aae057b3e9f38147151b54.tar.gz
cpython-a2514f4ce9b8333659aae057b3e9f38147151b54.tar.bz2
Merged revisions 74116 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r74116 | benjamin.peterson | 2009-07-20 12:22:35 -0500 (Mon, 20 Jul 2009) | 1 line placate windows ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/lib2to3/tests/test_refactor.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/lib2to3/tests/test_refactor.py b/Lib/lib2to3/tests/test_refactor.py
index a8d209a..39ed545 100644
--- a/Lib/lib2to3/tests/test_refactor.py
+++ b/Lib/lib2to3/tests/test_refactor.py
@@ -215,7 +215,7 @@ from __future__ import print_function"""
expected = ["hi.py"]
check(tree, expected)
tree = ["hi.py",
- "a_dir/stuff.py"]
+ os.path.join("a_dir", "stuff.py")]
check(tree, tree)
def test_file_encoding(self):