From a1591a964c3a2f4d12f133a7bd31ecc28ef40918 Mon Sep 17 00:00:00 2001
From: Benny Malengier <benny.malengier@gramps-project.org>
Date: Fri, 23 Nov 2012 17:22:00 +0000
Subject: [PATCH] python 3 support, avoid use of unicode

svn: r20699
---
 gramps/gen/plug/_options.py |  7 ++++---
 gramps/gen/utils/trans.py   | 10 ++++++----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/gramps/gen/plug/_options.py b/gramps/gen/plug/_options.py
index 770cc01bd..a9b8fadf8 100644
--- a/gramps/gen/plug/_options.py
+++ b/gramps/gen/plug/_options.py
@@ -53,6 +53,7 @@ except:
 # gramps modules
 #
 #-------------------------------------------------------------------------
+from ..constfunc import cuni
 from ..utils.cast import get_type_converter
 from .menu import Menu
 from ..plug import BasePluginManager
@@ -224,12 +225,12 @@ class OptionListCollection(object):
                             f.write('    <listitem '
                                     'number="%d" value=%s/>\n' % (
                                         list_index,
-                                        quoteattr(unicode(list_data))) )
+                                        quoteattr(cuni(list_data))) )
                         f.write('  </option>\n')
                 else:
                      f.write('  <option name=%s value=%s/>\n' % (
                              quoteattr(option_name),
-                             quoteattr(unicode(option_data))) )
+                             quoteattr(cuni(option_data))) )
             for docgen_name in self.docgen_names:
                 if module_docgen_opts[docgen_name]:
                     for ix, data in enumerate(module_docgen_opts[docgen_name]):
@@ -237,7 +238,7 @@ class OptionListCollection(object):
                                 'name=%s value=%s/>\n' %
                                     (quoteattr(docgen_name),
                                      quoteattr(data[0]),
-                                     quoteattr(unicode(data[1])) ))
+                                     quoteattr(cuni(data[1])) ))
             self.write_module_common(f, option_list)
 
             f.write('</module>\n')
diff --git a/gramps/gen/utils/trans.py b/gramps/gen/utils/trans.py
index 17948cb28..9f0aa39a5 100644
--- a/gramps/gen/utils/trans.py
+++ b/gramps/gen/utils/trans.py
@@ -42,7 +42,7 @@ import logging
 #
 #-------------------------------------------------------------------------
 from ..const import PREFIXDIR, ROOT_DIR
-from ..constfunc import mac
+from ..constfunc import mac, UNITYPE
 #-------------------------------------------------------------------------
 #
 # Public Constants
@@ -267,15 +267,17 @@ def get_addon_translator(filename=None, domain="addon", languages=None):
     path = os.path.dirname(os.path.abspath(filename))
     # Check if path is of type str. Do import and conversion if so.
     # The import cannot be done at the top as that will conflict with the translation system.
-    if type(path) == str:
+    if not isinstance(path, UNITYPE) == str:
         from .file import get_unicode_path_from_env_var
         path = get_unicode_path_from_env_var(path)
     if languages:
-        addon_translator = gettext.translation(domain, os.path.join(path,"locale"),
+        addon_translator = gettext.translation(domain,
+                                               os.path.join(path, "locale"),
                                                languages=languages,
                                                fallback=True)
     else:
-        addon_translator = gettext.translation(domain, os.path.join(path,"locale"),
+        addon_translator = gettext.translation(domain,
+                                               os.path.join(path, "locale"),
                                                fallback=True)
     gramps_translator.add_fallback(addon_translator)
     return gramps_translator # with a language fallback