summaryrefslogtreecommitdiffstats
path: root/Lib/lib2to3/tests
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2010-01-30 11:05:48 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2010-01-30 11:05:48 (GMT)
commit16a060d1a2ddd888b2549691ebd066d06f0dcb82 (patch)
treec2a1b4065d7b2e25c89f30ee80debadb2a481f06 /Lib/lib2to3/tests
parent93f562c4f9a751034616068468e7dc2cfd022275 (diff)
downloadcpython-16a060d1a2ddd888b2549691ebd066d06f0dcb82.zip
cpython-16a060d1a2ddd888b2549691ebd066d06f0dcb82.tar.gz
cpython-16a060d1a2ddd888b2549691ebd066d06f0dcb82.tar.bz2
Merged revisions 77846 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ................ r77846 | martin.v.loewis | 2010-01-30 11:56:23 +0100 (Sa, 30 Jan 2010) | 13 lines Merged revisions 77419,77435 via svnmerge from svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r77419 | benjamin.peterson | 2010-01-10 21:39:48 +0100 (So, 10 Jan 2010) | 1 line enclose path in quotes to handle paths with spaces correctly #7666 ........ r77435 | alexandre.vassalotti | 2010-01-12 01:36:54 +0100 (Di, 12 Jan 2010) | 2 lines Issue #1967: Add fixer for dictionary views. ........ ................
Diffstat (limited to 'Lib/lib2to3/tests')
-rwxr-xr-xLib/lib2to3/tests/test_fixers.py58
-rw-r--r--Lib/lib2to3/tests/test_parser.py2
2 files changed, 59 insertions, 1 deletions
diff --git a/Lib/lib2to3/tests/test_fixers.py b/Lib/lib2to3/tests/test_fixers.py
index 2e0092f..a92f14a 100755
--- a/Lib/lib2to3/tests/test_fixers.py
+++ b/Lib/lib2to3/tests/test_fixers.py
@@ -1215,6 +1215,14 @@ class Test_dict(FixerTestCase):
a = "[i for i in d. keys( ) ]"
self.check(b, a)
+ b = "if d. viewkeys ( ) : pass"
+ a = "if d. keys ( ) : pass"
+ self.check(b, a)
+
+ b = "[i for i in d. viewkeys( ) ]"
+ a = "[i for i in d. keys( ) ]"
+ self.check(b, a)
+
def test_trailing_comment(self):
b = "d.keys() # foo"
a = "list(d.keys()) # foo"
@@ -1234,6 +1242,16 @@ class Test_dict(FixerTestCase):
]"""
self.check(b, a)
+ b = """[i for i in d.iterkeys() # foo
+ ]"""
+ a = """[i for i in d.keys() # foo
+ ]"""
+ self.check(b, a)
+
+ b = "d.viewitems() # foo"
+ a = "d.items() # foo"
+ self.check(b, a)
+
def test_unchanged(self):
for wrapper in fixer_util.consuming_calls:
s = "s = %s(d.keys())" % wrapper
@@ -1367,6 +1385,46 @@ class Test_dict(FixerTestCase):
a = "for x in list(h.keys())[0]: print x"
self.check(b, a)
+ def test_25(self):
+ b = "d.viewkeys()"
+ a = "d.keys()"
+ self.check(b, a)
+
+ def test_26(self):
+ b = "d.viewitems()"
+ a = "d.items()"
+ self.check(b, a)
+
+ def test_27(self):
+ b = "d.viewvalues()"
+ a = "d.values()"
+ self.check(b, a)
+
+ def test_14(self):
+ b = "[i for i in d.viewkeys()]"
+ a = "[i for i in d.keys()]"
+ self.check(b, a)
+
+ def test_15(self):
+ b = "(i for i in d.viewkeys())"
+ a = "(i for i in d.keys())"
+ self.check(b, a)
+
+ def test_17(self):
+ b = "iter(d.viewkeys())"
+ a = "iter(d.keys())"
+ self.check(b, a)
+
+ def test_18(self):
+ b = "list(d.viewkeys())"
+ a = "list(d.keys())"
+ self.check(b, a)
+
+ def test_19(self):
+ b = "sorted(d.viewkeys())"
+ a = "sorted(d.keys())"
+ self.check(b, a)
+
class Test_xrange(FixerTestCase):
fixer = "xrange"
diff --git a/Lib/lib2to3/tests/test_parser.py b/Lib/lib2to3/tests/test_parser.py
index 7e649da..15b109e9 100644
--- a/Lib/lib2to3/tests/test_parser.py
+++ b/Lib/lib2to3/tests/test_parser.py
@@ -206,6 +206,6 @@ def diff(fn, result):
finally:
f.close()
try:
- return os.system("diff -u %s @" % fn)
+ return os.system("diff -u %r @" % fn)
finally:
os.remove("@")