their encode() method anymore, but continue to call the reset() method if the
final argument is True.

message:

Merging post 2.6.7rc2 changes from Subversion.

message:

Cross-port changes for 2.6.7rc2 from the Subversion branch.

message:

Reconcile with the 2.6svn branch.  The 2.6.7 release will be made from
Subversion, but there were differences, so this brings them in sync.  These
changes should *not* propagate to any newer versions.

Skip the whole file if the SSL module is missing. It was already the case,
except that the SkipTest exception was raised in test_main().

This commit fixes an error in test_ssl if the ssl module is missing.

to be able to unload the module.

This closes #12099.

the CJK encoding testcase BLOB into multiple text files.

Without this patch IDLE will crash reliably on OSX when Tkinter
is linked to TkCocoa 8.5.x.

To reproduce:

* Create a new file (script.py) with the following two lines:

x = raw_input('prompt: ')
print x

* Save the script

* Run the script using the F5 keyboard shortcut
  (running from the menu works fine)

The patch is a fairly crude hack, but we haven't found a better
workaround for this Tk bug yet.

On MacOSX and OpenBSD (and possibly other BSDs) "en_US.UTF-8" is a valid locale
while "en_US.UTF8" is not. As the former works on Linux as well it is better
to normalize to that value.

symlinks/hardlink was broken. It handles now in a graceful manner (No exception
is raised, behavior similar GNU tar).

Without this patch python will fail to start properly when the environment
variable MACOSX_DEPLOYMENT_TARGET is set on MacOSX and has a value that is
not compatible with the value during Python's build. This is caused by code
in sysconfig that was only meant to be used in disutils.

the expected builtin modules are not present.

This includes a unittest for __get_builtin_constructor() in the face
of such an error.

attribute when called without a max_length argument.