X-Git-Url: https://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=ljdump.py;fp=ljdump.py;h=6a7e3a2655ff67d88814066c10332d17ef36c788;hb=77d6008254c6ef87f8189294cbaa6ce332e6ab77;hp=a6d7db39ec0bc166639d87b8324ccc393332e9b7;hpb=e3eb2f016aafa2f5a9540d45a6d08f29aa96e43a;p=oss%2Fljdump.git

diff --git a/ljdump.py b/ljdump.py
index a6d7db3..6a7e3a2 100755
--- a/ljdump.py
+++ b/ljdump.py
@@ -74,7 +74,11 @@ def dumpelement(f, name, e):
         if isinstance(e[k], {}.__class__):
             dumpelement(f, k, e[k])
         else:
-            s = unicode(str(e[k]), "UTF-8")
+            try:
+                s = unicode(str(e[k]), "UTF-8")
+            except UnicodeDecodeError:
+                # fall back to Latin-1 for old entries that aren't UTF-8
+                s = unicode(str(e[k]), "cp1252")
             f.write("<%s>%s</%s>\n" % (k, saxutils.escape(s), k))
     f.write("</%s>\n" % name)