mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

* profile.py, pdb.py: added help() function

Browse source 
* builtin.py: b/w compat for builtin -> __builtin__ name change
* string.py: added atof() and atol() and corresponding exceptions
* test_types.py: added test for list sort with  user comparison function
This commit is contained in:
Guido van Rossum 1993-10-22 13:56:35 +00:00
parent 3bb8a05947
commit e61fa0a1e4
5 changed files with 93 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Lib/string.py
View file

@ -116,8 +116,26 @@ def find(*args):
except index_error:
return -1
# Convert string to float
atof_error = 'non-float argument to string.atof'
def atof(str):
import regex
sign = ''
s = str
if s and s[0] in '+-':
sign = s[0]
s = s[1:]
if not s: raise atof_error, str
while s[0] == '0' and len(s) > 1 and s[1] in digits: s = s[1:]
if regex.match('[0-9]*\(\.[0-9]*\)?\([eE][-+]?[0-9]+\)?', s) != len(s):
raise atof_error, str
try:
return eval(sign + s)
except SyntaxError:
raise atof_error, str
# Convert string to integer
atoi_error = 'non-numeric argument to string.atoi'
atoi_error = 'non-integer argument to string.atoi'
def atoi(str):
sign = ''
s = str
@ -130,6 +148,20 @@ def atoi(str):
if c not in digits: raise atoi_error, str
return eval(sign + s)
# Convert string to long integer
atol_error = 'non-integer argument to string.atol'
def atol(str):
sign = ''
s = str
if s and s[0] in '+-':
sign = s[0]
s = s[1:]
if not s: raise atoi_error, str
while s[0] == '0' and len(s) > 1: s = s[1:]
for c in s:
if c not in digits: raise atoi_error, str
return eval(sign + s + 'L')
# Left-justify a string
def ljust(s, width):
n = width - len(s)