diff options
| author | Josh Blum | 2011-11-21 21:38:06 -0800 |
|---|---|---|
| committer | Josh Blum | 2011-11-30 21:33:57 -0500 |
| commit | edbfdf08d8e4bfa3ea725dc69089123537403ed6 (patch) | |
| tree | 816af558f6d4416e112387872bd24b15329ff4d8 /volk/gen | |
| parent | 52c51c983d51ff725238c22571b2d466875a5f22 (diff) | |
| download | gnuradio-edbfdf08d8e4bfa3ea725dc69089123537403ed6.tar.gz gnuradio-edbfdf08d8e4bfa3ea725dc69089123537403ed6.tar.bz2 gnuradio-edbfdf08d8e4bfa3ea725dc69089123537403ed6.zip | |
volk: fix #466 deprecated string use, from Pinkava
Diffstat (limited to 'volk/gen')
| -rw-r--r-- | volk/gen/volk_regexp.py | 3 | ||||
| -rw-r--r-- | volk/gen/volk_register.py | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/volk/gen/volk_regexp.py b/volk/gen/volk_regexp.py index b83ce5206..eb4ceb54b 100644 --- a/volk/gen/volk_regexp.py +++ b/volk/gen/volk_regexp.py @@ -1,5 +1,4 @@ import re -import string remove_after_underscore = re.compile("_.*"); space_remove = re.compile(" "); @@ -10,5 +9,5 @@ replace_volk = re.compile("volk"); def strip_trailing(tostrip, stripstr): lindex = tostrip.rfind(stripstr) - tostrip = tostrip[0:lindex] + string.replace(tostrip[lindex:len(tostrip)], stripstr, ""); + tostrip = tostrip[0:lindex] + tostrip[lindex:len(tostrip)].replace(stripstr, ""); return tostrip diff --git a/volk/gen/volk_register.py b/volk/gen/volk_register.py index cd874e470..0774ece29 100644 --- a/volk/gen/volk_register.py +++ b/volk/gen/volk_register.py @@ -4,7 +4,6 @@ import sys import os import re import glob -import string from xml.dom import minidom from volk_regexp import * from make_cpuid_c import make_cpuid_c @@ -101,7 +100,7 @@ for filearch in filearchs: archs_or = "(" for arch in archs: - archs_or = archs_or + string.upper(arch) + "|"; + archs_or = archs_or + arch.upper() + "|"; archs_or = archs_or[0:len(archs_or)-1]; archs_or = archs_or + ")"; |