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

[benjamin.peterson]

http://hg.python.org/cpython/rev/971965daadfb
changeset:   85840:971965daadfb
parent:      85838:c27f036e7b48
parent:      85839:9922b2cda52c
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Sep 29 10:53:59 2013 -0400
summary:
  merge 3.3 (#19117)

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


diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
--- a/Lib/test/test_dis.py
+++ b/Lib/test/test_dis.py
@@ -247,7 +247,6 @@
             expected = _BIG_LINENO_FORMAT % (i + 2)
             self.do_disassembly_test(func(i), expected)
 
-    def test_big_linenos(self):
         from test import dis_module
         self.do_disassembly_test(dis_module, dis_module_expected_results)
 
@@ -273,9 +272,6 @@
             pass
         self.assertRaises(RuntimeError, dis.dis, None)
 
-    def test_dis_object(self):
-        self.assertRaises(TypeError, dis.dis, object())
-
     def test_dis_traceback(self):
         try:
             del sys.last_traceback

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