summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2014-07-07 11:09:43 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2014-07-07 11:09:43 (GMT)
commitf2c4ba120767e0e627844c2d8397462b5b2b86ca (patch)
treeb11b1a21abe2690d53f980e821d13660a82f63ae
parentcde9d1ee2f7a5ed930f917c7a0f26c9021c43317 (diff)
parent344f8316fd52205b19689dbdf44cfcfb338d127e (diff)
downloadcpython-f2c4ba120767e0e627844c2d8397462b5b2b86ca.zip
cpython-f2c4ba120767e0e627844c2d8397462b5b2b86ca.tar.gz
cpython-f2c4ba120767e0e627844c2d8397462b5b2b86ca.tar.bz2
Issue #19593: Use specific asserts in importlib tests.
-rw-r--r--Lib/test/test_import.py6
-rw-r--r--Lib/test/test_importlib/builtin/test_loader.py2
-rw-r--r--Lib/test/test_importlib/import_/test_fromlist.py2
-rw-r--r--Lib/test/test_importlib/import_/test_meta_path.py2
-rw-r--r--Lib/test/test_importlib/test_abc.py2
5 files changed, 7 insertions, 7 deletions
diff --git a/Lib/test/test_import.py b/Lib/test/test_import.py
index bda1541..781a159 100644
--- a/Lib/test/test_import.py
+++ b/Lib/test/test_import.py
@@ -190,12 +190,12 @@ class ImportTests(unittest.TestCase):
# import x.y.z binds x in the current namespace
import test as x
import test.support
- self.assertTrue(x is test, x.__name__)
+ self.assertIs(x, test, x.__name__)
self.assertTrue(hasattr(test.support, "__file__"))
# import x.y.z as w binds z as w
import test.support as y
- self.assertTrue(y is test.support, y.__name__)
+ self.assertIs(y, test.support, y.__name__)
def test_failing_reload(self):
# A failing reload should leave the module object in sys.modules.
@@ -223,7 +223,7 @@ class ImportTests(unittest.TestCase):
self.assertRaises(ZeroDivisionError, importlib.reload, mod)
# But we still expect the module to be in sys.modules.
mod = sys.modules.get(TESTFN)
- self.assertIsNot(mod, None, "expected module to be in sys.modules")
+ self.assertIsNotNone(mod, "expected module to be in sys.modules")
# We should have replaced a w/ 10, but the old b value should
# stick.
diff --git a/Lib/test/test_importlib/builtin/test_loader.py b/Lib/test/test_importlib/builtin/test_loader.py
index eaee025..1684ab6 100644
--- a/Lib/test/test_importlib/builtin/test_loader.py
+++ b/Lib/test/test_importlib/builtin/test_loader.py
@@ -88,7 +88,7 @@ class InspectLoaderTests:
def test_is_package(self):
# Cannot be a package.
result = self.machinery.BuiltinImporter.is_package(util.BUILTINS.good_name)
- self.assertTrue(not result)
+ self.assertFalse(result)
@unittest.skipIf(util.BUILTINS.bad_name is None, 'all modules are built in')
def test_not_builtin(self):
diff --git a/Lib/test/test_importlib/import_/test_fromlist.py b/Lib/test/test_importlib/import_/test_fromlist.py
index 8993226..8045465 100644
--- a/Lib/test/test_importlib/import_/test_fromlist.py
+++ b/Lib/test/test_importlib/import_/test_fromlist.py
@@ -62,7 +62,7 @@ class HandlingFromlist:
with util.import_state(meta_path=[importer]):
module = self.__import__('module', fromlist=['non_existent'])
self.assertEqual(module.__name__, 'module')
- self.assertTrue(not hasattr(module, 'non_existent'))
+ self.assertFalse(hasattr(module, 'non_existent'))
def test_module_from_package(self):
# [module]
diff --git a/Lib/test/test_importlib/import_/test_meta_path.py b/Lib/test/test_importlib/import_/test_meta_path.py
index 47a603c..c452cdd 100644
--- a/Lib/test/test_importlib/import_/test_meta_path.py
+++ b/Lib/test/test_importlib/import_/test_meta_path.py
@@ -97,7 +97,7 @@ class CallSignature:
args = log[1][0]
kwargs = log[1][1]
# Assuming all arguments are positional.
- self.assertTrue(not kwargs)
+ self.assertFalse(kwargs)
self.assertEqual(args[0], mod_name)
self.assertIs(args[1], path)
diff --git a/Lib/test/test_importlib/test_abc.py b/Lib/test/test_importlib/test_abc.py
index 66a8d7b..d4bf915 100644
--- a/Lib/test/test_importlib/test_abc.py
+++ b/Lib/test/test_importlib/test_abc.py
@@ -784,7 +784,7 @@ class SourceOnlyLoaderTests(SourceLoaderTestHarness):
warnings.simplefilter('ignore', DeprecationWarning)
module = self.loader.load_module(self.name)
self.verify_module(module)
- self.assertTrue(not hasattr(module, '__path__'))
+ self.assertFalse(hasattr(module, '__path__'))
def test_get_source_encoding(self):
# Source is considered encoded in UTF-8 by default unless otherwise