summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-09-09 19:31:25 (GMT)
committerGeorg Brandl <georg@python.org>2008-09-09 19:31:25 (GMT)
commit7cd67cc992acb659f1673706e037ee835648d60b (patch)
tree91508295990e666d4405906e4620ae5d8b991f70
parent617027fba48e84d09e21f69093754c0db5820006 (diff)
downloadcpython-7cd67cc992acb659f1673706e037ee835648d60b.zip
cpython-7cd67cc992acb659f1673706e037ee835648d60b.tar.gz
cpython-7cd67cc992acb659f1673706e037ee835648d60b.tar.bz2
Fix formatter usage of filter(). Bug #3800.
-rw-r--r--Lib/formatter.py4
-rw-r--r--Misc/NEWS2
2 files changed, 4 insertions, 2 deletions
diff --git a/Lib/formatter.py b/Lib/formatter.py
index bb8ad20..60e60f1 100644
--- a/Lib/formatter.py
+++ b/Lib/formatter.py
@@ -255,7 +255,7 @@ class AbstractFormatter:
def push_margin(self, 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:
margin = fstack[-1]
self.writer.new_margin(margin, len(fstack))
@@ -263,7 +263,7 @@ class AbstractFormatter:
def pop_margin(self):
if self.margin_stack:
del self.margin_stack[-1]
- fstack = filter(None, self.margin_stack)
+ fstack = [m for m in self.margin_stack if m]
if fstack:
margin = fstack[-1]
else:
diff --git a/Misc/NEWS b/Misc/NEWS
index 7dde481..d22d038 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -96,6 +96,8 @@ C API
Library
-------
+- Issue #3800: fix filter() related bug in formatter.py.
+
- Issue #874900: fix behaviour of threading module after a fork.
- Issue #3535: zipfile couldn't read some zip files larger than 2GB.