mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-03 21:55:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Fix formatter usage of filter(). Bug #3800.

Browse source
This commit is contained in:
Georg Brandl 2008-09-09 19:31:25 +00:00
parent 617027fba4
commit 7cd67cc992
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/formatter.py
View file

@ -255,7 +255,7 @@ class AbstractFormatter:
def push_margin(self, margin): def push_margin(self, margin):
self.margin_stack.append(margin) self.margin_stack.append(margin)
fstack = filter(None, self.margin_stack) fstack = [m for m in self.margin_stack if m]
if not margin and fstack: if not margin and fstack:
margin = fstack[-1] margin = fstack[-1]
self.writer.new_margin(margin, len(fstack)) self.writer.new_margin(margin, len(fstack))
@ -263,7 +263,7 @@ class AbstractFormatter:
def pop_margin(self): def pop_margin(self):
if self.margin_stack: if self.margin_stack:
del self.margin_stack[-1] del self.margin_stack[-1]
fstack = filter(None, self.margin_stack) fstack = [m for m in self.margin_stack if m]
if fstack: if fstack:
margin = fstack[-1] margin = fstack[-1]
else: else:

2
Misc/NEWS
View file

@ -96,6 +96,8 @@ C API
Library Library
------- -------
- Issue #3800: fix filter() related bug in formatter.py.
- Issue #874900: fix behaviour of threading module after a fork. - Issue #874900: fix behaviour of threading module after a fork.
- Issue #3535: zipfile couldn't read some zip files larger than 2GB. - Issue #3535: zipfile couldn't read some zip files larger than 2GB.