diff options
| author | Guido van Rossum <guido@python.org> | 1993-05-24 14:16:22 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1993-05-24 14:16:22 (GMT) |
| commit | d316607732aa70361d5793f6b301b70fab7ca367 (patch) | |
| tree | d87376c3075042ebffdbf8bb13416f8055a5fd13 /Lib/string.py | |
| parent | b3f7258f14cb2f3e52236a4087ed82541a173e7b (diff) | |
| download | cpython-d316607732aa70361d5793f6b301b70fab7ca367.zip cpython-d316607732aa70361d5793f6b301b70fab7ca367.tar.gz cpython-d316607732aa70361d5793f6b301b70fab7ca367.tar.bz2 | |
* ftplib.py: added abort() command (sends oob data).
* Several modules: change "class C(): ..." to "class C: ...".
* flp.py: support for frozen forms.
* Added string.find() which is like index but returns -1 if not found
Diffstat (limited to 'Lib/string.py')
| -rw-r--r-- | Lib/string.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Lib/string.py b/Lib/string.py index e5dc194..8c7d102 100644 --- a/Lib/string.py +++ b/Lib/string.py @@ -93,7 +93,7 @@ def joinfields(words, sep): res = res + (sep + w) return res[len(sep):] -# Find substring +# Find substring, raise exception if not found index_error = 'substring not found in string.index' def index(s, sub, *args): if args: @@ -107,7 +107,14 @@ def index(s, sub, *args): while i < m: if sub == s[i:i+n]: return i i = i+1 - raise index_error, (s, sub) + raise index_error, (s, sub) + args + +# Find substring, return -1 if not found +def find(*args): + try: + return apply(index, args) + except index_error: + return -1 # Convert string to integer atoi_error = 'non-numeric argument to string.atoi' |