--- lib/python/App/dtml/manage_page_header.dtml	Fri Jan 26 16:17:40 2001
+++ lib/python/App/dtml/manage_page_header.dtml	Sun Aug  4 20:06:21 2002
@@ -1,6 +1,11 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
 <html>
 <head>
+<dtml-unless management_page_charset>
+<dtml-call "REQUEST.set('management_page_charset','iso-8859-1')">
+</dtml-unless>
+<meta http-equiv="content-type" content="text/html;charset=<dtml-var management_page_charset>">
+<dtml-call "RESPONSE.setHeader('content-type','text/html;charset='+management_page_charset)">
 <title><dtml-if title><dtml-var title></dtml-if></title>
 <dtml-let ag="REQUEST.get('HTTP_USER_AGENT', '')"
      is_nav4="ag[:9] == 'Mozilla/4' and _.string.find(ag, 'MSIE') < 0"
--- lib/python/DocumentTemplate/DT_In.py	Wed Nov 28 16:50:54 2001
+++ lib/python/DocumentTemplate/DT_In.py	Sun Aug  4 20:08:59 2002
@@ -334,7 +334,7 @@
 __version__='$Revision: 1.57 $'[11:-2]
 
 import sys
-from DT_Util import ParseError, parse_params, name_param, str
+from DT_Util import ParseError, parse_params, name_param, str, join_unicode
 from DT_Util import render_blocks, InstanceDict, ValidationError, Eval
 from DT_Util import simple_name, add_with_prefix
 import re
@@ -601,7 +601,7 @@
                     if index==first: pkw['sequence-start']=0
 
 
-                result = ''.join(result)
+                result = join_unicode(result, '')
 
         finally:
             if cache: pop()
@@ -698,7 +698,7 @@
                             pop()
                     if index==0: pkw['sequence-start']=0
 
-                result = ''.join(result)
+                result=join_unicode(result, '')
 
         finally:
             if cache: pop()
--- lib/python/DocumentTemplate/DT_Util.py	Wed Nov 28 16:50:55 2001
+++ lib/python/DocumentTemplate/DT_Util.py	Sun Aug  4 20:11:05 2002
@@ -13,6 +13,26 @@
 '''$Id: DT_Util.py,v 1.85 2001/11/28 15:50:55 matt Exp $''' 
 __version__='$Revision: 1.85 $'[11:-2]
 
+# Waaah - we have to put this way up here to avoid an import dependency problem
+# This really needs a better place
+def join_unicode(sequence,sep=' '):
+    # Unicode aware join.
+    # This does roughly the same job as string.join, however this function will
+    # not report an error if there is a mix of unicode string and 8bit strings
+    # with the 7th bit set. Instead, the 8bit strings are interpreted as strings
+    # of latin-1 characters.
+    # This is the preferred way of combining content for Zope responses.
+    try:
+        return sep.join(sequence)
+    except UnicodeError:
+        # A mix of unicode string and normal strings with the 7th bit.
+        # Python considers this mix more dangerous than I do.
+        for i in range(len(sequence)):
+            if type(sequence[i]) is type(''):
+                sequence[i] = unicode(sequence[i],'latin-1')
+        return sep.join(sequence)
+
+
 import re, os
 from html_quote import html_quote # for import by other modules, dont remove!
 from RestrictedPython.Guards import safe_builtins
@@ -384,3 +404,7 @@
     text=text[l:].strip()
     if text: return apply(parse_params,(text,result),parms)
     else: return result
+
+
+
+
--- lib/python/DocumentTemplate/DT_Var.py	Wed Nov 28 16:50:55 2001
+++ lib/python/DocumentTemplate/DT_Var.py	Sun Aug  4 20:06:21 2002
@@ -253,8 +253,10 @@
 
         # finally, pump it through the actual string format...
         fmt=self.fmt
-        if fmt=='s': val=str(val)
-        else: val = ('%'+self.fmt) % (val,)
+        if fmt=='s':
+            val=ustr(val)
+        else:
+            val = ('%'+self.fmt) % (val,)
 
         # next, look for upper, lower, etc
         for f in self.modifiers: val=f(val)
