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

sb: Convert any unicode keys to strings

Browse Source 
Closes #3313
This commit is contained in:
Chris Johns 2018-02-23 13:03:11 +11:00
parent 4671017f41
commit 883dfa53a3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source-builder/sb/macros.py
View File

@ -150,7 +150,7 @@ class macros:
def __setitem__(self, key, value):
key = self._unicode_to_str(key)
if type(key) is not str:
raise TypeError('bad key type (want str): %s' % (type(key)))
raise TypeError('bad key type (want str): %s (%s)' % (type(key), key))
if type(value) is not tuple:
value = self._unicode_to_str(value)
if type(value) is str:
@ -396,6 +396,7 @@ class macros:
(path.host(self.expand(name))))
def get(self, key, globals = True, maps = None):
key = self._unicode_to_str(key)
if type(key) is not str:
raise TypeError('bad key type: %s' % (type(key)))
key = self.key_filter(key)
@ -435,11 +436,10 @@ class macros:
return self.get_attribute(key) == 'override'
def define(self, key, value = '1'):
if type(key) is not str:
raise TypeError('bad key type: %s' % (type(key)))
self.__setitem__(key, ('none', 'none', value))
def undefine(self, key):
key = self._unicode_to_str(key)
if type(key) is not str:
raise TypeError('bad key type: %s' % (type(key)))
key = self.key_filter(key)