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

Mon Feb 17 22:50:25 CET 2014

http://hg.python.org/cpython/rev/164504ecc2e3
changeset: 89236:164504ecc2e3
parent: 89234:38ac5d82507d
parent: 89235:a539e09be378
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Mon Feb 17 16:49:26 2014 -0500
summary:
 Merge with 3.3
files:
 Lib/test/test_tokenize.py | 4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
--- a/Lib/test/test_tokenize.py
+++ b/Lib/test/test_tokenize.py
@@ -1154,14 +1154,14 @@
 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))
 
-- 
Repository URL: http://hg.python.org/cpython
