Benjamin Peterson
94015f13f1
merge 3.2
2012-02-04 09:56:43 -05:00
Benjamin Peterson
f51ebf94bb
threading primitives now have timeouts
2012-02-04 09:55:52 -05:00
Charles-François Natali
edc67feaa4
Issue #8184 : Fix a potential file descriptor leak when a
...
multiprocessing.Connection socket can't be bound.
2012-02-04 15:12:08 +01:00
Charles-François Natali
992ca5278e
Issue #8184 : Fix a potential file descriptor leak when a
...
multiprocessing.Connection socket can't be bound.
2012-02-04 14:55:53 +01:00
Nadeem Vawda
d85d0e7247
Document that some of LZMAFile.__init__()'s args are keyword-only.
2012-02-04 14:06:07 +02:00
Nadeem Vawda
54d8144bb0
Make BZ2File.__init__()'s fileobj argument keyword-only.
2012-02-04 13:58:07 +02:00
Nadeem Vawda
cac8909d0c
Update docstring for BZ2File.__init__().
2012-02-04 13:08:11 +02:00
Georg Brandl
ff962c5f1f
Small grammar fixes by Mark Summerfield.
2012-02-04 08:55:56 +01:00
Benjamin Peterson
951138c795
merge 3.2
2012-02-03 19:25:01 -05:00
Benjamin Peterson
90b13583bc
put returns on their own lines
2012-02-03 19:22:31 -05:00
Benjamin Peterson
7bbb6e8cf9
merge 3.2
2012-02-03 19:09:38 -05:00
Benjamin Peterson
050a05aeef
remove unused import
2012-02-03 19:07:30 -05:00
Ned Deily
f16d6771c7
Issue #13861 : merge
2012-02-03 23:16:11 +01:00
Ned Deily
3429491950
Issue #13861 : Prevent test_apropos* test case failures in test_pydoc.
2012-02-03 23:14:37 +01:00
Vinay Sajip
2f7b286a8c
Revert fix for #13807 mistakenly applied in this branch.
2012-02-03 18:23:05 +00:00
Brett Cannon
1d06daa162
Merge
2012-02-03 12:08:32 -05:00
Brett Cannon
b6855683cc
Check for errors in creating sub-interpreters when testing the C API.
2012-02-03 12:08:03 -05:00
Martin v. Löwis
9d6c66933a
Issue #13777 : Add PF_SYSTEM sockets on OS X.
...
Patch by Michael Goderbauer.
2012-02-03 17:44:58 +01:00
Ned Deily
61c4e10035
Issue #13901 : Prevent test_packaging failures on OS X with --enable-shared.
2012-02-03 02:46:37 +01:00
Ned Deily
f9b0255db3
merge
2012-02-03 02:45:05 +01:00
Ned Deily
cf550dcff8
Issue #13901 : Prevent test_distutils failures on OS X with --enable-shared.
2012-02-03 02:42:16 +01:00
Georg Brandl
538343d6ec
Fix small grammatical inconsistency.
2012-02-02 22:22:19 +01:00
Charles-François Natali
bcd8cfc552
Null merge.
2012-02-02 20:38:46 +01:00
Charles-François Natali
3f32fc87ad
Merge.
2012-02-02 20:38:10 +01:00
Charles-François Natali
227e377b36
Merge.
2012-02-02 20:37:29 +01:00
Charles-François Natali
19c6bf8f83
Issue #13817 : After fork(), reinit the ad-hoc TLS implementation earlier to fix
...
a random deadlock when fork() is called in a multithreaded process in debug
mode, and make PyOS_AfterFork() more robust.
2012-02-02 20:32:48 +01:00
Charles-François Natali
6d0d24e359
Issue #13817 : After fork(), reinit the ad-hoc TLS implementation earlier to fix
...
a random deadlock when fork() is called in a multithreaded process in debug
mode, and make PyOS_AfterFork() more robust.
2012-02-02 20:31:42 +01:00
Petri Lehtinen
4b0eab62f0
Merge branch 3.2
...
Closes #13402 .
2012-02-02 21:23:15 +02:00
Petri Lehtinen
9713321f46
Document absoluteness of sys.executable
...
Closes #13402 .
2012-02-02 20:59:50 +02:00
Petri Lehtinen
f854799d84
Make sqlite3 tests editable with Emacs
...
Change the coding declaration from ISO-8859-1 to iso-8859-1. Emacs
doesn't understand the former.
2012-02-02 20:47:59 +02:00
Stefan Krah
c317a1c185
Issue #1813 : merge changeset that reverts a glibc workaround for the
...
Fedora buildbot.
2012-02-02 16:50:10 +01:00
Stefan Krah
03c29f90c3
Issue #1813 : Revert workaround for a glibc bug on the Fedora buildbot.
2012-02-02 16:40:52 +01:00
Brian Curtin
090ec3c7fc
merge. again.
2012-02-01 15:24:10 -06:00
Brian Curtin
97e2008645
merge updates
2012-02-01 15:20:03 -06:00
Brian Curtin
8d132c88c2
merge from 3.2
2012-02-01 15:15:14 -06:00
Brian Curtin
10dda6e029
Add a hint that CSD == Service Pack.
...
People searcing for the way to get a "service pack" will never find that we
provide it here, and people that find this function won't know what CSD is
until they run the function. On top of this, they won't know what the value
means unless they really have a service pack installed.
CSD, or Customer Service Diagnostics, is apparently no longer used, and was
rarely used term at that. Most references to it online are from
universities making Windows 2000 and XP service packs available to students.
2012-02-01 15:14:00 -06:00
Petri Lehtinen
8940f6242c
Merge branch 3.2
...
Closes #13676 .
2012-02-01 22:21:05 +02:00
Petri Lehtinen
023fe334bb
sqlite3: Handle strings with embedded zeros correctly
...
Closes #13676 .
2012-02-01 22:18:35 +02:00
Raymond Hettinger
590463efc4
merge
2012-02-01 09:08:08 -08:00
Raymond Hettinger
fc3ba6b8fc
Add usage note
2012-02-01 09:07:40 -08:00
Victor Stinner
ed27785b32
Issue #13706 : Add assertions to detect bugs earlier
2012-02-01 00:22:23 +01:00
Brett Cannon
5ea5b67a0b
Fix a minor output typo as found by Terry Reedy.
2012-01-31 17:02:10 -05:00
Brett Cannon
cdf1121076
Merge
2012-01-31 14:58:07 -05:00
Terry Jan Reedy
5d605c2861
Merge with 3.2 whitespace
2012-01-31 02:58:39 -05:00
Terry Jan Reedy
4d82ade424
whitespace
2012-01-31 02:57:29 -05:00
Terry Jan Reedy
f8672bec68
Merge 3.2
...
- Issue #13506 : Add '' to path for IDLE Shell when started and restarted with Restart Shell.
Original patches by Marco Scataglini and Roger Serwy.
Merge 3.2 #13506 Add '' to path for interactive interpreter by adding with_cwd
parameter to PyShell.PyShell.transfer_path() and changing elsewhere as needed.
Original patches by Marco Scataglini and Roger Serwy.
2012-01-31 02:42:19 -05:00
Terry Jan Reedy
da4c467210
#13506 Add '' to path for interactive interpreter by adding with_cwd parameter
...
to PyShell.PyShell.transfer_path() and changing elsewhere as needed.
Original patches by Marco Scataglini and Roger Serwy.
2012-01-31 02:26:32 -05:00
Brett Cannon
e3a9ae5ece
Let importlib.test.benchmark take a specific benchmark name to run.
2012-01-30 19:27:51 -05:00
Brett Cannon
190f33cd2b
Allow for the specification of a file to dump importlib benchmark
...
results to (and to compare against previous runs).
* * *
Move importlib.test.benchmark to argparse.
2012-01-30 19:12:29 -05:00
Gregory P. Smith
cc6abd56b8
Fix zipimport.c's read_directory() to use appropriate types for the values
...
being read from the header vs the values being used by fseek and ftell
(Py_ssize_t for those). Updates the Py_BuildValue format string to match
(including several existing wrong 'i's that should have been 'l's).
2012-01-30 15:55:29 -08:00