Reordered imports and a bit more PeP8/Pyflakes.

svn path=/Products.Poi/trunk/; revision=245124

Products/Poi/__init__.py

@@ -27,28 +27,25 @@
 __author__ = """Martin Aspeli <optilude@gmx.net>"""
 __docformat__ = 'plaintext'
 
-
 import logging
-logger = logging.getLogger("Poi")
-logger.debug('Start initialization of product.')
-
-from Products.CMFCore import utils as cmfutils
 
-from Products.CMFCore import DirectoryView
-from Products.Archetypes.atapi import process_types
 from Products.Archetypes import listTypes
+from Products.Archetypes.atapi import process_types
+from Products.CMFCore import DirectoryView
+from Products.CMFCore import utils as cmfutils
+from zope.i18nmessageid import MessageFactory
 
-from Products.Poi.config import PROJECTNAME
-from Products.Poi.config import DEFAULT_ADD_CONTENT_PERMISSION
 from Products.Poi.config import ADD_CONTENT_PERMISSIONS
+from Products.Poi.config import DEFAULT_ADD_CONTENT_PERMISSION
+from Products.Poi.config import PROJECTNAME
 from Products.Poi.config import product_globals
-from zope.i18nmessageid import MessageFactory
-PoiMessageFactory = MessageFactory('Poi')
 
+logger = logging.getLogger("Poi")
+logger.debug('Start initialization of product.')
+PoiMessageFactory = MessageFactory('Poi')
 
 DirectoryView.registerDirectory('skins', product_globals)
-DirectoryView.registerDirectory('skins/Poi',
-                                    product_globals)
+DirectoryView.registerDirectory('skins/Poi', product_globals)
 
 
 def initialize(context):

Products/Poi/adapters.py

@@ -1,18 +1,20 @@
 import logging
-from zope.interface import implements
-from zope.interface import Attribute
-from zope.interface import Interface
-from zope.component import adapts
-from zope.annotation.interfaces import IAnnotations
-from persistent import Persistent
-from persistent.list import PersistentList
-from Products.Poi.interfaces import IIssue
+
 from AccessControl import getSecurityManager
 from DateTime import DateTime
-from zope.app.container.contained import ObjectRemovedEvent
+from collective.watcherlist.watchers import WatcherList
+from persistent import Persistent
+from persistent.list import PersistentList
+from zope.annotation.interfaces import IAnnotations
 from zope.app.container.contained import ObjectAddedEvent
+from zope.app.container.contained import ObjectRemovedEvent
+from zope.component import adapts
 from zope.event import notify
-from collective.watcherlist.watchers import WatcherList
+from zope.interface import Attribute
+from zope.interface import Interface
+from zope.interface import implements
+
+from Products.Poi.interfaces import IIssue
 
 logger = logging.getLogger('Products.Poi.adapters')
 

Products/Poi/browser/__init__.py

@@ -0,0 +1 @@
+#

Products/Poi/browser/interfaces.py

@@ -1,8 +1,8 @@
+from zope.contentprovider.interfaces import ITALNamespaceData
+from zope.interface import Attribute
 from zope.interface import Interface
 from zope.interface import directlyProvides
-from zope.interface import Attribute
 from zope.viewlet.interfaces import IViewletManager
-from zope.contentprovider.interfaces import ITALNamespaceData
 
 
 class IIssueFolderView(Interface):

Products/Poi/browser/log.py

@@ -1,7 +1,7 @@
 from datetime import datetime
-from DateTime import DateTime
 
 from Acquisition import aq_inner
+from DateTime import DateTime
 from Products.CMFCore.utils import getToolByName
 from Products.Five.browser import BrowserView
 

Products/Poi/browser/notifications.py

@@ -1,13 +1,15 @@
+import textwrap
+
 from Acquisition import aq_inner, aq_parent
-from zope.app.component.hooks import getSite
-from zope.i18n import translate
 from Products.CMFCore.utils import getToolByName
