* 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
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 @@
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 @@
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'