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

[terry.reedy]

http://hg.python.org/cpython/rev/83b404da05e9
changeset:   84901:83b404da05e9
parent:      84899:206685a4b19c
parent:      84900:aa13693e3356
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Tue Jul 30 01:37:28 2013 -0400
summary:
  Merge with 3.3

files:
  Lib/idlelib/idle_test/test_calltips.py    |  2 +-
  Lib/idlelib/idle_test/test_config_name.py |  2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Lib/idlelib/idle_test/test_calltips.py b/Lib/idlelib/idle_test/test_calltips.py
--- a/Lib/idlelib/idle_test/test_calltips.py
+++ b/Lib/idlelib/idle_test/test_calltips.py
@@ -1,7 +1,7 @@
 import unittest
 import idlelib.CallTips as ct
 
-class Test_get_entity(unittest.TestCase):
+class Get_entityTest(unittest.TestCase):
     def test_bad_entity(self):
         self.assertIsNone(ct.get_entity('1/0'))
     def test_good_entity(self):
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
@@ -22,7 +22,7 @@
 orig_mbox = name_dialog_module.tkMessageBox
 showerror = Mbox.showerror
 
-class TestConfigName(unittest.TestCase):
+class ConfigNameTest(unittest.TestCase):
     dialog = Dummy_name_dialog()
 
     @classmethod

-- 
Repository URL: http://hg.python.org/cpython