merge 3.5

This commit is contained in:
Benjamin Peterson 2015-05-29 18:44:50 -05:00
commit 3979323ca3

View file

@ -183,7 +183,7 @@ class MultiPhaseExtensionModuleTests(abc.LoaderTests):
self.assertIsInstance(module, types.ModuleType) self.assertIsInstance(module, types.ModuleType)
self.assertEqual(module.__name__, 'x') self.assertEqual(module.__name__, 'x')
self.assertEqual(module.str_const, 'something different') self.assertEqual(module.str_const, 'something different')
assert 'x' not in sys.modules self.assertNotIn('x', sys.modules)
def test_load_twice(self): def test_load_twice(self):
'''Test that 2 loads result in 2 module objects''' '''Test that 2 loads result in 2 module objects'''