ERP5Security: cleanup. fix indentation and remove unused import.

product/ERP5Security/ERP5AccessTokenExtractionPlugin.py

@@ -28,7 +28,6 @@
 #
 ##############################################################################
 
-from zLOG import LOG, PROBLEM
 from Products.ERP5Type.Globals import InitializeClass
 
 from AccessControl import ClassSecurityInfo

product/ERP5Security/ERP5BearerExtractionPlugin.py

@@ -35,7 +35,7 @@ from Products.PluggableAuthService.utils import classImplements
 from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
 from Products.ERP5Security.ERP5UserManager import SUPER_USER
 from Products.PluggableAuthService.PluggableAuthService import DumbHTTPExtractor
-from AccessControl.SecurityManagement import getSecurityManager,\
+from AccessControl.SecurityManagement import getSecurityManager, \
   setSecurityManager, newSecurityManager
 
 #Form for new plugin in ZMI

product/ERP5Security/ERP5ExternalOauth2ExtractionPlugin.py

@@ -35,7 +35,7 @@ from Products.PluggableAuthService.utils import classImplements
 from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
 from Products.ERP5Security.ERP5UserManager import SUPER_USER
 from Products.PluggableAuthService.PluggableAuthService import DumbHTTPExtractor
-from AccessControl.SecurityManagement import getSecurityManager,\
+from AccessControl.SecurityManagement import getSecurityManager, \
   setSecurityManager, newSecurityManager
 from Products.ERP5Type.Cache import DEFAULT_CACHE_SCOPE
 import socket

product/ERP5Security/ERP5GroupManager.py

@@ -17,8 +17,6 @@
 
 from Products.ERP5Type.Globals import InitializeClass
 from AccessControl import ClassSecurityInfo
-from AccessControl.SecurityManagement import newSecurityManager,\
-    getSecurityManager, setSecurityManager
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
 from Products.PluggableAuthService.utils import classImplements
@@ -28,7 +26,6 @@ from Products.ERP5Type.ERP5Type \
   import ERP5TYPE_SECURITY_GROUP_ID_GENERATION_SCRIPT
 from Products.ERP5Type.UnrestrictedMethod import UnrestrictedMethod
 from Products.ZSQLCatalog.SQLCatalog import SimpleQuery
-from Products.PluggableAuthService.PropertiedUser import PropertiedUser
 from ZODB.POSException import ConflictError
 
 import sys
@@ -130,7 +127,6 @@ class ERP5GroupManager(BasePlugin):
           else: # no person is linked to this user login
             return ()
         person_object = catalog_result[0].getObject()
-        person_id = person_object.getId()
 
         # Fetch category values from defined scripts
         for (method_name, base_category_list) in security_definition_list:

product/ERP5Security/ERP5KeyAuthPlugin.py

@@ -35,9 +35,6 @@ from Products.ERP5Type.Globals import InitializeClass
 from zope.interface import Interface
 
 from AccessControl import ClassSecurityInfo
-from AccessControl.SecurityManagement import getSecurityManager,\
-                                             newSecurityManager,\
-                                             setSecurityManager
 
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 
@@ -49,8 +46,8 @@ from Products.PluggableAuthService.plugins.CookieAuthHelper import CookieAuthHel
 
 from Products.ERP5Type.Cache import CachingMethod
 from Products.ERP5Type.UnrestrictedMethod import UnrestrictedMethod
-from Products.ERP5Security.ERP5UserManager import ERP5UserManager,\
-                                                  SUPER_USER,\
+from Products.ERP5Security.ERP5UserManager import ERP5UserManager, \
+                                                  SUPER_USER, \
                                                   _AuthenticationFailure
 
 from Crypto.Cipher import AES
@@ -136,8 +133,8 @@ manage_addERP5KeyAuthPluginForm = PageTemplateFile(
     'www/ERP5Security_addERP5KeyAuthPlugin', globals(),
     __name__='manage_addERP5KeyAuthPluginForm')
 
-def addERP5KeyAuthPlugin(dispatcher, id, title=None,\
-                         encryption_key='', cipher='AES', cookie_name='',\
+def addERP5KeyAuthPlugin(dispatcher, id, title=None,
+                         encryption_key='', cipher='AES', cookie_name='',
                          default_cookie_name='',REQUEST=None):
   """ Add a ERP5KeyAuthPlugin to a Pluggable Auth Service. """
 
@@ -373,8 +370,7 @@ class ERP5KeyAuthPlugin(ERP5UserManager, CookieAuthHelper):
                                                 id='ERP5KeyAuthPlugin_authenticateCredentials',
                                                 cache_factory='erp5_content_short')
       try:
-          return _authenticateCredentials(
-                          login=login)
+        return _authenticateCredentials(login=login)
       except _AuthenticationFailure:
         return None
       except StandardError, e:

product/ERP5Security/ERP5RoleManager.py

@@ -20,7 +20,7 @@ from AccessControl import ClassSecurityInfo
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
 from Products.PluggableAuthService.plugins.BasePlugin import BasePlugin
 from Products.PluggableAuthService.utils import classImplements
-from Products.PluggableAuthService.interfaces.plugins import IRolesPlugin,\
+from Products.PluggableAuthService.interfaces.plugins import IRolesPlugin, \
   IRoleEnumerationPlugin
 
 from ERP5UserManager import SUPER_USER

product/ERP5Security/ERP5UserFactory.py

@@ -61,7 +61,7 @@ class ERP5User(PropertiedUser):
     principal_ids = list( group_ids )
     principal_ids.insert( 0, user_id )
 
-    local ={}
+    local = {}
     object = aq_inner( object )
 
     while 1:

product/ERP5Security/ERP5UserManager.py

@@ -165,7 +165,8 @@ class ERP5UserManager(BasePlugin):
         pass
       raise _AuthenticationFailure()
 
-        _authenticateCredentials = CachingMethod(_authenticateCredentials,
+    _authenticateCredentials = CachingMethod(
+      _authenticateCredentials,
       id='ERP5UserManager_authenticateCredentials',
       cache_factory='erp5_content_short')
     try: