[Zope-Checkins] CVS: Zope/lib/python/DocumentTemplate/sequence - SortEx.py:1.5.4.1

[Chris McDonough]

Update of /cvs-repository/Zope/lib/python/DocumentTemplate/sequence
In directory cvs.zope.org:/tmp/cvs-serv16902/lib/python/DocumentTemplate/sequence

Modified Files:
      Tag: chrism-install-branch
	SortEx.py 
Log Message:
Merge chrism-install-branch with head.  Apologies for the spew.


=== Zope/lib/python/DocumentTemplate/sequence/SortEx.py 1.5 => 1.5.4.1 ===
--- Zope/lib/python/DocumentTemplate/sequence/SortEx.py:1.5	Wed Aug 14 18:29:53 2002
+++ Zope/lib/python/DocumentTemplate/sequence/SortEx.py	Sat Sep 28 21:40:31 2002
@@ -98,7 +98,8 @@
                     try:
                         if mapping: akey = v[sk]
                         else: akey = getattr(v, sk)
-                    except AttributeError, KeyError: akey = None
+                    except (AttributeError, KeyError):
+                        akey = None
                     if not basic_type(akey):
                         try: akey = akey()
                         except: pass