0001-fix-stop-usign-function-deprecatd-in-python-2.5.patch

Jiří Pinkava, 11/19/2011 05:17 pm

Download (1.5 kB)

 
b/volk/gen/volk_regexp.py
1 1
import re
2
import string
3 2

4 3
remove_after_underscore = re.compile("_.*");
5 4
space_remove = re.compile(" ");
......
10 9

11 10
def strip_trailing(tostrip, stripstr):
12 11
    lindex = tostrip.rfind(stripstr)
13
    tostrip = tostrip[0:lindex] + string.replace(tostrip[lindex:len(tostrip)], stripstr, "");
12
    tostrip = tostrip[0:lindex] + tostrip[lindex:len(tostrip)].replace(stripstr, "");
14 13
    return tostrip
b/volk/gen/volk_register.py
4 4
import os
5 5
import re
6 6
import glob
7
import string
8 7
from xml.dom import minidom
9 8
from volk_regexp import *
10 9
from make_cpuid_c import make_cpuid_c
......
101 100

102 101
archs_or = "("
103 102
for arch in archs:
104
    archs_or = archs_or + string.upper(arch) + "|";
103
    archs_or = archs_or + arch.upper() + "|";
105 104
archs_or = archs_or[0:len(archs_or)-1];
106 105
archs_or = archs_or + ")";
107 106

108
-