[gedit-latex] Fix py2->3 encoding issues

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 273a455755453fb298eed37f1c4f608e849b7ced
Author: Aleksei Lissitsin <aldgracil gmail com>
Date:   Tue Apr 30 23:17:33 2013 +0300

    Fix py2->3 encoding issues

 latex/editor.py            |    2 +-
 latex/latex/cache.py       |    5 +----
 latex/latex/model.py       |    2 +-
 latex/preferences/tools.py |    2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/latex/editor.py b/latex/editor.py
index c126ab5..4f7cbe0 100644
--- a/latex/editor.py
+++ b/latex/editor.py
@@ -303,7 +303,7 @@ class Editor(object):
         """
         end_iter = self._text_buffer.get_iter_at_mark(self._text_buffer.get_insert())
         return self._text_buffer.get_text(self._text_buffer.get_start_iter(),
-                                    end_iter, False).decode(self.charset)
+                                    end_iter, False)
 
     def insert(self, source):
         """
diff --git a/latex/latex/cache.py b/latex/latex/cache.py
index 47faabe..fdd5ae2 100644
--- a/latex/latex/cache.py
+++ b/latex/latex/cache.py
@@ -102,7 +102,7 @@ class LaTeXDocumentCache(object):
 
             # read file
             try:
-                f = open(self.__file.path, "r")
+                f = open(self.__file.path, "r", encoding=self.__charset)
                 try:
                     content = f.read()
                 finally:
@@ -110,9 +110,6 @@ class LaTeXDocumentCache(object):
             except IOError:
                 return
 
-            if self.__charset is not None:
-                content = content.decode(self.__charset)
-
             # parse
             self.__document = self.__parser.parse(content, self.__file, self.__issue_handler)
 
diff --git a/latex/latex/model.py b/latex/latex/model.py
index 2c85190..22948a3 100644
--- a/latex/latex/model.py
+++ b/latex/latex/model.py
@@ -317,7 +317,7 @@ class LanguageModelFactory(object):
                 LOG.debug("Pickled object and XML file have different modification times")
             else:
                 try:
-                    obj = pickle.load(open(pkl_file.path))
+                    obj = pickle.load(open(pkl_file.path, "rb"))
                     if obj.VERSION == LANGUAGE_MODEL_VERSION:
                         return obj
                     else:
diff --git a/latex/preferences/tools.py b/latex/preferences/tools.py
index f50b819..33ff3b4 100644
--- a/latex/preferences/tools.py
+++ b/latex/preferences/tools.py
@@ -135,7 +135,7 @@ class ToolPreferences(GObject.GObject):
             tool_element = ElementTree.SubElement(self.__tools, "tool")
             tool_element.set("id", id)
         
-        tool_element.set("label", tool.label.decode('utf-8'))
+        tool_element.set("label", tool.label)
         tool_element.set("description", tool.description)
         tool_element.set("extensions", " ".join(tool.extensions))
         if tool.accelerator is None: