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

diff --git a/Lib/formatter.py b/Lib/formatter.py
index bb8ad20e44b4cc4cb3833c5dba33b7b8d616301f..60e60f116015b35203757a5429d8909dcdd2106c 100644 (file)
--- 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 7dde481a8658b74e8ba5067838035d66e2887210..d22d038d96cb2b971b48ed7a847cfb37bd1e41a9 100644 (file)
--- 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.