Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity
89,747 Commits 6 Branches 593 Tags 2.8 GiB
Commit Graph

17974 Commits

Author SHA1 Message Date
Benjamin Peterson f1c5dea3c2 merge 3.4 2015-04-08 11:11:45 -04:00
Benjamin Peterson 6f362fa6c8 actually ssl3 is just completely broken 2015-04-08 11:11:00 -04:00
Berker Peksag 291d7b0284 Issue #23400: Raise same exception on both Python 2 and 3 if sem_open is not available. 
Patch by Davin Potts.
 2015-04-08 17:57:44 +03:00
Berker Peksag 7ecfc82edb Issue #23400: Raise same exception on both Python 2 and 3 if sem_open is not available. 
Patch by Davin Potts.
 2015-04-08 17:56:30 +03:00
Victor Stinner 146907081c Issue #23853: Methods of SSL socket don't reset the socket timeout anymore each 
time bytes are received or sent. The socket timeout is now the maximum total
duration of the method.

This change fixes a denial of service if the application is regulary
interrupted by a signal and the signal handler does not raise an exception.
 2015-04-06 22:46:13 +02:00
Victor Stinner 8912d1418e Issue #23853: socket.socket.sendall() does no more reset the socket timeout 
each time data is sent successfuly. The socket timeout is now the maximum total
duration to send all data.
 2015-04-06 23:16:34 +02:00
Tim Golden 3fbcafa476 Merge doc change from 3.4 2015-04-06 11:06:18 +01:00
Tim Golden 42c235e833 Added missing right bracket (reported by Daryl Klakouski) 2015-04-06 11:04:49 +01:00
R David Murray cae7bdb424 #3566: Clean up handling of remote server disconnects. 
This changeset does two things: introduces a new RemoteDisconnected exception
(that subclasses ConnectionResetError and BadStatusLine) so that a remote
server disconnection can be detected by client code (and provides a better
error message for debugging purposes), and ensures that the client socket is
closed if a ConnectionError happens, so that the automatic re-connection code
can work if the application handles the error and continues on.

Tests are added that confirm that a connection is re-used or not re-used
as appropriate to the various combinations of protocol version and headers.

Patch by Martin Panter, reviewed by Demian Brecht.  (Tweaked only slightly by
me.)
 2015-04-05 19:26:29 -04:00
Serhiy Storchaka fcfcf853cf Updated pprint examples in according to issue #19105. 2015-04-05 08:22:41 +03:00
Serhiy Storchaka 778db289b5 Issue #10590: xml.sax.parseString() now supports string argument. 2015-04-04 10:12:26 +03:00
Serhiy Storchaka 5cf2b7253d Issue #15582: inspect.getdoc() now follows inheritance chains. 2015-04-03 22:38:53 +03:00
Victor Stinner 32ed750952 Merge 3.4 (asyncio doc) 2015-04-03 17:10:17 +02:00
Victor Stinner 72dcb0a765 Issue #23219: Update asyncio.wait_for() documentation 
the wait is cancelled, the future *fut* is now also cancelled.
 2015-04-03 17:08:19 +02:00
Serhiy Storchaka 61de087f0f Issue #2175: SAX parsers now support a character stream of InputSource object. 2015-04-02 21:00:13 +03:00
Victor Stinner acd8e7c1f5 Issue #23648: Complete the list of modified functions for the PEP 475 2015-04-02 13:56:29 +02:00
Victor Stinner 81c41dbfcc Issue #23618: socket.socket.connect() now waits until the connection completes 
instead of raising InterruptedError if the connection is interrupted by
signals, signal handlers don't raise an exception and the socket is blocking or
has a timeout.

socket.socket.connect() still raise InterruptedError for non-blocking sockets.
 2015-04-02 11:50:57 +02:00
Victor Stinner 708d9ba5a2 Issue #23618: Document EINTR changes in socket documentation 2015-04-02 11:49:42 +02:00
Victor Stinner bbe3803fb5 What's New in Python 3.5: mention signal.set_wakeup_fd() enhancement on Windows 2015-04-01 16:32:32 +02:00
R David Murray ef2a397a65 It wasn't a typo, it is the mnemonic (AT=@). 2015-04-01 09:15:02 -04:00
Benjamin Peterson f8521d55ad merge 3.4 (#12855) 2015-03-31 21:21:09 -04:00
Benjamin Peterson 8218bd4caf document what exactly str.splitlines() splits on (closes #12855) 
Patch by Martin Panter.
 2015-03-31 21:20:36 -04:00
Raymond Hettinger 41290a68ba Issue 23793: Add deque support for __add__(), __mul__(), and __imul__(). 2015-03-31 08:12:23 -07:00
Serhiy Storchaka 3822093143 Issue #10395: Added os.path.commonpath(). Implemented in posixpath and ntpath. 
Based on patch by Rafik Draoui.
 2015-03-31 15:31:53 +03:00
Victor Stinner eb011cb8df What's New in Python 3.5, PEP 475: mention modified signal functions 2015-03-31 12:19:15 +02:00
Serhiy Storchaka 58e4134a1c Issue #23611: Serializing more "lookupable" objects (such as unbound methods 
or nested classes) now are supported with pickle protocols < 4.
 2015-03-31 14:07:24 +03:00
Serhiy Storchaka 72e731cc03 Issue #13583: sqlite3.Row now supports slice indexing. 
Tests by Jessica McKellar.
 2015-03-31 13:33:11 +03:00
Victor Stinner b310173319 Issue #23485: Enhance and update selectors doc and test_selectors 
Selector.select() is now retried with the recomputed timeout when interrupted
by a signal.

Write an unit test with a signal handler raising an exception, and a unit with
a signal handler which does not raise an exception (it does nothing).
 2015-03-31 12:08:09 +02:00
Victor Stinner 45ca48b03d Issue #23485: select.devpoll.poll() is now retried when interrupted by a signal 2015-03-31 12:10:33 +02:00
Victor Stinner 4448c08451 Issue #23485: select.kqueue.control() is now retried when interrupted by a signal 2015-03-31 11:48:34 +02:00
Berker Peksag b6faf0dfa7 Fix typo in Doc/whatsnew/3.5.rst. 2015-03-31 07:20:03 +03:00
Raymond Hettinger c86f2525c9 merge 2015-03-30 20:29:55 -07:00
Raymond Hettinger c43a666ba2 Issue #23729: Improve docs for ElementTree namespace parsing 2015-03-30 20:29:28 -07:00
Victor Stinner 41eba224de Issue #23485: select.epoll.poll() is now retried when interrupted by a signal 2015-03-30 21:59:21 +02:00
Victor Stinner 3c7d6e0693 Issue #23485: select.poll.poll() is now retried when interrupted by a signal 2015-03-30 21:38:00 +02:00
Brett Cannon 9b16666f2f Ignore .rst files in the venv directory. 2015-03-30 15:35:37 -04:00
Victor Stinner f70e1ca0fc Issue #23485: select.select() is now retried automatically with the recomputed 
timeout when interrupted by a signal, except if the signal handler raises an
exception. This change is part of the PEP 475.

The asyncore and selectors module doesn't catch the InterruptedError exception
anymore when calling select.select(), since this function should not raise
InterruptedError anymore.
 2015-03-30 21:16:11 +02:00
R David Murray ba6ea9b237 #2211: Fix typo, address missed review comment. 2015-03-30 11:48:50 -04:00
Victor Stinner 93692bba3e What's New in Python 3.5: add pep 461 (bytes%args) and 465 (a@b) 2015-03-30 15:04:45 +02:00
Larry Hastings 09dab7a87e Merge 3.5.0a3 release engineering changes back into trunk. 2015-03-30 01:50:00 -07:00
Serhiy Storchaka 7901b48a1f Issue #23171: csv.Writer.writerow() now supports arbitrary iterables. 2015-03-30 09:09:54 +03:00
Larry Hastings b2c2dc3643 Regenerated pydoc topics and minor doc fixes for 3.5.0a3. 2015-03-29 15:32:55 -07:00
R David Murray 1813c1701f #2211: properly document the Morsel behavior changes. 
Also deprecate the undocumented set argument instead of removing
it already in 3.5.

Initial patch by Demian Brecht.
 2015-03-29 17:09:21 -04:00
Benjamin Peterson 52d1493c0c format .. note properly 2015-03-27 16:07:35 -04:00
Victor Stinner a766ddfa2f Issue #23648: Document the PEP 475 in the "Porting to Python 3.5" section and 
add a version changed note in modified functions.
 2015-03-26 23:50:57 +01:00
Serhiy Storchaka 764fc9bfac Issue #21717: The zipfile.ZipFile.open function now supports 'x' (exclusive 
creation) mode.
 2015-03-25 10:09:41 +02:00
