Skip to content

Commit

Permalink
handle utf-8 in function help
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed Sep 17, 2018
1 parent 239e93d commit d37a799
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions scripts/process_function_template.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# -*- coding: utf-8 -*-

import sys
import os
import json
Expand All @@ -8,9 +10,7 @@
os.path.dirname(os.path.realpath(__file__)),
'../python/ext-libs'))

from six import string_types

cpp = open(sys.argv[1], "w")
cpp = open(sys.argv[1], "w", encoding="utf-8")
cpp.write(
"#include \"qgsexpression.h\"\n"
"\n"
Expand All @@ -31,7 +31,7 @@ def quote(v):
elif isinstance(v, list):
return map(quote, v)

elif isinstance(v, string_types):
elif isinstance(v, str):
return v.replace('"', '\\"').replace('\n', '\\n')

elif isinstance(v, bool):
Expand All @@ -42,7 +42,7 @@ def quote(v):


for f in sorted(glob.glob('resources/function_help/json/*')):
with open(f) as function_file:
with open(f, encoding="utf-8") as function_file:
try:
json_params = json.load(function_file)
except:
Expand Down Expand Up @@ -103,7 +103,7 @@ def quote(v):

if 'examples' in v:
for e in v['examples']:
cpp.write("\n << HelpExample( tr( \"{0}\" ), tr( \"{1}\" ), tr( \"{2}\") )".format(
cpp.write("\n << HelpExample( tr( \"{0}\" ), tr( \"{1}\" ), tr( \"{2}\" ) )".format(
e['expression'],
e['returns'],
e.get('note', ''))
Expand Down

0 comments on commit d37a799

Please sign in to comment.