]> granicus.if.org Git - python/log
python
10 years agoIssue #23285: Install new test directory.
Ned Deily [Sun, 8 Feb 2015 04:48:40 +0000 (15:48 +1100)]
Issue #23285: Install new test directory.

10 years agoAdds automated test script for the Windows installer and fixes download URL
Steve Dower [Sat, 7 Feb 2015 23:42:53 +0000 (15:42 -0800)]
Adds automated test script for the Windows installer and fixes download URL

10 years agoFix whitespace.
Charles-François Natali [Sat, 7 Feb 2015 13:29:15 +0000 (13:29 +0000)]
Fix whitespace.

10 years agoIssue #23285: PEP 475 -- Retry system calls failing with EINTR.
Charles-François Natali [Sat, 7 Feb 2015 13:27:50 +0000 (13:27 +0000)]
Issue #23285: PEP 475 -- Retry system calls failing with EINTR.

10 years agoCloses #23357: Updated documentation on creating venvs.
Vinay Sajip [Sat, 7 Feb 2015 10:57:36 +0000 (10:57 +0000)]
Closes #23357: Updated documentation on creating venvs.

10 years agoCorrected typo.
Vinay Sajip [Sat, 7 Feb 2015 10:56:06 +0000 (10:56 +0000)]
Corrected typo.

10 years agoMinor change to documentation on creating venvs.
Vinay Sajip [Sat, 7 Feb 2015 10:52:02 +0000 (10:52 +0000)]
Minor change to documentation on creating venvs.

10 years agoFix download URL embedded in Windows installer.
Steve Dower [Fri, 6 Feb 2015 17:59:05 +0000 (09:59 -0800)]
Fix download URL embedded in Windows installer.

10 years agoRequire Mercurial on PATH when building a Windows release.
Steve Dower [Fri, 6 Feb 2015 17:02:54 +0000 (09:02 -0800)]
Require Mercurial on PATH when building a Windows release.
Without it, we will generate invalid build information for sys.version

10 years agoMerge
Barry Warsaw [Fri, 6 Feb 2015 17:00:57 +0000 (12:00 -0500)]
Merge

10 years agoIssue #23399: pyvenv creates relative symlinks where possible.
Barry Warsaw [Fri, 6 Feb 2015 17:00:04 +0000 (12:00 -0500)]
Issue #23399: pyvenv creates relative symlinks where possible.

10 years agoTrunk merge.
Barry Warsaw [Fri, 6 Feb 2015 16:59:26 +0000 (11:59 -0500)]
Trunk merge.

10 years agoIssue #23399: pyvenv creates relative symlinks where possible.
Barry Warsaw [Fri, 6 Feb 2015 16:58:06 +0000 (11:58 -0500)]
Issue #23399: pyvenv creates relative symlinks where possible.

10 years agoFix definition mismatch for type_is_subtype_base_chain.
Steve Dower [Fri, 6 Feb 2015 16:51:26 +0000 (08:51 -0800)]
Fix definition mismatch for type_is_subtype_base_chain.

10 years agoFix definition mismatch for type_is_subtype_base_chain.
Steve Dower [Fri, 6 Feb 2015 16:50:23 +0000 (08:50 -0800)]
Fix definition mismatch for type_is_subtype_base_chain.

10 years agoIssue #23399: pyvenv creates relative symlinks where possible.
Barry Warsaw [Fri, 6 Feb 2015 16:23:58 +0000 (11:23 -0500)]
Issue #23399: pyvenv creates relative symlinks where possible.

10 years agoIssue #20289: cgi.FieldStorage() now supports the context management protocol.
Berker Peksag [Fri, 6 Feb 2015 08:21:37 +0000 (10:21 +0200)]
Issue #20289: cgi.FieldStorage() now supports the context management protocol.

10 years agoFix typos in Doc/whatsnew/3.5.rst.
Berker Peksag [Fri, 6 Feb 2015 08:17:49 +0000 (10:17 +0200)]
Fix typos in Doc/whatsnew/3.5.rst.

10 years agoIssue #23392: Added tests for marshal C API that works with FILE*.
Serhiy Storchaka [Fri, 6 Feb 2015 07:00:44 +0000 (09:00 +0200)]
Issue #23392: Added tests for marshal C API that works with FILE*.

