1 |
Replace string.join() with ' '.join() and string.replace(var, ...) with |
2 |
var.replace(...) as the string module is deprecated. No real functional |
3 |
changes here otherwise. |
4 |
--- |
5 |
catalyst/base/stagebase.py | 33 ++++++++++++++++----------------- |
6 |
catalyst/support.py | 8 ++++---- |
7 |
catalyst/targets/livecd_stage1.py | 3 +-- |
8 |
3 files changed, 21 insertions(+), 23 deletions(-) |
9 |
|
10 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
11 |
index 8a7456e..432ad5c 100644 |
12 |
--- a/catalyst/base/stagebase.py |
13 |
+++ b/catalyst/base/stagebase.py |
14 |
@@ -1,6 +1,5 @@ |
15 |
|
16 |
import os |
17 |
-import string |
18 |
import imp |
19 |
import types |
20 |
import shutil |
21 |
@@ -312,7 +311,7 @@ class StageBase(TargetBase, ClearBase, GenBase): |
22 |
if "install_mask" in self.settings: |
23 |
if type(self.settings["install_mask"])!=types.StringType: |
24 |
self.settings["install_mask"]=\ |
25 |
- string.join(self.settings["install_mask"]) |
26 |
+ ' '.join(self.settings["install_mask"]) |
27 |
|
28 |
def set_spec_prefix(self): |
29 |
self.settings["spec_prefix"]=self.settings["target"] |
30 |
@@ -596,7 +595,7 @@ class StageBase(TargetBase, ClearBase, GenBase): |
31 |
self.settings["portage_overlay"]=\ |
32 |
self.settings["portage_overlay"].split() |
33 |
print "portage_overlay directories are set to: \""+\ |
34 |
- string.join(self.settings["portage_overlay"])+"\"" |
35 |
+ ' '.join(self.settings["portage_overlay"])+"\"" |
36 |
|
37 |
def set_overlay(self): |
38 |
if self.settings["spec_prefix"]+"/overlay" in self.settings: |
39 |
@@ -1134,7 +1133,7 @@ class StageBase(TargetBase, ClearBase, GenBase): |
40 |
if myusevars: |
41 |
myf.write("# These are the USE and USE_EXPAND flags that were used for\n# building in addition to what is provided by the profile.\n") |
42 |
myusevars = sorted(set(myusevars)) |
43 |
- myf.write('USE="'+string.join(myusevars)+'"\n') |
44 |
+ myf.write('USE="' + ' '.join(myusevars) + '"\n') |
45 |
if '-*' in myusevars: |
46 |
print "\nWarning!!! " |
47 |
print "\tThe use of -* in "+self.settings["spec_prefix"]+\ |
48 |
@@ -1148,7 +1147,7 @@ class StageBase(TargetBase, ClearBase, GenBase): |
49 |
|
50 |
if myuseexpandvars: |
51 |
for hostuseexpand in myuseexpandvars: |
52 |
- myf.write(hostuseexpand+'="'+string.join(myuseexpandvars[hostuseexpand])+'"\n') |
53 |
+ myf.write(hostuseexpand + '="' + ' '.join(myuseexpandvars[hostuseexpand]) + '"\n') |
54 |
|
55 |
myf.write('PORTDIR="%s"\n' % self.settings['portdir']) |
56 |
myf.write('DISTDIR="%s"\n' % self.settings['distdir']) |
57 |
@@ -1354,16 +1353,16 @@ class StageBase(TargetBase, ClearBase, GenBase): |
58 |
self.env['clst_' + opt.upper()] = "true" |
59 |
continue |
60 |
""" Sanitize var names by doing "s|/-.|_|g" """ |
61 |
- varname="clst_"+string.replace(x,"/","_") |
62 |
- varname=string.replace(varname,"-","_") |
63 |
- varname=string.replace(varname,".","_") |
64 |
+ varname = "clst_" + x.replace("/", "_") |
65 |
+ varname = varname.replace("-", "_") |
66 |
+ varname = varname.replace(".", "_") |
67 |
if type(self.settings[x])==types.StringType: |
68 |
""" Prefix to prevent namespace clashes """ |
69 |
#os.environ[varname]=self.settings[x] |
70 |
self.env[varname]=self.settings[x] |
71 |
elif type(self.settings[x])==types.ListType: |
72 |
- #os.environ[varname]=string.join(self.settings[x]) |
73 |
- self.env[varname]=string.join(self.settings[x]) |
74 |
+ #os.environ[varname] = ' '.join(self.settings[x]) |
75 |
+ self.env[varname] = ' '.join(self.settings[x]) |
76 |
elif type(self.settings[x])==types.BooleanType: |
77 |
if self.settings[x]: |
78 |
self.env[varname] = "true" |
79 |
@@ -1377,15 +1376,15 @@ class StageBase(TargetBase, ClearBase, GenBase): |
80 |
if x in ["compress_definitions", |
81 |
"decompress_definitions"]: |
82 |
continue |
83 |
- self.env[varname] = string.join(self.settings[x].keys()) |
84 |
+ self.env[varname] = ' '.join(self.settings[x].keys()) |
85 |
for y in self.settings[x].keys(): |
86 |
- varname2 = "clst_"+string.replace(y,"/","_") |
87 |
- varname2 = string.replace(varname2,"-","_") |
88 |
- varname2 = string.replace(varname2,".","_") |
89 |
+ varname2 = "clst_" + y.replace("/", "_") |
90 |
+ varname2 = varname2.replace("-", "_") |
91 |
+ varname2 = varname2.replace(".", "_") |
92 |
if type(self.settings[x][y]) == types.StringType: |
93 |
self.env[varname2] = self.settings[x][y] |
94 |
elif type(self.settings[x][y]) == types.ListType: |
95 |
- self.env[varname2] = string.join(self.settings[x][y]) |
96 |
+ self.env[varname2] = ' '.join(self.settings[x][y]) |
97 |
elif type(self.settings[x][y]) == types.BooleanType: |
98 |
if self.settings[x][y]: |
99 |
self.env[varname] = "true" |
100 |
@@ -1464,7 +1463,7 @@ class StageBase(TargetBase, ClearBase, GenBase): |
101 |
things like "<" to remain intact |
102 |
""" |
103 |
myunmerge[x]="'"+myunmerge[x]+"'" |
104 |
- myunmerge=string.join(myunmerge) |
105 |
+ myunmerge = ' '.join(myunmerge) |
106 |
|
107 |
""" Before cleaning, unmerge stuff """ |
108 |
try: |
109 |
@@ -1588,7 +1587,7 @@ class StageBase(TargetBase, ClearBase, GenBase): |
110 |
"/kernelopts"] |
111 |
|
112 |
if type(myopts) != types.StringType: |
113 |
- myopts = string.join(myopts) |
114 |
+ myopts = ' '.join(myopts) |
115 |
self.env[kname+"_kernelopts"]=myopts |
116 |
|
117 |
else: |
118 |
diff --git a/catalyst/support.py b/catalyst/support.py |
119 |
index 78942a7..5563a15 100644 |
120 |
--- a/catalyst/support.py |
121 |
+++ b/catalyst/support.py |
122 |
@@ -1,7 +1,7 @@ |
123 |
|
124 |
import glob |
125 |
import sys |
126 |
-import string |
127 |
+import string # pylint: disable=deprecated-module |
128 |
import os |
129 |
import types |
130 |
import re |
131 |
@@ -52,7 +52,7 @@ def read_from_clst(file): |
132 |
return -1 |
133 |
#raise CatalystError("Could not open file "+file) |
134 |
for line in myf.readlines(): |
135 |
- #line = string.replace(line, "\n", "") # drop newline |
136 |
+ #line = line.replace("\n", "") # drop newline |
137 |
myline = myline + line |
138 |
myf.close() |
139 |
return myline |
140 |
@@ -67,7 +67,7 @@ def list_bashify(mylist): |
141 |
# surround args with quotes for passing to bash, |
142 |
# allows things like "<" to remain intact |
143 |
mypack[x]="'"+mypack[x]+"'" |
144 |
- mypack=string.join(mypack) |
145 |
+ mypack = ' '.join(mypack) |
146 |
return mypack |
147 |
|
148 |
|
149 |
@@ -80,7 +80,7 @@ def list_to_string(mylist): |
150 |
# surround args with quotes for passing to bash, |
151 |
# allows things like "<" to remain intact |
152 |
mypack[x]=mypack[x] |
153 |
- mypack=string.join(mypack) |
154 |
+ mypack = ' '.join(mypack) |
155 |
return mypack |
156 |
|
157 |
|
158 |
diff --git a/catalyst/targets/livecd_stage1.py b/catalyst/targets/livecd_stage1.py |
159 |
index d5645e8..af59ed7 100644 |
160 |
--- a/catalyst/targets/livecd_stage1.py |
161 |
+++ b/catalyst/targets/livecd_stage1.py |
162 |
@@ -5,7 +5,6 @@ LiveCD stage1 target |
163 |
|
164 |
import os |
165 |
import types |
166 |
-import string |
167 |
|
168 |
|
169 |
from catalyst.support import (normpath, |
170 |
@@ -70,6 +69,6 @@ class livecd_stage1(StageBase): |
171 |
def set_pkgcache_path(self): |
172 |
if "pkgcache_path" in self.settings: |
173 |
if type(self.settings["pkgcache_path"]) != types.StringType: |
174 |
- self.settings["pkgcache_path"]=normpath(string.join(self.settings["pkgcache_path"])) |
175 |
+ self.settings["pkgcache_path"]=normpath(' '.join(self.settings["pkgcache_path"])) |
176 |
else: |
177 |
StageBase.set_pkgcache_path(self) |
178 |
-- |
179 |
2.5.2 |