summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2011-05-12 01:35:30 -0400
committerChris McDonough <chrism@plope.com>2011-05-12 01:35:30 -0400
commitef521397e9df77dd0c305e0c83a108f6883167e7 (patch)
tree429a9808313e7504cc4bf53fbfa04a03c848cecd
parentcde177a20260c712152f06ed6ad5bdf053e1a3a3 (diff)
parent7f9f373ddee95715909c82aeb20ac3a2984439df (diff)
downloadpyramid-ef521397e9df77dd0c305e0c83a108f6883167e7.tar.gz
pyramid-ef521397e9df77dd0c305e0c83a108f6883167e7.tar.bz2
pyramid-ef521397e9df77dd0c305e0c83a108f6883167e7.zip
Merge branch 'master' of github.com:Pylons/pyramid
-rw-r--r--pyramid/tests/test_paster.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/pyramid/tests/test_paster.py b/pyramid/tests/test_paster.py
index 2239d81ea..89b023852 100644
--- a/pyramid/tests/test_paster.py
+++ b/pyramid/tests/test_paster.py
@@ -327,6 +327,10 @@ class TestPViewsCommand(unittest.TestCase):
def _makeOne(self):
return self._getTargetClass()('pviews')
+ def failUnless(self, condition):
+ # silence stupid deprecation under Python >= 2.7
+ self.assertTrue(condition)
+
def test__find_view_no_match(self):
from pyramid.registry import Registry
registry = Registry()