Commit graph

87602 commits

Author SHA1 Message Date
Benjamin Peterson
52074ac866 merge 3.4 2014-12-31 18:11:34 -06:00
Benjamin Peterson
a453749a78 merge 3.3 2014-12-31 18:11:22 -06:00
Benjamin Peterson
7919acb920 merge 3.2 2014-12-31 18:10:13 -06:00
Benjamin Peterson
47e782a67a update for copyright for 2015 2014-12-31 18:09:36 -06:00
Benjamin Peterson
0396cd7067 merge 3.4 2014-12-30 15:17:09 -06:00
Benjamin Peterson
bab69bf655 update docs for #23111 2014-12-30 15:17:03 -06:00
Benjamin Peterson
bfdec6263f merge 3.4 (#23111) 2014-12-30 15:16:13 -06:00
Benjamin Peterson
36fe7926f8 make PROTOCOL_SSLv23 the default protocol version for ftplib (closes #23111) 2014-12-30 15:15:43 -06:00
Antoine Pitrou
5d4e27ecee whitespace 2014-12-30 22:09:42 +01:00
Antoine Pitrou
8477ed6048 Issue #19776: Add a expanduser() method on Path objects.
Patch by Serhiy.
2014-12-30 20:54:45 +01:00
Benjamin Peterson
864d57c244 merge 3.4 (#23130) 2014-12-30 10:09:30 -06:00
Benjamin Peterson
3cd1af51f6 merge 3.3 (#23130) 2014-12-30 10:09:17 -06:00
Benjamin Peterson
9582b33933 merge 3.2 (#23130) 2014-12-30 10:08:52 -06:00
Benjamin Peterson
44e4b98ff0 delete old ftpmirror script, which now has security bugs (closes #23130) 2014-12-30 10:08:16 -06:00
Benjamin Peterson
53553c4376 merge 3.4 2014-12-28 22:14:23 -06:00
Benjamin Peterson
5feeebaa84 use a proper m-dash 2014-12-28 22:14:15 -06:00
Raymond Hettinger
3f063a54ce Minor comment clean-up 2014-12-28 17:15:12 -08:00
Berker Peksag
4dcd61f1f3 Issue #23125: Update nose project page link.
Reported by Damien Marié.
2014-12-28 18:48:58 +02:00
Berker Peksag
a1a1409e42 Issue #23125: Update nose project page link.
Reported by Damien Marié.
2014-12-28 18:48:33 +02:00
Raymond Hettinger
8edf27c134 Small clean-up. Factor-out common code for add, contains, and discard function pairs. 2014-12-26 23:08:58 -08:00
Raymond Hettinger
08e3dc0ad6 Issue #23107: Tighten-up loops in setobject.c
* Move the test for an exact key match to after a hash match
* Use "used" as a loop counter instead of "fill"
* Minor improvements to variable names and code consistency
2014-12-26 20:14:00 -08:00
Raymond Hettinger
404a45d91a Neaten-up setobject.h
- Move all Py_LIMITED_API exclusions together under one #ifndef
- Group PyAPI_FUNC functions and PyAPI_DATA together.
- Bring related comments together and put them in the appropriate section.
2014-12-26 17:28:16 -08:00
Victor Stinner
0f9f7497d0 Merge 3.4 (asyncio) 2014-12-26 21:29:45 +01:00
Victor Stinner
956de691f8 Issue #22926: In debug mode, call_soon(), call_at() and call_later() methods of
asyncio.BaseEventLoop now use the identifier of the current thread to ensure
that they are called from the thread running the event loop.

Before, the get_event_loop() method was used to check the thread, and no
exception was raised when the thread had no event loop. Now the methods always
raise an exception in debug mode when called from the wrong thread. It should
help to notice misusage of the API.
2014-12-26 21:07:52 +01:00
Victor Stinner
d7ff5a5375 asyncio: sync with Tulip
* Fix pyflakes warnings: remove unused imports and variables
* asyncio.test_support now uses test.support and test.script_helper if available
2014-12-26 21:16:42 +01:00
Benjamin Peterson
42cc0b711e null merge 3.4 2014-12-26 11:07:39 -06:00
Benjamin Peterson
fe975a234f merge 3.4 (#23112) 2014-12-26 10:56:51 -06:00
Benjamin Peterson
94cb7a2429 fix behavior of trailing slash redirection when a query string is involved (closes #23112) 2014-12-26 10:53:43 -06:00
R David Murray
f2ad173eaf #20069: Add tests for os.chown.
Patch by Vajrasky Kok.
2014-12-25 18:36:56 -05:00
Berker Peksag
be6a5da755 Remove the redundant second argument of versionadded directive.
The versionadded directive is already placed in the scope of the
HTTPStatus documentation.
2014-12-25 14:14:09 +02:00
R David Murray
3ab6ba4744 Merge: #23040: Clarify treatment of encoding and errors when component is bytes. 2014-12-24 21:24:07 -05:00
R David Murray
8c4e112afc #23040: Clarify treatment of encoding and errors when component is bytes.
Patch by Wojtek Ruszczewski.
2014-12-24 21:23:18 -05:00
Benjamin Peterson
3226f9618f merge 3.4 2014-12-24 16:07:19 -06:00
Benjamin Peterson
a54f07504f update correct French examples (#23109) 2014-12-24 16:07:02 -06:00
Benjamin Peterson
724bdce8b8 merge 3.4 (#23109) 2014-12-24 13:58:47 -06:00
Benjamin Peterson
643eb4464a improve incorrect French (#23109)
Following suggestions from Clément.
2014-12-24 13:58:05 -06:00
Benjamin Peterson
7a120ecdf4 merge 3.4 (#23110) 2014-12-24 10:51:10 -06:00
Benjamin Peterson
b33bb89b1a doucment that Py_SetPath copies its argument (closes #23110) 2014-12-24 10:49:11 -06:00
Serhiy Storchaka
e4db76967d Issue #21793: Added http.HTTPStatus enums (i.e. HTTPStatus.OK,
HTTPStatus.NOT_FOUND).  Patch by Demian Brecht.
2014-12-23 16:28:28 +02:00
Donald Stufft
ab47932212 Merge pip and setuptools upgrade 2014-12-23 09:19:45 -05:00
Donald Stufft
c8d94ba8f4 Upgrade pip to 6.0.2 and setuptools to 8.2.1 2014-12-23 09:18:38 -05:00
Victor Stinner
fa45c2e7a6 Merge 3.4 (asyncio) 2014-12-22 22:10:10 +01:00
Victor Stinner
952ec98abb asyncio doc: update also Queue docstrings 2014-12-22 22:09:50 +01:00
Victor Stinner
1bdef7aefa Merge 3.4 (asyncio doc) 2014-12-22 22:07:29 +01:00
Victor Stinner
4f9b773a64 asyncio doc: Fix doc of get and put methods of Queue 2014-12-22 22:07:06 +01:00
Benjamin Peterson
98beb7599e merge 3.4 (#23093) 2014-12-21 21:00:51 -06:00
Benjamin Peterson
10e76b67c9 allow more operations to work on detached streams (closes #23093)
Patch by Martin Panter.
2014-12-21 20:51:50 -06:00
Victor Stinner
fe02e39029 Issue #22585: On OpenBSD 5.6 and newer, os.urandom() now calls getentropy(),
instead of reading /dev/urandom, to get pseudo-random bytes.
2014-12-21 01:16:38 +01:00
Victor Stinner
4d6a3d6c01 Issue #22585: On OpenBSD 5.6 and newer, os.urandom() now calls getentropy(),
instead of reading /dev/urandom, to get pseudo-random bytes.
2014-12-21 01:16:38 +01:00
Serhiy Storchaka
3c6fe4da88 Issue #19104: pprint now produces evaluable output for wrapped strings. 2014-12-20 20:58:28 +02:00