[Zope3-checkins] SVN: Zope3/trunk/src/zope/app/component/ cleanup interfaces

[Bernd Dorn]

Log message for revision 73635:
  cleanup interfaces

Changed:
  U   Zope3/trunk/src/zope/app/component/back35.py
  U   Zope3/trunk/src/zope/app/component/browser/__init__.py
  U   Zope3/trunk/src/zope/app/component/browser/registration.py
  U   Zope3/trunk/src/zope/app/component/hooks.py
  U   Zope3/trunk/src/zope/app/component/interfaces/__init__.py
  U   Zope3/trunk/src/zope/app/component/metaconfigure.py
  U   Zope3/trunk/src/zope/app/component/site.py
  U   Zope3/trunk/src/zope/app/component/tests/test_directives.py
  U   Zope3/trunk/src/zope/app/component/vocabulary.py

-=-
Modified: Zope3/trunk/src/zope/app/component/back35.py
===================================================================
--- Zope3/trunk/src/zope/app/component/back35.py	2007-03-26 15:03:33 UTC (rev 73634)
+++ Zope3/trunk/src/zope/app/component/back35.py	2007-03-26 15:47:22 UTC (rev 73635)
@@ -30,7 +30,6 @@
 import zope.cachedescriptors.property
 import zope.event
 import zope.schema
-import zope.interface.adapter
 import zope.component.interfaces
 import zope.deprecation
 import zope.schema.vocabulary
@@ -45,7 +44,6 @@
 from zope.configuration.exceptions import ConfigurationError
 from zope.publisher.interfaces.back35 import ILayer
 
-import zope.app.component.registration
 import zope.app.component.interfaces.registration
 import zope.app.container.interfaces
 import zope.app.container.constraints

Modified: Zope3/trunk/src/zope/app/component/browser/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/component/browser/__init__.py	2007-03-26 15:03:33 UTC (rev 73634)
+++ Zope3/trunk/src/zope/app/component/browser/__init__.py	2007-03-26 15:47:22 UTC (rev 73635)
@@ -21,17 +21,11 @@
 from zope.exceptions.interfaces import UserError
 from zope.security.proxy import removeSecurityProxy
 from zope.publisher.browser import BrowserView
-from zope.component.interfaces import ComponentLookupError
 from zope.component.interfaces import IFactory
-from zope.component.interface import getInterface, provideInterface
 from zope.component.interface import searchInterface
-from zope.interface.interfaces import IMethod
-from zope.schema.interfaces import IField
 
 from zope.app.component.i18n import ZopeMessageFactory as _
-from zope.app.container.interfaces import INameChooser
 from zope.app.container.browser.adding import Adding
-from zope.app.interface.interfaces import IInterfaceBasedRegistry
 from zope.app.component.site import LocalSiteManager
 from zope.app.component.interfaces import ISite
 

