Brett Cannon
3fd6e2b910
Merge
2012-02-07 09:20:20 -05:00
Brett Cannon
466e6a90f2
Have importlib.test.benchmark test with tabnanny as a medium-sized test.
2012-02-07 09:19:12 -05:00
Vinay Sajip
9a74c57ed7
Null merge for reverted fix for #13807 .
2012-02-06 21:25:43 +00:00
Vinay Sajip
73d1da3914
Null merge for reverted fix for #13807 .
2012-02-06 21:24:40 +00:00
Petri Lehtinen
96356d40b9
Merge branch '3.2'
2012-02-06 22:04:41 +02:00
Petri Lehtinen
4a84f58143
Issue #10811 : Fix recursive usage of cursors. Instead of crashing, raise a ProgrammingError now.
2012-02-06 22:04:18 +02:00
Charles-François Natali
7794090251
Following Nick's suggestion, rename posix.fdlistdir() to posix.flistdir(), to
...
be consistent with other functions accepting file descriptors (fdlistdir() was
added in 3.3, so hasn't been released yet).
2012-02-06 19:54:48 +01:00
Benjamin Peterson
9878b63c7c
merge 3.2
2012-02-06 11:30:05 -05:00
Benjamin Peterson
1f30575713
merge heads
2012-02-06 11:29:05 -05:00
Benjamin Peterson
2f9c71bbba
bltinmod is borrowed, so it shouldn't be decrefed
2012-02-06 11:28:45 -05:00
Éric Araujo
2f8c3f7ed7
Fix typos in comments.
...
Reported by David-Sarah Hopwood on the Bitbucket bug tracker of
Tarek’s former verlib/distutils.version project.
2012-02-06 16:12:21 +01:00
Ned Deily
6b1aecfdbf
Issue #10881 : merge
2012-02-06 01:00:05 +01:00
Ned Deily
d531b295f2
Issue #10881 : Fix test_site failure with OS X framework builds.
2012-02-06 00:58:18 +01:00
Terry Jan Reedy
ea4afbb6bc
Merge with 3.2 #964437
2012-02-05 15:24:39 -05:00
Terry Jan Reedy
e91e7637bb
Issue 964437 Make IDLE help window non-modal.
...
Patch by Guilherme Polo and Roger Serwy.
2012-02-05 15:14:20 -05:00
Terry Jan Reedy
d8d2c984d3
Merge with 3.2
...
#13933 refine patch using 'new' builtin
2012-02-05 14:32:37 -05:00
Terry Jan Reedy
a77aa69870
#13933 refine patch using 'new' builtin
2012-02-05 14:31:16 -05:00
Charles-François Natali
7372b06cd7
Issue #13734 : Add os.fwalk(), a directory walking function yielding file
...
descriptors.
2012-02-05 15:15:38 +01:00
Nadeem Vawda
fb39063202
Make lzma docs consistent with other compression modules (cf. changeset 11bd2d32b4e8).
2012-02-05 15:07:43 +02:00
É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