merge 3.1 -> 3.2

zlib.decompress() anymore to be able to unload the module.

to be able to unload the module.

when the socket's timeout expires (it used to return None).

3.2 (#10801: In zipfile, support different encodings for the header and the
filenames.  Patch by MvL, test by Eli Bendersky.)

different encodings for the header and the filenames.  Patch by MvL, test by
Eli Bendersky.

written by Charles-François Natali.

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 = 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.

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.

exist anymore

files

by Andreas Stührk.

Stührk.

Andreas Stührk.

Backport a fix already applied to Python 3.2+ (4a82be47a948 + 5060a92a8597).