Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace conv_to_unicode_direct with str

Browse Source
This commit is contained in:
Nick Hall
2015-03-14 21:49:45 +00:00
parent 63ffd83021
commit 6d047c946c
7 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gramps/cli/plug/__init__.py
View File

@@ -59,7 +59,7 @@ from gramps.gen.plug.report import (CATEGORY_TEXT, CATEGORY_DRAW, CATEGORY_BOOK,
from gramps.gen.plug.report._paper import paper_sizes
from gramps.gen.const import USER_HOME
from gramps.gen.dbstate import DbState
from gramps.gen.constfunc import STRTYPE, conv_to_unicode_direct
from gramps.gen.constfunc import STRTYPE
from ..grampscli import CLIManager
from ..user import User
from gramps.gen.const import GRAMPS_LOCALE as glocale
@@ -81,9 +81,9 @@ def _convert_str_to_match_type(str_val, type_val):
if ( str_val.startswith("'") and str_val.endswith("'") ) or \
( str_val.startswith('"') and str_val.endswith('"') ):
# Remove enclosing quotes
return conv_to_unicode_direct(str_val[1:-1])
return str(str_val[1:-1])
else:
return conv_to_unicode_direct(str_val)
return str(str_val)
elif ret_type == int:
if str_val.isdigit():