From 954ee16a180e16fbd232f18b0a69eaed55bd7fdd Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Mon, 23 Apr 2012 14:07:08 -0700
Subject: volk: force kwargs keys to be of type str, not unicode for py25

---
 volk/gen/volk_arch_defs.py    | 2 ++
 volk/gen/volk_machine_defs.py | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'volk')

diff --git a/volk/gen/volk_arch_defs.py b/volk/gen/volk_arch_defs.py
index 8ac99b338..41154d5a7 100644
--- a/volk/gen/volk_arch_defs.py
+++ b/volk/gen/volk_arch_defs.py
@@ -84,6 +84,8 @@ for arch_xml in archs_xml:
         name = flag_xml.attributes["compiler"].value
         if not flags.has_key(name): flags[name] = list()
         flags[name].append(flag_xml.firstChild.data)
+    #force kwargs keys to be of type str, not unicode for py25
+    kwargs = dict((str(k), v) for k, v in kwargs.iteritems())
     register_arch(flags=flags, checks=checks, **kwargs)
 
 if __name__ == '__main__':
diff --git a/volk/gen/volk_machine_defs.py b/volk/gen/volk_machine_defs.py
index b30a480ba..d1a856981 100644
--- a/volk/gen/volk_machine_defs.py
+++ b/volk/gen/volk_machine_defs.py
@@ -70,6 +70,8 @@ for machine_xml in machines_xml:
             kwargs[name] = val
         except: pass
     kwargs['archs'] = kwargs['archs'].split()
+    #force kwargs keys to be of type str, not unicode for py25
+    kwargs = dict((str(k), v) for k, v in kwargs.iteritems())
     register_machine(**kwargs)
 
 if __name__ == '__main__':
-- 
cgit