[Checkins] SVN: zope.documenttemplate/trunk/ made zope.documenttemplate work with python2.5

[nikhil n]

Log message for revision 78096:
   made zope.documenttemplate work with python2.5

Changed:
  U   zope.documenttemplate/trunk/CHANGES.txt
  U   zope.documenttemplate/trunk/src/zope/documenttemplate/ustr.py

-=-
Modified: zope.documenttemplate/trunk/CHANGES.txt
===================================================================
--- zope.documenttemplate/trunk/CHANGES.txt	2007-07-18 06:33:56 UTC (rev 78095)
+++ zope.documenttemplate/trunk/CHANGES.txt	2007-07-18 09:19:00 UTC (rev 78096)
@@ -1,5 +1,8 @@
 zope.documenttemplate Package Changelog
 =======================================
+Next Version
+--------------
+- zope.documenttemplate now supports Python2.5
 
 zope.documenttemplate version 3.2.0 (2006/01/05)
 ------------------------------------------------

Modified: zope.documenttemplate/trunk/src/zope/documenttemplate/ustr.py
===================================================================
--- zope.documenttemplate/trunk/src/zope/documenttemplate/ustr.py	2007-07-18 06:33:56 UTC (rev 78095)
+++ zope.documenttemplate/trunk/src/zope/documenttemplate/ustr.py	2007-07-18 09:19:00 UTC (rev 78096)
@@ -15,7 +15,7 @@
 $Id$
 """
 
-nasty_exception_str = Exception.__str__.im_func
+nasty_exception_str = getattr(Exception.__str__,"im_func",None)
 
 def ustr(v):
     """Convert any object to a plain string or unicode string,