From 1f825771b5691fb8319cdb1a4f97b7d02613cb83 Mon Sep 17 00:00:00 2001 From: Benny Malengier Date: Sat, 12 Jan 2013 14:48:37 +0000 Subject: [PATCH] 6321: installed rcs and tried to make an archive svn: r21082 --- gramps/gui/dbman.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gramps/gui/dbman.py b/gramps/gui/dbman.py index d6d44bfb2..68d4af4af 100644 --- a/gramps/gui/dbman.py +++ b/gramps/gui/dbman.py @@ -50,7 +50,7 @@ else: import logging LOG = logging.getLogger(".DbManager") -from gramps.gen.constfunc import win +from gramps.gen.constfunc import win, UNITYPE if win(): _RCS_FOUND = os.system("rcs -V >nul 2>nul") == 0 if _RCS_FOUND and "TZ" not in os.environ: @@ -798,6 +798,9 @@ def find_revisions(name): get_next = False if os.path.isfile(name): for line in proc.stdout: + if sys.version_info[0] >= 3 and not isinstance(line, UNITYPE): + # we assume utf-8 ... + line = line.decode('utf-8') match = rev.match(line) if match: rev_str = copy.copy(match.groups()[0])