diff options
author | Stephen Clark <stephen.clark@oarcorp.com> | 2020-09-23 16:00:55 -0500 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2020-09-26 10:59:55 +1000 |
commit | e32e184d69b3a54059c9bf9a72a037eb7f9de6db (patch) | |
tree | b261b30fc06b1e5ed4a140ae5e8f82788a4e4665 | |
parent | patch gcc i386 multiarch (diff) | |
download | rtems-source-builder-e32e184d69b3a54059c9bf9a72a037eb7f9de6db.tar.bz2 |
pkgconfig.py: Removed use of "unicode" keyword for python3 compatibility
Closes #4094.
-rwxr-xr-x | source-builder/sb/pkgconfig.py | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/source-builder/sb/pkgconfig.py b/source-builder/sb/pkgconfig.py index 99646f7..afc259b 100755 --- a/source-builder/sb/pkgconfig.py +++ b/source-builder/sb/pkgconfig.py @@ -103,6 +103,22 @@ class package(object): dst.nodes = copy.copy(src.nodes) @staticmethod + def _is_string(us): + if type(us) == str: + return True + try: + if type(us) == unicode: + return True + except: + pass + try: + if type(us) == bytes: + return True + except: + pass + return False + + @staticmethod def is_version(v): for n in v.split('.'): if not n.isdigit(): @@ -214,7 +230,7 @@ class package(object): prefix = default_prefix() if prefix: self._log('prefix: %s' % (prefix)) - if type(prefix) is str or type(prefix) is unicode: + if self._is_string(prefix): prefix = str(prefix) self.prefix = [] for p in prefix.split(os.pathsep): |