[Python-checkins] r43105 - in python/branches/p3yk/Lib: logging/__init__.py stringold.py

[neal.norwitz]

Author: neal.norwitz
Date: Fri Mar 17 09:28:24 2006
New Revision: 43105

Modified:
   python/branches/p3yk/Lib/logging/__init__.py
   python/branches/p3yk/Lib/stringold.py
Log:
More apply() cleanup

Modified: python/branches/p3yk/Lib/logging/__init__.py
==============================================================================
--- python/branches/p3yk/Lib/logging/__init__.py	(original)
+++ python/branches/p3yk/Lib/logging/__init__.py	Fri Mar 17 09:28:24 2006
@@ -1015,7 +1015,7 @@
         """
         Convenience method for logging an ERROR with exception information.
         """
-        self.error(msg, *args, exc_info=1)
+        self.error(msg, exc_info=1, *args)
 
     def critical(self, msg, *args, **kwargs):
         """
@@ -1292,7 +1292,7 @@
     Log a message with severity 'ERROR' on the root logger,
     with exception information.
     """
-    error(msg, *args, exc_info=1)
+    error(msg, exc_info=1, *args)
 
 def warning(msg, *args, **kwargs):
     """

Modified: python/branches/p3yk/Lib/stringold.py
==============================================================================
--- python/branches/p3yk/Lib/stringold.py	(original)
+++ python/branches/p3yk/Lib/stringold.py	Fri Mar 17 09:28:24 2006
@@ -126,9 +126,6 @@
     return sep.join(words)
 joinfields = join
 
-# for a little bit of speed
-_apply = apply
-
 # Find substring, raise exception if not found
 def index(s, *args):
     """index(s, sub [,start [,end]]) -> int
@@ -136,7 +133,7 @@
     Like find but raises ValueError when the substring is not found.
 
     """
-    return _apply(s.index, args)
+    return s.index(*args)
 
 # Find last substring, raise exception if not found
 def rindex(s, *args):
@@ -145,7 +142,7 @@
     Like rfind but raises ValueError when the substring is not found.
 
     """
-    return _apply(s.rindex, args)
+    return s.rindex(*args)
 
 # Count non-overlapping occurrences of substring
 def count(s, *args):
@@ -156,7 +153,7 @@
     interpreted as in slice notation.
 
     """
-    return _apply(s.count, args)
+    return s.count(*args)
 
 # Find substring, return -1 if not found
 def find(s, *args):
@@ -169,7 +166,7 @@
     Return -1 on failure.
 
     """
-    return _apply(s.find, args)
+    return s.find(*args)
 
 # Find last substring, return -1 if not found
 def rfind(s, *args):
@@ -182,7 +179,7 @@
     Return -1 on failure.
 
     """
-    return _apply(s.rfind, args)
+    return s.rfind(*args)
 
 # for a bit of speed
 _float = float
@@ -224,7 +221,7 @@
     # error message isn't compatible but the error type is, and this function
     # is complicated enough already.
     if type(s) == _StringType:
-        return _apply(_int, args)
+        return _int(*args)
     else:
         raise TypeError('argument 1: expected string, %s found' %
                         type(s).__name__)
@@ -252,7 +249,7 @@
     # error message isn't compatible but the error type is, and this function
     # is complicated enough already.
     if type(s) == _StringType:
-        return _apply(_long, args)
+        return _long(*args)
     else:
         raise TypeError('argument 1: expected string, %s found' %
                         type(s).__name__)