Merge with 3.5

This commit is contained in:
Terry Jan Reedy 2016-05-15 14:20:13 -04:00
commit 89d2a0394e
1 changed files with 0 additions and 9 deletions

View File

@ -68,15 +68,6 @@ class ShellWarnTest(unittest.TestCase):
'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)