]> granicus.if.org Git - python/log
python
9 years agomerge 3.5
Benjamin Peterson [Fri, 1 Jan 2016 17:56:35 +0000 (11:56 -0600)]
merge 3.5

9 years agomerge 3.4
Benjamin Peterson [Fri, 1 Jan 2016 17:56:16 +0000 (11:56 -0600)]
merge 3.4

9 years agomerge 3.3
Benjamin Peterson [Fri, 1 Jan 2016 17:55:47 +0000 (11:55 -0600)]
merge 3.3

9 years agoremove some copyright notices supserseded by the toplevel ones
Benjamin Peterson [Fri, 1 Jan 2016 17:53:47 +0000 (11:53 -0600)]
remove some copyright notices supserseded by the toplevel ones

9 years agoadd 2015 and 2016
Benjamin Peterson [Fri, 1 Jan 2016 17:53:14 +0000 (11:53 -0600)]
add 2015 and 2016

9 years agomerge 3.5
Benjamin Peterson [Fri, 1 Jan 2016 17:13:16 +0000 (11:13 -0600)]
merge 3.5

9 years agomerge 3.4
Benjamin Peterson [Fri, 1 Jan 2016 17:13:10 +0000 (11:13 -0600)]
merge 3.4

9 years agomerge 3.3
Benjamin Peterson [Fri, 1 Jan 2016 17:12:49 +0000 (11:12 -0600)]
merge 3.3

9 years agoreflow
Benjamin Peterson [Fri, 1 Jan 2016 17:12:44 +0000 (11:12 -0600)]
reflow

9 years agomerge 3.5
Benjamin Peterson [Fri, 1 Jan 2016 16:25:22 +0000 (10:25 -0600)]
merge 3.5

9 years agomerge 3.4
Benjamin Peterson [Fri, 1 Jan 2016 16:25:12 +0000 (10:25 -0600)]
merge 3.4

9 years agomerge 3.3
Benjamin Peterson [Fri, 1 Jan 2016 16:24:21 +0000 (10:24 -0600)]
merge 3.3

9 years ago2016 will be another year of writing copyrighted code
Benjamin Peterson [Fri, 1 Jan 2016 16:23:45 +0000 (10:23 -0600)]
2016 will be another year of writing copyrighted code

9 years agoIssue #25961: Disallowed null characters in the type name.
Serhiy Storchaka [Wed, 30 Dec 2015 19:41:53 +0000 (21:41 +0200)]
Issue #25961: Disallowed null characters in the type name.
Simplified testing for null characters in __name__ setter.

9 years agoIssue #25961: Disallowed null characters in the type name.
Serhiy Storchaka [Wed, 30 Dec 2015 19:40:49 +0000 (21:40 +0200)]
Issue #25961: Disallowed null characters in the type name.
Simplified testing for null characters in __name__ setter.

9 years agoMake catched exception more specific and correct a comment.
Serhiy Storchaka [Wed, 30 Dec 2015 19:00:29 +0000 (21:00 +0200)]
Make catched exception more specific and correct a comment.

9 years agoMake catched exception more specific and correct a comment.
Serhiy Storchaka [Wed, 30 Dec 2015 19:00:08 +0000 (21:00 +0200)]
Make catched exception more specific and correct a comment.

9 years agoFixed formatting comman-line usage message.
Serhiy Storchaka [Wed, 30 Dec 2015 07:28:48 +0000 (09:28 +0200)]
Fixed formatting comman-line usage message.

9 years agoFixed formatting comman-line usage message.
Serhiy Storchaka [Wed, 30 Dec 2015 07:28:19 +0000 (09:28 +0200)]
Fixed formatting comman-line usage message.

9 years agoIssue #25977: Fix typos in Lib/tokenize.py
Berker Peksag [Tue, 29 Dec 2015 23:42:43 +0000 (01:42 +0200)]
Issue #25977: Fix typos in Lib/tokenize.py

Patch by John Walker.

9 years agoIssue #25977: Fix typos in Lib/tokenize.py
Berker Peksag [Tue, 29 Dec 2015 23:41:58 +0000 (01:41 +0200)]
Issue #25977: Fix typos in Lib/tokenize.py

Patch by John Walker.

9 years agoClean up float.as_integer_ratio().
Serhiy Storchaka [Tue, 29 Dec 2015 20:55:48 +0000 (22:55 +0200)]
Clean up float.as_integer_ratio().

