pep8 on imports

CHANGES.rst

@@ -6,6 +6,7 @@ Changelog
 
 - Corrected table column style. Added contenttype css icon
   [sgeulette]
+- pep8 on imports
 
 3.0 (2017-05-30)
 ----------------

buildout.d/versions.cfg

@@ -9,7 +9,7 @@ createcoverage = 1.3.2
 dexterity.localroles =
 dexterity.localrolesfield =
 flake8 = 2.4.0
-ipython = 3.2.3
+ipython = 5.7.0
 mccabe = 0.3
 pathtools = 0.1.2
 plone.api = 1.3.2

src/collective/task/__init__.py

@@ -3,5 +3,6 @@
 
 from zope.i18nmessageid import MessageFactory
 
+
 _ = MessageFactory('collective.task')
 PMF = MessageFactory('plone')

src/collective/task/adapters.py

@@ -1,19 +1,20 @@
 # -*- coding: utf-8 -*-
 
+from collective.task.behaviors import ITask
+from collective.task.interfaces import ITaskContent
+from collective.task.interfaces import ITaskMethods
 from datetime import date
-from zope.component import adapts, getUtility
-from zope.dottedname.resolve import resolve
-from zope.interface import implements
-
 from plone.indexer import indexer
 from plone.registry.interfaces import IRegistry
 from Products.CMFCore.interfaces import IContentish
 from Products.CMFPlone.utils import base_hasattr
 from Products.PluginIndexes.common.UnIndex import _marker as common_marker
 from Products.PluginIndexes.DateIndex.DateIndex import _marker as date_marker
+from zope.component import adapts
+from zope.component import getUtility
+from zope.dottedname.resolve import resolve
+from zope.interface import implements
 
-from .behaviors import ITask
-from .interfaces import ITaskMethods, ITaskContent
 
 EMPTY_STRING = '__empty_string__'
 EMPTY_DATE = date(1950, 1, 1)

src/collective/task/behaviors.py

@@ -1,24 +1,24 @@
 # -*- coding: utf-8 -*-
 """Behaviors."""
-from zope.component import getUtility
-from zope.interface import alsoProvides, Interface, provider
-from zope import schema
-from zope.schema.interfaces import IContextAwareDefaultFactory
-from zope.schema.interfaces import IVocabularyFactory
-from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm
-
-from Products.CMFPlone.utils import base_hasattr
+from collective.task import _
+from collective.task.field import LocalRoleMasterSelectField
+from dexterity.localrolesfield.field import LocalRoleField
 from plone import api
 from plone.app.textfield import RichText
 from plone.autoform.interfaces import IFormFieldProvider
 from plone.directives.form import default_value
 from plone.supermodel import model
 from plone.supermodel.directives import fieldset
-
-from dexterity.localrolesfield.field import LocalRoleField
-
-from collective.task.field import LocalRoleMasterSelectField
-from collective.task import _
+from Products.CMFPlone.utils import base_hasattr
+from zope import schema
+from zope.component import getUtility
+from zope.interface import alsoProvides
+from zope.interface import Interface
+from zope.interface import provider
+from zope.schema.interfaces import IContextAwareDefaultFactory
+from zope.schema.interfaces import IVocabularyFactory
+from zope.schema.vocabulary import SimpleTerm
+from zope.schema.vocabulary import SimpleVocabulary
 
 
 class AssignedGroupsVocabulary(object):

src/collective/task/browser/table.py

@@ -1,17 +1,17 @@
 # -*- coding: utf-8 -*-
 """Define tables and columns."""
 
-from zope.cachedescriptors.property import CachedProperty
-from zope.i18n import translate
-
-from Products.CMFPlone.utils import safe_unicode, normalizeString
+from collective.task import _
+from collective.task import PMF
+from collective.task.adapters import EMPTY_STRING
 from plone import api
-
-from z3c.table.column import Column, LinkColumn
+from Products.CMFPlone.utils import normalizeString
+from Products.CMFPlone.utils import safe_unicode
+from z3c.table.column import Column
+from z3c.table.column import LinkColumn
 from z3c.table.table import Table
-
-from collective.task import _, PMF
-from collective.task.adapters import EMPTY_STRING
+from zope.cachedescriptors.property import CachedProperty
+from zope.i18n import translate
 
 
 class TasksTable(Table):

src/collective/task/browser/viewlets.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
 """Custom viewlets."""
