From 0c29cf2df41600d3906d521c72991c7686018b71 Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Mon, 15 Oct 2018 16:24:07 +0200
Subject: [PATCH] format source using black
---
src/pyramid/config/security.py | 110 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 70 insertions(+), 40 deletions(-)
diff --git a/src/pyramid/config/security.py b/src/pyramid/config/security.py
index c7afbcf..3b55c41 100644
--- a/src/pyramid/config/security.py
+++ b/src/pyramid/config/security.py
@@ -8,7 +8,7 @@
IDefaultPermission,
PHASE1_CONFIG,
PHASE2_CONFIG,
- )
+)
from pyramid.csrf import LegacySessionCSRFStoragePolicy
from pyramid.exceptions import ConfigurationError
@@ -16,8 +16,8 @@
from pyramid.config.util import action_method
-class SecurityConfiguratorMixin(object):
+class SecurityConfiguratorMixin(object):
def add_default_security(self):
self.set_csrf_storage_policy(LegacySessionCSRFStoragePolicy())
@@ -35,20 +35,30 @@
achieve the same purpose.
"""
+
def register():
self._set_authentication_policy(policy)
if self.registry.queryUtility(IAuthorizationPolicy) is None:
raise ConfigurationError(
'Cannot configure an authentication policy without '
'also configuring an authorization policy '
- '(use the set_authorization_policy method)')
- intr = self.introspectable('authentication policy', None,
- self.object_description(policy),
- 'authentication policy')
+ '(use the set_authorization_policy method)'
+ )
+
+ intr = self.introspectable(
+ 'authentication policy',
+ None,
+ self.object_description(policy),
+ 'authentication policy',
+ )
intr['policy'] = policy
# authentication policy used by view config (phase 3)
- self.action(IAuthenticationPolicy, register, order=PHASE2_CONFIG,
- introspectables=(intr,))
+ self.action(
+ IAuthenticationPolicy,
+ register,
+ order=PHASE2_CONFIG,
+ introspectables=(intr,),
+ )
def _set_authentication_policy(self, policy):
policy = self.maybe_dotted(policy)
@@ -67,8 +77,10 @@
:class:`pyramid.config.Configurator` constructor can be used to
achieve the same purpose.
"""
+
def register():
self._set_authorization_policy(policy)
+
def ensure():
if self.autocommit:
return
@@ -76,16 +88,24 @@
raise ConfigurationError(
'Cannot configure an authorization policy without '
'also configuring an authentication policy '
- '(use the set_authorization_policy method)')
+ '(use the set_authorization_policy method)'
+ )
- intr = self.introspectable('authorization policy', None,
- self.object_description(policy),
- 'authorization policy')
+ intr = self.introspectable(
+ 'authorization policy',
+ None,
+ self.object_description(policy),
+ 'authorization policy',
+ )
intr['policy'] = policy
# authorization policy used by view config (phase 3) and
# authentication policy (phase 2)
- self.action(IAuthorizationPolicy, register, order=PHASE1_CONFIG,
- introspectables=(intr,))
+ self.action(
+ IAuthorizationPolicy,
+ register,
+ order=PHASE1_CONFIG,
+ introspectables=(intr,),
+ )
self.action(None, ensure)
def _set_authorization_policy(self, policy):
@@ -133,21 +153,25 @@
:class:`pyramid.config.Configurator` constructor can be used to
achieve the same purpose.
"""
+
def register():
self.registry.registerUtility(permission, IDefaultPermission)
- intr = self.introspectable('default permission',
- None,
- permission,
- 'default permission')
+
+ intr = self.introspectable(
+ 'default permission', None, permission, 'default permission'
+ )
intr['value'] = permission
- perm_intr = self.introspectable('permissions',
- permission,
- permission,
- 'permission')
+ perm_intr = self.introspectable(
+ 'permissions', permission, permission, 'permission'
+ )
perm_intr['value'] = permission
# default permission used during view registration (phase 3)
- self.action(IDefaultPermission, register, order=PHASE1_CONFIG,
- introspectables=(intr, perm_intr,))
+ self.action(
+ IDefaultPermission,
+ register,
+ order=PHASE1_CONFIG,
+ introspectables=(intr, perm_intr),
+ )
def add_permission(self, permission_name):
"""
@@ -161,11 +185,8 @@
config.add_permission('view')
"""
intr = self.introspectable(
- 'permissions',
- permission_name,
- permission_name,
- 'permission'
- )
+ 'permissions', permission_name, permission_name, 'permission'
+ )
intr['value'] = permission_name
self.action(None, introspectables=(intr,))
@@ -217,22 +238,30 @@
"""
options = DefaultCSRFOptions(
- require_csrf, token, header, safe_methods, callback,
+ require_csrf, token, header, safe_methods, callback
)
+
def register():
self.registry.registerUtility(options, IDefaultCSRFOptions)
- intr = self.introspectable('default csrf view options',
- None,
- options,
- 'default csrf view options')
+
+ intr = self.introspectable(
+ 'default csrf view options',
+ None,
+ options,
+ 'default csrf view options',
+ )
intr['require_csrf'] = require_csrf
intr['token'] = token
intr['header'] = header
intr['safe_methods'] = as_sorted_tuple(safe_methods)
intr['callback'] = callback
- self.action(IDefaultCSRFOptions, register, order=PHASE1_CONFIG,
- introspectables=(intr,))
+ self.action(
+ IDefaultCSRFOptions,
+ register,
+ order=PHASE1_CONFIG,
+ introspectables=(intr,),
+ )
@action_method
def set_csrf_storage_policy(self, policy):
@@ -245,12 +274,13 @@
how to generate and persist CSRF tokens.
"""
+
def register():
self.registry.registerUtility(policy, ICSRFStoragePolicy)
- intr = self.introspectable('csrf storage policy',
- None,
- policy,
- 'csrf storage policy')
+
+ intr = self.introspectable(
+ 'csrf storage policy', None, policy, 'csrf storage policy'
+ )
intr['policy'] = policy
self.action(ICSRFStoragePolicy, register, introspectables=(intr,))
--
Gitblit v1.9.3