[Zope3-checkins] CVS: Zope3/src/zope/app/browser/workflow/stateful - content_filter.py:1.1.4.1 contentworkflow.py:1.1.4.1 definition.py:1.1.4.1 filteradapter.py:1.1.4.1 instance.py:1.2.2.1

[Grégoire Weber]

Update of /cvs-repository/Zope3/src/zope/app/browser/workflow/stateful
In directory cvs.zope.org:/tmp/cvs-serv24874/src/zope/app/browser/workflow/stateful

Modified Files:
      Tag: cw-mail-branch
	content_filter.py contentworkflow.py definition.py 
	filteradapter.py instance.py 
Log Message:
Synced up with HEAD

=== Zope3/src/zope/app/browser/workflow/stateful/content_filter.py 1.1 => 1.1.4.1 ===
--- Zope3/src/zope/app/browser/workflow/stateful/content_filter.py:1.1	Thu May  8 13:27:17 2003
+++ Zope3/src/zope/app/browser/workflow/stateful/content_filter.py	Sun Jun 22 10:22:53 2003
@@ -17,12 +17,10 @@
 """
 __metaclass__ = type
 
-from zope.component import getAdapter, queryAdapter, getService
-from zope.app.services.servicenames import Workflows
+from zope.component import queryAdapter
 from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
 from zope.app.interfaces.workflow import IProcessInstanceContainerAdaptable
 from zope.app.interfaces.workflow import IProcessInstanceContainer
-from zope.app.interfaces.workflow.stateful import IStatefulProcessInstance
 from zope.app.browser.container.contents import Contents
  
 class FilterList(Contents):


=== Zope3/src/zope/app/browser/workflow/stateful/contentworkflow.py 1.1 => 1.1.4.1 ===
--- Zope3/src/zope/app/browser/workflow/stateful/contentworkflow.py:1.1	Thu May  8 13:27:17 2003
+++ Zope3/src/zope/app/browser/workflow/stateful/contentworkflow.py	Sun Jun 22 10:22:53 2003
@@ -17,10 +17,7 @@
 """
 __metaclass__ = type
  
-from zope.component import getServiceManager
 from zope.publisher.browser import BrowserView
-from zope.app.form.utility import setUpWidgets, getWidgetsDataForContent
-from zope.app.interfaces.workflow.stateful import IContentWorkflowsUtility
 
 class ContentWorkflowsUtilityView(BrowserView):
  


=== Zope3/src/zope/app/browser/workflow/stateful/definition.py 1.1 => 1.1.4.1 ===
--- Zope3/src/zope/app/browser/workflow/stateful/definition.py:1.1	Thu May  8 13:27:17 2003
+++ Zope3/src/zope/app/browser/workflow/stateful/definition.py	Sun Jun 22 10:22:53 2003
@@ -11,22 +11,17 @@
 # FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
-"""ProcessDefinition configuration adding view
+"""ProcessDefinition registration adding view
  
 $Id$
 """
 __metaclass__ = type
 
-from zope.proxy.introspection import removeAllProxies
-from zope.component import getServiceManager
+from zope.proxy import removeAllProxies
 from zope.publisher.browser import BrowserView
 from zope.app.browser.container.adding import Adding
-from zope.app.form.utility import setUpWidgets, getWidgetsDataForContent
-from zope.app.interfaces.workflow.stateful import IStatefulProcessDefinition
-
-from zope.app.workflow.stateful.definition import State, Transition
-
 from zope.app.browser.form.submit import Update
+from zope.app.workflow.stateful.definition import State, Transition
 
 
 class StatesContainerAdding(Adding):


=== Zope3/src/zope/app/browser/workflow/stateful/filteradapter.py 1.1 => 1.1.4.1 ===
--- Zope3/src/zope/app/browser/workflow/stateful/filteradapter.py:1.1	Thu May  8 13:27:17 2003
+++ Zope3/src/zope/app/browser/workflow/stateful/filteradapter.py	Sun Jun 22 10:22:53 2003
@@ -17,6 +17,7 @@
 """
 __metaclass__ = type
 
+from zope.interface import implements
 from zope.component import queryAdapter 
 from zope.app.interfaces.workflow import IProcessInstanceContainerAdaptable
 from zope.app.interfaces.workflow import IProcessInstanceContainer
@@ -25,7 +26,7 @@
 class FilterAdapter:
     
     __used_for__ = IProcessInstanceContainerAdaptable
-    __implements__ = IContentFilterAdapter
+    implements(IContentFilterAdapter)
 
     def __init__(self, context):
         self.context = context


=== Zope3/src/zope/app/browser/workflow/stateful/instance.py 1.2 => 1.2.2.1 ===
--- Zope3/src/zope/app/browser/workflow/stateful/instance.py:1.2	Wed May 21 16:27:41 2003
+++ Zope3/src/zope/app/browser/workflow/stateful/instance.py	Sun Jun 22 10:22:53 2003
@@ -17,18 +17,15 @@
 """
 __metaclass__ = type
 
-from zope.schema import getFieldNames
-from zope.component import queryView, queryAdapter, getAdapter, getService
+from zope.app.interfaces.dublincore import IZopeDublinCore
+from zope.app.interfaces.workflow import IProcessInstanceContainer
+from zope.app.interfaces.workflow import IProcessInstanceContainerAdaptable
+from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
 from zope.app.services.servicenames import Workflows
+from zope.component import getAdapter, getService
+from zope.context import getWrapperData
+from zope.proxy import removeAllProxies
 from zope.publisher.browser import BrowserView
-from zope.app.pagetemplate.viewpagetemplatefile import ViewPageTemplateFile
-
-from zope.app.interfaces.workflow import IProcessInstanceContainerAdaptable
-from zope.app.interfaces.workflow import IProcessInstanceContainer
-from zope.app.interfaces.workflow.stateful import IStatefulProcessInstance
-from zope.app.interfaces.dublincore import IZopeDublinCore
-from zope.proxy.introspection import removeAllProxies
-from zope.proxy.context import getWrapperData
  
 class ManagementView(BrowserView):