Merge 8f8e18e into 1f2bdd1

anyblok_pyramid/bloks/auth/user.py

@@ -9,7 +9,10 @@
 from pyramid.httpexceptions import HTTPUnauthorized
 from anyblok import Declarations
 from anyblok.column import String
-from pyramid.authorization import Allow, ALL_PERMISSIONS
+try:
+    from pyramid.authorization import Allow, ALL_PERMISSIONS
+except ImportError:
+    from pyramid.security import Allow, ALL_PERMISSIONS
 
 
 @Declarations.register(Declarations.Model)

anyblok_pyramid/bloks/authorization/authorization.py

@@ -11,8 +11,11 @@
 from anyblok.relationship import Many2One
 from anyblok.field import JsonRelated
 from .exceptions import AuthorizationValidationException
-from pyramid.authorization import Allow, Deny, ALL_PERMISSIONS
 from sqlalchemy import or_
+try:
+    from pyramid.authorization import Allow, Deny, ALL_PERMISSIONS
+except ImportError:
+    from pyramid.security import Allow, Deny, ALL_PERMISSIONS
 
 
 Pyramid = Declarations.Model.Pyramid

anyblok_pyramid/bloks/authorization/tests/test_get_acl.py

@@ -6,7 +6,10 @@
 # v. 2.0. If a copy of the MPL was not distributed with this file,You can
 # obtain one at http://mozilla.org/MPL/2.0/.
 import pytest
-from pyramid.authorization import Allow, Deny, ALL_PERMISSIONS
+try:
+    from pyramid.authorization import Allow, Deny, ALL_PERMISSIONS
+except ImportError:
+    from pyramid.security import Allow, Deny, ALL_PERMISSIONS
 
 
 @pytest.mark.usefixtures('rollback_registry')

anyblok_pyramid/bloks/pyramid/__init__.py

@@ -6,7 +6,12 @@
 # v. 2.0. If a copy of the MPL was not distributed with this file,You can
 # obtain one at http://mozilla.org/MPL/2.0/.
 from anyblok.blok import Blok
-from pyramid.authorization import ACLAuthorizationPolicy
+try:
+    from pyramid.authorization import ACLAuthorizationPolicy
+except ImportError:
+    from pyramid.security import ACLAuthorizationPolicy
+
+
 from anyblok_pyramid.security import RootFactory
 from .pyramid import getAuthenticationPolicy
 

anyblok_pyramid/bloks/pyramid/model.py

@@ -8,7 +8,10 @@
 # obtain one at http://mozilla.org/MPL/2.0/.
 from pyramid.httpexceptions import HTTPUnauthorized
 from anyblok import Declarations
-from pyramid.authorization import Allow, ALL_PERMISSIONS
+try:
+    from pyramid.authorization import Allow, ALL_PERMISSIONS
+except ImportError:
+    from pyramid.security import Allow, ALL_PERMISSIONS
 
 
 @Declarations.register(Declarations.Model)

anyblok_pyramid/security.py

@@ -6,7 +6,10 @@
 # v. 2.0. If a copy of the MPL was not distributed with this file,You can
 # obtain one at http://mozilla.org/MPL/2.0/.
 from pyramid.httpexceptions import HTTPUnauthorized
-from pyramid.authorization import Deny, Everyone, ALL_PERMISSIONS
+try:
+    from pyramid.authorization import Deny, Everyone, ALL_PERMISSIONS
+except ImportError:
+    from pyramid.security import Deny, Everyone, ALL_PERMISSIONS
 
 
 def group_finder(userid, request):

anyblok_pyramid/test_bloks/test2/models.py

@@ -7,8 +7,11 @@
 # v. 2.0. If a copy of the MPL was not distributed with this file,You can
 # obtain one at http://mozilla.org/MPL/2.0/.
 from anyblok import Declarations
-from pyramid.authorization import Allow, Authenticated
 from anyblok_pyramid.bloks.pyramid.restrict import restrict_query_by_user
+try:
+    from pyramid.authorization import Allow, Authenticated
+except ImportError:
+    from pyramid.security import Allow, Authenticated
 
 
 @Declarations.register(Declarations.Model.Pyramid)

setup.py

@@ -13,7 +13,7 @@
 
 requires = [
     'anyblok>=1.1.0',
-    'pyramid>=2.0.0',
+    'pyramid<2.0.0',
     'pyramid_tm',
     'zope.sqlalchemy',
     'passlib',