summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2010-06-28 20:09:18 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2010-06-28 20:09:18 (GMT)
commitf5451e546a720392c1ceef9c33db336e6ebd2d7e (patch)
tree969ea230b870e0dbc34bc758ec307f432feea0f6
parentae1000533ac2414975f666978e8fad5426d61095 (diff)
downloadcpython-f5451e546a720392c1ceef9c33db336e6ebd2d7e.zip
cpython-f5451e546a720392c1ceef9c33db336e6ebd2d7e.tar.gz
cpython-f5451e546a720392c1ceef9c33db336e6ebd2d7e.tar.bz2
Merged revisions 82345 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r82345 | mark.dickinson | 2010-06-28 20:54:19 +0100 (Mon, 28 Jun 2010) | 1 line unparse.py: fix mispaced parentheses in chained comparisons ........
-rw-r--r--Demo/parser/test_unparse.py4
-rw-r--r--Demo/parser/unparse.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/Demo/parser/test_unparse.py b/Demo/parser/test_unparse.py
index aa6f270..edc9ee1 100644
--- a/Demo/parser/test_unparse.py
+++ b/Demo/parser/test_unparse.py
@@ -53,6 +53,10 @@ class UnparseTestCase(unittest.TestCase):
self.check_roundtrip("not True or False")
self.check_roundtrip("True or not False")
+ def test_chained_comparisons(self):
+ self.check_roundtrip("1 < 4 <= 5")
+ self.check_roundtrip("a is b is c is not d")
+
def test_main():
test.support.run_unittest(UnparseTestCase)
diff --git a/Demo/parser/unparse.py b/Demo/parser/unparse.py
index b02ef75..0d62e54 100644
--- a/Demo/parser/unparse.py
+++ b/Demo/parser/unparse.py
@@ -379,7 +379,7 @@ class Unparser:
for o, e in zip(t.ops, t.comparators):
self.write(" " + self.cmpops[o.__class__.__name__] + " ")
self.dispatch(e)
- self.write(")")
+ self.write(")")
boolops = {_ast.And: 'and', _ast.Or: 'or'}
def _BoolOp(self, t):