Blocked revisions 65351 via svnmerge

........
  r65351 | brett.cannon | 2008-07-31 18:36:47 -0700 (Thu, 31 Jul 2008) | 3 lines

  Remove use of tuple unpacking and dict.has_key() so as to silence
  SyntaxWarning as triggered by -3.
........