commit 8dc04a4dd1fc0e8c5feaba7308eaf8b8c8df8373
author Ezio Melotti <ezio.melotti@gmail.com> Mon Aug 02 00:24:26 2010 +0000
committer Ezio Melotti <ezio.melotti@gmail.com> Mon Aug 02 00:24:26 2010 +0000
tree 8a4de788c6c22e4d185f43b199735b44607fdf88
parent 8c7fe2d6f98908a597fec05767dc8a032c06dc61

Merged revisions 77310-77311 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77310 | antoine.pitrou | 2010-01-05 01:22:44 +0200 (Tue, 05 Jan 2010) | 4 lines

  Issue #7092: Fix the DeprecationWarnings emitted by the standard library
  when using the -3 flag.  Patch by Florent Xicluna.
........
  r77311 | antoine.pitrou | 2010-01-05 01:28:16 +0200 (Tue, 05 Jan 2010) | 3 lines

  Kill a couple of "<>"
........

Lib/formatter.py

diff --git a/Lib/formatter.py b/Lib/formatter.py
index 834b560..e0a8fe1 100644
--- a/Lib/formatter.py
+++ b/Lib/formatter.py
@@ -228,7 +228,8 @@
             self.align = None
             self.writer.new_alignment(None)
 
-    def push_font(self, (size, i, b, tt)):
+    def push_font(self, font):
+        size, i, b, tt = font
         if self.softspace:
             self.hard_break = self.para_end = self.softspace = 0
             self.nospace = 1