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