rtems/rtems-source-builder
1
0
Fork 0
mirror of https://git.rtems.org/rtems-source-builder synced 2024-10-09 07:15:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

pkgconfig.py: Removed use of "unicode" keyword for python3 compatibility

Browse Source 
Closes #4094.
This commit is contained in:
Stephen Clark 2020-09-23 16:00:55 -05:00 committed by Chris Johns
parent 1ea1c9cdc5
commit ed5030bc24
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source-builder/sb/pkgconfig.py
View File

@ -102,6 +102,22 @@ class package(object):
dst.fields = copy.copy(src.fields) dst.fields = copy.copy(src.fields)
dst.nodes = copy.copy(src.nodes) 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 @staticmethod
def is_version(v): def is_version(v):
for n in v.split('.'): for n in v.split('.'):
@ -214,12 +230,7 @@ class package(object):
prefix = default_prefix() prefix = default_prefix()
if prefix: if prefix:
self._log('prefix: %s' % (prefix)) self._log('prefix: %s' % (prefix))
try: if self._is_string(prefix):
if type(prefix) is unicode:
prefix = prefix.decode("utf-8", "ignore")
except:
pass
if type(prefix) is str:
prefix = str(prefix) prefix = str(prefix)
self.prefix = [] self.prefix = []
for p in prefix.split(os.pathsep): for p in prefix.split(os.pathsep):