diff options
| author | Michael Merickel <michael@merickel.org> | 2013-04-03 03:42:48 -0500 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2013-04-03 03:42:48 -0500 |
| commit | bdce333dc4bc29f0a7927539c032ba08ae2d6c57 (patch) | |
| tree | d3b751462da2bd69e3de3defafc0e1d752a6b916 | |
| parent | 2ae6f2cba5fc228e20c1ba26ad4f1411a63bbabb (diff) | |
| parent | bd17ff5e424ac25c60d197e3ba8cdb45b05a6a13 (diff) | |
| download | pyramid-bdce333dc4bc29f0a7927539c032ba08ae2d6c57.tar.gz pyramid-bdce333dc4bc29f0a7927539c032ba08ae2d6c57.tar.bz2 pyramid-bdce333dc4bc29f0a7927539c032ba08ae2d6c57.zip | |
Merge branch 'fix.954'
| -rw-r--r-- | pyramid/config/views.py | 4 | ||||
| -rw-r--r-- | pyramid/tests/test_config/test_views.py | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pyramid/config/views.py b/pyramid/config/views.py index 1c7620e67..707c84043 100644 --- a/pyramid/config/views.py +++ b/pyramid/config/views.py @@ -257,7 +257,9 @@ class ViewDeriver(object): view_name = getattr(request, 'view_name', None) if self.authn_policy and self.authz_policy: - if permission is None: + if permission is NO_PERMISSION_REQUIRED: + msg = 'Allowed (NO_PERMISSION_REQUIRED)' + elif permission is None: msg = 'Allowed (no permission registered)' else: principals = self.authn_policy.effective_principals( diff --git a/pyramid/tests/test_config/test_views.py b/pyramid/tests/test_config/test_views.py index 5388001f6..94bc497ba 100644 --- a/pyramid/tests/test_config/test_views.py +++ b/pyramid/tests/test_config/test_views.py @@ -2791,7 +2791,8 @@ class TestViewDeriver(unittest.TestCase): self.assertEqual(len(logger.messages), 1) self.assertEqual(logger.messages[0], "debug_authorization of url url (view name " - "'view_name' against context None): False") + "'view_name' against context None): " + "Allowed (NO_PERMISSION_REQUIRED)") def test_secured_view_authn_policy_no_authz_policy(self): response = DummyResponse() |