Commit graph

53194 commits

Author SHA1 Message Date
Éric Araujo
cd0d951a70 Merge edits from 3.2 (#13716, #1040439, #2945, #13770, #6715) 2012-02-05 13:49:59 +01:00
Éric Araujo
cd2a6033ac Branch merge 2012-02-05 13:41:47 +01:00
Éric Araujo
89dfd5cf80 Really make bztar support in shutil conditional.
This dict entry is added a few lines after if the bzip2 module is
available, but removing this line was forgotten.
2012-02-05 13:40:08 +01:00
Nadeem Vawda
be095b3b98 Null merge. 2012-02-05 14:30:09 +02:00
Nadeem Vawda
bd249c1bae Clarify note in BZ2File docs about lack of multi-stream support (issue #1625). 2012-02-05 14:29:00 +02:00
Éric Araujo
04410c05c1 Branch merge 2012-02-05 10:48:52 +01:00
Éric Araujo
dcfcb64582 Stop converting package_data to extra_files in pysetup create (#13712).
pysetup create, the setup.cfg creation helper, used to convert
package_data (from an existing setup.py) into extra_files, the
replacement for MANIFEST.in, but these files are only present in sdists,
not installed: they don’t have the same use case at all, so converting
one into the other did not work.
2012-02-05 10:26:16 +01:00
Georg Brandl
2cf04487ac merge with 3.2 2012-02-05 09:28:39 +01:00
Georg Brandl
9701eb6e14 Closes #13944: fix capitalization of class name. 2012-02-05 09:25:22 +01:00
Meador Inge
558880451c Issue #12142: Fixed reference cycle when importing ctypes 2012-02-04 20:38:20 -06:00
Meador Inge
8582bb1ebd Issue #12142: Fixed reference cycle when importing ctypes 2012-02-04 20:36:48 -06:00
Victor Stinner
d446d8e09a _Py_Identifier are always ASCII strings 2012-02-05 01:45:45 +01:00
Nadeem Vawda
e15ad2ff55 Null merge. 2012-02-04 23:45:40 +02:00
Nadeem Vawda
8f50912f87 Issue #1625: Document BZ2File's lack of support for multi-stream inputs. 2012-02-04 23:44:49 +02:00
Éric Araujo
31aefde876 Allow multiple values for package_data in setup.cfg (#11805).
Even though the resources system obsoletes data_files and package_data
(see bug discussion), package_data still exists to allow compatibility
with distutils and thus an easier transition.  In setup.py, the values
are lists of glob patterns, so the setup.cfg syntax needed a way to
express multiple values too.

Doc for this option will be added later as part of the big packaging doc
patches.  For now, the test serves as example.

Reported by Erik Bray.
2012-02-04 21:53:07 +01:00
Éric Araujo
591f6e82bd Improve one packaging test, remove a setuptoolism in another 2012-02-04 21:43:07 +01:00
Ned Deily
08d052ac5a Issue #13933: merge 2012-02-04 18:38:10 +01:00
Ned Deily
ed3b867f33 Issue #13933: IDLE auto-complete did not work with some imported
module, like hashlib.  (Patch by Roger Serwy)
2012-02-04 18:36:43 +01:00
Antoine Pitrou
672b3ac2f0 Fix failing test on big-endian machines (issue #13806). 2012-02-04 16:49:31 +01:00
Antoine Pitrou
f99f3339fd Fix failing test on big-endian machines (issue #13806). 2012-02-04 16:44:21 +01:00
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
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