-from Products.Poi.htmlrender import renderHTML
-from Products.Poi.adapters import IResponseContainer
-from Products.Poi import PoiMessageFactory as _
 from collective.watcherlist.browser import BaseMail
 from collective.watcherlist.utils import su
-import textwrap
+from zope.app.component.hooks import getSite
+from zope.i18n import translate
+
+from Products.Poi import PoiMessageFactory as _
+from Products.Poi.adapters import IResponseContainer
+from Products.Poi.htmlrender import renderHTML
 
 wrapper = textwrap.TextWrapper(initial_indent='    ', subsequent_indent='    ')
 

Products/Poi/browser/response.py

@@ -1,32 +1,34 @@
 import logging
-from zope.i18n import translate
+
 from AccessControl import Unauthorized
-from Products.CMFCore.utils import getToolByName
-from Products.Poi.browser.interfaces import IResponseAdder
-from zope.interface import implements
-from zope.cachedescriptors.property import Lazy
 from Acquisition import aq_inner
-from Products.Five.browser import BrowserView
-from Products.Poi.adapters import IResponseContainer
-from Products.Poi.adapters import Response
-from plone.memoize.view import memoize
+from OFS.Image import File
 from Products.Archetypes.atapi import DisplayList
-from Products.Poi.config import DEFAULT_ISSUE_MIME_TYPE
+from Products.Archetypes.utils import contentDispositionHeader
+from Products.CMFCore.utils import getToolByName
 from Products.CMFPlone import PloneMessageFactory as PMF
-from Products.Poi import PoiMessageFactory as _
-from Products.Poi import permissions
+from Products.CMFPlone.utils import safe_unicode
+from Products.Five.browser import BrowserView
 from Products.statusmessages.interfaces import IStatusMessage
+from plone.memoize.view import memoize
+from zope.cachedescriptors.property import Lazy
+from zope.i18n import translate
+from zope.interface import implements
 from zope.lifecycleevent import modified
-from OFS.Image import File
-from Products.CMFPlone.utils import safe_unicode
-from Products.Archetypes.utils import contentDispositionHeader
 try:
     from plone.i18n.normalizer.interfaces import \
         IUserPreferredFileNameNormalizer
     FILE_NORMALIZER = True
 except ImportError:
     FILE_NORMALIZER = False
 
+from Products.Poi import PoiMessageFactory as _
+from Products.Poi import permissions
+from Products.Poi.adapters import IResponseContainer
+from Products.Poi.adapters import Response
+from Products.Poi.browser.interfaces import IResponseAdder
+from Products.Poi.config import DEFAULT_ISSUE_MIME_TYPE
+
 logger = logging.getLogger('Poi')
 
 

Products/Poi/browser/watchers.py

@@ -1,6 +1,6 @@
-from collective.watcherlist.interfaces import IWatcherList
 from Acquisition import aq_inner
 from Products.Five.browser import BrowserView
+from collective.watcherlist.interfaces import IWatcherList
 
 
 class WatcherView(BrowserView):

Products/Poi/config.py

@@ -7,7 +7,7 @@
 ADD_CONTENT_PERMISSIONS = {
     'PoiTracker': 'Poi: Add Tracker',
     'PoiIssue': 'Poi: Add Issue',
-}
+    }
 
 product_globals = globals()
 

Products/Poi/content/PoiIssue.py

@@ -28,10 +28,11 @@
 __docformat__ = 'plaintext'
 
 import logging
+import textwrap
 
 from AccessControl import ClassSecurityInfo
 from Acquisition import aq_chain
-
+from Products.AddRemoveWidget.AddRemoveWidget import AddRemoveWidget
 from Products.Archetypes.atapi import AttributeStorage
 from Products.Archetypes.atapi import BaseFolder
 from Products.Archetypes.atapi import BaseFolderSchema
