diff options
| author | Johnathan Corgan | 2012-04-23 16:45:36 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-04-23 16:45:36 -0700 |
| commit | 6d1419febab128d82bad00abaf0935624f8aa6cb (patch) | |
| tree | d4e3eff02575f7504057403d081a0c645e219365 /volk | |
| parent | 0f8503fd9c7bc63f316b18094fc0ffa5bd62a3c1 (diff) | |
| parent | 954ee16a180e16fbd232f18b0a69eaed55bd7fdd (diff) | |
| download | gnuradio-6d1419febab128d82bad00abaf0935624f8aa6cb.tar.gz gnuradio-6d1419febab128d82bad00abaf0935624f8aa6cb.tar.bz2 gnuradio-6d1419febab128d82bad00abaf0935624f8aa6cb.zip | |
Merge remote branch 'jblum-github/volk_work'
Diffstat (limited to 'volk')
| -rw-r--r-- | volk/gen/volk_arch_defs.py | 2 | ||||
| -rw-r--r-- | volk/gen/volk_machine_defs.py | 2 |
2 files changed, 4 insertions, 0 deletions
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__': |