Mercurial > babel > mirror
changeset 488:580528227e55 stable-0.9.x
Merged revisions 458 via svnmerge from
http://svn.edgewall.org/repos/babel/trunk
........
r458 | aronacher | 2008-10-31 17:13:59 +0100 (vr, 31 okt 2008) | 3 lines
Removed `ValueError` raising for string formatting message checkers if the string does not contain any string formattings. The new behavior is undefined. This fixes at least one of the problems of the #150 ticket.
........
| author | jruigrok |
|---|---|
| date | Sun, 11 Apr 2010 09:10:49 +0000 |
| parents | 9020d6780181 |
| children | 73bd9ed0a362 |
| files | ChangeLog babel/messages/checkers.py |
| diffstat | 2 files changed, 4 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,8 @@ * Add a __ne__() method to the Local class. * Explicitly sort instead of using sorted() and don't assume ordering (Python 2.3 and Jython compatibility). + * Removed ValueError raising for string formatting message checkers if the + string does not contain any string formattings (ticket #150). Version 0.9.5
--- a/babel/messages/checkers.py +++ b/babel/messages/checkers.py @@ -69,7 +69,8 @@ arguments are not interchangeable as `alternative` may contain less placeholders if `format` uses named placeholders. - If `format` does not use string formatting a `ValueError` is raised. + The behavior of this function is undefined if the string does not use + string formattings. If the string formatting of `alternative` is compatible to `format` the function returns `None`, otherwise a `TranslationError` is raised. @@ -125,13 +126,6 @@ a, b = map(_parse, (format, alternative)) - # if a does not use string formattings, we are dealing with invalid - # input data. This function only works if the first string provided - # does contain string format chars - if not a: - raise ValueError('original string provided does not use string ' - 'formatting.') - # now check if both strings are positional or named a_positional, b_positional = map(_check_positional, (a, b)) if a_positional and not b_positional and not b: