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

[benjamin.peterson]

https://hg.python.org/cpython/rev/466c5119a256
changeset:   96361:466c5119a256
parent:      96359:d89bab1f160e
parent:      96360:8428cb297d15
user:        Benjamin Peterson <benjamin at python.org>
date:        Fri May 29 18:44:50 2015 -0500
summary:
  merge 3.5

files:
  Lib/test/test_importlib/extension/test_loader.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_importlib/extension/test_loader.py b/Lib/test/test_importlib/extension/test_loader.py
--- a/Lib/test/test_importlib/extension/test_loader.py
+++ b/Lib/test/test_importlib/extension/test_loader.py
@@ -183,7 +183,7 @@
         self.assertIsInstance(module, types.ModuleType)
         self.assertEqual(module.__name__, 'x')
         self.assertEqual(module.str_const, 'something different')
-        assert 'x' not in sys.modules
+        self.assertNotIn('x', sys.modules)
 
     def test_load_twice(self):
         '''Test that 2 loads result in 2 module objects'''

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