Mercurial > cpython-lru_cache-weakref
diff Lib/string.py @ 1086:db817f3a1c65 legacy-trunk
* change default line numbers for 'list' in pdb.py
* changed eval() into getattr() in cmd.py
* added dirname(), basename() and (dummy) normath() to macpath.py
* renamed nntp.py to nntplib.py
* Made string.index() compatible with strop.index()
* Make string.atoi('') raise string.atoi_error rather than ValueError
* Added dirname() and normpath() to posixpath.
| author | Guido van Rossum <guido@python.org> |
|---|---|
| date | Thu, 05 Nov 1992 10:43:02 +0000 |
| parents | 245003c006a6 |
| children | ac0828ef68f2 |
line wrap: on
line diff
--- a/Lib/string.py Wed Nov 04 15:51:30 1992 +0000 +++ b/Lib/string.py Thu Nov 05 10:43:02 1992 +0000 @@ -96,10 +96,18 @@ # Find substring index_error = 'substring not found in string.index' -def index(s, sub): +def index(s, sub, *args): + if args: + if len(args) > 1: + raise TypeError, 'string.index(): too many args' + i = args[0] + else: + i = 0 n = len(sub) - for i in range(len(s) + 1 - n): + m = len(s) + 1 - n + while i < m: if sub == s[i:i+n]: return i + i = i+1 raise index_error, (s, sub) # Convert string to integer @@ -107,7 +115,7 @@ def atoi(str): sign = '' s = str - if s[:1] in '+-': + if s and s[0] in '+-': sign = s[0] s = s[1:] if not s: raise atoi_error, str