diff options
| author | Damien Grassart <damien@grassart.com> | 2015-10-17 20:39:12 +0200 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2015-10-19 17:59:30 -0400 |
| commit | 5341da3520ef513e5a7c49e2d8737bb3f2341a3d (patch) | |
| tree | 7dd0053b9bd38c982cbce4b01891cf5af93dee3f /giscanner/ccompiler.py | |
| parent | cb956f565785835a6621ca8b89634fe58f59feaf (diff) | |
| download | gobject-introspection-5341da3520ef513e5a7c49e2d8737bb3f2341a3d.tar.gz | |
giscanner: Fix python2/3 compatibility
This allows building in both Python 2 and 3 by fixing a few
text/binary ambiguities and using "as" in an except clause.
https://bugzilla.gnome.org/show_bug.cgi?id=756763
Diffstat (limited to 'giscanner/ccompiler.py')
| -rw-r--r-- | giscanner/ccompiler.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py index 2f02bfc1..224c3e5d 100644 --- a/giscanner/ccompiler.py +++ b/giscanner/ccompiler.py @@ -235,8 +235,8 @@ class CCompiler(object): macros=macros, include_dirs=includes, extra_postargs=extra_postargs, - output_dir=source_str[tmpdir_idx + 1: - source_str.rfind(os.sep)].encode('UTF-8')) + output_dir=str(source_str[tmpdir_idx + 1: + source_str.rfind(os.sep)])) def link(self, output, objects, lib_args): # Note: This is used for non-libtool builds only! |