The branch, 2.0.x, has been updated. - Log -----------------------------------------------------------------
commit 2a7971eb6e96a6593ad66fd5481d88b7ecbceb46 Author: Georg Baum <[email protected]> Date: Sat Feb 23 14:56:53 2013 +0100 status for last commit diff --git a/status.20x b/status.20x index d00dbe3..6a7489c 100644 --- a/status.20x +++ b/status.20x @@ -110,6 +110,8 @@ What's new - Do not convert --- and -- to entities when outputting listings to XHTML (bug 8561). +- Fix lyx2lyx bug with non-ASCII layout file names (Debian bug 700828). + * USER INTERFACE commit a53dd33474f51645b5c692751fc036d4a7a03dcd Author: Georg Baum <[email protected]> Date: Sat Feb 23 12:23:29 2013 +0100 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 878017d..4174b5f 100644 --- a/lib/lyx2lyx/LyX.py +++ b/lib/lyx2lyx/LyX.py @@ -324,6 +324,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)): ----------------------------------------------------------------------- Summary of changes: lib/lyx2lyx/LyX.py | 2 ++ status.20x | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) hooks/post-receive -- The LyX Source Repository
