From: Georg Baum <baum@lyx.org>
Date: Sat, 23 Feb 2013 11:23:29 +0000 (+0100)
Subject: Fix lyx2lyx for layout files with umlauts
X-Git-Tag: 2.1.0beta1~611
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d2d0f1964ddafb1b46448a9e2d59255cf2875283;p=features.git

Fix lyx2lyx for layout files with umlauts

lyx2lyx died with UnicodeDecodeError: 'ascii' codec can't decode byte if a
layout with a non-ASCII character in the file name was used, since the
textclass member of the LyX class was of type str, and not unicode.
---

diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index 9a4763870e..7e0276199b 100644
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -330,6 +330,8 @@ class LyX_base:
         self.initial_version = self.read_version()
 
         # Second pass over header and preamble, now we know the file encoding
+        # Do not forget the textclass (Debian bug #700828)
+        self.textclass = self.textclass.decode(self.encoding)
         for i in range(len(self.header)):
             self.header[i] = self.header[i].decode(self.encoding)
         for i in range(len(self.preamble)):