Skip to content

Commit 4a597aa

Browse files
committed
Revert distutils changes
1 parent ecaeb45 commit 4a597aa

File tree

6 files changed

+25
-7
lines changed

6 files changed

+25
-7
lines changed

Lib/distutils/command/bdist_rpm.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,10 @@ def run(self):
341341
try:
342342
binary_rpms = []
343343
source_rpm = None
344-
while (line := out.readline()):
344+
while True:
345+
line = out.readline()
346+
if not line:
347+
break
345348
l = line.strip().split()
346349
assert(len(l) == 2)
347350
binary_rpms.append(l[1])

Lib/distutils/command/config.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,10 @@ def search_cpp(self, pattern, body=None, headers=None, include_dirs=None,
204204

205205
with open(out) as file:
206206
match = False
207-
while (line := file.readline()) != '':
207+
while True:
208+
line = file.readline()
209+
if line == '':
210+
break
208211
if pattern.search(line):
209212
match = True
210213
break

Lib/distutils/command/sdist.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,11 @@ def read_template(self):
333333
collapse_join=1)
334334

335335
try:
336-
while (line := template.readline()) is not None: # eof
336+
while True:
337+
line = template.readline()
338+
if line is None: # end of file
339+
break
340+
337341
try:
338342
self.filelist.process_template_line(line)
339343
# the call above can raise a DistutilsTemplateError for

Lib/distutils/extension.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,10 @@ def read_setup_file(filename):
158158
try:
159159
extensions = []
160160

161-
while (line := file.readline()) is not None: # eof
161+
while True:
162+
line = file.readline()
163+
if line is None: # eof
164+
break
162165
if re.match(_variable_rx, line): # VAR=VALUE, handled in first pass
163166
continue
164167

Lib/distutils/sysconfig.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,10 @@ def parse_makefile(fn, g=None):
8888
done = {}
8989
notdone = {}
9090

91-
while (line := fp.readline()) is not None: # eof
91+
while True:
92+
line = fp.readline()
93+
if line is None: # eof
94+
break
9295
m = re.match(_variable_rx, line)
9396
if m:
9497
n, v = m.group(1, 2)

Lib/distutils/text_file.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,9 +273,11 @@ def readlines(self):
273273
"""Read and return the list of all logical lines remaining in the
274274
current file."""
275275
lines = []
276-
while (line := self.readline()) is not None:
276+
while True:
277+
line = self.readline()
278+
if line is None:
279+
return lines
277280
lines.append(line)
278-
return lines
279281

280282
def unreadline(self, line):
281283
"""Push 'line' (a string) onto an internal buffer that will be

0 commit comments

Comments
 (0)