Issue #20078: Reading malformed zipfiles no longer hangs with 100% CPU
consumption.
Issue #20078: Reading malformed zipfiles no longer hangs with 100% CPU
consumption.
fix zipimport ref leak
merge 3.3
Issue #18960: Fix bugs with Python source code encoding in the second line.

* The first line of Python script could be executed twice when the source
encoding (not equal to 'utf-8') was specified on the second line.

* Now the source encoding declaration on the second line isn't effective if
the first line contains anything except a comment.

* As a consequence, 'python -x' works now again with files with the source
encoding declarations specified on the second file, and can be used again
to make Python batch files on Windows.

* The tokenize module now ignore the source encoding declaration on the second
line if the first line contains anything except a comment.

* IDLE now ignores the source encoding declaration on the second line if the
first line contains anything except a comment.

* 2to3 and the findnocoding.py script now ignore the source encoding
declaration on the second line if the first line contains anything except
a comment.
Issue #18960: Fix bugs with Python source code encoding in the second line.

* The first line of Python script could be executed twice when the source
encoding (not equal to 'utf-8') was specified on the second line.

* Now the source encoding declaration on the second line isn't effective if
the first line contains anything except a comment.

* As a consequence, 'python -x' works now again with files with the source
encoding declarations specified on the second file, and can be used again
to make Python batch files on Windows.

* The tokenize module now ignore the source encoding declaration on the second
line if the first line contains anything except a comment.

* IDLE now ignores the source encoding declaration on the second line if the
first line contains anything except a comment.

* 2to3 and the findnocoding.py script now ignore the source encoding
declaration on the second line if the first line contains anything except
a comment.
clear zip stat cache after each ref leak run
merge 3.3
Do not reset the line number because we already set file position to correct
value.

(fixes error in patch for issue #18960)
Do not reset the line number because we already set file position to correct
value.

(fixes error in patch for issue #18960)
Issue #20207: Always disable SSLv2 except when PROTOCOL_SSLv2 is explicitly asked for.
Remove conditional: it is useless at this point (OpenSSL headers are not yet included)
Issue #20207: Always disable SSLv2 except when PROTOCOL_SSLv2 is explicitly asked for.
Try to fix test_ssl failures on some buildbots
Try to fix test_ssl failures on some buildbots
Issue #13107: argparse and optparse no longer raises an exception when output
a help on environment with too small COLUMNS.  Based on patch by
Elazar Gershuni.
Issue #13107: argparse and optparse no longer raises an exception when output
a help on environment with too small COLUMNS.  Based on patch by
Elazar Gershuni.
assertEquals is deprecated, use assertEqual instead.
Issue #20152: import.c now uses Argument Clinic.
Closes #20200: Argument Clinic custom converter example should be in a
'python' clinic block, not a 'clinic' clinic block.  Patch written by
Ryan Smith-Roberts.