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

[frank.wierzbicki]

http://hg.python.org/cpython/rev/0dbd8a357a99
changeset:   81551:0dbd8a357a99
parent:      81549:d0cef6c90efc
parent:      81550:489f4e716b4b
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Wed Jan 16 14:10:36 2013 -0800
summary:
  merge with 3.3

files:
  Lib/test/test_dictcomps.py |  5 +----
  1 files changed, 1 insertions(+), 4 deletions(-)


diff --git a/Lib/test/test_dictcomps.py b/Lib/test/test_dictcomps.py
--- a/Lib/test/test_dictcomps.py
+++ b/Lib/test/test_dictcomps.py
@@ -84,8 +84,5 @@
                     "exec")
 
 
-def test_main():
-    support.run_unittest(__name__)
-
 if __name__ == "__main__":
-    test_main()
+    unittest.main()

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