[Zope-Checkins] CVS: Zope/lib/python/OFS - SimpleItem.py:1.102.4.1

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/OFS
In directory cvs.zope.org:/tmp/cvs-serv3114/lib/python/OFS

Modified Files:
      Tag: chrism-install-branch
	SimpleItem.py 
Log Message:
Merge of head into installer-branch.  Sorry.  :-(


=== Zope/lib/python/OFS/SimpleItem.py 1.102 => 1.102.4.1 ===
--- Zope/lib/python/OFS/SimpleItem.py:1.102	Wed Aug 14 17:42:56 2002
+++ Zope/lib/python/OFS/SimpleItem.py	Tue Sep  3 03:43:46 2002
@@ -142,7 +142,8 @@
         self, client=None, REQUEST={},
         error_type=None, error_value=None, tb=None,
         error_tb=None, error_message='',
-        tagSearch=re.compile(r'[a-zA-Z]>').search):
+        tagSearch=re.compile(r'[a-zA-Z]>').search,
+        error_log_url=''):
 
         try:
             if error_type  is None: error_type =sys.exc_info()[0]
@@ -156,13 +157,6 @@
             elif type(tb) is type('') and not error_tb:
                 error_tb = tb
 
-            try:
-                log = aq_acquire(self, '__error_log__', containment=1)
-            except AttributeError:
-                error_log_url = ''
-            else:
-                error_log_url = log.raising((error_type, error_value, tb))
-
             # turn error_type into a string
             if hasattr(error_type, '__name__'):
                 error_type=error_type.__name__
@@ -216,7 +210,8 @@
                 try:
                     strv = str(error_value)
                 except:
-                    strv = '<unprintable %s object>' % str(type(error_value).__name__)
+                    strv = ('<unprintable %s object>' % 
+                            str(type(error_value).__name__))
                 v = strv + (
                     " (Also, an error occurred while attempting "
                     "to render the standard error message.)")