diff -r bf589bc39592 -r 0cde6357775d src/pyams_ldap/zmi/plugin.py --- a/src/pyams_ldap/zmi/plugin.py Fri Apr 27 10:36:33 2018 +0200 +++ b/src/pyams_ldap/zmi/plugin.py Mon Nov 05 16:34:09 2018 +0100 @@ -12,48 +12,44 @@ __docformat__ = 'restructuredtext' - -# import standard library import base64 -import ldap3 -# import interfaces +import ldap3 +from pyramid.view import view_config +from z3c.form import field +from z3c.form.interfaces import DISPLAY_MODE +from z3c.table.column import GetAttrColumn +from z3c.table.interfaces import IColumn +from zope.component.interfaces import ISite +from zope.interface import Interface, implementer + +from pyams_form.form import AJAXAddForm, AJAXEditForm from pyams_form.interfaces.form import IInnerTabForm, IWidgetsSuffixViewletsManager +from pyams_form.search import SearchResultsView, SearchView from pyams_ldap.interfaces import ILDAPPlugin -from pyams_security.interfaces import ISecurityManager, IPlugin +from pyams_ldap.plugin import LDAPPlugin +from pyams_ldap.query import LDAPQuery +from pyams_pagelet.pagelet import pagelet_config +from pyams_security.interfaces import IPlugin, ISecurityManager +from pyams_security.zmi.utility import SecurityManagerPluginsTable from pyams_skin.interfaces import IPageHeader from pyams_skin.interfaces.viewlet import IToolbarAddingMenu from pyams_skin.layer import IPyAMSLayer -from pyams_utils.interfaces import VIEW_SYSTEM_PERMISSION, MANAGE_SECURITY_PERMISSION -from pyams_zmi.interfaces import IAdminView -from pyams_zmi.layer import IAdminLayer -from z3c.form.interfaces import DISPLAY_MODE -from z3c.table.interfaces import IColumn -from zope.component.interfaces import ISite - -# import packages -from pyams_form.form import AJAXAddForm, AJAXEditForm -from pyams_form.search import SearchView, SearchResultsView -from pyams_ldap.plugin import LDAPPlugin -from pyams_ldap.query import LDAPQuery -from pyams_pagelet.pagelet import pagelet_config -from pyams_security.zmi.utility import SecurityManagerPluginsTable from pyams_skin.page import DefaultPageHeaderAdapter from pyams_skin.skin import apply_skin from pyams_skin.table import I18nColumn from pyams_skin.viewlet.toolbar import ToolbarMenuItem from pyams_template.template import template_config from pyams_utils.adapter import adapter_config +from pyams_utils.interfaces import MANAGE_SECURITY_PERMISSION, VIEW_SYSTEM_PERMISSION from pyams_utils.registry import query_utility from pyams_utils.url import absolute_url -from pyams_viewlet.viewlet import viewlet_config, Viewlet -from pyams_zmi.form import AdminDialogAddForm, AdminDialogEditForm, AdminDialogDisplayForm, InnerAdminAddForm, \ +from pyams_viewlet.viewlet import Viewlet, viewlet_config +from pyams_zmi.form import AdminDialogAddForm, AdminDialogDisplayForm, AdminDialogEditForm, InnerAdminAddForm, \ InnerAdminEditForm +from pyams_zmi.interfaces import IAdminView +from pyams_zmi.layer import IAdminLayer from pyams_zmi.view import AdminView -from pyramid.view import view_config -from z3c.form import field -from z3c.table.column import GetAttrColumn -from zope.interface import implementer, Interface from pyams_ldap import _ @@ -125,8 +121,7 @@ tab_label = _("Connection") legend = None - fields = field.Fields(ILDAPPlugin).select('server_uri', 'bind_dn', 'bind_password', 'use_tls', - 'use_pool', 'pool_size', 'pool_lifetime') + fields = field.Fields(ILDAPPlugin).select('server_uri', 'use_tls', 'bind_dn', 'bind_password') weight = 1 @@ -237,8 +232,7 @@ tab_label = _("Connection") legend = None - fields = field.Fields(ILDAPPlugin).select('server_uri', 'bind_dn', 'bind_password', 'use_tls', - 'use_pool', 'pool_size', 'pool_lifetime') + fields = field.Fields(ILDAPPlugin).select('server_uri', 'use_tls', 'bind_dn', 'bind_password') edit_permission = MANAGE_SECURITY_PERMISSION weight = 1 @@ -422,6 +416,6 @@ dn, attributes = result[0] if 'jpegPhoto' in attributes: attributes['jpegPhoto'] = [''. - format(base64.encodebytes(attributes['jpegPhoto'][0]).decode()), ] + format(base64.encodebytes(attributes['jpegPhoto'][0]).decode()), ] result = sorted(attributes.items(), key=lambda x: x[0]) return result