1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
|
From 5857a22e79dc77c9b571297451dc11c4a68bc198 Mon Sep 17 00:00:00 2001
From: Stefan Strogin <steils@gentoo.org>
Date: Fri, 7 Feb 2020 13:15:16 +0200
Subject: [PATCH] Fix: support Python 3
Correct tabs and spaces in scripts to make them consistent.
Don't call deprecated methods.
Upstream-Status: Submitted [https://github.com/OpenTTD/OpenMSX/pull/2]
Signed-off-by: Stefan Strogin <steils@gentoo.org>
---
scripts/authorlist.py | 20 ++++++++---------
scripts/md5list.py | 48 ++++++++++++++++++++--------------------
scripts/midifiles.py | 30 ++++++++++++-------------
scripts/namelist.py | 34 ++++++++++++++--------------
scripts/playlist.py | 42 +++++++++++++++++------------------
scripts/sanitize_list.py | 48 ++++++++++++++++++++--------------------
6 files changed, 111 insertions(+), 111 deletions(-)
diff --git a/scripts/authorlist.py b/scripts/authorlist.py
index 689ddb9..e041d64 100755
--- a/scripts/authorlist.py
+++ b/scripts/authorlist.py
@@ -14,14 +14,14 @@ import string
import sys
while 1:
- data = sys.stdin.readline()
- if data != '':
- # do some processing of the contents of
- # the data variable
- separate = string.split(data,";")
- print '%-30s %s' % (separate[1]+":", separate[2])
- # end of data processing command group
+ data = sys.stdin.readline()
+ if data != '':
+ # do some processing of the contents of
+ # the data variable
+ separate = data.split(';')
+ print('%-30s %s' % (separate[1]+":", separate[2]))
+ # end of data processing command group
# sys.stdout.write(res)
- else:
- sys.stdout.flush()
- break
+ else:
+ sys.stdout.flush()
+ break
diff --git a/scripts/md5list.py b/scripts/md5list.py
index cf611fc..781052e 100755
--- a/scripts/md5list.py
+++ b/scripts/md5list.py
@@ -16,28 +16,28 @@ import subprocess
import os
while 1:
- data = sys.stdin.readline()
- if data != '':
- # leave out all comment lines (lines starting with '#')
- comment_pos = string.find(data,'#')
- if comment_pos == 0:
- continue
- # separate the single entries by ';'
- separate = string.split(data,";")
- if len(separate) != 4:
- continue
- systemtype = (os.uname())[0]
- if systemtype == 'Linux':
- md5call = ["md5sum"]
- elif systemtype == 'Darwin':
- md5call = ["md5", "-r"]
+ data = sys.stdin.readline()
+ if data != '':
+ # leave out all comment lines (lines starting with '#')
+ comment_pos = data.find('#')
+ if comment_pos == 0:
+ continue
+ # separate the single entries by ';'
+ separate = data.split(';')
+ if len(separate) != 4:
+ continue
+ systemtype = (os.uname())[0]
+ if systemtype == 'Linux':
+ md5call = ["md5sum"]
+ elif systemtype == 'Darwin':
+ md5call = ["md5", "-r"]
+ else:
+ md5call = ["md5sum"]
+ md5call = md5call + ["src/"+separate[1].strip()]
+ md5sum = subprocess.Popen(md5call, stdout=subprocess.PIPE).communicate()[0]
+ md5sum = md5sum.split()
+ res = "%-32s = %s\n" % (separate[1], md5sum[0].decode())
+ sys.stdout.write(res)
else:
- md5call = ["md5sum"]
- md5call = md5call + ["src/"+string.strip(separate[1])]
- md5sum = subprocess.Popen(md5call, stdout=subprocess.PIPE).communicate()[0]
- md5sum = string.split(md5sum)
- res = "%-32s = %s\n" % (separate[1], md5sum[0])
- sys.stdout.write(res)
- else:
- sys.stdout.flush()
- break
+ sys.stdout.flush()
+ break
diff --git a/scripts/midifiles.py b/scripts/midifiles.py
index 3b5ec57..a89e4f2 100755
--- a/scripts/midifiles.py
+++ b/scripts/midifiles.py
@@ -15,18 +15,18 @@ import sys
res = ""
while 1:
- data = sys.stdin.readline()
- if data != '':
- # leave out all comment lines (lines starting with '#')
- comment_pos = string.find(data,'#')
- if comment_pos == 0:
- continue
- # separate the single entries by ';'
- separate = string.split(data,";")
- if len(separate) != 4:
- continue
- res = res + " src/" + string.strip(separate[1])
- else:
- sys.stdout.write(res)
- sys.stdout.flush()
- break
+ data = sys.stdin.readline()
+ if data != '':
+ # leave out all comment lines (lines starting with '#')
+ comment_pos = data.find('#')
+ if comment_pos == 0:
+ continue
+ # separate the single entries by ';'
+ separate = data.split(';')
+ if len(separate) != 4:
+ continue
+ res = res + " src/" + separate[1].strip()
+ else:
+ sys.stdout.write(res)
+ sys.stdout.flush()
+ break
diff --git a/scripts/namelist.py b/scripts/namelist.py
index cdac127..107ad00 100755
--- a/scripts/namelist.py
+++ b/scripts/namelist.py
@@ -14,23 +14,23 @@ import string
import sys
while 1:
- data = sys.stdin.readline()
- if data != '':
- # leave out all comment lines (lines starting with '#')
- comment_pos = string.find(data,'#')
- if comment_pos == 0:
- continue
- # separate the single entries by ';'
- separate = string.split(data,";")
- if len(separate) != 4:
- continue
- res = "%-32s = %s\n" % (separate[1], string.strip(separate[3]))
- sys.stdout.write(res)
- else:
- sys.stdout.flush()
- break
+ data = sys.stdin.readline()
+ if data != '':
+ # leave out all comment lines (lines starting with '#')
+ comment_pos = data.find('#')
+ if comment_pos == 0:
+ continue
+ # separate the single entries by ';'
+ separate = data.split(';')
+ if len(separate) != 4:
+ continue
+ res = "%-32s = %s\n" % (separate[1], separate[3].strip())
+ sys.stdout.write(res)
+ else:
+ sys.stdout.flush()
+ break
def authorlist(mystr):
- separate = string.split()
+ separate = separate.split()
for str in separate:
- print string.strip(str)
\ No newline at end of file
+ print(str.strip())
diff --git a/scripts/playlist.py b/scripts/playlist.py
index 939d03d..e77b02a 100755
--- a/scripts/playlist.py
+++ b/scripts/playlist.py
@@ -14,27 +14,27 @@ import string
import sys
while 1:
- data = sys.stdin.readline()
- if data != '':
- # leave out all comment lines (lines starting with '#')
- comment_pos = string.find(data,'#')
- if comment_pos == 0:
- continue
- # separate the single entries by ';'
- separate = string.split(data,";")
- res = ""
- # leave out all lines which don't have the proper number of elements
- if len(separate) >= 1:
- res = string.strip(separate[0]) + " = "
- if len(separate) == 4:
- res = res + separate[1]
- res = res + "\n"
- sys.stdout.write(res)
- else:
- sys.stdout.flush()
- break
+ data = sys.stdin.readline()
+ if data != '':
+ # leave out all comment lines (lines starting with '#')
+ comment_pos = data.find('#')
+ if comment_pos == 0:
+ continue
+ # separate the single entries by ';'
+ separate = data.split(';')
+ res = ""
+ # leave out all lines which don't have the proper number of elements
+ if len(separate) >= 1:
+ res = separate[0].strip() + " = "
+ if len(separate) == 4:
+ res = res + separate[1]
+ res = res + "\n"
+ sys.stdout.write(res)
+ else:
+ sys.stdout.flush()
+ break
def authorlist(mystr):
- separate = string.split()
+ separate = separate.split()
for str in separate:
- print string.strip(str)
\ No newline at end of file
+ print(str.strip())
diff --git a/scripts/sanitize_list.py b/scripts/sanitize_list.py
index f97709a..5368831 100755
--- a/scripts/sanitize_list.py
+++ b/scripts/sanitize_list.py
@@ -14,30 +14,30 @@ import string
import sys
while 1:
- data = sys.stdin.readline()
- if data != '':
- # leave out all comment lines (lines starting with '#')
- comment_pos = string.find(data,'#')
- if comment_pos == 0:
- continue
- # separate the single entries by ';'
- separate = string.split(data,";")
- if len(separate) != 4:
- continue
- res = ""
- for str in separate:
- if res != '':
- res = res + ";" + string.strip(str)
- else:
- res = string.strip(str)
- # end of data processing command group
- res = res + "\n"
- sys.stdout.write(res)
- else:
- sys.stdout.flush()
- break
+ data = sys.stdin.readline()
+ if data != '':
+ # leave out all comment lines (lines starting with '#')
+ comment_pos = data.find('#')
+ if comment_pos == 0:
+ continue
+ # separate the single entries by ';'
+ separate = data.split(';')
+ if len(separate) != 4:
+ continue
+ res = ""
+ for str in separate:
+ if res != '':
+ res = res + ";" + str.strip()
+ else:
+ res = str.strip()
+ # end of data processing command group
+ res = res + "\n"
+ sys.stdout.write(res)
+ else:
+ sys.stdout.flush()
+ break
def authorlist(mystr):
- separate = string.split()
+ separate = separate.split()
for str in separate:
- print string.strip(str)
\ No newline at end of file
+ print(str.strip())
--
2.27.0
|
GitWeb