9 years agoIssue #25971: Optimized creating Fractions from floats by 2 times and from
Serhiy Storchaka [Tue, 29 Dec 2015 20:34:23 +0000 (22:34 +0200)]
Issue #25971: Optimized creating Fractions from floats by 2 times and from
Decimals by 3 times.
Unified error messages in float.as_integer_ratio(), Decimal.as_integer_ratio(),
and Fraction constructors.

9 years agomerge 3.5 (#25973)
Benjamin Peterson [Tue, 29 Dec 2015 16:08:51 +0000 (10:08 -0600)]
merge 3.5 (#25973)

9 years agomake recording and reporting errors and nonlocal and global directives more robust...
Benjamin Peterson [Tue, 29 Dec 2015 16:08:34 +0000 (10:08 -0600)]
make recording and reporting errors and nonlocal and global directives more robust (closes #25973)

9 years agoIssue #25972, #20440: Fix compilation on Windows
Zachary Ware [Tue, 29 Dec 2015 05:51:02 +0000 (21:51 -0800)]
Issue #25972, #20440: Fix compilation on Windows

9 years agoIssue #25802: Deprecate load_module() on importlib.machinery.SourceFileLoader and...
Brett Cannon [Tue, 29 Dec 2015 01:55:27 +0000 (17:55 -0800)]
Issue #25802: Deprecate load_module() on importlib.machinery.SourceFileLoader and SourcelessFileLoader.

They were the only remaining implementations of load_module() not
documented as deprecated.

9 years agoMerge for backport of fix for issue #25930
Brett Cannon [Tue, 29 Dec 2015 01:30:57 +0000 (17:30 -0800)]
Merge for backport  of fix for issue #25930

9 years agoBackport of fix for issue #25930
Brett Cannon [Tue, 29 Dec 2015 01:30:32 +0000 (17:30 -0800)]
Backport of fix for issue #25930

9 years agoIssue #25930: Document that os.unlink and os.remove are *semantically* identical.
Brett Cannon [Tue, 29 Dec 2015 01:28:19 +0000 (17:28 -0800)]
Issue #25930: Document that os.unlink and os.remove are *semantically* identical.

Saying that the functions were identical confused some users who were
upset when the functions were no longer simply the same function under
different names.

Thanks to Anthony Sottile for the bug report and Swati Jaiswal for the
initial patch.

9 years agoIssue #25234: Skip test_eintr.test_os_open under OS X.
Brett Cannon [Tue, 29 Dec 2015 01:23:35 +0000 (17:23 -0800)]
Issue #25234: Skip test_eintr.test_os_open under OS X.

Test inconsistently hangs.

9 years agoTweak skipping message
Brett Cannon [Tue, 29 Dec 2015 01:21:44 +0000 (17:21 -0800)]
Tweak skipping message

9 years agoMerge
Brett Cannon [Tue, 29 Dec 2015 01:18:21 +0000 (17:18 -0800)]
Merge

9 years agoIssue #24725: Skip the test_socket.testFDPassEmpty on OS X.
Brett Cannon [Tue, 29 Dec 2015 01:17:58 +0000 (17:17 -0800)]
Issue #24725: Skip the test_socket.testFDPassEmpty on OS X.

In OS X 10.11, the test fails consistently due to a platform change
since 10.10. Thanks to Jeff Ramnani for the patch.

9 years agoIssue #25940: Make buildbots usable again until a solution is found.
Stefan Krah [Tue, 29 Dec 2015 01:15:35 +0000 (02:15 +0100)]
Issue #25940: Make buildbots usable again until a solution is found.

9 years agoIssue #25928: Temporarily disable some tests in test_statistics in order
Stefan Krah [Mon, 28 Dec 2015 23:11:36 +0000 (00:11 +0100)]
Issue #25928: Temporarily disable some tests in test_statistics in order
to sort out its assumptions about the as_integer_ratio() interface.

9 years agoFix typo.
Stefan Krah [Mon, 28 Dec 2015 22:17:05 +0000 (23:17 +0100)]
Fix typo.

9 years agoMerge.
Stefan Krah [Mon, 28 Dec 2015 22:12:52 +0000 (23:12 +0100)]
Merge.

9 years agoIssue #25928: Add Decimal.as_integer_ratio(). Python parts and docs by
Stefan Krah [Mon, 28 Dec 2015 22:02:02 +0000 (23:02 +0100)]
Issue #25928: Add Decimal.as_integer_ratio(). Python parts and docs by
Mark Dickinson.

9 years agoMerge heads
Serhiy Storchaka [Mon, 28 Dec 2015 22:01:31 +0000 (00:01 +0200)]
Merge heads

9 years agoIssue #25447: Copying the lru_cache() wrapper object now always works,
Serhiy Storchaka [Mon, 28 Dec 2015 21:59:09 +0000 (23:59 +0200)]
Issue #25447: Copying the lru_cache() wrapper object now always works,
independedly from the type of the wrapped object (by returning the original
object unchanged).

9 years agoIssue #25447: Copying the lru_cache() wrapper object now always works,
Serhiy Storchaka [Mon, 28 Dec 2015 21:58:07 +0000 (23:58 +0200)]
Issue #25447: Copying the lru_cache() wrapper object now always works,
independedly from the type of the wrapped object (by returning the original
object unchanged).

9 years agoRemove duplicate method in test_pathlib. Initial patch by Navneet Suman.
Ezio Melotti [Mon, 28 Dec 2015 21:50:19 +0000 (23:50 +0200)]
Remove duplicate method in test_pathlib.  Initial patch by Navneet Suman.

9 years agoIssue #25768: Make compileall functions return booleans and document
Brett Cannon [Sun, 27 Dec 2015 21:17:04 +0000 (13:17 -0800)]
Issue #25768: Make compileall functions return booleans and document
the return values as well as test them.

Thanks to Nicholas Chammas for the bug report and initial patch.

9 years agoMerge for issue #12484
Brett Cannon [Sun, 27 Dec 2015 20:24:36 +0000 (12:24 -0800)]
Merge for issue #12484

9 years agoIssue #12484: Remove a mention of Py_InitModule() and _PyImport_FixupExtension().
Brett Cannon [Sun, 27 Dec 2015 20:24:06 +0000 (12:24 -0800)]
Issue #12484: Remove a mention of Py_InitModule() and _PyImport_FixupExtension().

Thanks to Alejandro Santos for the bug report and Anish Shah for the
patch.

9 years agoMerge for issue #25874
Brett Cannon [Sun, 27 Dec 2015 20:09:10 +0000 (12:09 -0800)]
Merge for issue #25874

9 years agoIssue #25874: Clarify platform support in the "Using Python on Windows" doc.
Brett Cannon [Sun, 27 Dec 2015 20:08:37 +0000 (12:08 -0800)]
Issue #25874: Clarify platform support in the "Using Python on Windows" doc.

Thanks to Chris Wilcox for the initial patch.

9 years agoIssue #20440: Cleaning up the code by using Py_SETREF and Py_CLEAR.
Serhiy Storchaka [Sun, 27 Dec 2015 13:51:32 +0000 (15:51 +0200)]
Issue #20440: Cleaning up the code by using Py_SETREF and Py_CLEAR.
Old code is correct, but with Py_SETREF and Py_CLEAR it can be cleaner.
This patch doesn't fix bugs and hence there is no need to backport it.

9 years agoIssue #20440: More use of Py_SETREF.
Serhiy Storchaka [Sun, 27 Dec 2015 13:44:33 +0000 (15:44 +0200)]
Issue #20440: More use of Py_SETREF.
This patch is manually crafted and contains changes that couldn't be handled
automatically.

9 years agoIssue #20440: More use of Py_SETREF.
Serhiy Storchaka [Sun, 27 Dec 2015 13:41:34 +0000 (15:41 +0200)]
Issue #20440: More use of Py_SETREF.
This patch is manually crafted and contains changes that couldn't be handled
automatically.

9 years agoIssue #20440: Applied yet one patch for using Py_SETREF.
Serhiy Storchaka [Sun, 27 Dec 2015 10:38:28 +0000 (12:38 +0200)]
Issue #20440: Applied yet one patch for using Py_SETREF.
The patch is automatically generated, it replaces the code that uses Py_CLEAR.

9 years agoIssue #20440: Applied yet one patch for using Py_SETREF.
Serhiy Storchaka [Sun, 27 Dec 2015 10:36:18 +0000 (12:36 +0200)]
Issue #20440: Applied yet one patch for using Py_SETREF.
The patch is automatically generated, it replaces the code that uses Py_CLEAR.

9 years agoCloses #25360: Merged fix from 3.5.
Vinay Sajip [Sat, 26 Dec 2015 13:11:38 +0000 (13:11 +0000)]
Closes #25360: Merged fix from 3.5.

9 years agoFixes #25360: Search for pythonw.exe when in pyw.exe.
Vinay Sajip [Sat, 26 Dec 2015 13:10:51 +0000 (13:10 +0000)]
Fixes #25360: Search for pythonw.exe when in pyw.exe.

9 years agoCloses #25685: Merged fix from 3.5.
Vinay Sajip [Sat, 26 Dec 2015 12:51:43 +0000 (12:51 +0000)]
Closes #25685: Merged fix from 3.5.

9 years agoCloses #25685: Made SocketHandler emission more efficient.
Vinay Sajip [Sat, 26 Dec 2015 12:48:44 +0000 (12:48 +0000)]
Closes #25685: Made SocketHandler emission more efficient.

9 years agoCloses #25789: Improved buffering behaviour in launcher.
Vinay Sajip [Sat, 26 Dec 2015 12:35:47 +0000 (12:35 +0000)]
Closes #25789: Improved buffering behaviour in launcher.

9 years agoIssue #22995: Instances of extension types with a state that aren't
Serhiy Storchaka [Fri, 25 Dec 2015 19:05:35 +0000 (21:05 +0200)]
Issue #22995: Instances of extension types with a state that aren't
subclasses of list or dict and haven't implemented any pickle-related
methods (__reduce__, __reduce_ex__, __getnewargs__, __getnewargs_ex__,
or __getstate__), can no longer be pickled.  Including memoryview.

9 years agoIssue #22995: Instances of extension types with a state that aren't
Serhiy Storchaka [Fri, 25 Dec 2015 19:04:29 +0000 (21:04 +0200)]
Issue #22995: Instances of extension types with a state that aren't
subclasses of list or dict and haven't implemented any pickle-related
methods (__reduce__, __reduce_ex__, __getnewargs__, __getnewargs_ex__,
or __getstate__), can no longer be pickled.  Including memoryview.

9 years agoIssue #25923: Added more const qualifiers to signatures of static and private functions.
Serhiy Storchaka [Fri, 25 Dec 2015 18:01:53 +0000 (20:01 +0200)]
Issue #25923: Added more const qualifiers to signatures of static and private functions.

9 years agoIssue #25923: Added the const qualifier to static constant arrays.
Serhiy Storchaka [Fri, 25 Dec 2015 17:53:18 +0000 (19:53 +0200)]
Issue #25923: Added the const qualifier to static constant arrays.

9 years agoIssue #24103: Fixed possible use after free in ElementTree.XMLPullParser.
Serhiy Storchaka [Thu, 24 Dec 2015 09:53:16 +0000 (11:53 +0200)]
Issue #24103: Fixed possible use after free in ElementTree.XMLPullParser.

9 years agoIssue #24103: Fixed possible use after free in ElementTree.XMLPullParser.
Serhiy Storchaka [Thu, 24 Dec 2015 09:51:57 +0000 (11:51 +0200)]
Issue #24103: Fixed possible use after free in ElementTree.XMLPullParser.

9 years agoIssue #20440: Massive replacing unsafe attribute setting code with special
Serhiy Storchaka [Thu, 24 Dec 2015 08:39:57 +0000 (10:39 +0200)]
Issue #20440: Massive replacing unsafe attribute setting code with special
macro Py_SETREF.

9 years agoIssue #20440: Massive replacing unsafe attribute setting code with special
Serhiy Storchaka [Thu, 24 Dec 2015 08:35:59 +0000 (10:35 +0200)]
Issue #20440: Massive replacing unsafe attribute setting code with special
macro Py_SETREF.

9 years agoMerge: #1753718: clarify RFC compliance and bytes/string argument types.
R David Murray [Thu, 24 Dec 2015 02:19:53 +0000 (21:19 -0500)]
Merge: #1753718: clarify RFC compliance and bytes/string argument types.

9 years ago#1753718: clarify RFC compliance and bytes/string argument types.
R David Murray [Thu, 24 Dec 2015 02:17:17 +0000 (21:17 -0500)]
#1753718: clarify RFC compliance and bytes/string argument types.

Patch includes contributions by Isobel Hooper, incorporating suggestions from
Paul Winkler.  Reviewed by Martin Panter.

In addition to accepting the corrections for the RFC compliance wording, I
went through and corrected all the argument and return types, and made the
pattern of how the arguments and return types are documented consistent.
So, this patch also addresses #20782, though I had forgotten about that issue
and its patch.

9 years agoIssue #25860: Fixed test failure caused by inconsistency of os.walk() and
Serhiy Storchaka [Tue, 22 Dec 2015 22:37:50 +0000 (00:37 +0200)]
Issue #25860: Fixed test failure caused by inconsistency of os.walk() and
os.fwalk() parameter names.

9 years agoIssue #25860: Fixed test failure caused by inconsistency of os.walk() and
Serhiy Storchaka [Tue, 22 Dec 2015 22:37:34 +0000 (00:37 +0200)]
Issue #25860: Fixed test failure caused by inconsistency of os.walk() and
os.fwalk() parameter names.

9 years agoIssue #25860: os.fwalk() no longer skips remaining directories when error occurs.
Serhiy Storchaka [Tue, 22 Dec 2015 22:09:01 +0000 (00:09 +0200)]
Issue #25860: os.fwalk() no longer skips remaining directories when error occurs.
Original patch by Samson Lee.

9 years agoIssue #25860: os.fwalk() no longer skips remaining directories when error occurs.
Serhiy Storchaka [Tue, 22 Dec 2015 22:08:24 +0000 (00:08 +0200)]
Issue #25860: os.fwalk() no longer skips remaining directories when error occurs.
Original patch by Samson Lee.

9 years agoIssue #25914: Fixed and simplified OrderedDict.__sizeof__.
Serhiy Storchaka [Tue, 22 Dec 2015 06:22:05 +0000 (08:22 +0200)]
Issue #25914: Fixed and simplified OrderedDict.__sizeof__.

9 years agoIssue #25914: Fixed and simplified OrderedDict.__sizeof__.
Serhiy Storchaka [Tue, 22 Dec 2015 06:16:18 +0000 (08:16 +0200)]
Issue #25914: Fixed and simplified OrderedDict.__sizeof__.

9 years agoIssue #25827: Merge with 3.5
Zachary Ware [Mon, 21 Dec 2015 20:17:12 +0000 (14:17 -0600)]
Issue #25827: Merge with 3.5

9 years agoIssue #25827: Add support for ICC to configure
Zachary Ware [Mon, 21 Dec 2015 18:09:17 +0000 (12:09 -0600)]
Issue #25827: Add support for ICC to configure

9 years agoIssue #25869: Optimized deepcopying ElementTree; it is now 20 times faster.
Serhiy Storchaka [Mon, 21 Dec 2015 10:57:27 +0000 (12:57 +0200)]
Issue #25869: Optimized deepcopying ElementTree; it is now 20 times faster.

9 years agoIssue #25873: Optimized iterating ElementTree.
Serhiy Storchaka [Mon, 21 Dec 2015 10:43:54 +0000 (12:43 +0200)]
Issue #25873: Optimized iterating ElementTree.
Iterating elements Element.iter() is now 40% faster,
iterating text Element.itertext() is now up to 2.5 times faster.

9 years agoIssue #25902: Fixed various refcount issues in ElementTree iteration.
Serhiy Storchaka [Mon, 21 Dec 2015 09:11:12 +0000 (11:11 +0200)]
Issue #25902: Fixed various refcount issues in ElementTree iteration.

9 years agoIssue #25902: Fixed various refcount issues in ElementTree iteration.
Serhiy Storchaka [Mon, 21 Dec 2015 09:09:48 +0000 (11:09 +0200)]
Issue #25902: Fixed various refcount issues in ElementTree iteration.

9 years agoMerge from 3.5 to default.
Larry Hastings [Mon, 21 Dec 2015 06:47:04 +0000 (22:47 -0800)]
Merge from 3.5 to default.

9 years agoMerge 3.4.4 from 3.4 to 3.5.
Larry Hastings [Mon, 21 Dec 2015 06:46:30 +0000 (22:46 -0800)]
Merge 3.4.4 from 3.4 to 3.5.

9 years agoMerge.
Larry Hastings [Mon, 21 Dec 2015 06:44:06 +0000 (22:44 -0800)]
Merge.

9 years agoPost-release touchups for Python 3.4.4 final.
Larry Hastings [Mon, 21 Dec 2015 06:42:47 +0000 (22:42 -0800)]
Post-release touchups for Python 3.4.4 final.

9 years agoIssue #25766: Special method __bytes__() now works in str subclasses.
Serhiy Storchaka [Sun, 20 Dec 2015 14:37:21 +0000 (16:37 +0200)]
Issue #25766: Special method __bytes__() now works in str subclasses.

9 years agoIssue #25766: Special method __bytes__() now works in str subclasses.
Serhiy Storchaka [Sun, 20 Dec 2015 14:36:34 +0000 (16:36 +0200)]
Issue #25766: Special method __bytes__() now works in str subclasses.

9 years agoFixed sizeof tests for dict and type (they were passed by accident).
Serhiy Storchaka [Sun, 20 Dec 2015 09:39:47 +0000 (11:39 +0200)]
Fixed sizeof tests for dict and type (they were passed by accident).
Added tests for dict views iterators.

9 years agoFixed sizeof tests for dict and type (they were passed by accident).
Serhiy Storchaka [Sun, 20 Dec 2015 09:39:14 +0000 (11:39 +0200)]
Fixed sizeof tests for dict and type (they were passed by accident).
Added tests for dict views iterators.

9 years agoDon't create non-needed file.
Serhiy Storchaka [Sun, 20 Dec 2015 07:38:31 +0000 (09:38 +0200)]
Don't create non-needed file.

9 years agoDon't create non-needed file.
Serhiy Storchaka [Sun, 20 Dec 2015 07:37:52 +0000 (09:37 +0200)]
Don't create non-needed file.

9 years agoAdded tag v3.4.4 for changeset 737efcadf5a6
Larry Hastings [Sun, 20 Dec 2015 03:31:20 +0000 (19:31 -0800)]
Added tag v3.4.4 for changeset 737efcadf5a6

9 years agoRelease bump for Python 3.4.4 final. v3.4.4
Larry Hastings [Sun, 20 Dec 2015 03:31:10 +0000 (19:31 -0800)]
Release bump for Python 3.4.4 final.

9 years agoRebuild pydoc topics for Python 3.4.4 final.
Larry Hastings [Sun, 20 Dec 2015 03:28:52 +0000 (19:28 -0800)]
Rebuild pydoc topics for Python 3.4.4 final.

9 years agoUse correct PyGC_Head size in tests for issue #25421.
Serhiy Storchaka [Sat, 19 Dec 2015 20:51:00 +0000 (22:51 +0200)]
Use correct PyGC_Head size in tests for issue #25421.

9 years agoUse correct PyGC_Head size in tests for issue #25421.
Serhiy Storchaka [Sat, 19 Dec 2015 20:49:29 +0000 (22:49 +0200)]
Use correct PyGC_Head size in tests for issue #25421.

9 years agoIssue #25421: __sizeof__ methods of builtin types now use dynamic basic size.
Serhiy Storchaka [Sat, 19 Dec 2015 18:07:11 +0000 (20:07 +0200)]
Issue #25421: __sizeof__ methods of builtin types now use dynamic basic size.
This allows sys.getsize() to work correctly with their subclasses with
__slots__ defined.

9 years agoIssue #25421: __sizeof__ methods of builtin types now use dynamic basic size.
Serhiy Storchaka [Sat, 19 Dec 2015 18:05:25 +0000 (20:05 +0200)]
Issue #25421: __sizeof__ methods of builtin types now use dynamic basic size.
This allows sys.getsize() to work correctly with their subclasses with
__slots__ defined.

9 years agoIssue #22227: The TarFile iterator is reimplemented using generator.
Serhiy Storchaka [Sat, 19 Dec 2015 07:43:14 +0000 (09:43 +0200)]
Issue #22227: The TarFile iterator is reimplemented using generator.
This implementation is simpler that using class.

9 years agoMerge with 3.5
Terry Jan Reedy [Fri, 18 Dec 2015 20:47:28 +0000 (15:47 -0500)]
Merge with 3.5

9 years agoMerge with 3.4
Terry Jan Reedy [Fri, 18 Dec 2015 20:47:13 +0000 (15:47 -0500)]
Merge with 3.4