[CMF-checkins] CVS: CMF/CMFDefault - Document.py:1.61

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFDefault
In directory cvs.zope.org:/tmp/cvs-serv25407/CMFDefault

Modified Files:
	Document.py 
Log Message:
cleanup:
- removed some dead code
- narrowed try statement
- updated html to xhtml

=== CMF/CMFDefault/Document.py 1.60 => 1.61 ===
--- CMF/CMFDefault/Document.py:1.60	Thu Sep 25 07:36:49 2003
+++ CMF/CMFDefault/Document.py	Fri Sep 26 10:27:10 2003
@@ -129,13 +129,11 @@
                 )
 
     def _edit(self, text, text_format='', safety_belt=''):
-        """ Edit the Document - Parses headers and cooks the body"""
-        headers = {}
+        """ Edit the Document and cook the body.
+        """
         level = self._stx_level
         if not text_format:
             text_format = self.text_format
-        if not safety_belt:
-            safety_belt = headers.get('SafetyBelt', '')
         if not self._safety_belt_update(safety_belt=safety_belt):
             msg = ("Intervening changes from elsewhere detected."
                    " Please refetch the document and reapply your changes."
@@ -147,7 +145,7 @@
             self.text = self.cooked_text = text
         elif text_format == 'plain':
             self.text = text
-            self.cooked_text = html_quote(text).replace('\n','<br>')
+            self.cooked_text = html_quote(text).replace('\n','<br />')
         else:
             self.cooked_text = format_stx(text=text, level=level)
             self.text = text
@@ -171,7 +169,7 @@
         if file and (type(file) is not type('')):
             contents=file.read()
             if contents:
-                text = self.text = contents
+                text = contents
         if html_headcheck(text):
             text = bodyfinder(text)
         self.setFormat(text_format)
@@ -353,14 +351,14 @@
         self.dav__init(REQUEST, RESPONSE)
         self.dav__simpleifhandler(REQUEST, RESPONSE, refresh=1)
         body = REQUEST.get('BODY', '')
+        headers, body, format = self.handleText(text=body)
+        safety_belt = headers.get('SafetyBelt', '')
+        if REQUEST.get_header('Content-Type', '') == 'text/html':
+            text_format = 'html'
+        else:
+            text_format = format
 
         try:
-            headers, body, format = self.handleText(text=body)
-            safety_belt = headers.get('SafetyBelt', '')
-            if REQUEST.get_header('Content-Type', '') == 'text/html':
-                text_format = 'html'
-            else:
-                text_format = format
             self.setFormat(text_format)
             self.setMetadata(headers)
             self._edit(text=body, safety_belt=safety_belt)