0
0
mirror of https://github.com/python/cpython.git synced 2024-12-01 11:15:56 +01:00
Commit Graph

57484 Commits

Author SHA1 Message Date
Nick Coghlan
68e9d7c102 Merge concurrent.futures dict comp tweak from 3.3 2012-10-16 23:14:38 +10:00
Nick Coghlan
d6d5cf33ef A dict comprehension is much prettier (thanks Antoine) 2012-10-16 23:14:03 +10:00
Trent Nelson
15a9bae20a Merge heads. 2012-10-16 08:56:46 -04:00
Trent Nelson
5ecd00402e Merge heads. 2012-10-16 08:56:41 -04:00
Trent Nelson
cd02b3f781 Merge issue #15819: additional fixes for out-of-tree builds from read-only src.
Specifically, make sure the 'Object', 'Python' and 'Include' directories
in the build directory take precedence over the source directory if we're
an out-of-tree build.

Fix typeslots.inc so that it gets generated into the build directory.

In addition, for 3.3, make sure importlib.h gets generated into the
build directory.
2012-10-16 08:53:13 -04:00
Trent Nelson
4d4ec6502d Merge issue #15819: additional fixes for out-of-tree builds from read-only src.
Specifically, make sure the 'Object', 'Python' and 'Include' directories
in the build directory take precedence over the source directory if we're
an out-of-tree build.

Fix typeslots.inc so that it gets generated into the build directory.

In addition, for 3.3, make sure importlib.h gets generated into the
build directory.
2012-10-16 08:51:24 -04:00
Nick Coghlan
c7c03ba5be Merge concurrent.futures example changes from 3.3 2012-10-16 22:51:11 +10:00
Nick Coghlan
f06ea25df2 Tweak the threaded example in concurrent.futures 2012-10-16 22:50:04 +10:00
Trent Nelson
9effe699b7 Issue #15819: additional fixes for out-of-tree builds from read-only src.
Specifically, make sure the 'Object', 'Python' and 'Include' directories
in the build directory take precedence over the source directory if we're
an out-of-tree build.

Fix typeslots.inc so that it gets generated into the build directory.
2012-10-16 08:41:32 -04:00
Trent Nelson
b16269e375 Merge issue #15298: ensure _sysconfigdata is generated in build directory,
not source directory.

Patch by: Richard Oudkerk (sbt).
2012-10-16 08:17:11 -04:00
Trent Nelson
c101bf32c4 Issue #15298: ensure _sysconfigdata is generated in build directory,
not source directory.

Patch by Richard Oudkerk (sbt).
2012-10-16 08:13:12 -04:00
Trent Nelson
744faddae8 Merge issue #15833: don't raise an exception if importlib can't write
byte-compiled files.

This fixes a regression introduced by 3.3.

Patch by Charles-François Natali.
2012-10-16 08:03:21 -04:00
Trent Nelson
8a42022748 Merge heads. 2012-10-16 07:48:34 -04:00
Trent Nelson
d783c8ed00 Issue #15833: don't raise an exception if importlib can't write byte-compiled
files.

This fixes a regression introduced by 3.3.  Patch by Charles-François Natali.
2012-10-16 07:47:34 -04:00
Andrew Svetlov
b3fe704a4a Merge issue #15936: Reformat text for os.random to follow Larry Hastings suggestion 2012-10-16 13:52:53 +03:00
Andrew Svetlov
2bfe386091 Issue #15936: Reformat text for os.random to follow Larry Hastings suggestion 2012-10-16 13:52:25 +03:00
Andrew Svetlov
f4e5044638 Merge issue #15936: Add link from os.urandom to random.SystemRandom 2012-10-16 13:15:35 +03:00
Andrew Svetlov
03cb99c2d1 Issue #15936: Add link from os.urandom to random.SystemRandom 2012-10-16 13:15:06 +03:00
Vinay Sajip
3ba726ce04 Closes #16244: Merged change from 3.3. 2012-10-16 10:33:30 +01:00
Vinay Sajip
e7e7af4558 Issue #16244: Merged change from 3.2. 2012-10-16 10:32:13 +01:00
Vinay Sajip
ee892b9226 Issue #16244: Remove file mode overrides. 2012-10-16 10:28:31 +01:00
Chris Jerdonek
c7633e684b Issue #16225: Merge from 3.3: Add additional note to tutorial about looping. 2012-10-15 19:47:32 -07:00
Chris Jerdonek
38049bb251 Issue #16225: Merge from 3.2: Add additional note to tutorial about looping. 2012-10-15 19:46:34 -07:00
Chris Jerdonek
4fab8f0e06 Issue #16225: Add additional note to tutorial about changing sequence while looping. 2012-10-15 19:44:47 -07:00
Giampaolo Rodola'
35eeb30adf logging's SocketHandler: get rid of some legacy code and use the newer socket.create_connection() utility function 2012-10-15 16:57:37 +02:00
Christian Heimes
7707f6fd32 Issue #16234: Modify sha3's block_size method to return NotImplemented.
This makes the sha3 types unusable from the hmac module. HMAC-SHA3 hasn't been specified yet.
2012-10-14 22:16:27 +02:00
Andrew Svetlov
11dc6c311d Issue #15721: make _tkinter module pep384 compatible. 2012-10-14 16:54:35 +03:00
Christian Heimes
1f476504fe Update comment: SPARC requires proper alignment 2012-10-14 14:36:09 +02:00
Christian Heimes
12e6a53b99 get 64bit platforms without uint64 right again 2012-10-14 04:17:50 +02:00
Christian Heimes
d376986014 merge 2012-10-14 02:53:40 +02:00
Christian Heimes
784fde7cb4 Force 32bit Keccak implementation on SPARC. It look like the Solaris CC compiler doesn't like the address alignment. 2012-10-14 02:52:01 +02:00
Nadeem Vawda
6d70870812 Clean up some warnings in test suite output. 2012-10-14 01:42:32 +02:00
Christian Heimes
ba3e4a0bc0 Keccak: fromBytesToWord() and fromWordToBytes() are required on 64bit big endian platforms 2012-10-14 00:59:29 +02:00
Benjamin Peterson
174baa39f6 merge heads 2012-10-13 11:58:23 -04:00
Benjamin Peterson
d541d3fee4 When not optimized function stack sizes are much larger and may cause this test to fail. 2012-10-13 11:46:44 -04:00
Chris Jerdonek
fe4985a1bb Issue #16206: Merge dict documentation improvements from 3.3.
Improve the documentation of the dict constructor.  This change includes
replacing the single-line signature documentation with a more complete
multiple-line signature.
2012-10-13 03:26:10 -07:00
Chris Jerdonek
39b867000b Issue #16206: Merge dict documentation improvements from 3.2.
Improve the documentation of the dict constructor.  This change includes
replacing the single-line signature documentation with a more complete
multiple-line signature.
2012-10-13 03:25:18 -07:00
Chris Jerdonek
f341317185 Issue #16206: Improve the documentation of the dict constructor.
This change includes replacing the single-line signature documentation
with a more complete multiple-line signature.
2012-10-13 03:22:33 -07:00
Chris Jerdonek
145fb897f2 Merge from 3.3: Undo changes accidentally reverted in de8787029fe4. 2012-10-12 20:31:50 -07:00
Chris Jerdonek
006d907afc Undo changes accidentally reverted in de8787029fe4. 2012-10-12 20:28:26 -07:00
Nadeem Vawda
801985e4b7 lzma module: Rewrap docstrings at 72 columns, as per PEP 8. 2012-10-13 04:26:49 +02:00
Benjamin Peterson
4604980854 merge 3.3 2012-10-12 12:05:09 -04:00
Benjamin Peterson
b548d49f65 merge heads 2012-10-12 12:05:01 -04:00
Benjamin Peterson
143d034ecd merge 3.2 2012-10-12 12:04:32 -04:00
Benjamin Peterson
78ef0885b4 merge 3.2 2012-10-12 12:02:06 -04:00
Benjamin Peterson
7a9953edfb skip if __doc__ is gone 2012-10-12 11:44:19 -04:00
Benjamin Peterson
a5c4090394 skip if __doc__ is gone 2012-10-12 11:44:19 -04:00
Benjamin Peterson
951a9e381b fix to work if __doc__ is removed 2012-10-12 11:44:10 -04:00
Benjamin Peterson
fa5f75a7ce fix to work if __doc__ is removed 2012-10-12 11:44:10 -04:00
Benjamin Peterson
fe1bcb64cd move more variable declarations to the top of blocks 2012-10-12 11:40:01 -04:00