@@ -41,38 +42,33 @@
 from Products.Archetypes.atapi import FileWidget
 from Products.Archetypes.atapi import LinesField
 from Products.Archetypes.atapi import LinesWidget
-from Products.Archetypes.atapi import registerType
 from Products.Archetypes.atapi import RichWidget
 from Products.Archetypes.atapi import Schema
 from Products.Archetypes.atapi import SelectionWidget
 from Products.Archetypes.atapi import StringField
 from Products.Archetypes.atapi import StringWidget
 from Products.Archetypes.atapi import TextField
+from Products.Archetypes.atapi import registerType
+from Products.CMFCore.utils import getToolByName
+from Products.CMFDynamicViewFTI.browserdefault import BrowserDefaultMixin
+from Products.CMFPlone.utils import getSiteEncoding
 from Products.CMFPlone.utils import safe_unicode
+from collective.watcherlist.utils import get_member_email
+from plone.memoize import instance
+from zope.interface import implements
+import transaction
 
+from Products.Poi import PoiMessageFactory as _
+from Products.Poi import permissions
+from Products.Poi.adapters import IResponseContainer
 from Products.Poi.config import DEFAULT_ISSUE_MIME_TYPE
 from Products.Poi.config import DESCRIPTION_LENGTH
 from Products.Poi.config import ISSUE_MIME_TYPES
 from Products.Poi.config import PROJECTNAME
-from Products.Poi.adapters import IResponseContainer
-
-from Products.Poi import permissions
-from Products.CMFDynamicViewFTI.browserdefault import BrowserDefaultMixin
-from Products.AddRemoveWidget.AddRemoveWidget import AddRemoveWidget
-from collective.watcherlist.utils import get_member_email
-
-from Products.CMFCore.utils import getToolByName
-from Products.CMFPlone.utils import getSiteEncoding
-import transaction
-
-import textwrap
-wrapper = textwrap.TextWrapper(initial_indent='    ', subsequent_indent='    ')
-from zope.interface import implements
 from Products.Poi.interfaces import IIssue
 from Products.Poi.interfaces import ITracker
-from Products.Poi import PoiMessageFactory as _
-from plone.memoize import instance
 
