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

Wed Jun 5 20:41:16 CEST 2013

http://hg.python.org/cpython/rev/9c06a9a8bba1
changeset: 84044:9c06a9a8bba1
parent: 84041:367377d800a5
parent: 84043:382f4718e765
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Wed Jun 05 14:36:50 2013 -0400
summary:
 Merge with 3.3
files:
 Lib/idlelib/configSectionNameDialog.py | 2 +-
 Lib/idlelib/idle_test/test_config_name.py | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Lib/idlelib/configSectionNameDialog.py b/Lib/idlelib/configSectionNameDialog.py
--- a/Lib/idlelib/configSectionNameDialog.py
+++ b/Lib/idlelib/configSectionNameDialog.py
@@ -91,7 +91,7 @@
 if __name__ == '__main__':
 import unittest
 unittest.main('idlelib.idle_test.test_config_name', verbosity=2, exit=False)
- 
+
 # also human test the dialog
 root = Tk()
 def run():
diff --git a/Lib/idlelib/idle_test/test_config_name.py b/Lib/idlelib/idle_test/test_config_name.py
--- a/Lib/idlelib/idle_test/test_config_name.py
+++ b/Lib/idlelib/idle_test/test_config_name.py
@@ -24,7 +24,7 @@
 
 class TestConfigName(unittest.TestCase):
 dialog = Dummy_name_dialog()
- 
+
 @classmethod
 def setUpClass(cls):
 name_dialog_module.tkMessageBox = Mbox
@@ -38,13 +38,13 @@
 self.assertEqual(self.dialog.name_ok(), '')
 self.assertEqual(showerror.title, 'Name Error')
 self.assertIn('No', showerror.message)
- 
+
 def test_used_name(self):
 self.dialog.name.set('used')
 self.assertEqual(self.dialog.name_ok(), '')
 self.assertEqual(showerror.title, 'Name Error')
 self.assertIn('use', showerror.message)
- 
+
 def test_long_name(self):
 self.dialog.name.set('good'*8)
 self.assertEqual(self.dialog.name_ok(), '')
@@ -56,7 +56,7 @@
 showerror.title = 'No Error' # should not be called
 self.assertEqual(self.dialog.name_ok(), 'good')
 self.assertEqual(showerror.title, 'No Error')
- 
+
 def test_ok(self):
 self.dialog.destroyed = False
 self.dialog.name.set('good')
@@ -69,7 +69,7 @@
 self.dialog.Cancel()
 self.assertEqual(self.dialog.result, '')
 self.assertTrue(self.dialog.destroyed)
- 
+
 
 if __name__ == '__main__':
 unittest.main(verbosity=2, exit=False)
-- 
Repository URL: http://hg.python.org/cpython