Modified: Zope3/trunk/src/zope/app/component/browser/registration.py
===================================================================
--- Zope3/trunk/src/zope/app/component/browser/registration.py	2007-03-26 15:03:33 UTC (rev 73634)
+++ Zope3/trunk/src/zope/app/component/browser/registration.py	2007-03-26 15:47:22 UTC (rev 73635)
@@ -17,7 +17,7 @@
 """
 import warnings
 
-from zope import interface, component, deprecation, schema
+from zope import interface, component, schema
 from zope.formlib import form
 from zope.publisher.browser import BrowserPage
 from zope.security.proxy import removeSecurityProxy
@@ -25,8 +25,6 @@
 import zope.publisher.interfaces.browser
 
 import zope.app.pagetemplate
-import zope.app.form
-from zope.app import zapi
 from zope.app.component.i18n import ZopeMessageFactory as _
 
 

Modified: Zope3/trunk/src/zope/app/component/hooks.py
===================================================================
--- Zope3/trunk/src/zope/app/component/hooks.py	2007-03-26 15:03:33 UTC (rev 73634)
+++ Zope3/trunk/src/zope/app/component/hooks.py	2007-03-26 15:47:22 UTC (rev 73635)
@@ -18,7 +18,6 @@
 __docformat__ = 'restructuredtext'
 
 import zope.component
-import zope.deprecation
 import zope.thread
 import zope.security
 

Modified: Zope3/trunk/src/zope/app/component/interfaces/__init__.py
===================================================================
--- Zope3/trunk/src/zope/app/component/interfaces/__init__.py	2007-03-26 15:03:33 UTC (rev 73634)
+++ Zope3/trunk/src/zope/app/component/interfaces/__init__.py	2007-03-26 15:47:22 UTC (rev 73635)
@@ -20,8 +20,6 @@
 import zope.interface
 import zope.component.interfaces
 import zope.app.container.interfaces
-from zope.app.component.i18n import ZopeMessageFactory as _
-import registration
 
 import zope.deferredimport
 

Modified: Zope3/trunk/src/zope/app/component/metaconfigure.py
===================================================================
--- Zope3/trunk/src/zope/app/component/metaconfigure.py	2007-03-26 15:03:33 UTC (rev 73634)
+++ Zope3/trunk/src/zope/app/component/metaconfigure.py	2007-03-26 15:47:22 UTC (rev 73635)
@@ -1,4 +1,4 @@
-##############################################################################
+#############################################################################
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
@@ -18,7 +18,6 @@
 __docformat__ = 'restructuredtext'
 
 import warnings
-import zope.component
 from zope import component
 from zope.interface import Interface
 from zope.component.zcml import handler, proxify, utility

Modified: Zope3/trunk/src/zope/app/component/site.py
===================================================================
--- Zope3/trunk/src/zope/app/component/site.py	2007-03-26 15:03:33 UTC (rev 73634)
+++ Zope3/trunk/src/zope/app/component/site.py	2007-03-26 15:47:22 UTC (rev 73635)
@@ -28,7 +28,6 @@
 import zope.event
 import zope.interface
 import zope.component
-import zope.component.registry
 import zope.component.persistentregistry
 import zope.component.interfaces
 import zope.traversing.api
@@ -38,12 +37,10 @@
 
 from zope.component.interfaces import ComponentLookupError
 from zope.traversing.interfaces import IContainmentRoot
-from zope.security.proxy import removeSecurityProxy
 from zope.lifecycleevent import ObjectCreatedEvent
 from zope.filerepresentation.interfaces import IDirectoryFactory
 
 import zope.app.component.back35
-from zope.app import zapi
 from zope.app.component import interfaces
 from zope.app.component import registration
 from zope.app.component.hooks import setSite

Modified: Zope3/trunk/src/zope/app/component/tests/test_directives.py
===================================================================
--- Zope3/trunk/src/zope/app/component/tests/test_directives.py	2007-03-26 15:03:33 UTC (rev 73634)
+++ Zope3/trunk/src/zope/app/component/tests/test_directives.py	2007-03-26 15:47:22 UTC (rev 73635)
@@ -21,29 +21,26 @@
 import warnings
 from cStringIO import StringIO
 
-from zope.interface import Interface, implements
+from zope.interface import implements
 from zope.testing.doctestunit import DocTestSuite
 from zope.component import createObject
 from zope.component.interfaces import IDefaultViewName
-from zope.component.registry import SubscriptionRegistration
 from zope.component.interfaces import ComponentLookupError
 from zope.component.interface import queryInterface
 
 from zope.configuration.xmlconfig import xmlconfig, XMLConfig
 from zope.configuration.exceptions import ConfigurationError
 from zope.configuration.xmlconfig import ZopeXMLConfigurationError
-from zope.security.proxy import removeSecurityProxy, getTestProxyItems
 from zope.security.checker import ProxyFactory, selectChecker
 
 import zope.app.component
 from zope.app import zapi
 from zope.app.testing.placelesssetup import PlacelessSetup
-from zope.app.component.tests.adapter import A1, A2, A3, Handler
+from zope.app.component.tests.adapter import A1, A2, A3
 from zope.app.component.tests.adapter import I1, I2, I3, IS
-from zope.app.component.tests.components import IContent, Content, Comp, comp
+from zope.app.component.tests.components import IContent, Content
 from zope.app.component.tests.components import IApp
 from zope.app.component.tests.views import Request, IV, IC, V1, R1, IR
-from zope.app.content.interfaces import IContentType
 
 from zope.app.component.tests import module, exampleclass
 

Modified: Zope3/trunk/src/zope/app/component/vocabulary.py
===================================================================
--- Zope3/trunk/src/zope/app/component/vocabulary.py	2007-03-26 15:03:33 UTC (rev 73634)
+++ Zope3/trunk/src/zope/app/component/vocabulary.py	2007-03-26 15:47:22 UTC (rev 73635)
@@ -22,8 +22,7 @@
 import zope.component
 from zope.interface import implements, classProvides, Interface
 from zope.interface.interfaces import IInterface
-from zope.interface.verify import verifyObject
-from zope.schema.interfaces import IVocabulary, IVocabularyTokenized
+from zope.schema.interfaces import IVocabularyTokenized
 from zope.schema.interfaces import ITokenizedTerm, IVocabularyFactory
 
 from zope.app.component.i18n import ZopeMessageFactory as _
@@ -34,8 +33,11 @@
     """A term representing a utility.
 
     The token of the term is the name of the utility. Here is a brief example
-    on how the IVocabulary interface is handled in this term as a utility:
-
+    on how the IVocabulary interface is handled in this term as a
+    utility:
+    
+    >>> from zope.interface.verify import verifyObject
+    >>> from zope.schema.interfaces import IVocabulary
     >>> term = UtilityTerm(IVocabulary, 'zope.schema.interfaces.IVocabulary')
     >>> verifyObject(ITokenizedTerm, term)
     True