diff options
| author | Patrick Williams <patrick@stwcx.xyz> | 2016-10-17 11:40:13 -0500 |
|---|---|---|
| committer | Patrick Williams <patrick@stwcx.xyz> | 2016-10-20 16:17:34 -0500 |
| commit | affeafada185ed1a1498d0d08d9a2baa4c69141c (patch) | |
| tree | 82447c47ad66644421b739d61166d1e1b47863e0 /tools | |
| parent | 831839ad872a5b4ebc4dcb0412e18b96719a1929 (diff) | |
| download | sdbusplus-affeafada185ed1a1498d0d08d9a2baa4c69141c.tar.gz sdbusplus-affeafada185ed1a1498d0d08d9a2baa4c69141c.zip | |
sdbus++: work around unicode support in python2
unicode strings in python2 do not have certain functions, such
as 'rstrip'. Send an option to Mako for python2 to ensure
unicode support is disabled.
Change-Id: Ia85581b5a091eec10e9999f30425a40e02de2ffc
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/sdbus++ | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/sdbus++ b/tools/sdbus++ index 6051046..01922c9 100755 --- a/tools/sdbus++ +++ b/tools/sdbus++ @@ -2,6 +2,7 @@ import sdbusplus import mako.lookup import argparse +import sys def main(): valid_types = { 'interface': sdbusplus.Interface } @@ -26,7 +27,11 @@ def main(): args = parser.parse_args(); - lookup = mako.lookup.TemplateLookup(directories=[args.templatedir]) + if sys.version_info < (3,0): + lookup = mako.lookup.TemplateLookup(directories=[args.templatedir], + disable_unicode=True) + else: + lookup = mako.lookup.TemplateLookup(directories=[args.templatedir]) instance = valid_types[args.typeName].load(args.item, args.rootdir) function = getattr(instance, valid_processes[args.process]) |
