--- a/src/pyams_content/component/extfile/zmi/__init__.py Thu Jun 02 15:18:57 2016 +0200
+++ b/src/pyams_content/component/extfile/zmi/__init__.py Thu Jun 02 15:20:41 2016 +0200
@@ -9,8 +9,6 @@
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
#
-from pyams_content.interfaces import MANAGE_CONTENT_PERMISSION
-from pyams_utils.interfaces import VIEW_SYSTEM_PERMISSION
__docformat__ = 'restructuredtext'
@@ -18,12 +16,14 @@
# import standard library
# import interfaces
-from pyams_content.component.extfile.interfaces import IExtFileContainer, IExtFileContainerTarget, IBaseExtFile, IExtFile, \
- IExtImage
+from pyams_content.component.extfile.interfaces import IExtFileContainer, IExtFileContainerTarget, IBaseExtFile, \
+ IExtFile, IExtImage
+from pyams_content.interfaces import MANAGE_CONTENT_PERMISSION
from pyams_file.interfaces import IFileInfo
from pyams_i18n.interfaces import INegotiator, II18n
from pyams_skin.interfaces.viewlet import IWidgetTitleViewletManager
from pyams_skin.layer import IPyAMSLayer
+from pyams_utils.interfaces import VIEW_SYSTEM_PERMISSION
from z3c.form.interfaces import NOT_CHANGED
# import packages
--- a/src/pyams_content/component/paragraph/zmi/container.py Thu Jun 02 15:18:57 2016 +0200
+++ b/src/pyams_content/component/paragraph/zmi/container.py Thu Jun 02 15:20:41 2016 +0200
@@ -9,11 +9,6 @@
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
#
-from zope.contentprovider.interfaces import IContentProvider
-
-from pyams_form.interfaces.form import IFormSecurityContext
-from pyams_viewlet.interfaces import IViewletManager
-from pyams_viewlet.manager import viewletmanager_config, WeightOrderedViewletManager, TemplateBasedViewletManager
__docformat__ = 'restructuredtext'
@@ -28,6 +23,7 @@
from pyams_content.component.links.interfaces import ILinkLinksContainerTarget, ILinkLinksContainer
from pyams_content.component.paragraph.interfaces import IParagraphContainerTarget, IParagraphContainer, IBaseParagraph
from pyams_content.component.paragraph.zmi.interfaces import IParagraphInnerEditor, IParagraphTitleToolbar
+from pyams_form.interfaces.form import IFormSecurityContext
from pyams_i18n.interfaces import II18n
from pyams_skin.interfaces import IInnerPage, IPageHeader
from pyams_skin.layer import IPyAMSLayer
@@ -35,6 +31,7 @@
from pyams_zmi.interfaces.menu import IPropertiesMenu
from pyams_zmi.layer import IAdminLayer
from z3c.table.interfaces import IColumn, IValues
+from zope.contentprovider.interfaces import IContentProvider
# import packages
from pyams_content.shared.common.zmi import WfModifiedContentColumnMixin
@@ -44,8 +41,9 @@
from pyams_skin.table import BaseTable, I18nColumn, TrashColumn, ActionColumn, JsActionColumn
from pyams_skin.viewlet.menu import MenuItem
from pyams_template.template import template_config
-from pyams_utils.adapter import adapter_config, ContextRequestViewAdapter, ContextAdapter
+from pyams_utils.adapter import adapter_config, ContextRequestViewAdapter
from pyams_utils.url import absolute_url
+from pyams_viewlet.manager import viewletmanager_config, WeightOrderedViewletManager, TemplateBasedViewletManager
from pyramid.exceptions import NotFound
from pyramid.view import view_config
from pyams_viewlet.viewlet import viewlet_config, Viewlet
--- a/src/pyams_content/shared/common/zmi/owner.py Thu Jun 02 15:18:57 2016 +0200
+++ b/src/pyams_content/shared/common/zmi/owner.py Thu Jun 02 15:20:41 2016 +0200
@@ -9,24 +9,6 @@
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
#
-from pyramid.view import view_config
-from z3c.form.browser.checkbox import SingleCheckBoxFieldWidget
-from zope.lifecycleevent import ObjectModifiedEvent
-from pyams_content.interfaces import MANAGE_SITE_PERMISSION
-from pyams_content.shared.common.interfaces import IWfSharedContent, IWfSharedContentRoles
-from pyams_form.form import AJAXAddForm
-from pyams_form.help import FormHelp
-from pyams_form.interfaces.form import IFormHelp
-from pyams_form.schema import CloseButton
-from pyams_pagelet.pagelet import pagelet_config
-from pyams_security.schema import Principal
-from pyams_security.zmi.interfaces import IObjectSecurityMenu
-from pyams_skin.layer import IPyAMSLayer
-from pyams_skin.viewlet.menu import MenuItem
-from pyams_utils.adapter import adapter_config
-from pyams_viewlet.viewlet import viewlet_config
-from pyams_workflow.interfaces import IWorkflowVersions, IWorkflow, IWorkflowState
-from pyams_zmi.form import AdminDialogAddForm
__docformat__ = 'restructuredtext'
@@ -34,10 +16,28 @@
# import standard library
# import interfaces
+from pyams_content.interfaces import MANAGE_SITE_PERMISSION
+from pyams_content.shared.common.interfaces import IWfSharedContent, IWfSharedContentRoles
+from pyams_form.interfaces.form import IFormHelp
+from pyams_security.zmi.interfaces import IObjectSecurityMenu
+from pyams_skin.layer import IPyAMSLayer
+from pyams_workflow.interfaces import IWorkflowVersions, IWorkflow, IWorkflowState
# import packages
+from pyams_form.form import AJAXAddForm
+from pyams_form.help import FormHelp
+from pyams_form.schema import CloseButton
+from pyams_pagelet.pagelet import pagelet_config
+from pyams_security.schema import Principal
+from pyams_skin.viewlet.menu import MenuItem
+from pyams_utils.adapter import adapter_config
+from pyams_viewlet.viewlet import viewlet_config
+from pyams_zmi.form import AdminDialogAddForm
+from pyramid.view import view_config
from z3c.form import field, button
+from z3c.form.browser.checkbox import SingleCheckBoxFieldWidget
from zope.interface import Interface
+from zope.lifecycleevent import ObjectModifiedEvent
from zope.schema import Bool
from pyams_content import _
--- a/src/pyams_content/zmi/viewlet/toplinks/__init__.py Thu Jun 02 15:18:57 2016 +0200
+++ b/src/pyams_content/zmi/viewlet/toplinks/__init__.py Thu Jun 02 15:20:41 2016 +0200
@@ -9,7 +9,6 @@
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
#
-from pyams_template.template import template_config
__docformat__ = 'restructuredtext'
@@ -28,6 +27,7 @@
from hypatia.query import Any, And, Or, NotEq
from pyams_catalog.query import CatalogResultSet
from pyams_skin.viewlet.toplinks import TopLinksViewlet, TopLinksMenu
+from pyams_template.template import template_config
from pyams_utils.list import unique
from pyams_utils.registry import get_local_registry, get_utility
from pyams_utils.url import absolute_url