ZODB Components: Migrate Products.ERP5Type.WebDAVSupport from filesystem.

product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.TextDocument.py

@@ -33,7 +33,7 @@ from zLOG import LOG, WARNING
 from Products.ERP5Type import Permissions, PropertySheet
 from Products.ERP5.Document.Document import Document, ConversionError, _MARKER, DEFAULT_CONTENT_TYPE
 from Products.ERP5.Document.File import File
-from Products.ERP5Type.WebDAVSupport import TextContent
+from erp5.component.module.WebDAVSupport import TextContent
 from Products.ERP5.Document.Document import VALID_IMAGE_FORMAT_LIST, VALID_TEXT_FORMAT_LIST
 import cStringIO
 from string import Template

product/ERP5Type/WebDAVSupport.py → product/ERP5/bootstrap/erp5_core/ModuleComponentTemplateItem/portal_components/module.erp5.WebDAVSupport.py

@@ -15,20 +15,17 @@
 
 import collections
 import email
-import re
 import transaction
 from lxml import html
 from Products.ERP5Type.Utils import formatRFC822Headers
-from Acquisition import aq_parent, aq_inner, aq_base
+from Acquisition import aq_base
 from AccessControl import ClassSecurityInfo, ModuleSecurityInfo
 from Products.ERP5Type.Globals import InitializeClass
-from Products.ERP5Type import Permissions, PropertySheet, Constraint
+from Products.ERP5Type import Permissions
 from Products.CMFCore.PortalContent import ResourceLockedError
-from Products.CMFCore.utils import getToolByName
-from zLOG import LOG
 from zExceptions import Forbidden
 
-security = ModuleSecurityInfo( 'Products.ERP5Type.WebDAVSupport' )
+security = ModuleSecurityInfo(__name__)
 
 
 class TextContent:
@@ -82,7 +79,7 @@ class TextContent:
       headers.setdefault('content_type', content_type)
       headers['file'] = body
       self._edit(**headers)
-    except ResourceLockedError, msg:
+    except ResourceLockedError:
       transaction.abort()
       RESPONSE.setStatus(423)
       return RESPONSE
@@ -120,7 +117,7 @@ class TextContent:
           continue
         elif content is not None:
           # XXX - Bad algorithm - we should use getPropertyMap directly
-          if type(content) in (type(()), type([])):
+          if isinstance(content, (list, tuple)):
             for content_item in content:
               hdrtext = '%s\n <meta name="%s" content="%s" />' % (
                          hdrtext, name, content_item)
@@ -152,43 +149,43 @@ from webdav.NullResource import NullResource
 NullResource_PUT = NullResource.PUT
 
 def PUT(self, REQUEST, RESPONSE):
-        """Create a new non-collection resource.
-        """
-        if getattr(self.__parent__, 'PUT_factory', None) is not None: # BBB
-          return NullResource_PUT(self, REQUEST, RESPONSE)
-
-        self.dav__init(REQUEST, RESPONSE)
-        if REQUEST.environ['REQUEST_METHOD'] != 'PUT':
-          raise Forbidden, 'REQUEST_METHOD should be PUT.'
-
-        name = self.__name__
-        parent = self.__parent__
-
-        ifhdr = REQUEST.get_header('If', '')
-        if IWriteLock.providedBy(parent) and parent.wl_isLocked():
-            if ifhdr:
-                parent.dav__simpleifhandler(REQUEST, RESPONSE, col=1)
-            else:
-                # There was no If header at all, and our parent is locked,
-                # so we fail here
-                raise Locked
-        elif ifhdr:
-            # There was an If header, but the parent is not locked
-            raise PreconditionFailed
-
-        # <ERP5>
-        # XXX: Do we really want to force 'id'
-        #      when PUT is called on Contribution Tool ?
-        kw = {'id': name, 'data': None, 'filename': name}
-        contribution_tool = parent.getPortalObject().portal_contributions
-        if aq_base(contribution_tool) is not aq_base(parent):
-          kw.update(container=parent, discover_metadata=False)
-        ob = contribution_tool.newContent(**kw)
-        # </ERP5>
-
-        ob.PUT(REQUEST, RESPONSE)
-        RESPONSE.setStatus(201)
-        RESPONSE.setBody('')
-        return RESPONSE
+  """Create a new non-collection resource.
+  """
+  if getattr(self.__parent__, 'PUT_factory', None) is not None: # BBB
+    return NullResource_PUT(self, REQUEST, RESPONSE)
+
+  self.dav__init(REQUEST, RESPONSE)
+  if REQUEST.environ['REQUEST_METHOD'] != 'PUT':
+    raise Forbidden, 'REQUEST_METHOD should be PUT.'
+
+  name = self.__name__
+  parent = self.__parent__
+
+  ifhdr = REQUEST.get_header('If', '')
+  if IWriteLock.providedBy(parent) and parent.wl_isLocked():
+    if ifhdr:
+      parent.dav__simpleifhandler(REQUEST, RESPONSE, col=1)
+    else:
+      # There was no If header at all, and our parent is locked,
+      # so we fail here
+      raise Locked
+  elif ifhdr:
+    # There was an If header, but the parent is not locked
+    raise PreconditionFailed
+
+  # <ERP5>
+  # XXX: Do we really want to force 'id'
+  #      when PUT is called on Contribution Tool ?
+  kw = {'id': name, 'data': None, 'filename': name}
+  contribution_tool = parent.getPortalObject().portal_contributions
+  if aq_base(contribution_tool) is not aq_base(parent):
+    kw.update(container=parent, discover_metadata=False)
+  ob = contribution_tool.newContent(**kw)
+  # </ERP5>
+
+  ob.PUT(REQUEST, RESPONSE)
+  RESPONSE.setStatus(201)
+  RESPONSE.setBody('')
+  return RESPONSE
 
 NullResource.PUT = PUT

product/ERP5/bootstrap/erp5_core/ModuleComponentTemplateItem/portal_components/module.erp5.WebDAVSupport.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Module Component" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>default_reference</string> </key>
+            <value> <string>WebDAVSupport</string> </value>
+        </item>
+        <item>
+            <key> <string>default_source_reference</string> </key>
+            <value> <string>Products.ERP5Type.WebDAVSupport</string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>module.erp5.WebDAVSupport</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Module Component</string> </value>
+        </item>
+        <item>
+            <key> <string>sid</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_error_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>text_content_warning_message</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>version</string> </key>
+            <value> <string>erp5</string> </value>
+        </item>
+        <item>
+            <key> <string>workflow_history</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>component_validation_workflow</string> </key>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="WorkflowHistoryList" module="Products.ERP5Type.Workflow"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_log</string> </key>
+            <value>
+              <list>
+                <dictionary>
+                  <item>
+                      <key> <string>action</string> </key>
+                      <value> <string>validate</string> </value>
+                  </item>
+                  <item>
+                      <key> <string>validation_state</string> </key>
+                      <value> <string>validated</string> </value>
+                  </item>
+                </dictionary>
+              </list>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

product/ERP5/bootstrap/erp5_core/bt/template_module_component_id_list

@@ -4,4 +4,5 @@ module.erp5.ExpandPolicy
 module.erp5.GeneratedAmountList
 module.erp5.Log
 module.erp5.MovementCollectionDiff
-module.erp5.MovementGroup
\ No newline at end of file
+module.erp5.MovementGroup
+module.erp5.WebDAVSupport
\ No newline at end of file