Blocked revisions 84790 via svnmerge

Blocked revisions 84790 via svnmerge

........
  r84790 | eric.smith | 2010-09-13 16:48:43 -0400 (Mon, 13 Sep 2010) | 8 lines

  Issue 7994: Make object.__format__() raise a PendingDeprecationWarning
  if the format string is not empty. Manually merge r79596 and r84772
  from 2.x.

  Also, apparently test_format() from test_builtin never made it into
  3.x. I've added it as well. It tests the basic format()
  infrastructure.
........