10 years agoIssue #23392: Added tests for marshal C API that works with FILE*.
Serhiy Storchaka [Fri, 6 Feb 2015 06:58:56 +0000 (08:58 +0200)]
Issue #23392: Added tests for marshal C API that works with FILE*.

10 years agoIssue #23881: Only use entry-values with gdb 7.4 in tests.
Serhiy Storchaka [Fri, 6 Feb 2015 06:35:54 +0000 (08:35 +0200)]
Issue #23881: Only use entry-values with gdb 7.4 in tests.
Fixes a regression in issue #22765.  Patch by Vinson Lee.

10 years agoIssue #23881: Only use entry-values with gdb 7.4 in tests.
Serhiy Storchaka [Fri, 6 Feb 2015 06:35:20 +0000 (08:35 +0200)]
Issue #23881: Only use entry-values with gdb 7.4 in tests.
Fixes a regression in issue #22765.  Patch by Vinson Lee.

10 years agoIssue #23260: Update Windows installer
Steve Dower [Fri, 6 Feb 2015 06:08:48 +0000 (22:08 -0800)]
Issue #23260: Update Windows installer

10 years agoFix missing :ref: for idle in doc build.
Ned Deily [Fri, 6 Feb 2015 04:43:01 +0000 (15:43 +1100)]
Fix missing :ref: for idle in doc build.

10 years agoFix missing :ref: for idle in doc build.
Ned Deily [Fri, 6 Feb 2015 04:42:06 +0000 (15:42 +1100)]
Fix missing :ref: for idle in doc build.

