reformatted code; merged Romain's changes

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@12183 20353a03-c40f-0410-a6d1-a30d3c3de9de

reformatted code; merged Romain's changes
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@12183 20353a03-c40f-0410-a6d1-a30d3c3de9de
51ccfad4 · Bartek Górny · 88e4b7da · 51ccfad4
Commit 51ccfad4 authored Jan 22, 2007 by Bartek Górny
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 8 deletions

product/ERP5/Document/File.py product/ERP5/Document/File.py +9 -8

No files found.
--- a/product/ERP5/Document/File.py
+++ b/product/ERP5/Document/File.py
@@ -26,20 +26,19 @@
 #
 ##############################################################################

-from AccessControl import ClassSecurityInfo
+import mimetypes
+import re

+from AccessControl import ClassSecurityInfo
 from Products.CMFCore.WorkflowCore import WorkflowMethod
 from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
 from Products.ERP5Type.Cache import CachingMethod
 from Products.ERP5.Document.Document import Document
 from Products.ERP5Type.Base import Base
-
 from Products.CMFDefault.File import File as CMFFile
-
 from zLOG import LOG
-
-import mimetypes, re
 from DateTime import DateTime
+
 mimetypes.init()

 rs=[]
@@ -47,11 +46,13 @@ rs.append(re.compile('<HEAD>.*</HEAD>',re.DOTALL|re.MULTILINE|re.IGNORECASE))
 rs.append(re.compile('<!DOCTYPE[^>]*>'))
 rs.append(re.compile('<.?(HTML|BODY)[^>]*>',re.DOTALL|re.MULTILINE|re.IGNORECASE))

+
 def stripHtml(txt): # XXX-JPS to be moved to TextDocument
  for r in rs:
    txt=r.sub('',txt)
  return txt

+
 class File(Document, CMFFile):
  """
      A File can contain raw data which can be uploaded and downloaded.
@@ -172,7 +173,7 @@ class File(Document, CMFFile):
      data_list = []
      while data is not None:
        data_list.append(data.data)
-        data=data.next
+        data = data.next
      return ''.join(data_list)

  security.declareProtected(Permissions.ModifyPortalContent, 'guessMimeType')
@@ -191,8 +192,8 @@ class File(Document, CMFFile):
  def PUT(self,REQUEST,RESPONSE):
    self.clearConversionCache()
    CMFFile.PUT(self,REQUEST,RESPONSE)
-    self.DMS_ingestFile(fname=self.getId()) # XXX-JPS we should call here Document_discoverMetadata
-                                            # with the filename as parameter
+    self.discoverMetadata(fname=self.getId())
+

  # DAV Support
  index_html = CMFFile.index_html # XXX-JPS - Here we have a security issue - ask seb what to do