summaryrefslogtreecommitdiff
path: root/tests/test_config
diff options
context:
space:
mode:
authorMichael Merickel <michael@merickel.org>2018-11-14 18:45:53 -0600
committerMichael Merickel <michael@merickel.org>2018-11-14 18:59:43 -0600
commit9ead1d8e84edcb86ea9e07b4d2c31e7b74a098ed (patch)
tree08c0f0389e2e467f8b104a98cc3e6bd19ffc8ab1 /tests/test_config
parent656ce2b499bd05ceb9b0ae492a0be15a07dc283f (diff)
downloadpyramid-9ead1d8e84edcb86ea9e07b4d2c31e7b74a098ed.tar.gz
pyramid-9ead1d8e84edcb86ea9e07b4d2c31e7b74a098ed.tar.bz2
pyramid-9ead1d8e84edcb86ea9e07b4d2c31e7b74a098ed.zip
move is_unbound_method to pyramid.util
Diffstat (limited to 'tests/test_config')
-rw-r--r--tests/test_config/test_init.py6
-rw-r--r--tests/test_config/test_views.py14
2 files changed, 9 insertions, 11 deletions
diff --git a/tests/test_config/test_init.py b/tests/test_config/test_init.py
index 1cd63f113..ce2b042ec 100644
--- a/tests/test_config/test_init.py
+++ b/tests/test_config/test_init.py
@@ -1,8 +1,6 @@
import os
import unittest
-from pyramid.compat import im_func
-
from . import dummy_tween_factory
from . import dummy_include
from . import dummy_extend
@@ -1205,7 +1203,7 @@ test_config.dummy_include2"""
directives = {'foo': (foo, True)}
config.registry._directives = directives
foo_meth = config.foo
- self.assertTrue(getattr(foo_meth, im_func).__docobj__ is foo)
+ self.assertTrue(getattr(foo_meth, '__func__').__docobj__ is foo)
def test___getattr__matches_no_action_wrap(self):
config = self._makeOne()
@@ -1216,7 +1214,7 @@ test_config.dummy_include2"""
directives = {'foo': (foo, False)}
config.registry._directives = directives
foo_meth = config.foo
- self.assertTrue(getattr(foo_meth, im_func) is foo)
+ self.assertTrue(getattr(foo_meth, '__func__') is foo)
class TestConfigurator_add_directive(unittest.TestCase):
diff --git a/tests/test_config/test_views.py b/tests/test_config/test_views.py
index aa5b67050..d530542b7 100644
--- a/tests/test_config/test_views.py
+++ b/tests/test_config/test_views.py
@@ -3,7 +3,7 @@ import unittest
from zope.interface import implementer
from pyramid import testing
-from pyramid.compat import im_func, text_
+from pyramid.compat import text_
from pyramid.exceptions import ConfigurationError
from pyramid.exceptions import ConfigurationExecutionError
from pyramid.exceptions import ConfigurationConflictError
@@ -3723,16 +3723,16 @@ class Test_preserve_view_attrs(unittest.TestCase):
self.assertTrue(view1.__module__ is view2.__module__)
self.assertTrue(view1.__name__ is view2.__name__)
self.assertTrue(
- getattr(view1.__call_permissive__, im_func)
- is getattr(view2.__call_permissive__, im_func)
+ getattr(view1.__call_permissive__, '__func__')
+ is getattr(view2.__call_permissive__, '__func__')
)
self.assertTrue(
- getattr(view1.__permitted__, im_func)
- is getattr(view2.__permitted__, im_func)
+ getattr(view1.__permitted__, '__func__')
+ is getattr(view2.__permitted__, '__func__')
)
self.assertTrue(
- getattr(view1.__predicated__, im_func)
- is getattr(view2.__predicated__, im_func)
+ getattr(view1.__predicated__, '__func__')
+ is getattr(view2.__predicated__, '__func__')
)