10 years agomerge 3.4 (#22735)
Benjamin Peterson [Fri, 6 Feb 2015 03:29:46 +0000 (22:29 -0500)]
merge 3.4 (#22735)

10 years agofix many custom mro() edge cases and improve code quality (#22735)
Benjamin Peterson [Fri, 6 Feb 2015 03:29:14 +0000 (22:29 -0500)]
fix many custom mro() edge cases and improve code quality (#22735)

Patch by Eldar Abusalimov.

10 years agoIssue #23212: merge from 3.4
Ned Deily [Fri, 6 Feb 2015 03:16:29 +0000 (14:16 +1100)]
Issue #23212: merge from 3.4

10 years agoIssue #23212: Update OS X installer build OpenSSL to 1.0.1l.
Ned Deily [Fri, 6 Feb 2015 03:13:30 +0000 (14:13 +1100)]
Issue #23212: Update OS X installer build OpenSSL to 1.0.1l.
(currently only used for builds with <= 10.5 deployment targets)

10 years ago(Merge 3.4) test_multiprocessing: tolerate a delta of 30 ms because of bad
Victor Stinner [Thu, 5 Feb 2015 13:25:53 +0000 (14:25 +0100)]
(Merge 3.4) test_multiprocessing: tolerate a delta of 30 ms because of bad
clock resolution on Windows

10 years agotest_multiprocessing: tolerate a delta of 30 ms because of bad clock resolution
Victor Stinner [Thu, 5 Feb 2015 13:25:05 +0000 (14:25 +0100)]
test_multiprocessing: tolerate a delta of 30 ms because of bad clock resolution
on Windows

10 years agoIssue #18982: Add tests for CLI of the calendar module.
Serhiy Storchaka [Thu, 5 Feb 2015 13:17:49 +0000 (15:17 +0200)]
Issue #18982: Add tests for CLI of the calendar module.

10 years agoIssue #18982: Add tests for CLI of the calendar module.
Serhiy Storchaka [Thu, 5 Feb 2015 13:14:35 +0000 (15:14 +0200)]
Issue #18982: Add tests for CLI of the calendar module.

10 years agoMerge 3.4 (asyncio)
Victor Stinner [Thu, 5 Feb 2015 10:46:45 +0000 (11:46 +0100)]
Merge 3.4 (asyncio)

10 years agoasyncio: BaseEventLoop: rename _owner to _thread_id
Victor Stinner [Thu, 5 Feb 2015 10:45:33 +0000 (11:45 +0100)]
asyncio: BaseEventLoop: rename _owner to _thread_id

10 years agoIssue #23345: merge from 3.4
Ned Deily [Thu, 5 Feb 2015 06:24:00 +0000 (17:24 +1100)]
Issue #23345: merge from 3.4

10 years agoIssue #23345: Prevent test_ssl failures with large OpenSSL patch level
Ned Deily [Thu, 5 Feb 2015 06:20:13 +0000 (17:20 +1100)]
Issue #23345: Prevent test_ssl failures with large OpenSSL patch level
values (like 0.9.8zc).

10 years agoMerge: Update pip to 6.0.8
Donald Stufft [Thu, 5 Feb 2015 03:00:56 +0000 (22:00 -0500)]
Merge: Update pip to 6.0.8

10 years agoUpdate pip to 6.0.8
Donald Stufft [Thu, 5 Feb 2015 03:00:17 +0000 (22:00 -0500)]
Update pip to 6.0.8

10 years agoMake the stdlib test suite helper test.script_helper._assert_python no longer
Gregory P. Smith [Thu, 5 Feb 2015 01:16:30 +0000 (17:16 -0800)]
Make the stdlib test suite helper test.script_helper._assert_python no longer
pass -I or -E to the child process by default when the environment is required
for the child process interpreter to function properly.

10 years agoMake the stdlib test suite helper test.script_helper._assert_python no longer
Gregory P. Smith [Thu, 5 Feb 2015 01:10:19 +0000 (17:10 -0800)]
Make the stdlib test suite helper test.script_helper._assert_python no longer
pass -I or -E to the child process by default when the environment is required
for the child process interpreter to function properly.

10 years agoMinor code clean up.
Raymond Hettinger [Wed, 4 Feb 2015 16:37:02 +0000 (08:37 -0800)]
Minor code clean up.

10 years agoMerge 3.4 (asyncio doc)
Victor Stinner [Wed, 4 Feb 2015 15:14:58 +0000 (16:14 +0100)]
Merge 3.4 (asyncio doc)

10 years agoasyncio doc: explain how to display ResourceWarning in the debug mode section
Victor Stinner [Wed, 4 Feb 2015 15:14:33 +0000 (16:14 +0100)]
asyncio doc: explain how to display ResourceWarning in the debug mode section

10 years agoMerge 3.4 (asyncio)
Victor Stinner [Wed, 4 Feb 2015 13:51:50 +0000 (14:51 +0100)]
Merge 3.4 (asyncio)

10 years agoasyncio: Only call _check_resolved_address() in debug mode
Victor Stinner [Wed, 4 Feb 2015 13:51:23 +0000 (14:51 +0100)]
asyncio: Only call _check_resolved_address() in debug mode

* _check_resolved_address() is implemented with getaddrinfo() which is slow
* If available, use socket.inet_pton() instead of socket.getaddrinfo(), because
  it is much faster

Microbenchmark (timeit) on Fedora 21 (Python 3.4, Linux 3.17, glibc 2.20) to
validate the IPV4 address "127.0.0.1" or the IPv6 address "::1":

* getaddrinfo() 10.4 usec per loop
* inet_pton(): 0.285 usec per loop

On glibc older than 2.14, getaddrinfo() always requests the list of all local
IP addresses to the kernel (using a NETLINK socket). getaddrinfo() has other
known issues, it's better to avoid it when it is possible.

10 years agoasyncio: BaseSelectorEventLoop uses directly the private _debug attribute
Victor Stinner [Wed, 4 Feb 2015 13:50:59 +0000 (14:50 +0100)]
asyncio: BaseSelectorEventLoop uses directly the private _debug attribute

Just try to be consistent: _debug was already used in some places, and always
used in BaseProactorEventLoop.

10 years agoFixes issue23390: make profile-opt causes -fprofile-generate and related flags
Gregory P. Smith [Wed, 4 Feb 2015 10:16:13 +0000 (02:16 -0800)]
Fixes issue23390: make profile-opt causes -fprofile-generate and related flags
to end up in distutils CFLAGS.

10 years agoFixes issue23390: make profile-opt causes -fprofile-generate and related flags
Gregory P. Smith [Wed, 4 Feb 2015 10:11:56 +0000 (02:11 -0800)]
Fixes issue23390: make profile-opt causes -fprofile-generate and related flags
to end up in distutils CFLAGS.

10 years agoSkip some tests that require a subinterpreter launched with -E or -I when the
Gregory P. Smith [Wed, 4 Feb 2015 09:04:31 +0000 (01:04 -0800)]
Skip some tests that require a subinterpreter launched with -E or -I when the
interpreter under test is being run in an environment that requires the use of
environment variables such as PYTHONHOME in order to function at all.

Adds a test.script_helper.interpreter_requires_environment() function
to be used with @unittest.skipIf on stdlib test methods requiring this.

10 years agoSkip some tests that require a subinterpreter launched with -E or -I when the
Gregory P. Smith [Wed, 4 Feb 2015 08:59:40 +0000 (00:59 -0800)]
Skip some tests that require a subinterpreter launched with -E or -I when the
interpreter under test is being run in an environment that requires the use of
environment variables such as PYTHONHOME in order to function at all.

Adds a private test.script_helper._interpreter_requires_environment() function
to be used with @unittest.skipIf on stdlib test methods requiring this.

10 years agoIssue #14203: Temporary fix for the compile failure on Windows.
Stefan Krah [Tue, 3 Feb 2015 21:27:21 +0000 (22:27 +0100)]
Issue #14203:  Temporary fix for the compile failure on Windows.

10 years agoIssue #14203: Remove obsolete support for view==NULL in bytesiobuf_getbuffer()
Stefan Krah [Tue, 3 Feb 2015 20:43:23 +0000 (21:43 +0100)]
Issue #14203: Remove obsolete support for view==NULL in bytesiobuf_getbuffer()
and array_buffer_getbuf().

10 years agoIssue #15381: Fixed a bug in BytesIO.write().
Serhiy Storchaka [Tue, 3 Feb 2015 16:51:58 +0000 (18:51 +0200)]
Issue #15381: Fixed a bug in BytesIO.write().
It was expected that string_size == PyBytes_GET_SIZE(buf) if the buffer is
shared, but truncate() and __setstate__() can set string_size without
unsharing the buffer.

10 years agoIssue 23359: Reduce size of code in set_lookkey. Only do linear probes when there...
Raymond Hettinger [Tue, 3 Feb 2015 16:15:30 +0000 (08:15 -0800)]
Issue 23359:  Reduce size of code in set_lookkey. Only do linear probes when there is no wrap-around.

Nice simplification contributed by Serhiy Storchaka :-)

10 years agoIssue #14203: Remove obsolete support for view==NULL in PyBuffer_FillInfo()
Stefan Krah [Tue, 3 Feb 2015 15:57:21 +0000 (16:57 +0100)]
Issue #14203: Remove obsolete support for view==NULL in PyBuffer_FillInfo()
and bytearray_getbuffer().  Both functions now raise BufferError in that
case.

10 years agoMerge 3.4 (asyncio doc)
Victor Stinner [Tue, 3 Feb 2015 14:12:13 +0000 (15:12 +0100)]
Merge 3.4 (asyncio doc)

10 years agoasyncio, Tulip issue 221: Fix doc of QueueEmpty and QueueFull
Victor Stinner [Tue, 3 Feb 2015 14:09:24 +0000 (15:09 +0100)]
asyncio, Tulip issue 221: Fix doc of QueueEmpty and QueueFull

10 years agoIssue #15381: Try to fix refcount bug. Empty and 1-byte buffers are always shared.
Serhiy Storchaka [Tue, 3 Feb 2015 12:57:49 +0000 (14:57 +0200)]
Issue #15381: Try to fix refcount bug. Empty and 1-byte buffers are always shared.

10 years agoIssue #13128: Print response headers for CONNECT requests when debuglevel > 0.
Berker Peksag [Tue, 3 Feb 2015 10:22:11 +0000 (12:22 +0200)]
Issue #13128: Print response headers for CONNECT requests when debuglevel > 0.

Patch by Demian Brecht.

10 years agoIssue #23358: Add missing BaseServer entry to socketserver.__all__.
Berker Peksag [Tue, 3 Feb 2015 09:55:32 +0000 (11:55 +0200)]
Issue #23358: Add missing BaseServer entry to socketserver.__all__.

Patch by Martin Panter.

10 years agoIssue #23358: Add missing BaseServer entry to socketserver.__all__.
Berker Peksag [Tue, 3 Feb 2015 09:55:09 +0000 (11:55 +0200)]
Issue #23358: Add missing BaseServer entry to socketserver.__all__.

Patch by Martin Panter.

10 years agoIssue #15381: Optimized io.BytesIO to make less allocations and copyings.
Serhiy Storchaka [Tue, 3 Feb 2015 09:30:10 +0000 (11:30 +0200)]
Issue #15381: Optimized io.BytesIO to make less allocations and copyings.

10 years agoIssue #22818: Splitting on a pattern that could match an empty string now
Serhiy Storchaka [Tue, 3 Feb 2015 09:04:19 +0000 (11:04 +0200)]
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.

10 years agoIssue #23099: Closing io.BytesIO with exported buffer is rejected now to
Serhiy Storchaka [Tue, 3 Feb 2015 07:30:51 +0000 (09:30 +0200)]
Issue #23099: Closing io.BytesIO with exported buffer is rejected now to
prevent corrupting exported buffer.

10 years agoIssue #23099: Closing io.BytesIO with exported buffer is rejected now to
Serhiy Storchaka [Tue, 3 Feb 2015 00:00:18 +0000 (02:00 +0200)]
Issue #23099: Closing io.BytesIO with exported buffer is rejected now to
prevent corrupting exported buffer.

10 years agoIssues #23363, #23364, #23365, #23366: Fixed itertools overflow tests.
Serhiy Storchaka [Mon, 2 Feb 2015 23:50:31 +0000 (01:50 +0200)]
Issues #23363, #23364, #23365, #23366: Fixed itertools overflow tests.
Used PyMem_New to check overflow.

10 years agoIssue #22896: Fixed using _getbuffer() in recently added _PyBytes_Format().
Serhiy Storchaka [Mon, 2 Feb 2015 23:49:18 +0000 (01:49 +0200)]
Issue #22896: Fixed using _getbuffer() in recently added _PyBytes_Format().

10 years agoIssues #23363, #23364, #23365, #23366: Fixed itertools overflow tests.
Serhiy Storchaka [Mon, 2 Feb 2015 23:35:10 +0000 (01:35 +0200)]
Issues #23363, #23364, #23365, #23366: Fixed itertools overflow tests.
Used PyMem_New to check overflow.

10 years agoIssues #23363, #23364, #23365, #23366: Fixed itertools overflow tests.
Serhiy Storchaka [Mon, 2 Feb 2015 23:34:09 +0000 (01:34 +0200)]
Issues #23363, #23364, #23365, #23366: Fixed itertools overflow tests.
Used PyMem_New to check overflow.

10 years agoIssue #22896: Avoid to use PyObject_AsCharBuffer(), PyObject_AsReadBuffer()
Serhiy Storchaka [Mon, 2 Feb 2015 23:25:42 +0000 (01:25 +0200)]
Issue #22896: Avoid to use PyObject_AsCharBuffer(), PyObject_AsReadBuffer()
and PyObject_AsWriteBuffer().

10 years agoIssue #22896: Avoid to use PyObject_AsCharBuffer(), PyObject_AsReadBuffer()
Serhiy Storchaka [Mon, 2 Feb 2015 23:21:08 +0000 (01:21 +0200)]
Issue #22896: Avoid to use PyObject_AsCharBuffer(), PyObject_AsReadBuffer()
and PyObject_AsWriteBuffer().

10 years agomerge 3.4
Benjamin Peterson [Mon, 2 Feb 2015 22:47:31 +0000 (17:47 -0500)]
merge 3.4

10 years agomerge 3.3
Benjamin Peterson [Mon, 2 Feb 2015 22:47:26 +0000 (17:47 -0500)]
merge 3.3

10 years agoreduce memory usage of test (closes #23369)
Benjamin Peterson [Mon, 2 Feb 2015 22:47:07 +0000 (17:47 -0500)]
reduce memory usage of test (closes #23369)

10 years agomerge 3.4
Benjamin Peterson [Mon, 2 Feb 2015 19:22:19 +0000 (14:22 -0500)]
merge 3.4

10 years agoadjust for py3k module renaming
Benjamin Peterson [Mon, 2 Feb 2015 19:22:13 +0000 (14:22 -0500)]
adjust for py3k module renaming

10 years agomerge 3.4
Benjamin Peterson [Mon, 2 Feb 2015 19:06:29 +0000 (14:06 -0500)]
merge 3.4

10 years ago_clear_type_cache is cpython-only
Benjamin Peterson [Mon, 2 Feb 2015 19:06:11 +0000 (14:06 -0500)]
_clear_type_cache is cpython-only

10 years agoMerge 3.4 (asyncio)
Victor Stinner [Mon, 2 Feb 2015 17:36:59 +0000 (18:36 +0100)]
Merge 3.4 (asyncio)

10 years agoIssue #23353, asyncio: Workaround CPython bug #23353
Victor Stinner [Mon, 2 Feb 2015 17:36:31 +0000 (18:36 +0100)]
Issue #23353, asyncio: Workaround CPython bug #23353

Don't use yield/yield-from in an except block of a generator. Store the
exception and handle it outside the except block.

10 years agoIssue 23359: Tighten inner search loop for sets (don't and-mask every entry lookup).
Raymond Hettinger [Mon, 2 Feb 2015 16:35:00 +0000 (08:35 -0800)]
Issue 23359: Tighten inner search loop for sets (don't and-mask every entry lookup).

10 years agomerge 3.4 (#21295)
Benjamin Peterson [Mon, 2 Feb 2015 15:52:56 +0000 (10:52 -0500)]
merge 3.4 (#21295)

10 years agorevert lineno and col_offset changes from #16795 (closes #21295)
Benjamin Peterson [Mon, 2 Feb 2015 15:51:20 +0000 (10:51 -0500)]
revert lineno and col_offset changes from #16795 (closes #21295)

10 years agoOptimization guides suggest copying memory in an ascending direction when possible.
Raymond Hettinger [Mon, 2 Feb 2015 06:53:41 +0000 (22:53 -0800)]
Optimization guides suggest copying memory in an ascending direction when possible.

10 years agomerge 3.4 (#23364, #23363)
Benjamin Peterson [Mon, 2 Feb 2015 02:36:01 +0000 (21:36 -0500)]
merge 3.4 (#23364, #23363)

10 years agomerge 3.3 (#23364, #23363)
Benjamin Peterson [Mon, 2 Feb 2015 02:35:34 +0000 (21:35 -0500)]
merge 3.3 (#23364, #23363)

10 years agocheck for overflows in permutations() and product() (closes #23363, closes #23364)
Benjamin Peterson [Mon, 2 Feb 2015 02:34:07 +0000 (21:34 -0500)]
check for overflows in permutations() and product() (closes #23363, closes #23364)

10 years agomerge 3.4 (#23365)
Benjamin Peterson [Mon, 2 Feb 2015 02:11:54 +0000 (21:11 -0500)]
merge 3.4 (#23365)

10 years agomerge 3.3 (#23365)
Benjamin Peterson [Mon, 2 Feb 2015 02:11:39 +0000 (21:11 -0500)]
merge 3.3 (#23365)

10 years agocheck for overflow in combinations_with_replacement (closes #23365)
Benjamin Peterson [Mon, 2 Feb 2015 02:10:47 +0000 (21:10 -0500)]
check for overflow in combinations_with_replacement (closes #23365)

10 years agomerge 3.4 (#23366)
Benjamin Peterson [Mon, 2 Feb 2015 02:01:43 +0000 (21:01 -0500)]
merge 3.4 (#23366)

10 years agomerge 3.3 (#23366)
Benjamin Peterson [Mon, 2 Feb 2015 02:00:15 +0000 (21:00 -0500)]
merge 3.3 (#23366)

10 years agodetect overflow in combinations (closes #23366)
Benjamin Peterson [Mon, 2 Feb 2015 01:59:00 +0000 (20:59 -0500)]
detect overflow in combinations (closes #23366)

10 years agomerge 3.4
Benjamin Peterson [Mon, 2 Feb 2015 01:18:29 +0000 (20:18 -0500)]
merge 3.4

10 years agohttps goodness
Benjamin Peterson [Mon, 2 Feb 2015 01:17:22 +0000 (20:17 -0500)]
https goodness

10 years agofix tests on systems that can't validate python.org
Benjamin Peterson [Mon, 2 Feb 2015 01:16:59 +0000 (20:16 -0500)]
fix tests on systems that can't validate python.org

10 years agomerge 3.4
Benjamin Peterson [Sun, 1 Feb 2015 23:02:21 +0000 (18:02 -0500)]
merge 3.4

10 years agomerge 3.3
Benjamin Peterson [Sun, 1 Feb 2015 23:02:15 +0000 (18:02 -0500)]
merge 3.3

10 years agoremove extra ws
Benjamin Peterson [Sun, 1 Feb 2015 23:02:09 +0000 (18:02 -0500)]
remove extra ws