Mercurial > babel > old > mirror

diff babel/messages/pofile.py @ 416:f03cc3bed4e1
fix Python 2.3 compat: rearrange set/itemgetter/rsplit/sorted/unicode.decode usage. still has a few, unimportant failing tests
author: pjenvey
date: Wed, 08 Oct 2008 22:42:55 +0000
parents: d1a9c618d2d5
children: 322b257aeb3c
--- a/babel/messages/pofile.py
+++ b/babel/messages/pofile.py
@@ -21,14 +21,10 @@
 from datetime import date, datetime
 import os
 import re
-try:
-    set
-except NameError:
-    from sets import Set as set
 
 from babel import __version__ as VERSION
 from babel.messages.catalog import Catalog, Message
-from babel.util import wraptext, LOCALTZ
+from babel.util import set, wraptext, LOCALTZ
 
 __all__ = ['read_po', 'write_po']
 __docformat__ = 'restructuredtext en'
@@ -207,7 +203,9 @@
                 context.append(line.rstrip())
 
     for lineno, line in enumerate(fileobj.readlines()):
-        line = line.strip().decode(catalog.charset)
+        line = line.strip()
+        if not isinstance(line, unicode):
+            line = line.decode(catalog.charset)
         if line.startswith('#'):
             in_msgid[0] = in_msgstr[0] = False
             if messages and translations: