From cfc82382a140b375471a822883b9f1649ce1663e Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Mon, 12 Aug 2013 10:33:07 +0200
Subject: [PATCH] [python3] Fix remaining portability issues
---
setup.py | 2 +-
xbob/extension/__init__.py | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index 88b9f86..8aaffb4 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ from setuptools import setup, find_packages
setup(
name="xbob.extension",
- version="0.2.0",
+ version="0.2.1",
description="Helps projects building Python/C++ extensions for Bob",
license="GPLv3",
author='Andre Anjos',
diff --git a/xbob/extension/__init__.py b/xbob/extension/__init__.py
index 8b22049..d03bcb8 100644
--- a/xbob/extension/__init__.py
+++ b/xbob/extension/__init__.py
@@ -40,6 +40,8 @@ def pkgconfig(package):
stderr=subprocess.STDOUT)
output = proc.communicate()[0]
+ if isinstance(output, bytes) and not isinstance(output, str):
+ output = output.decode('utf8')
if proc.returncode != 0:
raise RuntimeError("PkgConfig did not find package %s. Output:\n%s" % \
@@ -64,6 +66,8 @@ def pkgconfig(package):
stderr=subprocess.STDOUT)
output = proc.communicate()[0]
+ if isinstance(output, bytes) and not isinstance(output, str):
+ output = output.decode('utf8')
if proc.returncode != 0:
raise RuntimeError("PkgConfig did not find package %s. Output:\n%s" % \
@@ -191,6 +195,8 @@ class Extension(ExtensionBase):
# Make sure the language is correctly set to C++
kwargs['language'] = 'c++'
+ import ipdb; ipdb.set_trace()
+
# Run the constructor for the base class
ExtensionBase.__init__(self, *args, **kwargs)
--
GitLab