changeset 270:23e60ca937ca stable-0.9.x

Merged [295:296] via svnmerge from [source:trunk].
author cmlenz
date Wed, 22 Aug 2007 11:38:02 +0000
parents 2c68c69c83dc
children 726791865a5e
files babel/messages/frontend.py doc/messages.txt
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/babel/messages/frontend.py
+++ b/babel/messages/frontend.py
@@ -631,7 +631,8 @@
             format = u'%%-%ds %%s' % (longest + 1)
             for identifier in localedata.list():
                 locale = Locale.parse(identifier)
-                print format % (identifier, locale.english_name)
+                output = format % (identifier, locale.english_name)
+                print output.encode(sys.stdout.encoding or 'ascii', 'replace')
             return 0
 
         if not args:
--- a/doc/messages.txt
+++ b/doc/messages.txt
@@ -175,8 +175,8 @@
 The ``python`` extractor is by default mapped to the glob pattern ``**.py``,
 meaning it'll be applied to all files with the ``.py`` extension in any 
 directory. If you specify your own mapping configuration, this default mapping
-is not discarded, so you need to explicitly add it to your mapping (as shown in
-the example above.)
+is discarded, so you need to explicitly add it to your mapping (as shown in the
+example above.)
 
 
 .. _`referencing extraction methods`:
Copyright (C) 2012-2017 Edgewall Software