Log message for revision 71270: - removed unused imports Changed: U Products.Five/trunk/__init__.py U Products.Five/trunk/browser/resource.py U Products.Five/trunk/component/tests.py U Products.Five/trunk/fiveconfigure.py U Products.Five/trunk/form/__init__.py U Products.Five/trunk/form/metaconfigure.py U Products.Five/trunk/form/objectwidget.py U Products.Five/trunk/formlib/tests/view.py U Products.Five/trunk/security.py U Products.Five/trunk/site/localsite.py U Products.Five/trunk/site/metaconfigure.py U Products.Five/trunk/site/tests/test_functional.py U Products.Five/trunk/site/tests/test_localsite.py U Products.Five/trunk/site/tests/test_utility.py U Products.Five/trunk/tests/testing/__init__.py U Products.Five/trunk/viewlet/metaconfigure.py U Products.Five/trunk/viewlet/viewlet.py
-=- Modified: Products.Five/trunk/__init__.py =================================================================== --- Products.Five/trunk/__init__.py 2006-11-22 13:37:06 UTC (rev 71269) +++ Products.Five/trunk/__init__.py 2006-11-22 13:37:52 UTC (rev 71270) @@ -15,9 +15,6 @@ $Id$ """ -import Acquisition -from Globals import INSTANCE_HOME - from Products.Five import zcml # public API provided by Five Modified: Products.Five/trunk/browser/resource.py =================================================================== --- Products.Five/trunk/browser/resource.py 2006-11-22 13:37:06 UTC (rev 71269) +++ Products.Five/trunk/browser/resource.py 2006-11-22 13:37:52 UTC (rev 71270) @@ -19,20 +19,16 @@ import urllib import Acquisition -from ComputedAttribute import ComputedAttribute from OFS.Traversable import Traversable as OFSTraversable - +from zope.app.publisher.browser.resources import empty +from zope.app.publisher.fileresource import File, Image +from zope.app.publisher.pagetemplateresource import PageTemplate from zope.interface import implements from zope.component import getMultiAdapter from zope.component.interfaces import IResource -from zope.publisher.interfaces.browser import IBrowserPublisher -from zope.traversing.browser.interfaces import IAbsoluteURL from zope.datetime import time as timeFromDateTimeString +from zope.traversing.browser.interfaces import IAbsoluteURL -from zope.app.publisher.fileresource import File, Image -from zope.app.publisher.pagetemplateresource import PageTemplate -from zope.app.publisher.browser.resources import empty - from Products.Five.browser import BrowserView _marker = [] Modified: Products.Five/trunk/component/tests.py =================================================================== --- Products.Five/trunk/component/tests.py 2006-11-22 13:37:06 UTC (rev 71269) +++ Products.Five/trunk/component/tests.py 2006-11-22 13:37:52 UTC (rev 71270) @@ -16,7 +16,7 @@ $Id$ """ import unittest -from zope.testing.doctestunit import DocFileSuite, DocTestSuite +from zope.testing.doctestunit import DocFileSuite from Testing.ZopeTestCase import FunctionalDocFileSuite __docformat__ = "reStructuredText" Modified: Products.Five/trunk/fiveconfigure.py =================================================================== --- Products.Five/trunk/fiveconfigure.py 2006-11-22 13:37:06 UTC (rev 71269) +++ Products.Five/trunk/fiveconfigure.py 2006-11-22 13:37:52 UTC (rev 71270) @@ -18,7 +18,6 @@ $Id$ """ import os -import sys import glob import warnings import logging @@ -29,11 +28,9 @@ import Products import Zope2 -from zope.interface import classImplements, classImplementsOnly, implementedBy -from zope.interface.interface import InterfaceClass +from zope.interface import classImplements, implementedBy from zope.component import getUtility from zope.component.interface import provideInterface -from zope.component.zcml import adapter from zope.configuration import xmlconfig from zope.configuration.exceptions import ConfigurationError from zope.publisher.interfaces.browser import IDefaultBrowserLayer Modified: Products.Five/trunk/form/__init__.py =================================================================== --- Products.Five/trunk/form/__init__.py 2006-11-22 13:37:06 UTC (rev 71269) +++ Products.Five/trunk/form/__init__.py 2006-11-22 13:37:52 UTC (rev 71270) @@ -18,7 +18,6 @@ import sys from datetime import datetime -import Acquisition import transaction from zope.event import notify from zope.lifecycleevent import ObjectCreatedEvent, ObjectModifiedEvent @@ -29,11 +28,11 @@ from zope.i18nmessageid import MessageFactory _ = MessageFactory('zope') -from zope.app.form.utility import setUpEditWidgets, applyWidgetsChanges from zope.app.form.browser.submit import Update -from zope.app.form.interfaces import WidgetsError, MissingInputError +from zope.app.form.interfaces import IInputWidget +from zope.app.form.interfaces import WidgetsError +from zope.app.form.utility import setUpEditWidgets, applyWidgetsChanges from zope.app.form.utility import setUpWidgets, getWidgetsData -from zope.app.form.interfaces import IInputWidget, WidgetsError from Products.Five.browser import BrowserView from Products.Five.browser.decode import processInputs, setPageEncoding Modified: Products.Five/trunk/form/metaconfigure.py =================================================================== --- Products.Five/trunk/form/metaconfigure.py 2006-11-22 13:37:06 UTC (rev 71269) +++ Products.Five/trunk/form/metaconfigure.py 2006-11-22 13:37:52 UTC (rev 71270) @@ -20,7 +20,6 @@ import zope.component from zope.interface import Interface -from zope.publisher.interfaces.browser import IBrowserRequest from zope.i18nmessageid import MessageFactory _ = MessageFactory('zope') Modified: Products.Five/trunk/form/objectwidget.py =================================================================== --- Products.Five/trunk/form/objectwidget.py 2006-11-22 13:37:06 UTC (rev 71269) +++ Products.Five/trunk/form/objectwidget.py 2006-11-22 13:37:52 UTC (rev 71270) @@ -22,7 +22,6 @@ $Id$ """ -import os.path import Acquisition import zope.app.form.browser.objectwidget from AccessControl import ClassSecurityInfo Modified: Products.Five/trunk/formlib/tests/view.py =================================================================== --- Products.Five/trunk/formlib/tests/view.py 2006-11-22 13:37:06 UTC (rev 71269) +++ Products.Five/trunk/formlib/tests/view.py 2006-11-22 13:37:52 UTC (rev 71270) @@ -15,12 +15,9 @@ $Id$ """ -from zope.formlib import form, page +from zope.formlib import form -from Products.Five.browser import BrowserView -from Products.Five.formlib.formbase import AddForm, EditForm, Form -from Products.Five.browser.pagetemplatefile import ZopeTwoPageTemplateFile - +from Products.Five.formlib.formbase import AddForm, EditForm from Products.Five.formlib.tests.content import IContent, Content class AddContentForm(AddForm): Modified: Products.Five/trunk/security.py =================================================================== --- Products.Five/trunk/security.py 2006-11-22 13:37:06 UTC (rev 71269) +++ Products.Five/trunk/security.py 2006-11-22 13:37:52 UTC (rev 71270) @@ -15,16 +15,15 @@ $Id$ """ -from zope.interface import implements, classProvides from zope.component import queryUtility, getUtility -from zope.security.management import thread_local +from zope.interface import implements, classProvides from zope.security.interfaces import IInteraction, ISecurityPolicy from zope.security.interfaces import IPermission +from zope.security.management import thread_local from zope.security.simplepolicies import ParanoidSecurityPolicy from AccessControl import ClassSecurityInfo, getSecurityManager from Globals import InitializeClass as initializeClass -from types import StringTypes CheckerPublicId = 'zope.Public' CheckerPrivateId = 'zope2.Private' @@ -65,7 +64,7 @@ permission is None or permission is CheckerPublic): return True - if isinstance(permission, StringTypes): + if isinstance(permission, basestring): permission = queryUtility(IPermission, unicode(permission)) if permission is None: return False Modified: Products.Five/trunk/site/localsite.py =================================================================== --- Products.Five/trunk/site/localsite.py 2006-11-22 13:37:06 UTC (rev 71269) +++ Products.Five/trunk/site/localsite.py 2006-11-22 13:37:52 UTC (rev 71270) @@ -15,11 +15,10 @@ $Id$ """ +from zope.app.component.interfaces import ISite, IPossibleSite +from zope.component import getGlobalSiteManager from zope.interface import implements from zope.interface.interface import InterfaceClass -from zope.component import getGlobalSiteManager -from zope.component.interfaces import ComponentLookupError -from zope.app.component.interfaces import ISite, IPossibleSite from Acquisition import aq_parent, aq_inner from Products.Five.site.interfaces import IFiveSiteManager, IFiveUtilityRegistry Modified: Products.Five/trunk/site/metaconfigure.py =================================================================== --- Products.Five/trunk/site/metaconfigure.py 2006-11-22 13:37:06 UTC (rev 71269) +++ Products.Five/trunk/site/metaconfigure.py 2006-11-22 13:37:52 UTC (rev 71270) @@ -18,13 +18,8 @@ $Id: fiveconfigure.py 18581 2005-10-14 16:54:25Z regebro $ """ from zope.interface import classImplements, classImplementsOnly, implementedBy -from zope.interface.interface import InterfaceClass -from zope.configuration.exceptions import ConfigurationError -from zope.component.zcml import adapter from zope.app.component.interfaces import IPossibleSite -from Products.Five.site.localsite import FiveSite - import logging, warnings LOG = logging.getLogger('Five') Modified: Products.Five/trunk/site/tests/test_functional.py =================================================================== --- Products.Five/trunk/site/tests/test_functional.py 2006-11-22 13:37:06 UTC (rev 71269) +++ Products.Five/trunk/site/tests/test_functional.py 2006-11-22 13:37:52 UTC (rev 71270) @@ -20,7 +20,6 @@ if __name__ == '__main__': execfile(os.path.join(sys.path[0], 'framework.py')) -import pprint from zope.app import zapi from Products.Five import BrowserView from Products.Five.site.interfaces import IFiveUtilityRegistry Modified: Products.Five/trunk/site/tests/test_localsite.py =================================================================== --- Products.Five/trunk/site/tests/test_localsite.py 2006-11-22 13:37:06 UTC (rev 71269) +++ Products.Five/trunk/site/tests/test_localsite.py 2006-11-22 13:37:52 UTC (rev 71270) @@ -21,7 +21,6 @@ execfile(os.path.join(sys.path[0], 'framework.py')) import unittest -from Testing import ZopeTestCase import zope.interface from zope.component import getGlobalSiteManager, getSiteManager @@ -29,7 +28,7 @@ from zope.component.interfaces import IComponentLookup from zope.traversing.interfaces import IContainmentRoot from zope.app.component.hooks import setSite, getSite, setHooks -from zope.app.component.interfaces import IPossibleSite, ISite +from zope.app.component.interfaces import ISite from zope.app.testing.placelesssetup import PlacelessSetup from Acquisition import Implicit Modified: Products.Five/trunk/site/tests/test_utility.py =================================================================== --- Products.Five/trunk/site/tests/test_utility.py 2006-11-22 13:37:06 UTC (rev 71269) +++ Products.Five/trunk/site/tests/test_utility.py 2006-11-22 13:37:52 UTC (rev 71270) @@ -24,18 +24,16 @@ import sets from Testing import ZopeTestCase -from zope.interface import directlyProvides -from zope.component import provideUtility -from zope.component.interfaces import ComponentLookupError from zope.app import zapi -from zope.app.testing.placelesssetup import setUp, tearDown from zope.app.component import getNextUtility -from zope.app.component.hooks import setSite, clearSite, setHooks +from zope.app.component.hooks import setHooks +from zope.app.testing.placelesssetup import setUp, tearDown from zope.component import getSiteManager +from zope.component import provideUtility +from zope.interface import directlyProvides import Products.Five from Products.Five import zcml -from Products.Five.component import enableSite from Products.Five.site.interfaces import IRegisterUtilitySimply from Products.Five.site.tests.dummy import manage_addDummySite, \ IDummyUtility, ISuperDummyUtility, DummyUtility Modified: Products.Five/trunk/tests/testing/__init__.py =================================================================== --- Products.Five/trunk/tests/testing/__init__.py 2006-11-22 13:37:06 UTC (rev 71269) +++ Products.Five/trunk/tests/testing/__init__.py 2006-11-22 13:37:52 UTC (rev 71270) @@ -15,9 +15,7 @@ $Id$ """ -from Products.Five.tests.testing.restricted import RestrictedPythonTestCase - from Products.Five.tests.testing.folder import FiveTraversableFolder from Products.Five.tests.testing.folder import manage_addFiveTraversableFolder -from Products.Five.tests.testing.folder import NoVerifyPasteFolder from Products.Five.tests.testing.folder import manage_addNoVerifyPasteFolder +from Products.Five.tests.testing.folder import NoVerifyPasteFolder Modified: Products.Five/trunk/viewlet/metaconfigure.py =================================================================== --- Products.Five/trunk/viewlet/metaconfigure.py 2006-11-22 13:37:06 UTC (rev 71269) +++ Products.Five/trunk/viewlet/metaconfigure.py 2006-11-22 13:37:52 UTC (rev 71270) @@ -1,19 +1,17 @@ import os +from zope.app.publisher.browser import viewmeta +from zope.component import zcml from zope.configuration.exceptions import ConfigurationError -from zope.viewlet import interfaces from zope.interface import Interface, classImplements -from zope.component import zcml -from zope.publisher.interfaces.browser import IDefaultBrowserLayer from zope.publisher.interfaces.browser import IBrowserView -from zope.app.publisher.browser import viewmeta +from zope.publisher.interfaces.browser import IDefaultBrowserLayer +from zope.viewlet import interfaces -from Products.Five.security import getSecurityInfo, protectClass, protectName -from Products.Five.viewlet import viewlet +from Globals import InitializeClass as initializeClass +from Products.Five.security import protectClass, protectName from Products.Five.viewlet import manager +from Products.Five.viewlet import viewlet - -from Globals import InitializeClass as initializeClass - def viewletManagerDirective( _context, name, permission, for_=Interface, layer=IDefaultBrowserLayer, view=IBrowserView, Modified: Products.Five/trunk/viewlet/viewlet.py =================================================================== --- Products.Five/trunk/viewlet/viewlet.py 2006-11-22 13:37:06 UTC (rev 71269) +++ Products.Five/trunk/viewlet/viewlet.py 2006-11-22 13:37:52 UTC (rev 71270) @@ -1,6 +1,5 @@ -import os, sys +import os from Acquisition import Explicit -from zope.viewlet import interfaces from zope.viewlet import viewlet as orig_viewlet from Products.Five.browser.pagetemplatefile import ZopeTwoPageTemplateFile _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins