Benjamin Peterson
876e789f65
merge heads
2012-02-21 11:23:21 -05:00
Barry Warsaw
dbe0329d4c
merge 2.7
2012-02-21 11:19:00 -05:00
Barry Warsaw
f7254bd2aa
merge 2.6
2012-02-21 11:16:52 -05:00
Barry Warsaw
8757cad394
Backport fix from default branch for ./python -R -Wd where hash('d') would not
...
have gotten randomized.
2012-02-21 11:16:06 -05:00
Benjamin Peterson
26da920001
ensure no one tries to hash things before the random seed is found
2012-02-21 11:08:50 -05:00
Martin v. Löwis
ef281bdddb
Issue #10580 : Minor grammar change in Windows installer.
2012-02-21 17:07:32 +01:00
Barry Warsaw
f364b15985
null merge from 2.6
2012-02-21 10:23:27 -05:00
Barry Warsaw
b69fa1f8b7
Let's sort the keys so that this test passes even with random hashes.
2012-02-21 10:22:34 -05:00
Benjamin Peterson
e39ccef64c
carefully don't depend on any dict order
2012-02-21 09:07:40 -05:00
Benjamin Peterson
b6596c516b
remove extra zero
2012-02-21 08:08:29 -05:00
Petri Lehtinen
4ab701b2d3
sqlite3: Fix 64-bit integer handling in user functions on 32-bit architectures
...
Closes #8033 .
2012-02-21 14:04:46 +02:00
Ezio Melotti
36b7361fe7
HTMLParser is now able to handle slashes in the start tag.
2012-02-21 09:22:16 +02:00
Benjamin Peterson
9be6c3ddf0
kill interned strings computed before random initialization
2012-02-21 00:40:14 -05:00
Benjamin Peterson
c7bbd7be94
don't rely on dict order
2012-02-21 00:15:10 -05:00
Benjamin Peterson
c59df7d4e9
a frozenset is better here
2012-02-20 23:13:20 -05:00
Benjamin Peterson
740593416a
use set
2012-02-20 23:11:19 -05:00
Benjamin Peterson
f093724845
don't rely on dict order
2012-02-20 23:06:22 -05:00
Benjamin Peterson
72949bd511
this was supposed to die
2012-02-20 22:33:33 -05:00
Benjamin Peterson
5037677170
fix for real this time...
2012-02-20 22:00:46 -05:00
Benjamin Peterson
6949299e64
belately resolve conflicts here
2012-02-20 21:57:25 -05:00
Benjamin Peterson
11fa11bc95
fix test_gdb under hash randomization
2012-02-20 21:55:32 -05:00
Benjamin Peterson
5bc92e0824
don't rely on dict order here
2012-02-20 21:47:54 -05:00
Benjamin Peterson
aee9dfba4a
merge 2.6 with hash randomization fix
2012-02-20 21:44:56 -05:00
Barry Warsaw
b19fb2462e
Whitespace normalization
2012-02-20 20:44:15 -05:00
Barry Warsaw
1e13eb084f
- Issue #13703 : oCERT-2011-003: add -R command-line option and PYTHONHASHSEED
...
environment variable, to provide an opt-in way to protect against denial of
service attacks due to hash collisions within the dict and set types. Patch
by David Malcolm, based on work by Victor Stinner.
2012-02-20 20:42:21 -05:00
Benjamin Peterson
34b345b888
don't rely on the order of module clearing
2012-02-20 15:20:37 -05:00
Barry Warsaw
9769eb063c
null merge from 2.6
2012-02-20 14:45:45 -05:00
Barry Warsaw
b0516c2fe0
null merge from 2.6
2012-02-20 14:44:26 -05:00
Barry Warsaw
f5a5beb339
Back port Python 2.7 fix for test_invalid_redirect() in test_urllib.py.
2012-02-20 14:43:22 -05:00
Vinay Sajip
7d13cd3f5d
logging: clarified documentation for Handler.handleError.
2012-02-20 18:34:07 +00:00
Éric Araujo
bb42f5ed7f
Add missing “::” markup and wrap overlong lines
2012-02-20 02:08:01 +01:00
Éric Araujo
a4c81b07f8
Fix typo
2012-02-20 02:07:31 +01:00
Sandro Tosi
09c05fde63
don't split 'Hye-Shik Chang' name; thanks to Sergey from docs@
2012-02-19 12:29:43 +01:00
Benjamin Peterson
32c49d9533
use Py_CLEAR
2012-02-19 01:11:56 -05:00
Jesus Cea
f5f6af81ac
Fix Test for issue #13500
2012-02-19 04:20:45 +01:00
Jesus Cea
6e250998b6
Test for issue #13500
2012-02-19 03:54:08 +01:00
Ned Deily
c5df563041
Issue #12627 : Implement PEP 394 for OS X framework builds.
...
OS X framework builds already created versioned symlinks for all
executables and scripts installed in the framework bin directory,
of the general form ${cmd} - ${cmd}2.7. The changes here add a
hierarchy of ${cmd} -> ${cmd}2 -> ${cmd}2.7. Per previous
practice, all of the links are created in the framework bin
directory for both the install and altinstall targets. This is
consistent with the long-standing recommendation to manage multiple
framework versions by adding and ordering framework bin directories
on $PATH. Also, per past practice, symlinks to all framework bin
entries are created in $prefix/bin (by default, /usr/local/bin)
for the install target and only versioned links are created for
altinstall, although the use of these links is not recommended
for framework builds and their installation is optional with
the standard OS X installers.
2012-02-19 02:19:12 +01:00
Sandro Tosi
8d38fcf5a9
Refer to 'time' and 'datetime' submodules; thanks to Erik Johnson from docs@
...
This is needed after the move to Sphinx 1.x and it's the same way 3.x braches
managed it.
2012-02-18 20:28:35 +01:00
Charles-François Natali
e062466480
Issue #14001 : CVE-2012-0845: xmlrpc: Fix an endless loop in SimpleXMLRPCServer
...
upon malformed POST request.
2012-02-18 14:30:34 +01:00
Charles-François Natali
66f3cc6f8d
Issue #14001 : CVE-2012-0845: xmlrpc: Fix an endless loop in SimpleXMLRPCServer
...
upon malformed POST request.
2012-02-18 14:15:38 +01:00
Ezio Melotti
c39b552603
#14020 : improve HTMLParser documentation.
2012-02-18 01:46:04 +02:00
Petri Lehtinen
437b149b0c
Fix a variable scoping error in an sqlite3 test
...
Initial patch by Torsten Landschoff.
Closes #11689 .
2012-02-17 21:34:45 +02:00
Nick Coghlan
e6010061fc
Implement PEP 394 for Python 2.7
2012-02-17 22:10:38 +10:00
Petri Lehtinen
002b202009
Fix errors in sqlite3's Cursor.rowcount documentation
...
Closes #13995 .
2012-02-16 21:42:34 +02:00
Gregory P. Smith
14dc510395
news entry for previous commit
2012-02-16 00:44:50 -08:00
Gregory P. Smith
b4b605624d
Issue #2489 : Fix bug in _copy loop that could consume 100% cpu on EOF.
2012-02-16 00:40:03 -08:00
Sandro Tosi
c0b1172459
Issue #11836 : document multiprocessing.queues.SimpleQueue
2012-02-15 22:39:52 +01:00
Antoine Pitrou
dd7e071b23
Issue #13014 : Fix a possible reference leak in SSLSocket.getpeercert().
2012-02-15 22:25:27 +01:00
Éric Araujo
c82da813c1
Fix test failure for shared builds caused by #1326113 fix
2012-02-15 18:13:45 +01:00
Éric Araujo
d9756beb87
Improve doc for atexit.register ( #12297 )
2012-02-15 17:08:34 +01:00