summaryrefslogtreecommitdiff
path: root/tests/test_viewderivers.py
diff options
context:
space:
mode:
authorMichael Merickel <github@m.merickel.org>2018-10-25 18:08:57 -0500
committerGitHub <noreply@github.com>2018-10-25 18:08:57 -0500
commit4149922e64aecf2a213f8efb120cd2d61fed3eb7 (patch)
tree0c3901d9b0ce7cf7b74ce4a10aac8dc5eeb37974 /tests/test_viewderivers.py
parent41f103af2745c336a3bcdc715e70ef3cb5d1e545 (diff)
parent69ea9e4ad7e11581d724ffe91aa66935a62c06d7 (diff)
downloadpyramid-4149922e64aecf2a213f8efb120cd2d61fed3eb7.tar.gz
pyramid-4149922e64aecf2a213f8efb120cd2d61fed3eb7.tar.bz2
pyramid-4149922e64aecf2a213f8efb120cd2d61fed3eb7.zip
Merge pull request #3397 from mmerickel/refactor-actions
refactor configurator actions and predicates into mixins
Diffstat (limited to 'tests/test_viewderivers.py')
-rw-r--r--tests/test_viewderivers.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_viewderivers.py b/tests/test_viewderivers.py
index a1455ed92..f01cb490e 100644
--- a/tests/test_viewderivers.py
+++ b/tests/test_viewderivers.py
@@ -1265,7 +1265,7 @@ class TestDeriveView(unittest.TestCase):
self.assertEqual(result(None, None), response)
def test_attr_wrapped_view_branching_default_phash(self):
- from pyramid.config.util import DEFAULT_PHASH
+ from pyramid.config.predicates import DEFAULT_PHASH
def view(context, request): # pragma: no cover
pass