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

Closes #4094.
This commit is contained in:
Stephen Clark
2020-09-23 16:00:55 -05:00
committed by Chris Johns
parent ebc3abe403
commit e32e184d69

View File

@@ -102,6 +102,22 @@ class package(object):
dst.fields = copy.copy(src.fields)
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('.'):
@@ -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):