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

Sun May 15 14:20:30 EDT 2016

https://hg.python.org/cpython/rev/25e4e0373224
changeset: 101350:25e4e0373224
parent: 101348:423e159e1340
parent: 101349:5f561804bc8e
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Sun May 15 14:20:13 2016 -0400
summary:
 Merge with 3.5
files:
 Lib/idlelib/idle_test/test_warning.py | 9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/Lib/idlelib/idle_test/test_warning.py b/Lib/idlelib/idle_test/test_warning.py
--- a/Lib/idlelib/idle_test/test_warning.py
+++ b/Lib/idlelib/idle_test/test_warning.py
@@ -68,15 +68,6 @@
 'Test', UserWarning, 'test_warning.py', 99, f, 'Line of code')
 self.assertEqual(shellmsg.splitlines(), f.getvalue().splitlines())
 
-class ImportWarnTest(unittest.TestCase):
- def test_idlever(self):
- with warnings.catch_warnings(record=True) as w:
- warnings.simplefilter("always")
- import idlelib.idlever
- self.assertEqual(len(w), 1)
- self.assertTrue(issubclass(w[-1].category, DeprecationWarning))
- self.assertIn("version", str(w[-1].message))
-
 
 if __name__ == '__main__':
 unittest.main(verbosity=2, exit=False)
-- 
Repository URL: https://hg.python.org/cpython
