Changeset d255e81 in rtems-source-builder

Timestamp:

02/23/18 01:58:28 (5 years ago)

Author:

Chris Johns <chrisj@…>

Branches:

5, master

Children:

4b3e0f8

Parents:

d30be31

git-author:

Chris Johns <chrisj@…> (02/23/18 01:58:28)

git-committer:

Chris Johns <chrisj@…> (02/23/18 02:04:35)

Message:

sb: Convert any unicode keys to strings

Closes #3312

File:

• source-builder/sb/macros.py (modified) (3 diffs)

source-builder/sb/macros.py

@@ -151 +151 @@
         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)
@@ -397 +397 @@
 
     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)))
@@ -436 +437 @@
 
     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)))