From f14b5d89449da9ce63dbe904e0ac6c2abd48a8ca Mon Sep 17 00:00:00 2001 From: John Ralls Date: Sun, 6 Jan 2013 20:40:46 +0000 Subject: [PATCH] Fix up mactrans.py for python3 svn: r21010 --- gramps/gen/utils/mactrans.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gramps/gen/utils/mactrans.py b/gramps/gen/utils/mactrans.py index da9fa77fc..ffaf3c1a0 100644 --- a/gramps/gen/utils/mactrans.py +++ b/gramps/gen/utils/mactrans.py @@ -71,7 +71,7 @@ locale, leaving $LANGUAGE unset (which is the same as setting it to """ -import os, subprocess +import sys, os, subprocess def get_available_translations(dir, domain): """ @@ -108,18 +108,21 @@ def mac_setup_localization(dir, domain): languages = subprocess.Popen( [defaults, "read", "-app", "Gramps", "AppleLanguages"], stderr=open("/dev/null"), - stdout=subprocess.PIPE).communicate()[0].strip("()\n").split(",\n") + stdout=subprocess.PIPE).communicate()[0] + if not sys.version_info[0] < 3: + languages = languages.decode("utf-8") + languages = languages.strip("()\n").split(",\n") except OSError: pass if len(languages) == 0 or (len(languages) == 1 and languages[0] == ""): -# try: languages = subprocess.Popen( [defaults, "read", "-g", "AppleLanguages"], stderr=open("/dev/null"), - stdout=subprocess.PIPE).communicate()[0].strip("()\n").split(",\n") -# except OSError: -# pass + stdout=subprocess.PIPE).communicate()[0] + if not sys.version_info[0] < 3: + languages = languages.decode("utf-8") + languages = languages.strip("()\n").split(",\n") usable = [] for lang in languages: lang = lang.strip().strip('"').replace("-", "_", 1) @@ -157,7 +160,7 @@ def mac_setup_localization(dir, domain): except OSError: return (locale, calendar, currency) - div = default_locale.split("@") + div = default_locale.split(b"@") locale = div[0] if len(div) > 1: div = div[1].split(";")