diff options
| author | Chris McDonough <chrism@plope.com> | 2011-09-25 03:47:56 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-09-25 03:47:56 -0400 |
| commit | fd266a8ffe324a0c45bffded28522ff9984765a3 (patch) | |
| tree | a1ece3e66e7f8e740d35785c75699d8b51a04c51 | |
| parent | c779f17dd60745e033075df2d76ab168cc2ecfd5 (diff) | |
| download | pyramid-fd266a8ffe324a0c45bffded28522ff9984765a3.tar.gz pyramid-fd266a8ffe324a0c45bffded28522ff9984765a3.tar.bz2 pyramid-fd266a8ffe324a0c45bffded28522ff9984765a3.zip | |
coverage and warnings
| -rw-r--r-- | pyramid/compat.py | 2 | ||||
| -rw-r--r-- | pyramid/tests/test_config/test_init.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pyramid/compat.py b/pyramid/compat.py index e1f5f16a8..e686be27d 100644 --- a/pyramid/compat.py +++ b/pyramid/compat.py @@ -42,7 +42,7 @@ else: def text_(s, encoding='latin-1', errors='strict'): if isinstance(s, binary_type): return s.decode(encoding, errors) - return s + return s # pragma: no cover def bytes_(s, encoding='latin-1', errors='strict'): if isinstance(s, text_type): diff --git a/pyramid/tests/test_config/test_init.py b/pyramid/tests/test_config/test_init.py index b5eb85d59..ca1508295 100644 --- a/pyramid/tests/test_config/test_init.py +++ b/pyramid/tests/test_config/test_init.py @@ -605,8 +605,8 @@ class ConfiguratorTests(unittest.TestCase): pyramid.tests.test_config.dummy_include2""", } config.setup_registry(settings=settings) - self.assert_(reg.included) - self.assert_(reg.also_included) + self.assertTrue(reg.included) + self.assertTrue(reg.also_included) def test_setup_registry_includes_spaces(self): from pyramid.registry import Registry @@ -617,8 +617,8 @@ pyramid.tests.test_config.dummy_include2""", """pyramid.tests.test_config.dummy_include pyramid.tests.test_config.dummy_include2""", } config.setup_registry(settings=settings) - self.assert_(reg.included) - self.assert_(reg.also_included) + self.assertTrue(reg.included) + self.assertTrue(reg.also_included) def test_setup_registry_tweens(self): from pyramid.interfaces import ITweens |