]> granicus.if.org Git - python/log
python
10 years agoUpdates CRT installation for Windows installer.
Steve Dower [Sun, 1 Mar 2015 03:53:50 +0000 (19:53 -0800)]
Updates CRT installation for Windows installer.
Bundling versions of the CRT prior to 14.0 is no longer supported.

10 years agoUse unsigned division and modulo for item assignment as well.
Raymond Hettinger [Sun, 1 Mar 2015 01:49:47 +0000 (17:49 -0800)]
Use unsigned division and modulo for item assignment as well.

10 years agoIssue #19980: Improved help() for non-recognized strings. help('') now
Serhiy Storchaka [Sat, 28 Feb 2015 22:42:54 +0000 (00:42 +0200)]
Issue #19980: Improved help() for non-recognized strings.  help('') now
shows the help on str.  help('help') now shows the help on help().
Original patch by Mark Lawrence.

10 years agomerge
Alexander Belopolsky [Sat, 28 Feb 2015 15:46:00 +0000 (10:46 -0500)]
merge

10 years agoFixes #23521: Corrected pure python implementation of timedelta division.
Alexander Belopolsky [Sat, 28 Feb 2015 15:44:47 +0000 (10:44 -0500)]
Fixes #23521: Corrected pure python implementation of timedelta division.

 * Eliminated OverflowError from timedelta * float for some floats;
 * Corrected rounding in timedlta true division.

10 years agoFixes #23521: Corrected pure python implementation of timedelta division.
Alexander Belopolsky [Sat, 28 Feb 2015 15:41:57 +0000 (10:41 -0500)]
Fixes #23521: Corrected pure python implementation of timedelta division.

 * Eliminated OverflowError from timedelta * float for some floats;
 * Corrected rounding in timedlta true division.

10 years agoConvert one more division to unsigned arithmetic to speed-up deque_item().
Raymond Hettinger [Sat, 28 Feb 2015 15:41:30 +0000 (07:41 -0800)]
Convert one more division to unsigned arithmetic to speed-up deque_item().

10 years agoFixed a test for issue #21619 on Windows.
Serhiy Storchaka [Sat, 28 Feb 2015 11:28:19 +0000 (13:28 +0200)]
Fixed a test for issue #21619 on Windows.
On Windows an OSError with errno=EINVAL is raised.

10 years agoFixed a test for issue #21619 on Windows.
Serhiy Storchaka [Sat, 28 Feb 2015 11:27:54 +0000 (13:27 +0200)]
Fixed a test for issue #21619 on Windows.
On Windows an OSError with errno=EINVAL is raised.

10 years agoIssue #21619: Popen objects no longer leave a zombie after exit in the with
Serhiy Storchaka [Sat, 28 Feb 2015 10:45:00 +0000 (12:45 +0200)]
Issue #21619: Popen objects no longer leave a zombie after exit in the with
statement if the pipe was broken.  Patch by Martin Panter.

10 years agoIssue #21619: Popen objects no longer leave a zombie after exit in the with
Serhiy Storchaka [Sat, 28 Feb 2015 10:43:08 +0000 (12:43 +0200)]
Issue #21619: Popen objects no longer leave a zombie after exit in the with
statement if the pipe was broken.  Patch by Martin Panter.

10 years agoLine missed in last checkin
Raymond Hettinger [Sat, 28 Feb 2015 00:59:29 +0000 (16:59 -0800)]
Line missed in last checkin

10 years agoSince the index is always non-negative, use faster unsigned division and modulo.
Raymond Hettinger [Fri, 27 Feb 2015 20:42:54 +0000 (12:42 -0800)]
Since the index is always non-negative, use faster unsigned division and modulo.

10 years agoMerge with 3.4 for porting HOWTO tweaks
Brett Cannon [Fri, 27 Feb 2015 20:10:38 +0000 (15:10 -0500)]
Merge with 3.4 for porting HOWTO tweaks

10 years agoFix the clarification as to why division cannot be ported automatically
Brett Cannon [Fri, 27 Feb 2015 20:10:03 +0000 (15:10 -0500)]
Fix the clarification as to why division cannot be ported automatically

10 years agoMerge from 3.4.
Larry Hastings [Fri, 27 Feb 2015 17:21:06 +0000 (09:21 -0800)]
Merge from 3.4.

10 years agoFix minor errors in Misc/NEWS. (Thanks for the report, Florian Bruhin!)
Larry Hastings [Fri, 27 Feb 2015 17:14:32 +0000 (09:14 -0800)]
Fix minor errors in Misc/NEWS.  (Thanks for the report, Florian Bruhin!)

10 years agoIssue #22834: Drop a redundant comment and use errno instead of an
Brett Cannon [Fri, 27 Feb 2015 17:13:35 +0000 (12:13 -0500)]
Issue #22834: Drop a redundant comment and use errno instead of an
integer.

Thanks to Serhiy Storchaka and Martin Panter for the suggestions.

10 years agoMerge 3.4 (asyncio)
Victor Stinner [Fri, 27 Feb 2015 16:49:19 +0000 (17:49 +0100)]
Merge 3.4 (asyncio)

10 years agoIssue #23537: Remove 2 unused private methods of asyncio.BaseSubprocessTransport
Victor Stinner [Fri, 27 Feb 2015 16:49:09 +0000 (17:49 +0100)]
Issue #23537: Remove 2 unused private methods of asyncio.BaseSubprocessTransport

Methods only raise NotImplementedError and are never used.

10 years agoMerge 3.4 (httplib)
Victor Stinner [Fri, 27 Feb 2015 16:47:40 +0000 (17:47 +0100)]
Merge 3.4 (httplib)

10 years agoIssue #23526: Fix ResourceWarning in test_httplib. Patch written by Alex Shkop.
Victor Stinner [Fri, 27 Feb 2015 16:47:23 +0000 (17:47 +0100)]
Issue #23526: Fix ResourceWarning in test_httplib. Patch written by Alex Shkop.

10 years agoMerge with 3.4
Zachary Ware [Fri, 27 Feb 2015 07:40:41 +0000 (01:40 -0600)]
Merge with 3.4

10 years agoFix copy/paste error in bytes.isupper() doc.
Zachary Ware [Fri, 27 Feb 2015 07:40:22 +0000 (01:40 -0600)]
Fix copy/paste error in bytes.isupper() doc.

Reported by Jon Colburn on docs@.

10 years agoBump the blocksize up from 62 to 64 to speed up the modulo calculation.
Raymond Hettinger [Fri, 27 Feb 2015 07:21:29 +0000 (23:21 -0800)]
Bump the blocksize up from 62 to 64 to speed up the modulo calculation.

Remove the old comment suggesting that it was desireable to have
blocksize+2 as a multiple of the cache line length.  That would
have made sense only if the block structure start point was always
aligned to a cache line boundary.  However, the memory allocations
are 16 byte aligned, so we don't really have control over whether
the struct spills across cache line boundaries.

10 years agounix newlines
Benjamin Peterson [Fri, 27 Feb 2015 03:50:43 +0000 (22:50 -0500)]
unix newlines

10 years agomerge 3.4
Benjamin Peterson [Fri, 27 Feb 2015 03:50:12 +0000 (22:50 -0500)]
merge 3.4

10 years agoremove duplicate 3.4.3 tags
Benjamin Peterson [Fri, 27 Feb 2015 03:49:21 +0000 (22:49 -0500)]
remove duplicate 3.4.3 tags

10 years agoIssue #23465: Implement PEP 486 - Make the Python Launcher aware of virtual environme...
Steve Dower [Thu, 26 Feb 2015 22:25:33 +0000 (14:25 -0800)]
Issue #23465: Implement PEP 486 - Make the Python Launcher aware of virtual environments (patch by Paul Moore)

10 years agoMerge 3.4.3 release engineering changes back into 3.4.
Larry Hastings [Thu, 26 Feb 2015 13:58:48 +0000 (05:58 -0800)]
Merge 3.4.3 release engineering changes back into 3.4.

10 years agoPost-release changes for 3.4.3.
Larry Hastings [Thu, 26 Feb 2015 13:56:32 +0000 (05:56 -0800)]
Post-release changes for 3.4.3.

10 years agoSilenced minor GCC warnings.
Serhiy Storchaka [Thu, 26 Feb 2015 13:27:57 +0000 (15:27 +0200)]
Silenced minor GCC warnings.

10 years agoIssue #15955: Add an option to limit the output size in bz2.decompress().
Antoine Pitrou [Thu, 26 Feb 2015 12:08:07 +0000 (13:08 +0100)]
Issue #15955: Add an option to limit the output size in bz2.decompress().

Patch by Nikolaus Rath.

10 years agoMerge 3.4 (asyncio doc)
Victor Stinner [Thu, 26 Feb 2015 09:39:31 +0000 (10:39 +0100)]
Merge 3.4 (asyncio doc)

10 years agoasyncio doc: lock classes are not thread safe
Victor Stinner [Thu, 26 Feb 2015 09:39:16 +0000 (10:39 +0100)]
asyncio doc: lock classes are not thread safe

10 years agoBack-out wcstok deprecation suppression and updates calls to use wcstok_s.
Steve Dower [Thu, 26 Feb 2015 04:48:01 +0000 (20:48 -0800)]
Back-out wcstok deprecation suppression and updates calls to use wcstok_s.

10 years agoAdds _CRT_NON_CONFORMING_WCSTOK to retain two-parameter wcstok.
Steve Dower [Thu, 26 Feb 2015 04:38:31 +0000 (20:38 -0800)]
Adds _CRT_NON_CONFORMING_WCSTOK to retain two-parameter wcstok.

10 years agomerge 3.4
Benjamin Peterson [Wed, 25 Feb 2015 21:47:20 +0000 (16:47 -0500)]
merge 3.4

10 years agoremove unused import
Benjamin Peterson [Wed, 25 Feb 2015 21:47:14 +0000 (16:47 -0500)]
remove unused import

10 years agoIssue #23511: Port email-simple.py to Python 3.
Berker Peksag [Wed, 25 Feb 2015 16:14:47 +0000 (18:14 +0200)]
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.

10 years agoIssue #23511: Port email-simple.py to Python 3.
Berker Peksag [Wed, 25 Feb 2015 16:14:09 +0000 (18:14 +0200)]
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.

10 years agomerge 3.4 (#23515)
Benjamin Peterson [Wed, 25 Feb 2015 15:16:56 +0000 (10:16 -0500)]
merge 3.4 (#23515)

10 years agofix merge_collapse to actually maintain the invariant it purports to (closes #23515)
Benjamin Peterson [Wed, 25 Feb 2015 15:12:26 +0000 (10:12 -0500)]
fix merge_collapse to actually maintain the invariant it purports to (closes #23515)

See
de Gouw, Stijn and Rot, Jurriaan and de Boer, Frank S and Bubel, Richard and Hähnle, Reiner
"OpenJDK’s java.utils.Collection.sort() is broken: The good, the bad and the worst case"

10 years agoMerge 3.4 (asyncio doc)
Victor Stinner [Wed, 25 Feb 2015 13:24:47 +0000 (14:24 +0100)]
Merge 3.4 (asyncio doc)

10 years agoasyncio: add a note about (non) thread safety in each class
Victor Stinner [Wed, 25 Feb 2015 13:24:15 +0000 (14:24 +0100)]
asyncio: add a note about (non) thread safety in each class

10 years agoasyncio doc: begin with warnings on asyncio traps
Victor Stinner [Wed, 25 Feb 2015 13:23:51 +0000 (14:23 +0100)]
asyncio doc: begin with warnings on asyncio traps

10 years agoasyncio doc: move queues to a new page
Victor Stinner [Wed, 25 Feb 2015 12:55:43 +0000 (13:55 +0100)]
asyncio doc: move queues to a new page

10 years agoAdded tag v3.4.3 for changeset b4cbecbc0781
Larry Hastings [Wed, 25 Feb 2015 12:17:04 +0000 (04:17 -0800)]
Added tag v3.4.3 for changeset b4cbecbc0781

10 years agoChecking in this change LOCAL ONLY NO UPLOAD ANYWHERE v3.4.3
Larry Hastings [Wed, 25 Feb 2015 12:15:33 +0000 (04:15 -0800)]
Checking in this change  LOCAL ONLY  NO UPLOAD ANYWHERE

10 years agoMerge with 3.4
Georg Brandl [Wed, 25 Feb 2015 12:07:03 +0000 (13:07 +0100)]
Merge with 3.4

10 years agoRemove unsupported (in latex) character from the source.
Georg Brandl [Wed, 25 Feb 2015 12:05:53 +0000 (13:05 +0100)]
Remove unsupported (in latex) character from the source.

10 years agoIssue 23314: SuppressCrashReports now disables CRT assertions
Steve Dower [Mon, 23 Feb 2015 15:56:13 +0000 (07:56 -0800)]
Issue 23314: SuppressCrashReports now disables CRT assertions
SuppressCrashReports should be used in test subprocesses that test invalid conditions.

10 years agoMerge 3.4 (asyncio doc)
Victor Stinner [Mon, 23 Feb 2015 10:42:22 +0000 (11:42 +0100)]
Merge 3.4 (asyncio doc)

10 years agoasyncio doc: close explicitly event loops
Victor Stinner [Mon, 23 Feb 2015 10:41:56 +0000 (11:41 +0100)]
asyncio doc: close explicitly event loops

10 years agoAdded tag v3.4.3 for changeset 9b73f1c3e601
Larry Hastings [Mon, 23 Feb 2015 07:55:48 +0000 (23:55 -0800)]
Added tag v3.4.3 for changeset 9b73f1c3e601

10 years agoRelease bump for 3.4.3 final.
Larry Hastings [Mon, 23 Feb 2015 07:55:39 +0000 (23:55 -0800)]
Release bump for 3.4.3 final.

10 years agoDoc updates for 3.4.3 final.
Larry Hastings [Mon, 23 Feb 2015 07:54:38 +0000 (23:54 -0800)]
Doc updates for 3.4.3 final.

10 years agoIssue #23499: Fix grammar error noticed by SilentGhost
Ned Deily [Mon, 23 Feb 2015 00:15:14 +0000 (16:15 -0800)]
Issue #23499: Fix grammar error noticed by SilentGhost

10 years agoIssue #23499: Fix grammar error noticed by SilentGhost
Ned Deily [Mon, 23 Feb 2015 00:14:32 +0000 (16:14 -0800)]
Issue #23499: Fix grammar error noticed by SilentGhost

10 years agoBroke reference loops in tests added in issue #5700.
Serhiy Storchaka [Sun, 22 Feb 2015 22:31:33 +0000 (00:31 +0200)]
Broke reference loops in tests added in issue #5700.

10 years agoBroke reference loops in tests added in issue #5700.
Serhiy Storchaka [Sun, 22 Feb 2015 22:28:38 +0000 (00:28 +0200)]
Broke reference loops in tests added in issue #5700.

10 years agoIssue #23152: Move declarations back to posixmodule.c.
Serhiy Storchaka [Sun, 22 Feb 2015 19:34:54 +0000 (21:34 +0200)]
Issue #23152: Move declarations back to posixmodule.c.

Declarations of Windows-specific auxilary functions need Windows types
from windows.h.  Instead of including windows.h in Python.h and making
it available to all Windows users, it is simpler and safer just move
declarations to the single file that needs them.

10 years agoIssue #23152: Move declaration into a header and exclude from stable API.
Serhiy Storchaka [Sun, 22 Feb 2015 17:39:36 +0000 (19:39 +0200)]
Issue #23152: Move declaration into a header and exclude from stable API.

10 years agoIssue #6639: Module-level turtle functions no longer raise TclError after
Serhiy Storchaka [Sun, 22 Feb 2015 15:26:35 +0000 (17:26 +0200)]
Issue #6639: Module-level turtle functions no longer raise TclError after
closing the window.

10 years agoIssue #6639: Module-level turtle functions no longer raise TclError after
Serhiy Storchaka [Sun, 22 Feb 2015 15:25:33 +0000 (17:25 +0200)]
Issue #6639: Module-level turtle functions no longer raise TclError after
closing the window.

10 years agoIssue #23152: Renames time_t_to_FILE_TIME to _Py_time_t_to_FILE_TIME, removes unused...
Steve Dower [Sat, 21 Feb 2015 23:26:02 +0000 (15:26 -0800)]
Issue #23152: Renames time_t_to_FILE_TIME to _Py_time_t_to_FILE_TIME, removes unused struct win32_stat and return value

10 years agoIssue #23152: Renames attribute_data_to_stat to _Py_attribute_data_to_stat
Steve Dower [Sat, 21 Feb 2015 18:04:10 +0000 (10:04 -0800)]
Issue #23152: Renames attribute_data_to_stat to _Py_attribute_data_to_stat

10 years agoIssue #23152: Implement _Py_fstat() to support files larger than 2 GB on Windows.
Steve Dower [Sat, 21 Feb 2015 16:44:05 +0000 (08:44 -0800)]
Issue #23152: Implement _Py_fstat() to support files larger than 2 GB on Windows.
fstat() may fail with EOVERFLOW on files larger than 2 GB because the file size type is an signed 32-bit integer.

10 years agoNull merge
Serhiy Storchaka [Sat, 21 Feb 2015 10:10:59 +0000 (12:10 +0200)]
Null merge

10 years agoIssues #814253, #9179: Warnings now are raised when group references and
Serhiy Storchaka [Sat, 21 Feb 2015 10:08:52 +0000 (12:08 +0200)]
Issues #814253, #9179: Warnings now are raised when group references and
conditional group references are used in lookbehind assertions in regular
expressions.

10 years agoIssues #814253, #9179: Group references and conditional group references now
Serhiy Storchaka [Sat, 21 Feb 2015 08:07:35 +0000 (10:07 +0200)]
Issues #814253, #9179: Group references and conditional group references now
work in lookbehind assertions in regular expressions.

10 years agoIssue #23215: Multibyte codecs with custom error handlers that ignores errors
Serhiy Storchaka [Fri, 20 Feb 2015 23:21:08 +0000 (01:21 +0200)]
Issue #23215: Multibyte codecs with custom error handlers that ignores errors
consumed too much memory and raised SystemError or MemoryError.
Original patch by Aleksi Torhamo.

10 years agoIssue #23215: Multibyte codecs with custom error handlers that ignores errors
Serhiy Storchaka [Fri, 20 Feb 2015 23:19:58 +0000 (01:19 +0200)]
Issue #23215: Multibyte codecs with custom error handlers that ignores errors
consumed too much memory and raised SystemError or MemoryError.
Original patch by Aleksi Torhamo.

10 years agoIssue #5700: io.FileIO() called flush() after closing the file.
Serhiy Storchaka [Fri, 20 Feb 2015 22:35:53 +0000 (00:35 +0200)]
Issue #5700: io.FileIO() called flush() after closing the file.
flush() was not called in close() if closefd=False.

10 years agoIssue #5700: io.FileIO() called flush() after closing the file.
Serhiy Storchaka [Fri, 20 Feb 2015 22:35:09 +0000 (00:35 +0200)]
Issue #5700: io.FileIO() called flush() after closing the file.
flush() was not called in close() if closefd=False.

10 years agoIssue #23374: Fixed pydoc failure with non-ASCII files when stdout encoding
Serhiy Storchaka [Fri, 20 Feb 2015 21:47:09 +0000 (23:47 +0200)]
Issue #23374: Fixed pydoc failure with non-ASCII files when stdout encoding
differs from file system encoding (e.g. on Mac OS).

10 years agoIssue #23374: Fixed pydoc failure with non-ASCII files when stdout encoding
Serhiy Storchaka [Fri, 20 Feb 2015 21:46:06 +0000 (23:46 +0200)]
Issue #23374: Fixed pydoc failure with non-ASCII files when stdout encoding
differs from file system encoding (e.g. on Mac OS).

10 years agoIssue #23490: Fixed possible crashes related to interoperability between
Serhiy Storchaka [Fri, 20 Feb 2015 19:34:39 +0000 (21:34 +0200)]
Issue #23490: Fixed possible crashes related to interoperability between
old-style and new API for string with 2**30-1 characters.

10 years agoIssue #23490: Fixed possible crashes related to interoperability between
Serhiy Storchaka [Fri, 20 Feb 2015 19:34:06 +0000 (21:34 +0200)]
Issue #23490: Fixed possible crashes related to interoperability between
old-style and new API for string with 2**30-1 characters.

10 years agoCloses #23018: Replace copyright symbol with escape.
Steve Dower [Fri, 20 Feb 2015 17:08:48 +0000 (09:08 -0800)]
Closes #23018: Replace copyright symbol with escape.

10 years agoRemoves unused string resources from Windows installer.
Steve Dower [Fri, 20 Feb 2015 16:23:23 +0000 (08:23 -0800)]
Removes unused string resources from Windows installer.

10 years agoIssue #23422: Clarify some things around importlib.import_module()
Brett Cannon [Fri, 20 Feb 2015 15:34:20 +0000 (10:34 -0500)]
Issue #23422: Clarify some things around importlib.import_module()

10 years agoIssue #22834: Fix a failing test under Solaris due to the platform not
Brett Cannon [Fri, 20 Feb 2015 14:48:18 +0000 (09:48 -0500)]
Issue #22834: Fix a failing test under Solaris due to the platform not
allowing the deletion of the cwd.

Thanks to Martin Panter for the initial fix.

10 years agoIssue #23442: Rename two member names to stay backward compatible
Berker Peksag [Fri, 20 Feb 2015 12:57:31 +0000 (14:57 +0200)]
Issue #23442: Rename two member names to stay backward compatible
with the constants in http.client.

Initial patch by Demian Brecht.

10 years agoRegenerated Argument Clinic checksums.
Serhiy Storchaka [Fri, 20 Feb 2015 10:46:11 +0000 (12:46 +0200)]
Regenerated Argument Clinic checksums.

10 years agoImprove struct cache locality by bring commonly accessed fields close together.
Raymond Hettinger [Fri, 20 Feb 2015 08:50:04 +0000 (00:50 -0800)]
Improve struct cache locality by bring commonly accessed fields close together.

10 years agoIssue #23439: Add missing entries to http.client.__all__.
Berker Peksag [Fri, 20 Feb 2015 07:45:05 +0000 (09:45 +0200)]
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.

10 years agoIssue #23439: Add missing entries to http.client.__all__.
Berker Peksag [Fri, 20 Feb 2015 07:39:38 +0000 (09:39 +0200)]
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.

10 years agoNull merge with 3.4
Zachary Ware [Fri, 20 Feb 2015 04:31:29 +0000 (22:31 -0600)]
Null merge with 3.4

(Typo was already fixed on this branch.)

10 years agoFix typo pointed out on docs@ by Yaniv Sayeh
Zachary Ware [Fri, 20 Feb 2015 04:30:15 +0000 (22:30 -0600)]
Fix typo pointed out on docs@ by Yaniv Sayeh

10 years agoMerge with 3.4
Zachary Ware [Fri, 20 Feb 2015 04:15:54 +0000 (22:15 -0600)]
Merge with 3.4

10 years agoFix a typo pointed out on docs@
Zachary Ware [Fri, 20 Feb 2015 04:15:36 +0000 (22:15 -0600)]
Fix a typo pointed out on docs@

10 years agomerge 3.4 (#23481)
Benjamin Peterson [Thu, 19 Feb 2015 22:58:19 +0000 (17:58 -0500)]
merge 3.4 (#23481)

10 years agoremove rc4 from the default client ciphers (closes #23481)
Benjamin Peterson [Thu, 19 Feb 2015 22:57:08 +0000 (17:57 -0500)]
remove rc4 from the default client ciphers (closes #23481)

10 years agoCloses #23482: sqlite3_d.dll is not included in installer
Steve Dower [Thu, 19 Feb 2015 02:02:22 +0000 (18:02 -0800)]
Closes #23482: sqlite3_d.dll is not included in installer

10 years agomerge 3.4
Benjamin Peterson [Wed, 18 Feb 2015 13:56:47 +0000 (08:56 -0500)]
merge 3.4

10 years agomerge heads
Benjamin Peterson [Wed, 18 Feb 2015 13:56:43 +0000 (08:56 -0500)]
merge heads

10 years agomerge heads
Benjamin Peterson [Wed, 18 Feb 2015 13:56:33 +0000 (08:56 -0500)]
merge heads

10 years agomerge 3.4
Benjamin Peterson [Wed, 18 Feb 2015 13:55:59 +0000 (08:55 -0500)]
merge 3.4

10 years agomerge 3.3
Benjamin Peterson [Wed, 18 Feb 2015 13:55:38 +0000 (08:55 -0500)]
merge 3.3