Mercurial > babel > old > mirror
changeset 487:d725fd333f61 stable
Merged revisions 482 via svnmerge from
http://svn.edgewall.org/repos/babel/trunk
........
r482 | pjenvey | 2009-09-25 22:29:11 +0200 (vr, 25 sep 2009) | 2 lines
remove sorted and don't assume dict ordering (Python 2.3 & Jython compat)
........
author | jruigrok |
---|---|
date | Sun, 11 Apr 2010 09:01:02 +0000 |
parents | 5db33ef166d3 |
children | f39489017da8 |
files | 0.9.x/ChangeLog 0.9.x/babel/localedata.py 0.9.x/babel/messages/frontend.py |
diffstat | 3 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/0.9.x/ChangeLog +++ b/0.9.x/ChangeLog @@ -16,6 +16,8 @@ * Fixed negative offset handling of Catalog._set_mime_headers (ticket #165). * Add --project and --version options for commandline (ticket #173). * 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). Version 0.9.5
--- a/0.9.x/babel/localedata.py +++ b/0.9.x/babel/localedata.py @@ -120,8 +120,8 @@ >>> d = {1: 'foo', 3: 'baz'} >>> merge(d, {1: 'Foo', 2: 'Bar'}) - >>> d - {1: 'Foo', 2: 'Bar', 3: 'baz'} + >>> items = d.items(); items.sort(); items + [(1, 'Foo'), (2, 'Bar'), (3, 'baz')] :param dict1: the dictionary to merge into :param dict2: the dictionary containing the data that should be merged
--- a/0.9.x/babel/messages/frontend.py +++ b/0.9.x/babel/messages/frontend.py @@ -638,8 +638,9 @@ if options.list_locales: identifiers = localedata.list() longest = max([len(identifier) for identifier in identifiers]) + identifiers.sort() format = u'%%-%ds %%s' % (longest + 1) - for identifier in sorted(localedata.list()): + for identifier in identifiers: locale = Locale.parse(identifier) output = format % (identifier, locale.english_name) print output.encode(sys.stdout.encoding or