From: Alexandre Vassalotti <alexandre@peadrop.com>
Date: Fri, 16 May 2008 03:14:20 +0000 (+0000)
Subject: Blocked revisions 63105,63240,63255,63279,63323,63326,63347 via svnmerge
X-Git-Tag: v3.0b1~306
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7203d0fbba7b220258eb4879b9091541bb8a840b;p=python

Blocked revisions 63105,63240,63255,63279,63323,63326,63347 via svnmerge

........
  r63105 | alexandre.vassalotti | 2008-05-11 19:12:38 -0400 (Sun, 11 May 2008) | 2 lines

  Revert commit r63086.
........
  r63240 | alexandre.vassalotti | 2008-05-14 17:52:37 -0400 (Wed, 14 May 2008) | 5 lines

  Moved copy_reg stub module to lib-old/.

  Stub modules will be easier to track (and remove) if they are all kept
  in lib-old/, instead of sprinkling them throughout the library.
........
  r63255 | alexandre.vassalotti | 2008-05-14 20:33:57 -0400 (Wed, 14 May 2008) | 6 lines

  Revert distutils changes done in r63248.

  As explained by Marc-Andre Lemburg, distutils needs to stay
  backward-compatible. Therefore, it should use the old ConfigParser
  module name.
........
  r63279 | brett.cannon | 2008-05-14 23:32:11 -0400 (Wed, 14 May 2008) | 1 line

  Deprecate imgfile for removal in 3.0.
........
  r63323 | andrew.kuchling | 2008-05-15 16:06:51 -0400 (Thu, 15 May 2008) | 1 line

  Use lowercase version of module name
........
  r63326 | alexandre.vassalotti | 2008-05-15 16:30:56 -0400 (Thu, 15 May 2008) | 5 lines

  Revert r63323: Use lowercase version of module name.

  The distutils module should continue to use the old ConfigParser name,
  for backward-compatibility.
........
  r63347 | alexandre.vassalotti | 2008-05-15 22:06:59 -0400 (Thu, 15 May 2008) | 6 lines

  Fixed import of configparser in the distutils module.

  If configparser is unavailable, try to import configparser using its
  old name. This is required for backward-compatibility with older
  Python versions.
........
---