--- lib/python/DocumentTemplate/__init__.py	Wed Nov 28 16:50:55 2001
+++ lib/python/DocumentTemplate/__init__.py	Sun Aug  4 20:12:49 2002
@@ -18,5 +18,34 @@
 $Id: __init__.py,v 1.16 2001/11/28 15:50:55 matt Exp $'''
 __version__='$Revision: 1.16 $'[11:-2]
 
+
+try:
+    ustr
+except:
+    # At one time the function ustr looked like it would be added as a builtin
+    # in python 2.0, but that didnt happen. It is left here as a hack, until
+    # a better place can be decided for it
+    import __builtin__
+    from types import StringType,UnicodeType
+    def ustr(v):
+        string_types = (StringType,UnicodeType)
+        if type(v) in string_types:
+            return v
+        else:
+            try:
+                fn = v.__str__
+            except AttributeError:
+                return str(v)
+            else:
+                v = fn()
+                if type(v) in string_types:
+                    return v
+                else:
+                    raise ValueError('__str__ returned wrong type')
+    __builtin__.ustr = ustr
+    del __builtin__
+    del ustr
+
+
 import ExtensionClass # work-around for import bug.
 from DocumentTemplate import String, File, HTML, HTMLDefault, HTMLFile
--- lib/python/DocumentTemplate/cDocumentTemplate.c	Wed Nov 28 16:50:55 2001
+++ lib/python/DocumentTemplate/cDocumentTemplate.c	Sun Aug  4 20:46:24 2002
@@ -17,7 +17,7 @@
 
 #include "ExtensionClass.h"
 
-static PyObject *py_isDocTemp=0, *py_blocks=0, *py_=0, *join=0, *py_acquire;
+static PyObject *py_isDocTemp=0, *py_blocks=0, *py_=0, *join=0, *py_acquire, *ustr=0;
 static PyObject *py___call__, *py___roles__, *py_AUTHENTICATED_USER;
 static PyObject *py_hasRole, *py__proxy_roles, *py_Unauthorized;
 static PyObject *py_Unauthorized_fmt, *py_guarded_getattr;
@@ -687,7 +687,7 @@
 
               if (t == NULL || (! PyString_Check(t)))
                 {
-                  if (t) ASSIGN(t, PyObject_Str(t));
+                  if (t) ASSIGN(t, PyObject_CallFunction(ustr,"O",t));
                   UNLESS(t) return -1;
                 }
 
@@ -787,7 +787,7 @@
               return -1;
             }
         }
-      else if (PyString_Check(block))
+      else if (PyString_Check(block) || PyUnicode_Check(block))
 	{
 	  Py_INCREF(block);
 	}
@@ -807,10 +807,39 @@
   return 0;
 }
 
+
+static int
+render_unicode_fixup(PyObject *list)
+{
+    PyObject *string,*unicode;
+    int i,l;
+
+    l = PyList_Size(list);
+
+    for(i=0;i<l;++i)
+    {
+        if(PyString_Check(PyList_GetItem(list,i)))
+        {
+            string = PyList_GetItem(list,i);
+            unicode = PyUnicode_DecodeLatin1(PyString_AsString(string),PyString_Size(string),NULL);
+            if(unicode)
+            {
+                PyList_SetItem(list,i,unicode);
+            }
+            else
+            {
+                return -1;
+            }
+        }
+    }
+    return 0;
+}
+
+
 static PyObject *
 render_blocks(PyObject *self, PyObject *args)
 {
-  PyObject *md, *blocks, *mda=0, *rendered=0;
+  PyObject *md, *blocks, *mda=0, *rendered=0, *prejoined=0;
   int l;
 
   UNLESS(PyArg_ParseTuple(args,"OO", &blocks, &md)) return NULL;
@@ -819,7 +848,7 @@
   
   if (render_blocks_(blocks, rendered, md, mda) < 0) goto err;
 
-  Py_DECREF(mda);
+  ASSIGN(mda,NULL);
 
   l=PyList_Size(rendered);
   if (l==0)
@@ -830,7 +859,28 @@
   else if (l==1)
     ASSIGN(rendered, PySequence_GetItem(rendered,0));
   else
-    ASSIGN(rendered, PyObject_CallFunction(join,"OO",rendered,py_));
+    {
+      prejoined = rendered;
+      rendered = PyObject_CallFunction(join,"OO",prejoined,py_);
+      if(!rendered && PyErr_ExceptionMatches(PyExc_UnicodeError))
+      {
+          PyErr_Clear();
+          if(render_unicode_fixup(prejoined)<0)
+          {
+              Py_DECREF(prejoined);
+              goto err;
+          }
+          else
+          {
+              rendered = PyObject_CallFunction(join,"OO",prejoined,py_);
+              Py_DECREF(prejoined);
+          }
+      }
+      else
+      {
+          Py_DECREF(prejoined);
+      }
+    }
 
   return rendered;
 
@@ -839,7 +889,7 @@
   Py_XDECREF(rendered);
   return NULL;
 }  
-  
+
 static PyObject *
 safe_callable(PyObject *self, PyObject *args)
 {
@@ -896,9 +946,16 @@
     return;
 
   UNLESS(py_=PyString_FromString("")) return;
+
   UNLESS(join=PyImport_ImportModule("string")) return;
   ASSIGN(join,PyObject_GetAttrString(join,"join"));
   UNLESS(join) return;
+
+  /* does this have a C interface ? */
+  UNLESS(ustr=PyImport_ImportModule("__builtin__")) return;
+  ASSIGN(ustr,PyObject_GetAttrString(ustr,"ustr"));
+  UNLESS(ustr) return;
+
   UNLESS(ExtensionClassImported) return;
 
   m = Py_InitModule4("cDocumentTemplate", Module_Level__methods,
--- lib/python/DocumentTemplate/html_quote.py	Mon Jun 18 20:11:39 2001
+++ lib/python/DocumentTemplate/html_quote.py	Sun Aug  4 20:06:21 2002
@@ -3,5 +3,5 @@
 from cgi import escape
 
 def html_quote(v, name='(Unknown name)', md={}):
-    return escape(str(v), 1)
+    return escape(ustr(v), 1)
 
--- lib/python/DocumentTemplate/pDocumentTemplate.py	Wed Nov 28 16:50:55 2001
+++ lib/python/DocumentTemplate/pDocumentTemplate.py	Sun Aug  4 20:22:04 2002
@@ -41,6 +41,7 @@
 
 
 StringType=type('')
+UnicodeType=type(u'')
 TupleType=type(())
 
 
@@ -187,7 +188,7 @@
                 section=section[0]
                 if type(section) is StringType: section=md[section]
                 else: section=section(md)
-                section=str(section)
+                section=ustr(section)
             else:
                 # if
                 cache={}
@@ -220,7 +221,7 @@
 
                 finally: md._pop()
 
-        elif type(section) is not StringType:
+        elif type(section) is not StringType and type(section) is not UnicodeType:
             section=section(md)
 
         if section: rendered.append(section)
@@ -228,5 +229,16 @@
     l=len(rendered)
     if l==0: return ''
     elif l==1: return rendered[0]
-    return ''.join(rendered)
-    return rendered
+    try:
+        return ''.join(rendered)
+    except UnicodeError:
+        # A mix of unicode string and normal strings with the 7th bit.
+        # Python considers this mix more dangerous than I do. Fix up the
+        # list, treating normal strings as latin-1
+        for i in range(len(rendered)):
+            if type(rendered[i]) is StringType:
+                rendered[i] = unicode(rendered[i],'latin-1')
+        return u''.join(rendered)
+
+
+
--- lib/python/OFS/SimpleItem.py	Wed Nov 28 16:50:57 2001
+++ lib/python/OFS/SimpleItem.py	Sun Aug  4 20:06:21 2002
@@ -172,11 +172,19 @@
                     except:
                         pass
                     else:
-                        if tagSearch(s) is not None:
+                        try:    
+                            match = tagSearch(s)
+                        except TypeError:
+                            match = None
+                        if match is not None:
                             error_message=error_value
-                elif (type(error_value) is StringType
-                      and tagSearch(error_value) is not None):
-                    error_message=error_value
+                else:
+                    try:    
+                        match = tagSearch(error_value)
+                    except TypeError:
+                        match = None
+                    if match is not None:
+                        error_message=error_value
 
             if client is None: client=self
             if not REQUEST: REQUEST=self.aq_acquire('REQUEST')
--- lib/python/OFS/dtml/properties.dtml	Thu Mar 21 18:26:30 2002
+++ lib/python/OFS/dtml/properties.dtml	Sun Aug  4 20:06:21 2002
@@ -1,3 +1,5 @@
+<dtml-call "REQUEST.set('management_page_charset','UTF-8')">
+<dtml-var "u''">
 <dtml-var manage_page_header>
 <dtml-with "_(management_view='Properties')">
 <dtml-var manage_tabs>
@@ -42,7 +44,7 @@
 <tr>
   <td align="left" valign="top" width="16">
   <dtml-if "'d' in _['sequence-item'].get('mode', 'awd')">
-  <input type="checkbox" name="ids:list" value="<dtml-var id html_quote>" 
+  <input type="checkbox" name="ids:utf8:list" value="<dtml-var id html_quote>" 
    id="cb-<dtml-var id>">
   <dtml-else>
   </dtml-if>
@@ -66,20 +68,20 @@
   <dtml-elif "type in ('float', 'date')">
   <input type="text" name="<dtml-var id>:<dtml-var type>" size="35"
    value="<dtml-var "getProperty(id)" html_quote>">
-  <dtml-elif "type=='string'">
-  <input type="text" name="<dtml-var id>:string" size="35"
+  <dtml-elif "type in ['string','ustring']">
+  <input type="text" name="<dtml-var id>:utf8:<dtml-var type>" size="35"
    value="<dtml-var "getProperty(id)" html_quote>">
   <dtml-elif "type=='boolean'">
   <input type="checkbox" name="<dtml-var id>:boolean" size="35"
    <dtml-if "getProperty(id)">CHECKED</dtml-if>>
-  <dtml-elif "type=='tokens'">
-  <input type="text" name="<dtml-var id>:tokens" size="35"
+  <dtml-elif "type in ['tokens','utokens']">
+  <input type="text" name="<dtml-var id>:utf8:<dtml-var type>" size="35"
    value="<dtml-in "getProperty(id)"><dtml-var sequence-item html_quote> </dtml-in>">
-  <dtml-elif "type=='text'">
-  <textarea name="<dtml-var id>:text" rows="6" cols="35"><dtml-var 
+  <dtml-elif "type in ['text','utext']">
+  <textarea name="<dtml-var id>:utf8:<dtml-var type>" rows="6" cols="35"><dtml-var 
    "getProperty(id)" html_quote></textarea>
-  <dtml-elif "type=='lines'">
-  <textarea name="<dtml-var id>:lines" rows="6" cols="35"><dtml-in
+  <dtml-elif "type in ['lines','ulines']">
+  <textarea name="<dtml-var id>:utf8:<dtml-var type>" rows="6" cols="35"><dtml-in
   "getProperty(id)"><dtml-var sequence-item html_quote><dtml-if
    sequence-end><dtml-else><dtml-var "'\n'"></dtml-if></dtml-in></textarea>
 
@@ -87,7 +89,7 @@
 
     <dtml-if "hasProperty(select_variable)">
     <div class="form-element">
-    <select name="<dtml-var id>">
+    <select name="<dtml-var id>:utf8:text">
       <dtml-in "getProperty(select_variable)">
          <option
           <dtml-if "_['sequence-item']==getProperty(id)">SELECTED</dtml-if>
@@ -97,7 +99,7 @@
     </div>
     <dtml-elif "_.has_key(select_variable)">
     <div class="form-element">
-    <select name="<dtml-var id>">
+    <select name="<dtml-var id>:utf8:text">
       <dtml-in "_[select_variable]">
          <option
           <dtml-if "_['sequence-item']==getProperty(id)">SELECTED</dtml-if>
@@ -115,7 +117,7 @@
 
     <dtml-if "hasProperty(select_variable)">
     <div class="form-element">
-    <select name="<dtml-var id>:list" multiple
+    <select name="<dtml-var id>:utf8:list" multiple
       size="<dtml-var "_.min(7, _.len(getProperty(select_variable)))">">
       <dtml-in "getProperty(select_variable)">
          <option<dtml-if 
@@ -127,7 +129,7 @@
     </div>
     <dtml-elif "_.has_key(select_variable)">
     <div class="form-element">
-    <select name="<dtml-var id>:list" multiple
+    <select name="<dtml-var id>:utf8:list" multiple
       size="<dtml-var "_.min(7, _.len(_[select_variable]))">">
       <dtml-in "_[select_variable]">
          <option<dtml-if 
@@ -211,7 +213,7 @@
   </div>
   </td>
   <td align="left" valign="top">
-  <input type="text" name="id" size="30" value=""/>
+  <input type="text" name="id:utf8:string" size="30" value=""/>
   </td>
   <td align="left" valign="top" class="form-label">
   Type
@@ -226,8 +228,12 @@
       <option>lines</option>
       <option>long</option>
       <option selected>string</option>
+      <option>ustring</option>
       <option>text</option>
       <option>tokens</option>
+      <option>utext</option>
+      <option>utokens</option>
+      <option>ulines</option>
       <option>selection</option>
       <option>multiple selection</option>
     </select>
@@ -241,7 +247,7 @@
   </div>
   </td>
   <td colspan=2 align="left" valign="top">
-  <input type="text" name="value" size="30" />
+  <input type="text" name="value:utf8:string" size="30" />
   </td>
   <td align="right" valign="top">
   <div class="form-element">
--- lib/python/ZPublisher/Converters.py	Wed Jan  2 16:56:04 2002
+++ lib/python/ZPublisher/Converters.py	Sun Aug  4 20:06:21 2002
@@ -113,6 +113,44 @@
 def field2boolean(v):
     return v
 
+
+class _unicode_converter:
+    def __call__(self,v):
+        # Convert a regular python string. This probably doesnt do what you want,
+        # whatever that might be. If you are getting exceptions below, you
+        # probably missed the encoding tag from a form field name. Use:
+        #       <input name="description:utf8:ustring" .....
+        # rather than
+        #       <input name="description:ustring" .....
+        if hasattr(v,'read'): v=v.read()
+        v = unicode(v)
+        return self.convert_unicode(v)
+
+    def convert_unicode(self,v):
+        raise NotImplementedError('convert_unicode')
+
+
+class field2ustring(_unicode_converter):
+    def convert_unicode(self,v):
+        return v
+field2ustring = field2ustring()
+
+class field2utokens(_unicode_converter):
+    def convert_unicode(self,v):
+        return split(v)
+field2utokens = field2utokens()
+
+class field2utext(_unicode_converter):
+    def convert_unicode(self,v):
+        return unicode(field2text(v.encode('utf8')),'utf8')
+field2utext = field2utext()
+
+class field2ulines(_unicode_converter):
+    def convert_unicode(self,v):
+        return split(field2utext.convert_unicode(v),'\n')
+field2ulines = field2ulines()
+
+
 type_converters = {
     'float':    field2float,
     'int':      field2int,
@@ -123,7 +161,13 @@
     'tokens':   field2tokens,
     'lines':    field2lines,
     'text':     field2text,
-    'boolean':     field2boolean,
+    'boolean':    field2boolean,
+    
+    # u-prefixed converters are Unicode variants. utokens, ulines, and utext will be added soon
+    'ustring':  field2ustring,
+    'utokens':  field2utokens,
+    'ulines':   field2ulines,
+    'utext':    field2utext,
     }
 
 get_converter=type_converters.get
--- lib/python/ZPublisher/HTTPRequest.py	Fri Apr 12 18:07:45 2002
+++ lib/python/ZPublisher/HTTPRequest.py	Sun Aug  4 20:52:54 2002
@@ -13,7 +13,7 @@
 
 __version__='$Revision: 1.61.6.2 $'[11:-2]
 
-import re, sys, os,  urllib, time, whrandom, cgi
+import re, sys, os,  urllib, time, whrandom, cgi, codecs
 from BaseRequest import BaseRequest
 from HTTPResponse import HTTPResponse
 from cgi import FieldStorage, escape
@@ -384,6 +384,7 @@
                         item=item.value
 
                 flags=0
+                character_encoding = ''
 
                 # Loop through the different types and set
                 # the appropriate flags
@@ -431,6 +432,8 @@
                             flags=flags|RECORDS
                         elif type_name == 'ignore_empty':
                             if not item: flags=flags|EMPTY
+                        elif has_codec(type_name):
+                            character_encoding = type_name
     
                         l=key.rfind(':')
                         if l < 0: break
@@ -456,7 +459,17 @@
                     # defer conversion
                     if flags&CONVERTED:
                         try:
-                            item=converter(item)
+                            if character_encoding:
+                                # We have a string with a specified character encoding.
+                                # This gets passed to the converter either as unicode, if it can
+                                # handle it, or crunched back down to latin-1 if it can not.
+                                item = unicode(item,character_encoding)
+                                if hasattr(converter,'convert_unicode'):
+                                    item = converter.convert_unicode(item)
+                                else:
+                                    item = converter(item.encode('latin1'))
+                            else:
+                                item=converter(item)
                         except:
                             if (not item and not (flags&DEFAULT) and
                                 defaults.has_key(key)):
@@ -968,6 +981,16 @@
 
 
 base64=None
+
+
+def has_codec(x):
+    try:
+        codecs.lookup(x)
+    except LookupError:
+        return 0
+    else:
+        return 1
+
 
 def sane_environment(env):
     # return an environment mapping which has been cleaned of
--- lib/python/ZPublisher/HTTPResponse.py	Mon Apr 15 22:55:27 2002
+++ lib/python/ZPublisher/HTTPResponse.py	Sun Aug  4 20:36:09 2002
@@ -17,7 +17,7 @@
 
 import types, os, sys, re
 from string import translate, maketrans
-from types import StringType, InstanceType, LongType
+from types import StringType, InstanceType, LongType, UnicodeType
 from BaseResponse import BaseResponse
 from zExceptions import Unauthorized
 
@@ -252,7 +252,13 @@
             if hasattr(body,'asHTML'):
                 body=body.asHTML()
 
-        body=str(body)
+        body=ustr(body)
+
+        if type(body) is UnicodeType:
+            body = self._encode_unicode(body)
+ 
+        isHTML=self.isHTML(body)
+
         l=len(body)
         if ((l < 200) and body[:1]=='<' and body.find('>')==l-1 and 
             bogus_str_search(body) is not None):
@@ -267,7 +273,6 @@
             else:
                 self.body=body
 
-
         if not self.headers.has_key('content-type'):
             isHTML=self.isHTML(body)
             if isHTML: c='text/html'
@@ -287,6 +292,16 @@
         self.insertBase()
         return self
 
+    def _encode_unicode(self,body,charset_re=re.compile(r'text/[0-9a-z]+\s*;\s*charset=([-_0-9a-z]+)(?:(?:\s*;)|\Z)',re.IGNORECASE)):
+        # Try to encode the Unicode data as requested.
+        if self.headers.has_key('content-type'):
+            match = charset_re.match(self.headers['content-type'])
+            if match:
+                encoding = match.group(1)
+                return body.encode(encoding)
+        # Choose a default character encoding.
+        return body.encode('latin1','replace')
+
     def setBase(self,base):
         'Set the base URL for the returned document.'
         if base[-1:] != '/':
@@ -553,7 +568,7 @@
             # Try to capture exception info for bci calls
             et = translate(str(t), nl2sp)
             self.setHeader('bobo-exception-type', et)
-            ev = translate(str(v), nl2sp)
+            ev = translate(ustr(v),nl2sp)
             if ev.find( '<html>') >= 0:
                 ev = 'bobo exception'
             self.setHeader('bobo-exception-value', ev[:255])
@@ -596,7 +611,7 @@
         b = v
         if isinstance(b, Exception):
             try:
-                b = str(b)
+                b = ustr(b)
             except:
                 b = '<unprintable %s object>' % type(b).__name__
 
@@ -605,21 +620,26 @@
                 (str(t),
                  'Zope has exited normally.<p>' + self._traceback(t, v, tb)),
                 is_error=1)
-        elif type(b) is not types.StringType or tag_search(b) is None:
-            body = self.setBody(
-                (str(t),
-                'Sorry, a site error occurred.<p>'
-                 + self._traceback(t, v, tb)),
-                 is_error=1)
-        elif b.strip().lower()[:6]=='<html>' or \
-              b.strip().lower()[:14]=='<!doctype html':
-            # error is an HTML document, not just a snippet of html
-            body = self.setBody(b + self._traceback(t, '(see above)', tb),
-                              is_error=1)
         else:
-            body = self.setBody((str(t),
-                               b + self._traceback(t,'(see above)', tb)),
-                              is_error=1)
+            try:
+                match = tag_search(b)
+            except TypeError:
+                match = None
+            if match is None:
+                body = self.setBody(
+                    (str(t),
+                    'Sorry, a site error occurred.<p>'+
+                     self._traceback(t,v,tb)),
+                     is_error=1)
+            elif b.strip().lower()[:6]=='<html>' or \
+                 b.strip().lower()[:14]=='<!doctype html':
+                # error is an HTML document, not just a snippet of html
+                body = self.setBody(b + self._traceback(t,'(see above)',tb),
+                    is_error=1)
+            else:
+                body = self.setBody(
+                    (str(t), b + self._traceback(t,'(see above)',tb)),
+                     is_error=1)
         del tb
         return body
 
--- lib/python/RestrictedPython//PrintCollector.py	Wed Nov 28 16:51:11 2001
+++ lib/python/RestrictedPython//PrintCollector.py	Sun Aug  4 20:37:28 2002
@@ -13,6 +13,8 @@
 
 __version__='$Revision: 1.3 $'[11:-2]
 
+from DocumentTemplate.DT_Util import join_unicode
+
 class PrintCollector:
     '''Collect written text, and return it when called.'''
     def __init__(self):
@@ -20,4 +22,4 @@
     def write(self, text):
         self.txt.append(text)
     def __call__(self):
-        return ''.join(self.txt)
+        return join_unicode(self.txt)
