Mercurial > babel > old > babel-test

diff babel/messages/pofile.py @ 507:b29ff192b610 stable-0.9.x
Python 2.3 compatibility: backporting r456 and r457 to 0.9 branch (see #233)
author: fschwarz
date: Fri, 04 Mar 2011 13:14:03 +0000
parents: 2c6f5e610e86
--- 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'
@@ -195,7 +191,9 @@
                 translations[-1][1] += u'\n' + 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: