]> granicus.if.org Git - python/log
python
11 years ago#6916: raise a deprecation warning if using asynchat.fifo
Giampaolo Rodola' [Sat, 21 Jun 2014 11:58:30 +0000 (13:58 +0200)]
#6916: raise a deprecation warning if using asynchat.fifo

11 years agofix issue #6916: undocument deprecated asynchat.fifo class.q
Giampaolo Rodola' [Sat, 14 Jun 2014 15:03:42 +0000 (17:03 +0200)]
fix issue #6916: undocument deprecated asynchat.fifo class.q

11 years agoCloses #21742: Merged fix from 3.4.
Vinay Sajip [Sat, 14 Jun 2014 09:23:20 +0000 (10:23 +0100)]
Closes #21742: Merged fix from 3.4.

11 years agoIssue #21742: Set stream to None after closing.
Vinay Sajip [Sat, 14 Jun 2014 09:22:05 +0000 (10:22 +0100)]
Issue #21742: Set stream to None after closing.

11 years agoCloses #21752: Merged update from 3.4.
Vinay Sajip [Sat, 14 Jun 2014 08:27:10 +0000 (09:27 +0100)]
Closes #21752: Merged update from 3.4.

11 years agoIssue #21752: Documented change to behaviour of logging.getLevelName().
Vinay Sajip [Sat, 14 Jun 2014 08:26:26 +0000 (09:26 +0100)]
Issue #21752: Documented change to behaviour of logging.getLevelName().

11 years agoFix typo
Raymond Hettinger [Sat, 14 Jun 2014 07:03:28 +0000 (00:03 -0700)]
Fix typo

11 years agoMerge with 3.4
Terry Jan Reedy [Fri, 13 Jun 2014 19:21:01 +0000 (15:21 -0400)]
Merge with 3.4

11 years agoIssue #21730: Add no-thread skip in test_socket. Patch by Berker Peksag.
Terry Jan Reedy [Fri, 13 Jun 2014 19:20:45 +0000 (15:20 -0400)]
Issue #21730: Add no-thread skip in test_socket. Patch by Berker Peksag.

11 years agoMerge with 3.4
Terry Jan Reedy [Fri, 13 Jun 2014 18:58:09 +0000 (14:58 -0400)]
Merge with 3.4

11 years agoIssue #21726: Remove unnecessary and contextually wrong line.
Terry Jan Reedy [Fri, 13 Jun 2014 18:57:51 +0000 (14:57 -0400)]
Issue #21726: Remove unnecessary and contextually wrong line.

11 years agoIssue #19493: Merge with 3.4
Zachary Ware [Fri, 13 Jun 2014 18:48:03 +0000 (13:48 -0500)]
Issue #19493: Merge with 3.4

11 years agoIssue #19493: Refactor ctypes test package.
Zachary Ware [Fri, 13 Jun 2014 18:44:39 +0000 (13:44 -0500)]
Issue #19493: Refactor ctypes test package.

Skipped tests are now marked as skipped, formerly commented-out or
renamed-so-it-doesn't-look-like-a-test tests are uncommented, properly named,
and unconditionally skipped, some tests that simply didn't run before
are now able to run, and a few are split into multiple methods instead of
skipping via 'return' in the middle of a method.  Also, a couple of unused
files are removed completely.

11 years agoMerge with 3.4
Terry Jan Reedy [Fri, 13 Jun 2014 18:23:57 +0000 (14:23 -0400)]
Merge with 3.4

11 years agoIssue #20043: Add direct test for _thread.
Terry Jan Reedy [Fri, 13 Jun 2014 18:23:43 +0000 (14:23 -0400)]
Issue #20043: Add direct test for _thread.

11 years agoMerge with 3.4
Zachary Ware [Fri, 13 Jun 2014 14:43:32 +0000 (09:43 -0500)]
Merge with 3.4

11 years agoPer Martin [1], PGO is no longer used for official releases.
Zachary Ware [Fri, 13 Jun 2014 14:43:15 +0000 (09:43 -0500)]
Per Martin [1], PGO is no longer used for official releases.

[1] https://mail.python.org/pipermail/python-dev/2014-June/135018.html

11 years agoIssue #21745: Merge with 3.4
Zachary Ware [Fri, 13 Jun 2014 14:39:24 +0000 (09:39 -0500)]
Issue #21745: Merge with 3.4

11 years agoIssue #21745: Mention VS2010 SP1 as a solution for LNK1123 errors
Zachary Ware [Fri, 13 Jun 2014 14:38:50 +0000 (09:38 -0500)]
Issue #21745: Mention VS2010 SP1 as a solution for LNK1123 errors

11 years agoMerge 3.4 (null merge)
Victor Stinner [Fri, 13 Jun 2014 12:58:55 +0000 (14:58 +0200)]
Merge 3.4 (null merge)

11 years agoIssue #16136: VMSError is done, bye bye VMS
Victor Stinner [Fri, 13 Jun 2014 12:58:48 +0000 (14:58 +0200)]
Issue #16136: VMSError is done, bye bye VMS

11 years agoIssue #16136: VMSError is done, bye bye VMS
Victor Stinner [Fri, 13 Jun 2014 12:55:47 +0000 (14:55 +0200)]
Issue #16136: VMSError is done, bye bye VMS

11 years agoIssue #21711: support for "site-python" directories has now been removed from the...
Antoine Pitrou [Thu, 12 Jun 2014 23:41:30 +0000 (19:41 -0400)]
Issue #21711: support for "site-python" directories has now been removed from the site module (it was deprecated in 3.4).

11 years agoIssue #21709: Merged update from 3.4.
Vinay Sajip [Thu, 12 Jun 2014 22:38:16 +0000 (23:38 +0100)]
Issue #21709: Merged update from 3.4.

11 years agoIssue #21709: Improved implementation to cover the frozen module case.
Vinay Sajip [Thu, 12 Jun 2014 22:36:33 +0000 (23:36 +0100)]
Issue #21709: Improved implementation to cover the frozen module case.

11 years ago(Merge 3.4) asyncio: Tulip issue 173: Enhance repr(Handle) and repr(Task)
Victor Stinner [Thu, 12 Jun 2014 16:39:42 +0000 (18:39 +0200)]
(Merge 3.4) asyncio: Tulip issue 173: Enhance repr(Handle) and repr(Task)

repr(Handle) is shorter for function: "foo" instead of "<function foo at
0x...>". It now also includes the source of the callback, filename and line
number where it was defined, if available.

repr(Task) now also includes the current position in the code, filename and
line number, if available. If the coroutine (generator) is done, the line
number is omitted and "done" is added.

11 years agoasyncio: Tulip issue 173: Enhance repr(Handle) and repr(Task)
Victor Stinner [Thu, 12 Jun 2014 16:39:26 +0000 (18:39 +0200)]
asyncio: Tulip issue 173: Enhance repr(Handle) and repr(Task)

repr(Handle) is shorter for function: "foo" instead of "<function foo at
0x...>". It now also includes the source of the callback, filename and line
number where it was defined, if available.

repr(Task) now also includes the current position in the code, filename and
line number, if available. If the coroutine (generator) is done, the line
number is omitted and "done" is added.

11 years agoMerge with 3.4
Terry Jan Reedy [Thu, 12 Jun 2014 05:03:35 +0000 (01:03 -0400)]
Merge with 3.4

11 years agoIssue #12387: Add missing upper(lower)case versions of default Windows key
Terry Jan Reedy [Thu, 12 Jun 2014 05:03:08 +0000 (01:03 -0400)]
Issue #12387: Add missing upper(lower)case versions of default Windows key
bindings for Idle so Caps Lock does not disable them. Patch by Roger Serwy.

11 years agoSuppress a couple more DeprecationWarnings in the test suite.
R David Murray [Wed, 11 Jun 2014 21:09:43 +0000 (17:09 -0400)]
Suppress a couple more DeprecationWarnings in the test suite.

11 years agoCloses #21713: Merge with 3.4
Zachary Ware [Wed, 11 Jun 2014 20:28:31 +0000 (15:28 -0500)]
Closes #21713: Merge with 3.4

11 years agoIssue #21713: Fix typo in a comment. Found by Joseph Shen.
Zachary Ware [Wed, 11 Jun 2014 20:27:04 +0000 (15:27 -0500)]
Issue #21713: Fix typo in a comment.  Found by Joseph Shen.

11 years agoEliminate DeprecationWarning in test_concurrent_futures.
R David Murray [Wed, 11 Jun 2014 20:25:05 +0000 (16:25 -0400)]
Eliminate DeprecationWarning in test_concurrent_futures.

11 years ago#14758: Fix the fix (fix getaddrinfo in mock_socket)
R David Murray [Wed, 11 Jun 2014 20:10:10 +0000 (16:10 -0400)]
#14758: Fix the fix (fix getaddrinfo in mock_socket)

I forgot to run all the affected tests when I fixed smtpd.

11 years agoFix doc build warning
Zachary Ware [Wed, 11 Jun 2014 20:02:25 +0000 (15:02 -0500)]
Fix doc build warning

11 years ago#14758: Need to specify the desired socket type in the getaddrinfo call.
R David Murray [Wed, 11 Jun 2014 19:17:50 +0000 (15:17 -0400)]
#14758: Need to specify the desired socket type in the getaddrinfo call.

This worked by accident on Linux because the SOCK_STREAM was returned
first, but on the FreeBSD the SOCK_DGRAM is first in the list.

11 years ago#19840: Add copy_function to shutil.move.
R David Murray [Wed, 11 Jun 2014 18:40:13 +0000 (14:40 -0400)]
#19840: Add copy_function to shutil.move.

Patch by Claudiu Popa.

11 years ago#14758: add IPv6 support to smtpd.
R David Murray [Wed, 11 Jun 2014 17:48:58 +0000 (13:48 -0400)]
#14758: add IPv6 support to smtpd.

Patch by Milan Oberkirch.

11 years ago#19662: Eliminate warnings in other test modules that use smtpd.
R David Murray [Wed, 11 Jun 2014 16:27:40 +0000 (12:27 -0400)]
#19662: Eliminate warnings in other test modules that use smtpd.

Eventually these will want to convert to decode_data=False, I think.

11 years ago#19662: add decode_data to smtpd so you can get at DATA in bytes form.
R David Murray [Wed, 11 Jun 2014 15:18:08 +0000 (11:18 -0400)]
#19662: add decode_data to smtpd so you can get at DATA in bytes form.

Otherwise smtpd is restricted to 7bit clean data, since even if the
incoming data is actually utf-8, it will often break things to decode
it before parsing the message.

Patch by Maciej Szulik, with some adjustments (mostly the warning
support).

11 years agomerge from 3.4
Senthil Kumaran [Wed, 11 Jun 2014 13:19:47 +0000 (06:19 -0700)]
merge from 3.4

11 years ago#21693 - Fix the broken link for pylons project.
Senthil Kumaran [Wed, 11 Jun 2014 13:19:21 +0000 (06:19 -0700)]
#21693 - Fix the broken link for pylons project.

11 years agoIssue #21629: Merge from 3.4.
Larry Hastings [Wed, 11 Jun 2014 11:36:09 +0000 (04:36 -0700)]
Issue #21629: Merge from 3.4.

11 years agoIssue #21629: Fix Argument Clinic's "--converters" feature.
Larry Hastings [Wed, 11 Jun 2014 11:31:29 +0000 (04:31 -0700)]
Issue #21629: Fix Argument Clinic's "--converters" feature.

11 years agoCloses #21709: Merged fix from 3.4.
Vinay Sajip [Wed, 11 Jun 2014 07:04:16 +0000 (08:04 +0100)]
Closes #21709: Merged fix from 3.4.

11 years agoIssue #21709: Remove references to __file__ when part of a frozen application.
Vinay Sajip [Wed, 11 Jun 2014 07:01:32 +0000 (08:01 +0100)]
Issue #21709: Remove references to __file__ when part of a frozen application.

11 years agoPyErr_NormalizeException doesn't like being called with an exception set
Serhiy Storchaka [Wed, 11 Jun 2014 04:19:39 +0000 (07:19 +0300)]
PyErr_NormalizeException doesn't like being called with an exception set
(issues #21677, #21310).

11 years agoPyErr_NormalizeException doesn't like being called with an exception set
Serhiy Storchaka [Wed, 11 Jun 2014 04:18:53 +0000 (07:18 +0300)]
PyErr_NormalizeException doesn't like being called with an exception set
(issues #21677, #21310).

11 years agofix issue #17552: add socket.sendfile() method allowing to send a file over a socket...
Giampaolo Rodola' [Wed, 11 Jun 2014 01:54:30 +0000 (03:54 +0200)]
fix issue #17552: add socket.sendfile() method allowing to send a file over a socket by using high-performance os.sendfile() on UNIX. Patch by Giampaolo Rodola'·

11 years agoIssue #18039: dbm.dump.open() now always creates a new database when the
Serhiy Storchaka [Tue, 10 Jun 2014 18:16:00 +0000 (21:16 +0300)]
Issue #18039: dbm.dump.open() now always creates a new database when the
flag has the value 'n'.  Patch by Claudiu Popa.

11 years agoIssue #21688: Merge with 3.4
Zachary Ware [Tue, 10 Jun 2014 17:08:20 +0000 (12:08 -0500)]
Issue #21688: Merge with 3.4

11 years agoIssue #21688: Give informative error message when hhc.exe cannot be found.
Zachary Ware [Tue, 10 Jun 2014 17:07:45 +0000 (12:07 -0500)]
Issue #21688: Give informative error message when hhc.exe cannot be found.

Initial patch by Olive Kilburn.

11 years ago(Merge 3.4) Issue #21596: asyncio.wait(): mention that the sequence of futures
Victor Stinner [Tue, 10 Jun 2014 09:16:18 +0000 (11:16 +0200)]
(Merge 3.4) Issue #21596: asyncio.wait(): mention that the sequence of futures
must not be empty.

11 years agoIssue #21596: asyncio.wait(): mention that the sequence of futures must not
Victor Stinner [Tue, 10 Jun 2014 09:16:05 +0000 (11:16 +0200)]
Issue #21596: asyncio.wait(): mention that the sequence of futures must not
be empty.

11 years agoMerge 3.4
Victor Stinner [Tue, 10 Jun 2014 08:26:38 +0000 (10:26 +0200)]
Merge 3.4

11 years agoIssue #21326: Add a new is_closed() method to asyncio.BaseEventLoop
Victor Stinner [Tue, 10 Jun 2014 08:23:10 +0000 (10:23 +0200)]
Issue #21326: Add a new is_closed() method to asyncio.BaseEventLoop

Add BaseEventLoop._closed attribute and use it to check if the event loop was
closed or not, instead of checking different attributes in each subclass of
BaseEventLoop.

run_forever() and run_until_complete() methods now raise a RuntimeError('Event loop is
closed') exception if the event loop was closed.

BaseProactorEventLoop.close() now also cancels "accept futures".

11 years ago(Merge 3.4) Issue #21700: Fix asyncio doc, add DatagramProtocol
Victor Stinner [Tue, 10 Jun 2014 07:21:07 +0000 (09:21 +0200)]
(Merge 3.4) Issue #21700: Fix asyncio doc, add DatagramProtocol

11 years agoIssue #21700: Fix asyncio doc, add DatagramProtocol
Victor Stinner [Tue, 10 Jun 2014 07:19:26 +0000 (09:19 +0200)]
Issue #21700: Fix asyncio doc, add DatagramProtocol

11 years agoMerge with 3.4
Terry Jan Reedy [Tue, 10 Jun 2014 06:49:54 +0000 (02:49 -0400)]
Merge with 3.4

11 years agoIssue #21695: Catch AttributeError created when user closes grep output window
Terry Jan Reedy [Tue, 10 Jun 2014 06:49:35 +0000 (02:49 -0400)]
Issue #21695: Catch AttributeError created when user closes grep output window
while still being written to. With no console, this closed Idle.
Also add missing import and a few other changes.

11 years agoMerge: #20903: clarify what happens when an smtp connection timeout occurs.
R David Murray [Mon, 9 Jun 2014 20:41:27 +0000 (16:41 -0400)]
Merge: #20903: clarify what happens when an smtp connection timeout occurs.

11 years ago#20903: clarify what happens when an smtp connection timeout occurs.
R David Murray [Mon, 9 Jun 2014 20:41:06 +0000 (16:41 -0400)]
#20903: clarify what happens when an smtp connection timeout occurs.

Patch by Milan Oberkirch.

11 years agoIssue #21310: Fixed possible resource leak in failed open().
Serhiy Storchaka [Mon, 9 Jun 2014 10:35:43 +0000 (13:35 +0300)]
Issue #21310: Fixed possible resource leak in failed open().

11 years agoIssue #21310: Fixed possible resource leak in failed open().
Serhiy Storchaka [Mon, 9 Jun 2014 10:32:34 +0000 (13:32 +0300)]
Issue #21310: Fixed possible resource leak in failed open().

11 years agoCloses #21256: Printout of keyword args in deterministic order in mock calls.
Kushal Das [Mon, 9 Jun 2014 08:15:56 +0000 (13:45 +0530)]
Closes #21256: Printout of keyword args in deterministic order in mock calls.

Printout of keyword args should be in deterministic order in
a mock function call. This will help to write better doctests.

11 years agoIssue #21677: Fixed chaining nonnormalized exceptions in io close() methods.
Serhiy Storchaka [Mon, 9 Jun 2014 06:15:42 +0000 (09:15 +0300)]
Issue #21677: Fixed chaining nonnormalized exceptions in io close() methods.

11 years agoIssue #21677: Fixed chaining nonnormalized exceptions in io close() methods.
Serhiy Storchaka [Mon, 9 Jun 2014 06:13:04 +0000 (09:13 +0300)]
Issue #21677: Fixed chaining nonnormalized exceptions in io close() methods.

11 years agoIssue #21569: merge from 3.4
Nick Coghlan [Mon, 9 Jun 2014 03:30:33 +0000 (13:30 +1000)]
Issue #21569: merge from 3.4

11 years agoIssue #21569: Fix incorrect cross reference
Nick Coghlan [Mon, 9 Jun 2014 03:14:54 +0000 (13:14 +1000)]
Issue #21569: Fix incorrect cross reference

11 years agoIssue #21515: Fix typo in a comment, thanks Arfrever for the report
Victor Stinner [Sun, 8 Jun 2014 22:05:47 +0000 (00:05 +0200)]
Issue #21515: Fix typo in a comment, thanks Arfrever for the report

11 years agoMerge with 3.4
Zachary Ware [Sun, 8 Jun 2014 19:43:08 +0000 (14:43 -0500)]
Merge with 3.4

11 years agoIssue #21683: Add Tix build to the Windows buildbot scripts.
Zachary Ware [Sun, 8 Jun 2014 19:28:13 +0000 (14:28 -0500)]
Issue #21683: Add Tix build to the Windows buildbot scripts.

11 years agoMerge with 3.4 whitespace
Terry Jan Reedy [Sun, 8 Jun 2014 18:57:42 +0000 (14:57 -0400)]
Merge with 3.4 whitespace

11 years agowhitespace
Terry Jan Reedy [Sun, 8 Jun 2014 18:57:24 +0000 (14:57 -0400)]
whitespace

11 years agoMerge with 3.4
Terry Jan Reedy [Sun, 8 Jun 2014 18:49:30 +0000 (14:49 -0400)]
Merge with 3.4

11 years agoMerge heads.
Terry Jan Reedy [Sun, 8 Jun 2014 18:49:07 +0000 (14:49 -0400)]
Merge heads.

11 years agoIssue #21682: Replace EditorWindow with mock to eliminate memory leaks.
Terry Jan Reedy [Sun, 8 Jun 2014 18:47:26 +0000 (14:47 -0400)]
Issue #21682: Replace EditorWindow with mock to eliminate memory leaks.
Patch by Saimadhav Heblikar. (2 head merge)

11 years agobackout 0fb7789b5eeb for test breakage (#20578)
Benjamin Peterson [Sun, 8 Jun 2014 06:18:12 +0000 (23:18 -0700)]
backout 0fb7789b5eeb for test breakage (#20578)

11 years agomerge 3.4 (#11709)
Benjamin Peterson [Sun, 8 Jun 2014 03:17:29 +0000 (20:17 -0700)]
merge 3.4 (#11709)

11 years agomake sure the builtin help function doesn't fail when sys.stdin is not a valid file...
Benjamin Peterson [Sun, 8 Jun 2014 03:14:26 +0000 (20:14 -0700)]
make sure the builtin help function doesn't fail when sys.stdin is not a valid file (closes #11709)

Original patch by Amaury Forgeot d'Arc with a test by bdettmer.

11 years agoadd BufferedIOBase.readinto1 (closes #20578)
Benjamin Peterson [Sun, 8 Jun 2014 03:06:48 +0000 (20:06 -0700)]
add BufferedIOBase.readinto1 (closes #20578)

Patch by Nikolaus Rath.

11 years agomerge 3.4 (#12063)
Benjamin Peterson [Sun, 8 Jun 2014 00:55:53 +0000 (17:55 -0700)]
merge 3.4 (#12063)

11 years agodocument TokenError and unclosed expression behavior (closes #12063)
Benjamin Peterson [Sun, 8 Jun 2014 00:47:41 +0000 (17:47 -0700)]
document TokenError and unclosed expression behavior (closes #12063)

Patch by Amandine Lee.

11 years agomerge 3.4 (#13223)
Benjamin Peterson [Sat, 7 Jun 2014 23:47:15 +0000 (16:47 -0700)]
merge 3.4 (#13223)

11 years agodon't remove self from example code in the HTML output (closes #13223)
Benjamin Peterson [Sat, 7 Jun 2014 23:44:00 +0000 (16:44 -0700)]
don't remove self from example code in the HTML output (closes #13223)

Patch by Víctor Terrón.

11 years agomerge 3.4 (#21463)
Benjamin Peterson [Sat, 7 Jun 2014 22:09:36 +0000 (15:09 -0700)]
merge 3.4 (#21463)

11 years agoin ftp cache pruning, avoid changing the size of a dict while iterating over it ...
Benjamin Peterson [Sat, 7 Jun 2014 22:08:04 +0000 (15:08 -0700)]
in ftp cache pruning, avoid changing the size of a dict while iterating over it (closes #21463)

Patch by Skyler Leigh Amador.

11 years agomerge 3.4 (#10503)
Benjamin Peterson [Sat, 7 Jun 2014 20:51:51 +0000 (13:51 -0700)]
merge 3.4 (#10503)

11 years agospecify that getuid() returns the real uid (closes #10503)
Benjamin Peterson [Sat, 7 Jun 2014 20:50:34 +0000 (13:50 -0700)]
specify that getuid() returns the real uid (closes #10503)

Patch by εσχατοκυριος.

11 years agomerge 3.4 (#21404)
Benjamin Peterson [Sat, 7 Jun 2014 19:48:09 +0000 (12:48 -0700)]
merge 3.4 (#21404)

11 years agodocument the compress_level argument to tarfile.open (closes #21404)
Benjamin Peterson [Sat, 7 Jun 2014 19:45:37 +0000 (12:45 -0700)]
document the compress_level argument to tarfile.open (closes #21404)

Patch by Katherine Busch.

11 years agomerge 3.4 (#21642)
Benjamin Peterson [Sat, 7 Jun 2014 19:39:51 +0000 (12:39 -0700)]
merge 3.4 (#21642)

11 years agoallow the keyword else immediately after (no space) an integer (closes #21642)
Benjamin Peterson [Sat, 7 Jun 2014 19:36:39 +0000 (12:36 -0700)]
allow the keyword else immediately after (no space) an integer (closes #21642)

11 years agoMerge issue #21569 from 3.4
Nick Coghlan [Sat, 7 Jun 2014 14:00:13 +0000 (00:00 +1000)]
Merge issue #21569 from 3.4

11 years agoIssue #21569: sync Python 2.7 What's New with 2.7 version
Nick Coghlan [Sat, 7 Jun 2014 13:43:00 +0000 (23:43 +1000)]
Issue #21569: sync Python 2.7 What's New with 2.7 version

11 years agoMerge issue #21667 from 3.4
Nick Coghlan [Sat, 7 Jun 2014 13:22:06 +0000 (23:22 +1000)]
Merge issue #21667 from 3.4

11 years agoIssue #21667: Clarify string data model description
Nick Coghlan [Sat, 7 Jun 2014 13:21:14 +0000 (23:21 +1000)]
Issue #21667: Clarify string data model description

11 years agoMerge with 3.4
Terry Jan Reedy [Sat, 7 Jun 2014 08:28:16 +0000 (04:28 -0400)]
Merge with 3.4

11 years agoIssue #21682: Replace EditorWindow with mock to eliminate memory leaks.
Terry Jan Reedy [Sat, 7 Jun 2014 08:27:50 +0000 (04:27 -0400)]
Issue #21682: Replace EditorWindow with mock to eliminate memory leaks.
Patch by Saimadhav Heblikar.

11 years agoMerge with 3.4
Terry Jan Reedy [Fri, 6 Jun 2014 21:43:37 +0000 (17:43 -0400)]
Merge with 3.4