Merge with 3.3

This commit is contained in:
Terry Jan Reedy 2014-02-17 16:49:26 -05:00
commit 65429cf639
1 changed files with 2 additions and 2 deletions

View File

@ -1154,14 +1154,14 @@ class TestTokenize(TestCase):
self.assertExactTypeEqual('@ ', token.AT)
class UntokenizeTest(TestCase):
def test_bad_input_order(self):
u = Untokenizer()
u.prev_row = 2
u.prev_col = 2
with self.assertRaises(ValueError) as cm:
u.add_whitespace((1,3))
self.assertEqual(cm.exception.args[0],
self.assertEqual(cm.exception.args[0],
'start (1,3) precedes previous end (2,2)')
self.assertRaises(ValueError, u.add_whitespace, (2,1))