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

Andreas Jung andreas@digicool.com
Thu, 7 Feb 2002 12:47:43 -0500


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

Modified Files:
	SortEx.py 
Log Message:
replace string module calls by string methods


=== Zope/lib/python/DocumentTemplate/sequence/SortEx.py 1.3 => 1.4 ===
 """
 
-from string import lower
+
 TupleType=type(())
 
 
@@ -132,14 +132,14 @@
             type(None) : 1 }.has_key
 
 def nocase(str1, str2):
-    return cmp(lower(str1), lower(str2))
+    return cmp(str1.lower(), str2.lower())
 
 import sys
 if sys.modules.has_key("locale"): # only if locale is already imported
     from locale import strcoll
 
     def strcoll_nocase(str1, str2):
-        return strcoll(lower(str1), lower(str2))
+        return strcoll(str1.lower(), str2.lower())
 
 
 def make_sortfunctions(sortfields, _):
@@ -175,7 +175,7 @@
         else: # no - look it up in the namespace
             func = _.getitem(f_name, 0)
 
-        sort_order = lower(f[2])
+        sort_order = f[2].lower()
 
         if sort_order == "asc":
             multiplier = +1