diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2018-07-11 09:36:09 +0200 |
|---|---|---|
| committer | Christoph Reiter <reiter.christoph@gmail.com> | 2018-07-11 09:36:09 +0200 |
| commit | 4542321c383304807228f204de600aa64944c87e (patch) | |
| tree | a6142d163a5bdfd95a1766c051582386cda1b7ce /giscanner/shlibs.py | |
| parent | 4770c7c9645e6bbc0f19cdf13b989f3c1fc5ae64 (diff) | |
| download | gobject-introspection-4542321c383304807228f204de600aa64944c87e.tar.gz | |
shlibs: Don't depend on Python 3
Diffstat (limited to 'giscanner/shlibs.py')
| -rw-r--r-- | giscanner/shlibs.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py index 32fc5e44..7b7b2d02 100644 --- a/giscanner/shlibs.py +++ b/giscanner/shlibs.py @@ -106,7 +106,9 @@ def _resolve_non_libtool(options, binary, libraries): args.extend(['otool', '-L', binary.args[0]]) else: args.extend(['ldd', binary.args[0]]) - output = subprocess.check_output(args, universal_newlines=True, errors='replace') + output = subprocess.check_output(args) + if isinstance(output, bytes): + output = output.decode("utf-8", "replace") # Use absolute paths on OS X to conform to how libraries are usually # referenced on OS X systems, and file names everywhere else. |