From c52cfec057a9e22b794da655eac1708dfba8bef7 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Mon, 23 Dec 2019 13:31:54 -0600
Subject: modify deprecation warning

---
 src/pyramid/config/routes.py | 11 +++++++++++
 src/pyramid/config/views.py  | 11 +++++++++++
 src/pyramid/predicates.py    | 18 ------------------
 3 files changed, 22 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/pyramid/config/routes.py b/src/pyramid/config/routes.py
index 4b26b7481..daef8e9f2 100644
--- a/src/pyramid/config/routes.py
+++ b/src/pyramid/config/routes.py
@@ -332,6 +332,17 @@ class RoutesConfiguratorMixin(object):
                 stacklevel=3,
             )
 
+        if 'effective_principals' in predicates:
+            warnings.warn(
+                (
+                    'The new security policy has removed the concept of '
+                    'principals. See "Upgrading Authentication/Authorization" '
+                    'in "What\'s New in Pyramid 2.0" for more information.'
+                ),
+                DeprecationWarning,
+                stacklevel=3,
+            )
+
         if accept is not None:
             if not is_nonstr_iter(accept):
                 accept = [accept]
diff --git a/src/pyramid/config/views.py b/src/pyramid/config/views.py
index bc0b05a08..1c17d2343 100644
--- a/src/pyramid/config/views.py
+++ b/src/pyramid/config/views.py
@@ -791,6 +791,17 @@ class ViewsConfiguratorMixin(object):
                 stacklevel=4,
             )
 
+        if 'effective_principals' in view_options:
+            warnings.warn(
+                (
+                    'The new security policy has removed the concept of '
+                    'principals. See "Upgrading Authentication/Authorization" '
+                    'in "What\'s New in Pyramid 2.0" for more information.'
+                ),
+                DeprecationWarning,
+                stacklevel=4,
+            )
+
         if accept is not None:
             if is_nonstr_iter(accept):
                 raise ConfigurationError(
diff --git a/src/pyramid/predicates.py b/src/pyramid/predicates.py
index 83f7f3295..32c6a4089 100644
--- a/src/pyramid/predicates.py
+++ b/src/pyramid/predicates.py
@@ -1,7 +1,5 @@
 import re
 
-from zope.deprecation import deprecated
-
 from pyramid.exceptions import ConfigurationError
 
 from pyramid.traversal import (
@@ -271,28 +269,12 @@ class PhysicalPathPredicate(object):
 
 
 class EffectivePrincipalsPredicate(object):
-    """
-    .. deprecated:: 2.0
-
-        The new security system has removed the concept of principals.  See
-        :ref:`upgrading_auth` for more information.
-
-    """
-
     def __init__(self, val, config):
         if is_nonstr_iter(val):
             self.val = set(val)
         else:
             self.val = set((val,))
 
-    __init__ = deprecated(
-        __init__,
-        'The new security policy has removed the concept of principals.  See '
-        'https://docs.pylonsproject.org/projects/pyramid/en/latest'
-        '/whatsnew-2.0.html#upgrading-authentication-authorization '
-        'for more information.',
-    )
-
     def text(self):
         return 'effective_principals = %s' % sorted(list(self.val))
 
-- 
cgit v1.2.3