diff options
| author | Arthur de Jong <arthur@arthurdejong.org> | 2011-08-19 10:22:13 +0200 |
|---|---|---|
| committer | Arthur de Jong <arthur@arthurdejong.org> | 2011-08-19 10:22:13 +0200 |
| commit | 881e8a6a2429b43180e1ece0148077bdb77c59d5 (patch) | |
| tree | a68cb2dc12bd38f3d73528b9bb7ec705b5fe2093 /stdnum/iban.py | |
| parent | 8dbcedd38baa7b04ae66fd4c1908b8eb2dddc613 (diff) | |
make source code layout follow PEP8 more
git-svn-id: http://arthurdejong.org/svn/python-stdnum/python-stdnum@76 9dea7c4f-944c-4273-ac1a-574ede026edc
Diffstat (limited to 'stdnum/iban.py')
| -rw-r--r-- | stdnum/iban.py | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/stdnum/iban.py b/stdnum/iban.py index 3edddf1..ac7ec35 100644 --- a/stdnum/iban.py +++ b/stdnum/iban.py @@ -39,12 +39,18 @@ import re # our open copy of the IBAN database _ibandb = numdb.get('iban') +# the valid characters we have +_alphabet = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ' + +# regular expression to check IBAN structure +_struct_re = re.compile('([1-9][0-9]*)!([nac])') + + def compact(number): """Convert the iban number to the minimal representation. This strips the number of any valid separators and removes surrounding whitespace.""" - return number.replace(' ','').replace('-','').strip().upper() + return number.replace(' ', '').replace('-', '').strip().upper() -_alphabet = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ' def _convert(number): """Prepare the number to it's base10 representation (also moving the @@ -53,8 +59,6 @@ def _convert(number): # TODO: find out whether this should be in the mod_97_10 module return ''.join(str(_alphabet.index(x)) for x in number[4:] + number[:4]) -# regular expression to check IBAN structure -_struct_re = re.compile('([1-9][0-9]*)!([nac])') def _matches_structure(number, structure): """Check the supplied number against the supplied structure.""" @@ -66,11 +70,12 @@ def _matches_structure(number, structure): elif code == 'a' and not number[start:start + length].isalpha(): return False elif code == 'c' and not number[start:start + length].isalnum(): - return False # should not happen due to checksum check + return False # should not happen due to checksum check start += length # the whole number should be parsed now return start == len(number) + def is_valid(number): """Checks to see if the number provided is a valid IBAN.""" try: @@ -85,7 +90,8 @@ def is_valid(number): # check if the number has the correct structure return _matches_structure(number[4:], info[0][1].get('bban', '')) + def format(number, separator=' '): """Reformat the passed number to the space-separated format.""" number = compact(number) - return separator.join(number[i:i+4] for i in range(0,len(number),4)) + return separator.join(number[i:i + 4] for i in range(0, len(number), 4)) |