diff options
| author | Guido van Rossum <guido@python.org> | 1997-10-24 14:46:16 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1997-10-24 14:46:16 (GMT) |
| commit | 31626bce66635ee3f3950730eee20d096ddb3bde (patch) | |
| tree | 2b628469731b944b67fdd09b64138b21968ea929 /Lib/fpformat.py | |
| parent | f81e5b9c780e47c8a312a69a7ff71169276a9720 (diff) | |
| download | cpython-31626bce66635ee3f3950730eee20d096ddb3bde.zip cpython-31626bce66635ee3f3950730eee20d096ddb3bde.tar.gz cpython-31626bce66635ee3f3950730eee20d096ddb3bde.tar.bz2 | |
re -> regex conversions by Sjoerd.
Diffstat (limited to 'Lib/fpformat.py')
| -rw-r--r-- | Lib/fpformat.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Lib/fpformat.py b/Lib/fpformat.py index 404738d..8ddd73c 100644 --- a/Lib/fpformat.py +++ b/Lib/fpformat.py @@ -14,13 +14,12 @@ import re # Compiled regular expression to "decode" a number -decoder = re.compile( \ - '^([-+]?)0*([0-9]*)((\.[0-9]*)?)(([eE][-+]?[0-9]+)?)$') +decoder = re.compile(r'^([-+]?)0*(\d*)((?:\.\d*)?)(([eE][-+]?\d+)?)$') # \0 the whole thing # \1 leading sign or empty # \2 digits left of decimal point # \3 fraction (empty or begins with point) -# \5 exponent part (empty or begins with 'e' or 'E') +# \4 exponent part (empty or begins with 'e' or 'E') NotANumber = 'fpformat.NotANumber' @@ -30,9 +29,9 @@ NotANumber = 'fpformat.NotANumber' # fraction is 0 or more digits # expo is an integer def extract(s): - m = decoder.match(s) - if not m: raise NotANumber - sign, intpart, fraction, exppart = m.group(1, 2, 3, 5) + res = decoder.match(s) + if res is None: raise NotANumber + sign, intpart, fraction, exppart = res.group(1,2,3,4) if sign == '+': sign = '' if fraction: fraction = fraction[1:] if exppart: expo = eval(exppart[1:]) @@ -135,3 +134,4 @@ def test(): print x, fix(x, digs), sci(x, digs) except (EOFError, KeyboardInterrupt): pass + |