+from collective.task import _
+from collective.task.behaviors import ITask
+from collective.task.interfaces import ITaskMethods
 from plone import api
 from plone.app.layout.viewlets import common as base
-
-from ..interfaces import ITaskMethods
-from ..behaviors import ITask
-from .. import _
 from table import TasksTable
 
 

src/collective/task/browser/views.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
 
-import copy
+from collective.task import _
 from plone import api
 from plone.app import dexterity
 from plone.dexterity.browser.view import DefaultView
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
-from .. import _
+
+import copy
 
 
 class TaskItemView(DefaultView):

src/collective/task/content/task.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
-from zope.interface import implements
-from plone.dexterity.content import Container
 from collective.task.interfaces import ITaskContent
+from plone.dexterity.content import Container
+from zope.interface import implements
 
 
 class Task(Container):

src/collective/task/field.py

@@ -2,8 +2,8 @@
 """Define custom fields."""
 
 from dexterity.localrolesfield.field import LocalRoleField
-
 from plone.formwidget.masterselect import MasterSelectField
+
 import plone.supermodel.exportimport
 
 

src/collective/task/interfaces.py

@@ -1,18 +1,17 @@
 # -*- coding: utf-8 -*-
 """Module where all interfaces, events and exceptions live."""
 
-from zope import schema
-from zope.interface import Interface
-from zope.publisher.interfaces.browser import IDefaultBrowserLayer
-from z3c.form.browser.select import SelectFieldWidget
+from collective.task import _
+from collective.z3cform.datagridfield.registry import DictRow
+from dexterity.localrolesfield.field import LocalRolesField
 from plone.app.dexterity import PloneMessageFactory as _PMF
 from plone.autoform import directives
 from plone.supermodel import model
-
-from collective.z3cform.datagridfield.registry import DictRow
-from dexterity.localrolesfield.field import LocalRolesField
-
-from collective.task import _
+# from z3c.form import validator
+from z3c.form.browser.select import SelectFieldWidget
+from zope import schema
+from zope.interface import Interface
+from zope.publisher.interfaces.browser import IDefaultBrowserLayer
 
 
 class ICollectiveTaskLayer(IDefaultBrowserLayer):

src/collective/task/migrations/migrate_to_100.py

@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
 
-from zope.component import getUtility
+from collective.task.setuphandlers import PARENTS_FIELDS_CONFIG
+from imio.migrator.migrator import Migrator
 from plone import api
 from plone.registry.interfaces import IRegistry
-from imio.migrator.migrator import Migrator
-from ..setuphandlers import PARENTS_FIELDS_CONFIG
+from zope.component import getUtility
 
 import logging
+
+
 logger = logging.getLogger('collective.task')
 
 
@@ -31,7 +33,7 @@ def run(self):
 
         # settings config
         registry = getUtility(IRegistry)
-        #if not registry.get('collective.task.parents_fields'):
+        # if not registry.get('collective.task.parents_fields'):
         if True:
             registry['collective.task.parents_fields'] = PARENTS_FIELDS_CONFIG
 

src/collective/task/migrations/migrate_to_2_2.py

@@ -1,9 +1,12 @@
 # -*- coding: utf-8 -*-
 
-from imio.helpers.catalog import addOrUpdateIndexes, addOrUpdateColumns
+from imio.helpers.catalog import addOrUpdateColumns
+from imio.helpers.catalog import addOrUpdateIndexes
 from imio.migrator.migrator import Migrator
 
 import logging
+
+
 logger = logging.getLogger('collective.task')
 
 

src/collective/task/migrations/migrate_to_2_2_2.py

@@ -3,6 +3,8 @@
 from imio.migrator.migrator import Migrator
 
 import logging
+
+
 logger = logging.getLogger('collective.task')
 
 

src/collective/task/setuphandlers.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 """Initial setup."""
-import logging
-
-from zope.component import getUtility
-from plone.registry.interfaces import IRegistry
 from dexterity.localroles.utils import add_fti_configuration
+from plone.registry.interfaces import IRegistry
+from zope.component import getUtility
+
+import logging
 
 
 logger = logging.getLogger('collective.task: setuphandlers')

src/collective/task/subscribers.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 
+from collective.task.interfaces import ITaskContainerMethods
+from collective.task.interfaces import ITaskContentMethods
 from zope.component import getAdapter
-from collective.task.interfaces import ITaskContainerMethods, ITaskContentMethods
 
 
 def afterTransitionITaskSubscriber(obj, event):