Ezio Melotti 2e3998fae0 #11468: improve unittest basic example. Initial patch by Florian Preinstorfer. 2015-03-24 12:42:41 +02:00
Raymond Hettinger f6e31b79a8 Issue 23729: Document ElementTree namespace handling and fix an omission in the XPATH predicate table. 2015-03-22 15:29:09 -07:00
R David Murray beed8402ca #23539: Set Content-Length to 0 for PUT, POST, and PATCH if body is None. 
Some http servers will reject PUT, POST, and PATCH requests if they
do not have a Content-Length header.

Patch by James Rutherford, with additional cleaning up of the
'request' documentation by me.
 2015-03-22 15:18:23 -04:00
Benjamin Peterson 218144a94d clarify behavior of shutil.move when destination exists (closes #22933) 
Patch by Mike Short.
 2015-03-22 10:11:54 -04:00
Serhiy Storchaka a54aae0683 Issue #23622: Unknown escapes in regular expressions that consist of ``'\'`` 
and ASCII letter now raise a deprecation warning and will be forbidden in
Python 3.6.
 2015-03-24 22:58:14 +02:00
Serhiy Storchaka b876df4cbb Issue #23671: string.Template now allows to specify the "self" parameter as 
keyword argument.  string.Formatter now allows to specify the "self" and
the "format_string" parameters as keyword arguments.
 2015-03-24 22:30:46 +02:00
Benjamin Peterson b365a06a84 change Σ to ν for obscure joke reasons 
https://twitter.com/ncoghlan_dev/status/579173053793353728
 2015-03-24 12:12:44 -04:00
Ezio Melotti 0f05cea057 #11468: merge with 3.4. 2015-03-24 12:52:13 +02:00
Serhiy Storchaka bca63b362d Issue #23688: Added support of arbitrary bytes-like objects and avoided 
unnecessary copying of memoryview in gzip.GzipFile.write().
Original patch by Wolfgang Maier.
 2015-03-23 14:59:48 +02:00
Serhiy Storchaka 77d899726f Issue #23252: Added support for writing ZIP files to unseekable streams. 2015-03-23 01:09:35 +02:00
Raymond Hettinger 1b2f4d5f0c merge 2015-03-22 15:29:48 -07:00
R David Murray 0a0d20edfb Merge: #23539: Set Content-Length to 0 for PUT, POST, and PATCH if body is None. 2015-03-22 15:19:01 -04:00
Paul Moore a4d4dd3a9d #23657 Don't explicitly do an isinstance check for str in zipapp 
As a result, explicitly support pathlib.Path objects as arguments.
Also added tests for the CLI interface.
 2015-03-22 15:32:36 +00:00
Benjamin Peterson 67057ab57c merge 3.4 (#22933) 2015-03-22 10:15:12 -04:00
Raymond Hettinger 32ea16577d Issue 23704: Add index(), copy(), and insert() to deques. Register deques as a MutableSequence. 2015-03-21 01:37:37 -07:00
Serhiy Storchaka 17d3a58e39 Issue #22832: Tweaked parameter names for fcntl module to better match 
official POSIX documentation.  Updated the documenttion for Python 3.
Patch by Alex Shkop.
 2015-03-20 20:04:21 +02:00
R David Murray 6faa62445f Merge: #11726: Make linecache docs reflect that all files are treated the same. 2015-03-20 11:32:17 -04:00
R David Murray 63998a3520 #11726: Make linecache docs reflect that all files are treated the same. 
Being able to read non-python text files is not a purpose of linecache, but it
does work and people use it.  This changeset adjusts the language to make it
clear that Python files are not treated uniquely, but does not go so far as to
say reading non-python files is explicitly supported.
 2015-03-20 11:31:38 -04:00
Serhiy Storchaka 1dd49824df Issue #23681: The -b option now affects comparisons of bytes with int. 2015-03-20 16:54:57 +02:00
Victor Stinner a453cd8d85 Issue #23715: signal.sigwaitinfo() and signal.sigtimedwait() are now retried 
when interrupted by a signal not in the *sigset* parameter, if the signal
handler does not raise an exception. signal.sigtimedwait() recomputes the
timeout with a monotonic clock when it is retried.

Remove test_signal.test_sigwaitinfo_interrupted() because sigwaitinfo() doesn't
raise InterruptedError anymore if it is interrupted by a signal not in its
sigset parameter.
 2015-03-20 12:54:28 +01:00
Serhiy Storchaka 8490f5acfe Issue #23001: Few functions in modules mmap, ossaudiodev, socket, ssl, and 
codecs, that accepted only read-only bytes-like object now accept writable
bytes-like object too.
 2015-03-20 09:00:36 +02:00
Antoine Pitrou 31084ba528 Issue #23632: Memoryviews now allow tuple indexing (including for multi-dimensional memoryviews). 2015-03-19 23:29:36 +01:00
Victor Stinner 79d68f929d Issue #23646: If time.sleep() is interrupted by a signal, the sleep is now 
retried with the recomputed delay, except if the signal handler raises an
exception (PEP 475).

Modify also test_signal to use a monotonic clock instead of the system clock.
 2015-03-19 21:54:09 +01:00
Serhiy Storchaka 009b811d67 Removed unintentional trailing spaces in non-external and non-generated C files. 2015-03-18 21:53:15 +02:00
Victor Stinner 072248ec63 Merge 3.4 (linecache doc) 2015-03-18 14:19:19 +01:00
Victor Stinner 376658fa13 Issue #11726: Fix linecache example in the doc 
Use a Python source file (linecache.__file__) instead of /etc/passwd.

Modify also linecache docstrings to clarify the linecache is written to cache
Python source files, not any text files.
 2015-03-18 14:16:50 +01:00
Victor Stinner 58b8f3923e Merge 3.4 (linecache doc) 2015-03-18 14:14:52 +01:00
Victor Stinner 93f0665fb6 Issue #11726: clarify linecache doc: linecache is written to cache Python 
source files, even if "it works" with other text files encoded to UTF-8.
 2015-03-18 14:14:42 +01:00
Victor Stinner de31134558 Issue #12155: Fix queue doc example to join threads 
Use None as a sentinel to stop a worker.
 2015-03-18 14:05:43 +01:00
Victor Stinner 926ce70066 Merge 3.4 (marshal doc) 2015-03-18 13:59:02 +01:00
Victor Stinner 6a318d420a Issue #19428: Document that PyMarshal_ReadLongFromFile() and 
PyMarshal_ReadShortFromFile() can fail.
 2015-03-18 13:58:49 +01:00
Serhiy Storchaka 9c1a9b2657 Issue #2211: Updated the implementation of the http.cookies.Morsel class. 
Setting attributes key, value and coded_value directly now is deprecated.
update() and setdefault() now transform and check keys.  Comparing for
equality now takes into account attributes key, value and coded_value.
copy() now returns a Morsel, not a dict.  repr() now contains all attributes.
Optimized checking keys and quoting values.  Added new tests.
Original patch by Demian Brecht.
 2015-03-18 10:59:57 +02:00
Robert Collins 302dbc6792 Issue #18983: Allow selection of output units in timeit. 
This allows manual selection of a specific unit such as usecs rather than the
use of a heuristic. This is intended to aid machine processing of timeit
output.

Patch by Serhiy Storchaka.
 2015-03-18 09:54:50 +13:00
Victor Stinner 0c2fd89777 Revert changeset d927047b1d8eb87738676980a24930d053ba2150 
Sorry, it was a mistake, the patch is still under review: issue #23646.
 2015-03-17 10:49:17 +01:00
Berker Peksag e010d8f031 Issue #23682: Delete Python 2.2 mention from distutils documentation. 
Patch by Thomas Kluyver.
 2015-03-17 06:56:11 +02:00
Berker Peksag 6a98002d47 Issue #23682: Delete Python 2.2 mention from distutils documentation. 
Patch by Thomas Kluyver.
 2015-03-17 06:55:48 +02:00
Benjamin Peterson 85586ebc39 merge 3.4 (#23679) 2015-03-16 12:45:27 -05:00
Benjamin Peterson 59c4eb71f2 versionchanged for rc4 removal (closes #23679) 2015-03-16 12:43:38 -05:00
Eli Bendersky a84099bcc5 Issue #23549: Clarify confusion in heapq doc - accessing the mininmal element 
Merge 3.4

The current documentation only mentions heap[0] as the smallest element in the
beginning, and not in any of the methods' docs. There's no method to access the
minimal element without popping it, and the documentation of nsmallest is
confusing because it may suggest that min() is the way to go for n==1.
 2015-03-14 20:17:38 -07:00
Eli Bendersky 39430daa3b Issue #23549: Clarify confusion in heapq doc - accessing the mininmal element 
The current documentation only mentions heap[0] as the smallest element in the
beginning, and not in any of the methods' docs. There's no method to access the
minimal element without popping it, and the documentation of nsmallest is
confusing because it may suggest that min() is the way to go for n==1.
 2015-03-14 20:14:23 -07:00
Berker Peksag 102029dfd6 Issue #2052: Add charset parameter to HtmlDiff.make_file(). 2015-03-15 01:18:47 +02:00
Serhiy Storchaka fbd011dd49 Fix minor docs markup errors. 2015-03-14 21:34:25 +02:00
Serhiy Storchaka b19542d062 Fix minor docs markup errors. 2015-03-14 21:32:57 +02:00
Benjamin Peterson 76c95a01dc merge 3.4 2015-03-13 16:21:29 -05:00
Benjamin Peterson 0d70ab6b8c __getslice__ certainly won't appear in the output 2015-03-13 16:21:23 -05:00
Brett Cannon cb1dde5df5 Merge 3.4 2015-03-13 12:50:16 -04:00
Brett Cannon 2645bad04f Make the case to only support Python 2.7 when supporting 2/3 simultaneously 2015-03-13 12:49:44 -04:00
Brett Cannon 64e4f7f96d Strip trailing whitespace 2015-03-13 10:42:08 -04:00
Brett Cannon cc4dfc1b75 Issue #23491: Implement PEP 441: Improving Python Zip Application Support 
Thanks to Paul Moore for the PEP and implementation.
 2015-03-13 10:40:49 -04:00
Benjamin Peterson f0f14f72bb use the meth role for ZipFile.open 2015-03-12 22:41:06 -05:00
Berker Peksag 32799953b0 Issue #23081: Document that PySequence_List also accepts iterables. 
Patch by Lars Buitinck.
 2015-03-13 02:55:45 +02:00
Berker Peksag ce77ee9183 Issue #22154: Add an example to show context management protocol support of ZipFile.open(). 
Patch by Mike Short.
 2015-03-13 02:29:54 +02:00
Serhiy Storchaka a60c2fe480 Issue #23641: Cleaned out legacy dunder names from tests and docs. 
Fixed 2 to 3 porting bug in pynche.ColorDB.
 2015-03-12 21:56:08 +02:00
Victor Stinner 945c82eea3 test 2015-03-12 16:19:01 +01:00
Benjamin Peterson 38dae173d1 merge 3.4 2015-03-12 22:41:14 -05:00
Berker Peksag 09bb904fda Issue #23081: Document that PySequence_List also accepts iterables. 
Patch by Lars Buitinck.
 2015-03-13 02:56:12 +02:00
Berker Peksag 406221ccd9 Issue #22154: Add an example to show context management protocol support of ZipFile.open(). 
Patch by Mike Short.
 2015-03-13 02:30:17 +02:00
Serhiy Storchaka c2ccce791c Issue #23641: Cleaned out legacy dunder names from tests and docs. 
Fixed 2 to 3 porting bug in pynche.ColorDB.
Added few tests for __truediv__, __floordiv__ and __matmul__.
 2015-03-12 22:01:30 +02:00
Berker Peksag da0870c87a Add versionadded directives for the matmul operator. 2015-03-12 20:56:45 +02:00
Berker Peksag e7e497bdca Issue #23651: Fix typo in allow_abbrev docs. 
Noticed by Nathan West.
 2015-03-12 20:47:41 +02:00
Victor Stinner 95bb714ff7 Issue #23566: enable(), register(), dump_traceback() and dump_traceback_later() 
functions of faulthandler now accept file descriptors. Patch by Wei Wu.
 2015-03-12 15:32:03 +01:00
Ethan Furman 62e977f1b6 Close issue23467: add %r compatibility to bytes and bytearray 2015-03-11 08:17:00 -07:00
Victor Stinner fb581d9154 Merge 3.4 (asyncio doc) 2015-03-10 16:29:31 +01:00
Victor Stinner 84c717dd9e asyncio doc: changes on the Queue API missed Python 3.4.3 release 2015-03-10 16:27:54 +01:00
Berker Peksag 55f1949225 Issue #23432: Remove duplicate content from SystemExit docs. 
Also, document SystemExit.code attribute explicitly.
 2015-03-10 14:47:41 +02:00
Berker Peksag 77a6b20a35 Issue #23432: Remove duplicate content from SystemExit docs. 
Also, document SystemExit.code attribute explicitly.
 2015-03-10 14:47:15 +02:00
Victor Stinner 80f6bb4cd8 Merge 3.4 (os doc) 2015-03-10 13:31:58 +01:00
Victor Stinner 47c41b4e4d Issue #23605: os.walk() doc now mentions shutil.rmtree() in the last example 2015-03-10 13:31:47 +01:00
Victor Stinner 37f2034802 Issue #22524: Rephrase scandir addition in What's New in Python 3.5 
Patch written by Ben Hoyt.
 2015-03-10 13:29:41 +01:00
Victor Stinner 524a5ba111 Issue #23605: os.walk() now calls os.scandir() instead of os.listdir(). 
The usage of os.scandir() reduces the number of calls to os.stat().
Initial patch written by Ben Hoyt.
 2015-03-10 13:20:34 +01:00
Ned Deily 52eb536c99 Issue #23617: Correct plurals typo noted by Kentrell Johnson. 2015-03-09 01:55:35 -07:00
Ned Deily 8be2142377 Issue #23617: Correct plurals typo noted by Kentrell Johnson. 2015-03-09 01:55:02 -07:00
Benjamin Peterson af098a221a merge 3.4 (#23608) 2015-03-08 09:42:40 -04:00
Benjamin Peterson c8358273ae indicate correct version (closes #23608) 2015-03-08 09:42:25 -04:00
Victor Stinner 6036e4431d Issue #22524: New os.scandir() function, part of the PEP 471: "os.scandir() 
function -- a better and faster directory iterator". Patch written by Ben
Hoyt.
 2015-03-08 01:58:04 +01:00
Benjamin Peterson a5f3ad8c05 merge 3.4 2015-03-07 09:34:49 -05:00
Benjamin Peterson 8c69ecf95d replace Amazon links in the documentation (closes #23579) 
Patch by Sayan Chowdhury.
 2015-03-07 09:34:16 -05:00
Berker Peksag 49f373bf66 Issue #17911: Tweak traceback documentation. 
Changes:

* Fixed reSt markup
* Fixed cross references
* Fixed a couple of typos
 2015-03-06 12:18:06 +02:00
Robert Collins f0c819acd0 Issue #22936: Allow showing local variables in unittest errors. 2015-03-06 13:46:35 +13:00
Robert Collins d7c7e0ef69 Issue #22936: Make it possible to show local variables in tracebacks. 2015-03-05 20:28:52 +13:00
Benjamin Peterson de8eca4638 merge 3.4 2015-03-04 22:50:25 -05:00
Benjamin Peterson 990fcaac3c expose X509_V_FLAG_TRUSTED_FIRST 2015-03-04 22:49:41 -05:00
Robert Collins 6bc2c1e7eb Issue #17911: traceback module overhaul 
Provide a way to seed the linecache for a PEP-302 module without actually
loading the code.

Provide a new object API for traceback, including the ability to not lookup
lines at all until the traceback is actually rendered, without any trace of the
original objects being kept alive.
 2015-03-05 12:07:57 +13:00
Ethan Furman 738f805074 issue19075: add visual sorting algorithms to turtledemo; original code from Jason Yeo 2015-03-02 12:29:58 -08:00
Benjamin Peterson 2f3d440549 merge 3.4 (#23561) 2015-03-02 09:36:48 -05:00
Benjamin Peterson bdf525b77c wrap everything at 80 chars 2015-03-02 09:31:40 -05:00
Benjamin Peterson 29fec92875 link to the correct dis method or function (closes #23561) 2015-03-02 09:27:43 -05:00
Berker Peksag 6897e5688d Issue #20521: Change ``TOS`` to TOS in dis documentation. 
TOS is an abbreviation of top-of-stack.

Patch by Sven Berkvens-Matthijsse.
 2015-03-02 06:34:00 +02:00
Berker Peksag ab4040e3c6 Issue #20521: Change ``TOS`` to TOS in dis documentation. 
TOS is an abbreviation of top-of-stack.

Patch by Sven Berkvens-Matthijsse.
 2015-03-02 06:33:30 +02:00
Berker Peksag f2d4e5773a Add a versionadded directive for PEP 486. 2015-03-02 05:36:19 +02:00
Alexander Belopolsky e2e178e081 Closes issue #22791: Improved datetime from timestamp methods documentation. 
Original patch by Akira Li.
 2015-03-01 14:52:07 -05:00
Serhiy Storchaka 490055a167 Issue #20204: Deprecation warning is now raised for builtin type without the 
__module__ attribute.
 2015-03-01 10:03:02 +02:00
Brett Cannon b44ed82b81 Merge with 3.4 for porting HOWTO tweaks 2015-02-27 15:10:38 -05:00
Brett Cannon fdde79dbf6 Fix the clarification as to why division cannot be ported automatically 2015-02-27 15:10:03 -05:00
Zachary Ware ad9296e403 Merge with 3.4 2015-02-27 01:40:41 -06:00
Zachary Ware 0b49637890 Fix copy/paste error in bytes.isupper() doc. 
Reported by Jon Colburn on docs@.
 2015-02-27 01:40:22 -06:00
Steve Dower 76998fef2c Issue #23465: Implement PEP 486 - Make the Python Launcher aware of virtual environments (patch by Paul Moore) 2015-02-26 14:25:33 -08:00
Antoine Pitrou e71258a0e6 Issue #15955: Add an option to limit the output size in bz2.decompress(). 
Patch by Nikolaus Rath.
 2015-02-26 13:08:07 +01:00
Victor Stinner 87f50158ee Merge 3.4 (asyncio doc) 2015-02-26 10:39:31 +01:00
Victor Stinner 7b2c3c6840 asyncio doc: lock classes are not thread safe 2015-02-26 10:39:16 +01:00
Berker Peksag a1780bc321 Issue #23511: Port email-simple.py to Python 3. 
Also, update email examples to use the context manager version of open().

Patch by Baptiste Mispelon.
 2015-02-25 18:14:47 +02:00
Berker Peksag f9e3cf1f9f Issue #23511: Port email-simple.py to Python 3. 
Also, update email examples to use the context manager version of open().

Patch by Baptiste Mispelon.
 2015-02-25 18:14:09 +02:00
Victor Stinner 1313af2340 Merge 3.4 (asyncio doc) 2015-02-25 14:24:47 +01:00
Victor Stinner 83704963c0 asyncio: add a note about (non) thread safety in each class 2015-02-25 14:24:15 +01:00
Victor Stinner 532c69a428 asyncio doc: begin with warnings on asyncio traps 2015-02-25 14:23:51 +01:00
Victor Stinner 615a58eaab asyncio doc: move queues to a new page 2015-02-25 13:55:43 +01:00
Georg Brandl 961dfa10a6 Merge with 3.4 2015-02-25 13:07:03 +01:00
Georg Brandl 7e91af3a91 Remove unsupported (in latex) character from the source. 2015-02-25 13:05:53 +01:00
Victor Stinner 7caa615fb0 Merge 3.4 (asyncio doc) 2015-02-23 11:42:22 +01:00
Victor Stinner b8064a8a16 asyncio doc: close explicitly event loops 2015-02-23 11:41:56 +01:00
Ned Deily 1de71915ff Issue #23499: Fix grammar error noticed by SilentGhost 2015-02-22 16:15:14 -08:00
Ned Deily 75790938a4 Issue #23499: Fix grammar error noticed by SilentGhost 2015-02-22 16:14:32 -08:00
Serhiy Storchaka a3369a524c Issues #814253, #9179: Warnings now are raised when group references and 
conditional group references are used in lookbehind assertions in regular
expressions.
 2015-02-21 12:08:52 +02:00
Serhiy Storchaka 4eea62fd2e Issues #814253, #9179: Group references and conditional group references now 
work in lookbehind assertions in regular expressions.
 2015-02-21 10:07:35 +02:00
Brett Cannon 3fa84224fd Issue #23422: Clarify some things around importlib.import_module() 2015-02-20 10:34:20 -05:00
Berker Peksag 8e28679417 Issue #23439: Add missing entries to http.client.__all__. 
Also, document the LineTooLong exception since it can be raised by
the members of public API (e.g. http.client.HTTPResponse).

Patch by Martin Panter.
 2015-02-20 09:45:05 +02:00
Berker Peksag babc688180 Issue #23439: Add missing entries to http.client.__all__. 
Also, document the LineTooLong exception since it can be raised by
the members of public API (e.g. http.client.HTTPResponse).

Patch by Martin Panter.
 2015-02-20 09:39:38 +02:00
Zachary Ware 56dee1e463 Fix typo pointed out on docs@ by Yaniv Sayeh 2015-02-19 22:30:15 -06:00
Zachary Ware 4785f5e249 Merge with 3.4 2015-02-19 22:15:54 -06:00
Zachary Ware 57c616f1e4 Fix a typo pointed out on docs@ 2015-02-19 22:15:36 -06:00
Benjamin Peterson 1130c7f693 merge 3.4 (#23410) 2015-02-17 21:13:30 -05:00
Benjamin Peterson 70e2847347 document the requestline and close_connection attributes, use real booleans, and add tests (closes #23410) 
Patch by Martin Panter.
 2015-02-17 21:11:10 -05:00
Victor Stinner cbbdfb5933 Merge 3.4 (asyncio doc) 2015-02-17 23:11:56 +01:00
Victor Stinner f91d845797 asyncio, Tulip issue 220: Update doc of asyncio.Queue, add join and task_done 
methods
 2015-02-17 23:09:52 +01:00
Victor Stinner e170ed27c6 asyncio doc: fix the sphinx extension for coroutine commands 2015-02-17 23:08:35 +01:00
Serhiy Storchaka 8391b728e9 Issue #22883: Update PyInt to PyLong in C API example. 2015-02-17 10:19:07 +02:00
Serhiy Storchaka df0db49b1b Issue #22883: Update PyInt to PyLong in C API example. 2015-02-17 10:18:44 +02:00
Berker Peksag 5a4addabbf Fix typo in os.supports_effective_ids documentation. 2015-02-16 03:36:45 +02:00
Berker Peksag 4d6c6063bf Fix typo in os.supports_effective_ids documentation. 2015-02-16 03:36:10 +02:00
Antoine Pitrou c481bfb3f6 Issue #23239: ssl.match_hostname() now supports matching of IP addresses. 2015-02-15 18:12:20 +01:00
Berker Peksag 9121fe849e Add a whatsnew entry for issue #22003. 
Patch by David Wilson.
 2015-02-15 00:45:57 +02:00
Berker Peksag 2eb8f8178b Issue #13637: Remove outdated versionchanged directives. 
Patch by Martin Panter.
 2015-02-15 00:06:07 +02:00
Berker Peksag 50ef8a8e67 Issue #13637: Remove outdated versionchanged directives. 
Patch by Martin Panter.
 2015-02-15 00:05:42 +02:00
Steve Dower 8dcc1a9f96 Issue #23437: Update NEWS and whatsnew/3.5 2015-02-14 12:07:59 -08:00
Steve Dower 17be514d0a Closes #23437: Make user scripts directory versioned on Windows (patch by pmoore) 2015-02-14 09:50:59 -08:00
Berker Peksag 8089cd642f Issue #14910: Add allow_abbrev parameter to argparse.ArgumentParser. 
Patch by Jonathan Paugh, Steven Bethard, paul j3 and Daniel Eriksson.
 2015-02-14 01:39:17 +02:00
Berker Peksag 0fe6325acf Issue #21717: tarfile.open() now supports 'x' (exclusive creation) mode. 2015-02-13 21:02:12 +02:00
Victor Stinner 866ca88f2d Merge 3.4 (asyncio doc) 2015-02-12 22:49:45 +01:00
Victor Stinner bdd574d09a asyncio doc: annotate coroutine on coroutine functions and methods 2015-02-12 22:49:18 +01:00
Serhiy Storchaka c1efe5f039 Issue #23344: marshal.dumps() is now 20-25% faster on average. 2015-02-11 15:54:54 +02:00
Serhiy Storchaka ce921c62cc Issue #20416: marshal.dumps() with protocols 3 and 4 is now 40-50% faster on 
average.
 2015-02-11 15:53:31 +02:00
Berker Peksag bd09d7bac5 Fix typos in Doc/whatsnew/3.5.rst. 2015-02-11 15:32:34 +02:00
Vinay Sajip 365701add9 Added respect_handler_level to QueueListener. 2015-02-09 19:49:00 +00:00
Martin v. Löwis 78daf00e3f Amend b8ebf381390f: find patchlevel.py in extensions. 2015-02-09 08:07:12 +01:00
Larry Hastings df4fb13cdc Merge. 2015-02-08 14:07:35 -08:00
Steve Dower 312cef086b Improve Windows release scripts 2015-02-07 22:20:48 -08:00
Larry Hastings 206853035e Fix a copyright notice that still said 2014. 2015-02-07 16:04:29 -08:00
Larry Hastings b250610134 Fix a copyright notice that still said 2014. 2015-02-07 16:04:22 -08:00
Charles-François Natali 6e6c59b508 Issue #23285: PEP 475 -- Retry system calls failing with EINTR. 2015-02-07 13:27:50 +00:00
Vinay Sajip d005090e01 Closes #23357: Updated documentation on creating venvs. 2015-02-07 10:57:36 +00:00
Vinay Sajip 3595276bdd Corrected typo. 2015-02-07 10:56:06 +00:00
Vinay Sajip c7e34fb0bb Minor change to documentation on creating venvs. 2015-02-07 10:52:02 +00:00
Berker Peksag bf5e9604cc Issue #20289: cgi.FieldStorage() now supports the context management protocol. 2015-02-06 10:21:37 +02:00
Berker Peksag 088ca8b947 Fix typos in Doc/whatsnew/3.5.rst. 2015-02-06 10:17:49 +02:00
Steve Dower bb24087a2c Issue #23260: Update Windows installer 2015-02-05 22:08:48 -08:00
Ned Deily 7425f36ee7 Fix missing :ref: for idle in doc build. 2015-02-06 15:43:01 +11:00
Ned Deily 50afcc09ac Fix missing :ref: for idle in doc build. 2015-02-06 15:42:06 +11:00
Victor Stinner 0afc3dc183 Merge 3.4 (asyncio doc) 2015-02-04 16:14:58 +01:00
Victor Stinner 6a1b004b83 asyncio doc: explain how to display ResourceWarning in the debug mode section 2015-02-04 16:14:33 +01:00
Victor Stinner 7277761428 Merge 3.4 (asyncio doc) 2015-02-03 15:12:13 +01:00
Victor Stinner 17d87f8ae4 asyncio, Tulip issue 221: Fix doc of QueueEmpty and QueueFull 2015-02-03 15:09:24 +01:00
Serhiy Storchaka 87d0b45485 Issue #15381: Optimized io.BytesIO to make less allocations and copyings. 2015-02-03 11:30:10 +02:00
Serhiy Storchaka 83e802796c Issue #22818: Splitting on a pattern that could match an empty string now 
raises a warning.  Patterns that can only match empty strings are now
rejected.
 2015-02-03 11:04:19 +02:00
Serhiy Storchaka 32ca3dcb97 Issue #23099: Closing io.BytesIO with exported buffer is rejected now to 
prevent corrupting exported buffer.
 2015-02-03 09:30:51 +02:00
Serhiy Storchaka c057c3859c Issue #23099: Closing io.BytesIO with exported buffer is rejected now to 
prevent corrupting exported buffer.
 2015-02-03 02:00:18 +02:00
Stefan Krah 3a43d06321 Whitespace. 2015-02-01 19:46:31 +01:00
Stefan Krah 3e9bec26f4 Whitespace. 2015-02-01 19:45:14 +01:00
Stefan Krah a7e9a6a076 Issue #23352: Merge from 3.4. 2015-02-01 19:42:45 +01:00
Stefan Krah 0dc4e153a2 Issue #23352: Document that Py_buffer.suboffsets must be NULL if no suboffsets 
are required.
 2015-02-01 19:42:12 +01:00
Vinay Sajip 7929be6aeb Merged documentation update from 3.4. 2015-02-01 15:18:14 +00:00
Vinay Sajip f046dfe60e Added a cookbook entry on logging audible messages. 2015-02-01 15:17:34 +00:00
R David Murray 6ef0285aec Merge: Fix asyncio doc typo. 2015-01-29 19:54:03 -05:00
R David Murray 756f0b1982 Fix asyncio doc typo. 2015-01-29 19:53:33 -05:00
Victor Stinner fc37abf3ee Merge 3.4 (asyncio doc) 2015-01-30 01:39:01 +01:00
Victor Stinner 188f2c0b75 asyncio doc: document the new ResourceWarning warnings 2015-01-30 01:35:14 +01:00
Victor Stinner 151b23562e Merge 3.4 (asyncio doc) 2015-01-30 00:56:10 +01:00
Victor Stinner 1077dee457 asyncio doc: add a section about task cancellation 2015-01-30 00:55:58 +01:00
Victor Stinner ff5d085fde Merge 3.4 (asyncio doc) 2015-01-30 00:37:22 +01:00
Victor Stinner 7a55b88d9c Issue #21962, asyncio doc: Suggest the usage of wait_for() to replace 
the lack of timeout parameter for locks and queues.
 2015-01-30 00:37:04 +01:00
Stefan Krah f5324d7074 Closes #22668: Merge from 3.4. 2015-01-29 14:29:51 +01:00
Victor Stinner 3e48d77bcb Merge 3.4 (asyncio doc) 2015-01-29 13:33:28 +01:00
Victor Stinner 54a231d539 asyncio doc: document Protocol state machine 2015-01-29 13:33:15 +01:00
Vinay Sajip 85ad88dbc6 Merged documentation update from 3.4. 2015-01-28 07:33:14 +00:00
Vinay Sajip db07164053 Added a logging cookbook entry on customized exception formatting. 2015-01-28 07:32:38 +00:00
Berker Peksag 618e315f93 Add whatsnew entry for issue #5309. 2015-01-27 02:59:09 +02:00
Berker Peksag b820d0defc Issue #23286: Fix typo in the tutorial. 
Patch by Mayank Tripathi.
 2015-01-27 02:52:40 +02:00
Berker Peksag b68c420d8a Issue #23286: Fix typo in the tutorial. 
Patch by Mayank Tripathi.
 2015-01-27 02:52:14 +02:00
Serhiy Storchaka b76bcc4ffc Issue #14099: Backout changeset e5bb3044402b (except adapted tests). 2015-01-26 13:45:39 +02:00
Serhiy Storchaka 47efb4a5dc Issue #19361: JSON decoder now raises JSONDecodeError instead of ValueError. 2015-01-26 13:16:30 +02:00
Serhiy Storchaka c959b0cd30 Issue #18518: timeit now rejects statements which can't be compiled outside 
a function or a loop (e.g. "return" or "break").
 2015-01-26 12:09:59 +02:00
Serhiy Storchaka 2bef58577f Issue #18518: timeit now rejects statements which can't be compiled outside 
a function or a loop (e.g. "return" or "break").
 2015-01-26 12:09:17 +02:00
Serhiy Storchaka 07985ef387 Issue #22286: The "backslashreplace" error handlers now works with 
decoding and translating.
 2015-01-25 22:56:57 +02:00
R David Murray 58f02019e0 Merge: #23215: note that time.sleep affects the current thread only. 2015-01-25 15:47:06 -05:00
R David Murray 1923b627b5 #23215: reflow paragraph. 2015-01-25 15:46:22 -05:00
R David Murray f1f9675b8a #23251: Note that time.sleep affects the calling thread only. 
This change parallels the language used in the unix man page.
 2015-01-25 15:45:14 -05:00
Steve Dower 7d0e0c9f7b Closes #23253: Delay-load ShellExecute 2015-01-24 08:18:24 -08:00
Ethan Furman b95b56150f Issue20284: Implement PEP461 2015-01-23 20:05:18 -08:00
Benjamin Peterson 8861502e07 prefer server alpn ordering over the client's 2015-01-23 17:30:26 -05:00
Benjamin Peterson cca2732a82 add support for ALPN (closes #20188) 2015-01-23 16:35:37 -05:00
Vinay Sajip 06140f2e04 Closes #23305: Merged documentation fix from 3.4. 2015-01-23 21:19:53 +00:00
Vinay Sajip ff37cfe9cc Issue #23305: clarified RotatingFileHandler documentation. 2015-01-23 21:19:04 +00:00
Vinay Sajip 9aeef32cc0 Closes #23202: pyvenv documentation updated to match its behavior. 2015-01-23 19:36:54 +00:00
Vinay Sajip 71e7296016 Updated pyvenv documentation to match its current behaviour. 2015-01-23 19:35:12 +00:00
Berker Peksag 08f3143aea Issue #20898: Enum names are only available in the http.client module as constants. 
Noticed by Martin Panter.
 2015-01-20 08:02:28 +02:00
Berker Peksag 7b6b3d771a Issue #22317: Document the action parameter in ArgumentParser.add_subparsers() docs. 
Patch by Mike Short.
 2015-01-20 06:46:49 +02:00
Berker Peksag 5a494f6ad8 Issue #22317: Document the action parameter in ArgumentParser.add_subparsers() docs. 
Patch by Mike Short.
 2015-01-20 06:45:53 +02:00
Berker Peksag cb18b95ab8 Issue #20898: Add a "HTTP status codes" section to avoid duplication in HTTP docs. 
This commit also removes a couple of non-standard status codes. They were
added as part of edf669b13482, so there is no backwards compatibility issue.

Patch by Demian Brecht.
 2015-01-20 06:30:46 +02:00
Serhiy Storchaka 82e07b92b3 Issue #23181: More "codepoint" -> "code point". 2015-01-18 11:33:31 +02:00
Serhiy Storchaka d3faf43f9b Issue #23181: More "codepoint" -> "code point". 2015-01-18 11:28:37 +02:00
Ned Deily 140fc9f501 Issue #23180: merge from 3.4 2015-01-17 21:09:16 -08:00
Ned Deily ccb416fee2 Issue #23180: Rename IDLE "Windows" menu item to "Window". 
Patch by Al Sweigart.
 2015-01-17 21:06:27 -08:00
Antoine Pitrou 26795baaa8 Issue #15955: Add an option to limit output size when decompressing LZMA data. 
Patch by Nikolaus Rath and Martin Panter.
 2015-01-17 16:22:18 +01:00
Georg Brandl 0443c92ee1 merge with 3.4 2015-01-15 08:16:25 +01:00
Georg Brandl caa12dab69 Closes #23244: fix typo. Thanks Mayank Tripathi for the patch. 2015-01-15 08:16:01 +01:00
Ethan Furman 61f50bb488 Issue22997: minor doc update; thanks to Simoen Visser 2015-01-14 22:32:29 -08:00
Ethan Furman 8a12329281 Issue22997: minor doc update; thanks to Simoen Visser 2015-01-14 22:31:50 -08:00
Ethan Furman e62430eda4 Issue22988: clarify yield and exception blocks 2015-01-14 22:26:04 -08:00
Ethan Furman 2f825af728 Issue22988: clarify yield and exception blocks 2015-01-14 22:25:27 -08:00
Ethan Furman 9fdb0fe17b Issue20467: clarify __init__'s role 2015-01-14 21:57:15 -08:00
Ethan Furman 845d33c526 Issue20467: clarify __init__'s role 2015-01-14 21:56:49 -08:00
Ethan Furman 119479f705 Issue20467: clarify __init__'s role 2015-01-14 21:56:10 -08:00
Georg Brandl 3be472b5f7 Closes #23181: codepoint -> code point 2015-01-14 08:26:30 +01:00
Victor Stinner 4ec042278f Issue #22560, asyncio doc: ProactorEventLoop now supports SSL! 2015-01-14 00:30:22 +01:00
Benjamin Peterson 610bc6a211 merge 3.4 (#23221) 2015-01-13 09:20:31 -05:00
Benjamin Peterson 82f34ada45 fix instances of consecutive articles (closes #23221) 
Patch by Karan Goel.
 2015-01-13 09:17:24 -05:00
Antoine Pitrou 17cba7daf5 Issue #19777: Provide a home() classmethod on Path objects. 
Contributed by Victor Salgado and Mayank Tripathi.
 2015-01-12 21:03:41 +01:00
Antoine Pitrou 2cae11e87e Issue #22952: improve multiprocessing doc introduction and defer notes until appropriate. 
Patch by Davin Potts.
 2015-01-11 15:06:39 +01:00
Antoine Pitrou 73dd030c8b Issue #22952: improve multiprocessing doc introduction and defer notes until appropriate. 
Patch by Davin Potts.
 2015-01-11 15:05:29 +01:00
Mark Dickinson cc8617b93a Issue #21092: Merge from 3.4. 2015-01-11 13:22:44 +00:00
Mark Dickinson dfe0b2326b Issue #21902: Replace incorrect 'hyperbolic arc sine' (etc.) with 'inverse hyperbolic sine' (etc.). Remove meaningless reference to radians. 2015-01-11 13:08:05 +00:00
Mark Dickinson a5d0c7c2fd Issue #23185: add math.inf and math.nan constants. 2015-01-11 11:55:29 +00:00
Brett Cannon 02d8454002 Issue #23014: Make importlib.abc.Loader.create_module() required when 
importlib.abc.Loader.exec_module() is also defined.

Before this change, create_module() was optional **and** could return
None to trigger default semantics. This change now reduces the
options for choosing default semantics to one and in the most
backporting-friendly way (define create_module() to return None).
 2015-01-09 11:39:21 -05:00
Victor Stinner 863c69cfeb Merge 3.4 (asyncio doc) 2015-01-09 16:00:30 +01:00
Victor Stinner 7eb10311be asyncio: SelectSelector is limited to 512 sockets on Windows 2015-01-09 15:59:44 +01:00
Victor Stinner a092a615f5 asyncio doc: fix section of event loop examples 2015-01-09 15:58:41 +01:00
Victor Stinner 25638d3109 Merge 3.4 (asyncio doc) 2015-01-09 01:32:25 +01:00
Victor Stinner 399c59d7bd asyncio doc: list limitations to run subprocesses from different threads 2015-01-09 01:32:02 +01:00
Berker Peksag a65766e5ea Issue #20487: Clarify meaning of "side effect" in the magic mock documentation. 
Patch by A.M. Kuchling.
 2015-01-07 21:15:33 +02:00
Berker Peksag 283f1aa881 Issue #20487: Clarify meaning of "side effect" in the magic mock documentation. 
Patch by A.M. Kuchling.
 2015-01-07 21:15:02 +02:00
Benjamin Peterson 4cb17812d9 expose the client's cipher suites from the handshake (closes #23186) 2015-01-07 11:14:26 -06:00
Nick Coghlan f212636fe3 Issue #19548: clean up merge issues in codecs docs 
Patch by Martin Panter to clean up some problems with the merge
of the codecs docs changes from Python 3.4.
 2015-01-07 13:14:47 +10:00
Nick Coghlan 582acb75e9 Merge issue 19548 changes from 3.4 2015-01-07 00:37:01 +10:00
Nick Coghlan b9fdb7a452 Issue 19548: update codecs module documentation 
- clarified the distinction between text encodings and other codecs
- clarified relationship with builtin open and the io module
- consolidated documentation of error handlers into one section
- clarified type constraints of some behaviours
- added tests for some of the new statements in the docs
 2015-01-07 00:22:00 +10:00
Victor Stinner 3ce67a9560 Issue #23177: Document that ssl.RAND_egd() is not available with LibreSSL 2015-01-06 13:53:09 +01:00
Zachary Ware 4908f7158f Merge with 3.4 2015-01-06 00:45:52 -06:00
Zachary Ware 5819cfa5aa Cosmetic fixes to the 'Develop with asyncio' page 2015-01-06 00:40:43 -06:00
Benjamin Peterson 743ffe248c merge 3.4 2015-01-05 14:39:06 -06:00
Benjamin Peterson 63b55580fb emphasize that cffi is better than extension modules for portability 2015-01-05 14:38:46 -06:00
Benjamin Peterson dc5fdc5bb3 merge 3.4 (#23167) 2015-01-04 16:30:13 -06:00
Benjamin Peterson b461000a3f the current marshal version is 4 (closes #23167) 
Patch by Dmitry Kazakov.
 2015-01-04 16:29:48 -06:00
Ned Deily 99f7249264 Add missing URL link to Modernize docs. 2015-01-03 00:46:24 -08:00
Ned Deily 4592497f9d Add missing URL link to Modernize docs. 2015-01-03 00:45:55 -08:00
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