Merged revisions 78689,78696-78697,78708,78711 via svnmerge from

Merged revisions 78689,78696-78697,78708,78711 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r78689 | ezio.melotti | 2010-03-05 14:43:17 +0200 (Fri, 05 Mar 2010) | 1 line

  This fixes a missing .lower() on the encoding name, a wrong byte undecodable by UTF-8, a wrong variable name, hopefully some windows buildbot on 3.x and adds a proper skip. It might break other things though.
........
  r78696 | ezio.melotti | 2010-03-05 17:08:19 +0200 (Fri, 05 Mar 2010) | 1 line

  r78689 enabled the test on more platforms but the buildbot did not like it. Using the filesystem encoding might work better. Also see #5604.
........
  r78697 | ezio.melotti | 2010-03-05 17:17:26 +0200 (Fri, 05 Mar 2010) | 1 line

  sys.getdefaultencoding() can return None.
........
  r78708 | ezio.melotti | 2010-03-06 03:20:49 +0200 (Sat, 06 Mar 2010) | 1 line

  Cleanup and minor fixes.
........
  r78711 | ezio.melotti | 2010-03-06 03:50:25 +0200 (Sat, 06 Mar 2010) | 1 line

  The test was failing because the curdir was missing from sys.path. This should fix the problem.
........