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

[Chris McDonough]

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

Modified Files:
      Tag: chrism-install-branch
	SortEx.py 
Log Message:
Merge with HEAD.  Again, sorry for the spew (what's left of it... someone seems to have filtered some of this branch's checkins out).


=== Zope/lib/python/DocumentTemplate/sequence/SortEx.py 1.5.4.3 => 1.5.4.4 ===
--- Zope/lib/python/DocumentTemplate/sequence/SortEx.py:1.5.4.3	Tue Oct  8 17:45:48 2002
+++ Zope/lib/python/DocumentTemplate/sequence/SortEx.py	Sat Oct 26 15:51:39 2002
@@ -17,9 +17,7 @@
 $Id$
 """
 
-
-TupleType=type(())
-
+from types import TupleType
 
 def sort(sequence, sort=(), _=None, mapping=0):
     """
@@ -108,7 +106,7 @@
                 try:
                     if mapping: k = v[sort]
                     else: k = getattr(v, sort)
-                except AttributeError, KeyError: k = None
+                except (AttributeError, KeyError): k = None
                 if not basic_type(type(k)):
                     try: k = k()
                     except: pass