+wrapper = textwrap.TextWrapper(initial_indent='    ', subsequent_indent='    ')
 logger = logging.getLogger('Poi')
 
 schema = Schema((

Products/Poi/content/PoiResponse.py

@@ -27,38 +27,34 @@
 __author__ = """Martin Aspeli <optilude@gmx.net>"""
 __docformat__ = 'plaintext'
 
-from AccessControl import ClassSecurityInfo
+import textwrap
 
+from AccessControl import ClassSecurityInfo
 from Products.Archetypes.atapi import AttributeStorage
 from Products.Archetypes.atapi import BaseContent
 from Products.Archetypes.atapi import BaseSchema
 from Products.Archetypes.atapi import FileField
 from Products.Archetypes.atapi import FileWidget
-from Products.Archetypes.atapi import registerType
 from Products.Archetypes.atapi import RichWidget
 from Products.Archetypes.atapi import Schema
 from Products.Archetypes.atapi import SelectionWidget
 from Products.Archetypes.atapi import StringField
 from Products.Archetypes.atapi import StringWidget
 from Products.Archetypes.atapi import TextField
+from Products.Archetypes.atapi import registerType
+from Products.CMFCore.utils import getToolByName
+from Products.CMFDynamicViewFTI.browserdefault import BrowserDefaultMixin
+from plone.memoize import instance
+from zope.interface import implements
+import transaction
 
-
+from Products.Poi import permissions
 from Products.Poi.config import DEFAULT_ISSUE_MIME_TYPE
 from Products.Poi.config import ISSUE_MIME_TYPES
 from Products.Poi.config import PROJECTNAME
-
-from Products.Poi import permissions
-from Products.CMFDynamicViewFTI.browserdefault import BrowserDefaultMixin
-
-from Products.CMFCore.utils import getToolByName
-import transaction
-
-import textwrap
-wrapper = textwrap.TextWrapper(initial_indent='    ', subsequent_indent='    ')
-from zope.interface import implements
 from Products.Poi.interfaces import IResponse
-from plone.memoize import instance
 
+wrapper = textwrap.TextWrapper(initial_indent='    ', subsequent_indent='    ')
 schema = Schema((
 
     StringField(

Products/Poi/content/PoiTracker.py

@@ -28,25 +28,24 @@
 __docformat__ = 'plaintext'
 
 from AccessControl import ClassSecurityInfo
+from Products.CMFCore.utils import getToolByName
+from Products.CMFDynamicViewFTI.browserdefault import BrowserDefaultMixin
+from Products.DataGridField.DataGridField import DataGridField
+from Products.DataGridField.DataGridWidget import DataGridWidget
+from zope.interface import implements
 try:
     from Products.LinguaPlone import public as atapi
+    atapi  # pyflakes
 except ImportError:
     # No multilingual support
     from Products.Archetypes import atapi
-from Products.Poi.config import PROJECTNAME
 
-from Products.DataGridField.DataGridField import DataGridField
+from Products.Poi import PoiMessageFactory as _
 from Products.Poi import permissions
-from Products.DataGridField.DataGridWidget import DataGridWidget
-from Products.CMFDynamicViewFTI.browserdefault import BrowserDefaultMixin
-
-from Products.CMFCore.utils import getToolByName
-
-from zope.interface import implements
+from Products.Poi.config import PROJECTNAME
 from Products.Poi.interfaces import ITracker
-from Products.Poi.utils import linkSvn
 from Products.Poi.utils import linkBugs
-from Products.Poi import PoiMessageFactory as _
+from Products.Poi.utils import linkSvn
 
 schema = atapi.Schema((
 

Products/Poi/content/__init__.py

@@ -27,9 +27,6 @@
 __author__ = """Martin Aspeli <optilude@gmx.net>"""
 __docformat__ = 'plaintext'
 
-# Subpackages
-# Additional
-
 # Classes
 import PoiTracker
 import PoiIssue

Products/Poi/events.py

@@ -3,6 +3,7 @@
 from Products.CMFCore.utils import getToolByName
 from collective.watcherlist.interfaces import IWatcherList
 from collective.watcherlist.utils import get_member_email
+
 from Products.Poi.interfaces import IIssue
 
 logger = logging.getLogger('Poi')

Products/Poi/htmlrender.py

@@ -20,6 +20,7 @@
 __all__ = ('renderHTML', )
 
 import reStructuredText as rst
+
 from collective.watcherlist.utils import get_charset
 
 htmlTemplate = """<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

Products/Poi/permissions.py

@@ -2,16 +2,16 @@
 
 from Products.CMFCore import permissions as CMFCorePermissions
 
-View = CMFCorePermissions.View
-ModifyPortalContent = CMFCorePermissions.ModifyPortalContent
 AccessContentsInformation = CMFCorePermissions.AccessContentsInformation
+ModifyPortalContent = CMFCorePermissions.ModifyPortalContent
+View = CMFCorePermissions.View
 
-ManageTracker = "Poi: Manage tracker"
 EditResponse = "Poi: Edit response"
-ModifyIssueSeverity = "Poi: Modify issue severity"
+ManageTracker = "Poi: Manage tracker"
 ModifyIssueAssignment = "Poi: Modify issue assignment"
+ModifyIssueSeverity = "Poi: Modify issue severity"
 ModifyIssueState = "Poi: Modify issue state"
 ModifyIssueTags = "Poi: Modify issue tags"
-ModifyIssueWatchers = "Poi: Modify issue watchers"
 ModifyIssueTargetRelease = "Poi: Modify issue target release"
+ModifyIssueWatchers = "Poi: Modify issue watchers"
 UploadAttachment = "Poi: Upload attachment"