summaryrefslogtreecommitdiff
path: root/tests/test_config/test_views.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_config/test_views.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_config/test_views.py')
-rw-r--r--tests/test_config/test_views.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/test_config/test_views.py b/tests/test_config/test_views.py
index 977944fdd..5e722c9a0 100644
--- a/tests/test_config/test_views.py
+++ b/tests/test_config/test_views.py
@@ -664,7 +664,7 @@ class TestViewsConfigurationMixin(unittest.TestCase):
self.assertEqual(wrapper(None, request), 'OK')
def test_add_view_default_phash_overrides_default_phash(self):
- from pyramid.config.util import DEFAULT_PHASH
+ from pyramid.config.predicates import DEFAULT_PHASH
from pyramid.renderers import null_renderer
from zope.interface import Interface
from pyramid.interfaces import IRequest
@@ -690,7 +690,7 @@ class TestViewsConfigurationMixin(unittest.TestCase):
self.assertEqual(wrapper(None, request), 'OK')
def test_add_view_exc_default_phash_overrides_default_phash(self):
- from pyramid.config.util import DEFAULT_PHASH
+ from pyramid.config.predicates import DEFAULT_PHASH
from pyramid.renderers import null_renderer
from zope.interface import implementedBy
from pyramid.interfaces import IRequest