diff options
| -rw-r--r-- | Lib/logging/__init__.py | 4 | ||||
| -rw-r--r-- | Lib/stringold.py | 17 |
2 files changed, 9 insertions, 12 deletions
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py index 862f7ca..4b2f8a6 100644 --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -1015,7 +1015,7 @@ class Logger(Filterer): """ 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 @@ def exception(msg, *args): 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): """ diff --git a/Lib/stringold.py b/Lib/stringold.py index 213a04c..69656be 100644 --- a/Lib/stringold.py +++ b/Lib/stringold.py @@ -126,9 +126,6 @@ def join(words, sep = ' '): 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 @@ def index(s, *args): 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 @@ def rindex(s, *args): 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 @@ def count(s, *args): 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 @@ def find(s, *args): 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 @@ def rfind(s, *args): Return -1 on failure. """ - return _apply(s.rfind, args) + return s.rfind(*args) # for a bit of speed _float = float @@ -224,7 +221,7 @@ def atoi(*args): # 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 @@ def atol(*args): # 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__) |