(I guess *all* changes to this file should be backported to the 3.0 branch.)

This fixes test_binascii.

Will backport to 3.0

function which shadows the builtin.

Will backport to 3.0

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67528 | fred.drake | 2008-12-04 13:25:17 -0500 (Thu, 04 Dec 2008) | 4 lines

  Issue #1055234: cgi.parse_header(): Fixed parsing of header parameters to
  support unusual filenames (such as those containing semi-colons) in
  Content-Disposition headers.
........

- remove silly emoticon

Wording change (flaunt -> disobey); markup fixes.  The largest edit is to the paragraph on relative imports; please review.  (Backport candidate)

subsection in common pitfalls, rather than spreading it out.  Made
this the last subsection of common pitfalls.  All XXX comments are now
gone.  I'm sure much is still missing, we'll have to clean that up
post 3.0.  At least all PEPs and all implemented items in PEP 3100
have at least one mention.

(A bit of a mess, a previous submit apparently didn't go through.)

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67484 | christian.heimes | 2008-12-03 01:53:18 +0100 (Wed, 03 Dec 2008) | 2 lines

  Issue #4025 again
  Converted a C99 style comment to a C89 style comment (found by MAL).
........

howto/cporting.rst.

Also add some labels to 2.6.rst and howto/unicode.rst so I can refer
to them.  (Somehow a label named 'module-contextlib' couldn't be
referenced -- why???)