@@ -24,7 +25,7 @@ def taskContent_created(task, event):
         Update parents localrole fields.
         Moving or copying a tree will trigger events from children to parents !
     """
-    #print "op:%s, on:%s, np:%s, nn:%s" % (event.oldParent, event.oldName, event.newParent, event.newName)
+    # print "op:%s, on:%s, np:%s, nn:%s" % (event.oldParent, event.oldName, event.newParent, event.newName)
     if event.oldParent is None or event.oldName is None:
         status = 'create'
     elif event.newParent is None or event.newName is None:
@@ -35,7 +36,8 @@ def taskContent_created(task, event):
     elif event.oldName != event.newName:
         status = 'rename'
         return
-    #print "MOVED %s on %s" % (status, task.absolute_url_path())
+    status
+    # print "MOVED %s on %s" % (status, task.absolute_url_path())
     adapted = getAdapter(task, ITaskContentMethods)
     fields = adapted.get_parents_fields()
     for field in fields:
@@ -50,7 +52,7 @@ def taskContent_modified(task, event):
     """
         Update parents localrole fields.
     """
-    #print "MODIF %s with %s" % (task.absolute_url_path(), ';'.join([str(e.interface) for e in event.descriptions]))
+    # print "MODIF %s with %s" % (task.absolute_url_path(), ';'.join([str(e.interface) for e in event.descriptions]))
     # at object creation
     if not event.descriptions:
         return

src/collective/task/tests/test_adapters.py

@@ -1,12 +1,17 @@
 # -*- coding: utf-8 -*-
-import unittest
+from collective.task.adapters import TaskContainerAdapter
+from collective.task.adapters import TaskContentAdapter
+from collective.task.behaviors import ITask
+from collective.task.interfaces import ITaskContent
+from collective.task.interfaces import ITaskMethods
+from collective.task.testing import COLLECTIVE_TASK_FUNCTIONAL_TESTING
 from plone import api
-from plone.app.testing import login, TEST_USER_NAME, setRoles, TEST_USER_ID
+from plone.app.testing import login
+from plone.app.testing import setRoles
+from plone.app.testing import TEST_USER_ID
+from plone.app.testing import TEST_USER_NAME
 
-from ..adapters import TaskContentAdapter, TaskContainerAdapter
-from ..behaviors import ITask
-from ..testing import COLLECTIVE_TASK_FUNCTIONAL_TESTING
-from ..interfaces import ITaskMethods, ITaskContent
+import unittest
 
 
 class TestAdapters(unittest.TestCase):

src/collective/task/tests/test_behaviors.py

@@ -1,11 +1,16 @@
 # -*- coding: utf-8 -*-
-import datetime
-import unittest2 as unittest
+from collective.task.behaviors import get_current_user_id
+from collective.task.behaviors import get_parent_assigned_group
+from collective.task.behaviors import get_users_vocabulary
+from collective.task.testing import COLLECTIVE_TASK_FUNCTIONAL_TESTING
 from plone import api
-from plone.app.testing import login, TEST_USER_NAME, setRoles, TEST_USER_ID
+from plone.app.testing import login
+from plone.app.testing import setRoles
+from plone.app.testing import TEST_USER_ID
+from plone.app.testing import TEST_USER_NAME
 
-from ..behaviors import get_users_vocabulary, get_parent_assigned_group, get_current_user_id
-from ..testing import COLLECTIVE_TASK_FUNCTIONAL_TESTING
+import datetime
+import unittest2 as unittest
 
 
 class TestBehaviors(unittest.TestCase):

src/collective/task/tests/test_subscribers.py

@@ -1,12 +1,16 @@
 # -*- coding: utf-8 -*-
-import unittest2 as unittest
-from zope.interface import Interface
-from zope.lifecycleevent import modified, Attributes
+from collective.task.testing import COLLECTIVE_TASK_FUNCTIONAL_TESTING
 from plone import api
-from plone.app.testing import login, TEST_USER_NAME, setRoles, TEST_USER_ID
-
+from plone.app.testing import login
+from plone.app.testing import setRoles
+from plone.app.testing import TEST_USER_ID
+from plone.app.testing import TEST_USER_NAME
 from Products.CMFPlone.utils import base_hasattr
-from ..testing import COLLECTIVE_TASK_FUNCTIONAL_TESTING
+from zope.interface import Interface
+from zope.lifecycleevent import Attributes
+from zope.lifecycleevent import modified
+
+import unittest2 as unittest
 
 
 class TestSubscribers(unittest.TestCase):