]> git.ipfire.org Git - thirdparty/Python/cpython.git/log
thirdparty/Python/cpython.git
10 years agoIssue #25220, libregrtest: Cleanup setup code
Victor Stinner [Tue, 29 Sep 2015 22:59:35 +0000 (00:59 +0200)] 
Issue #25220, libregrtest: Cleanup setup code

10 years agoIssue #25220: Use print(flush=True) in libregrtest
Victor Stinner [Tue, 29 Sep 2015 22:48:27 +0000 (00:48 +0200)] 
Issue #25220: Use print(flush=True) in libregrtest

10 years agoIssue #25220: Enhance regrtest -jN
Victor Stinner [Tue, 29 Sep 2015 22:33:29 +0000 (00:33 +0200)] 
Issue #25220: Enhance regrtest -jN

Running the Python test suite with -jN now:

- Display the duration of tests which took longer than 30 seconds
- Display the tests currently running since at least 30 seconds
- Display the tests we are waiting for when the test suite is interrupted

Clenaup also run_test_in_subprocess() code.

10 years agoDon't strip refcount in libregrtest/runtest_mp.py
Victor Stinner [Tue, 29 Sep 2015 21:52:33 +0000 (23:52 +0200)] 
Don't strip refcount in libregrtest/runtest_mp.py

Python doesn't display the refcount anymore by default. It only displays it
when -X showrefcount command line option is used, which is not the case here.
regrtest can be run with -X showrefcount, the option is not inherited by child
processes.

10 years agoIssue #25220, libregrtest: Remove unused import
Victor Stinner [Tue, 29 Sep 2015 21:50:19 +0000 (23:50 +0200)] 
Issue #25220, libregrtest: Remove unused import

10 years agoIssue #25220: truncate some long lines in libregrtest/*.py
Victor Stinner [Tue, 29 Sep 2015 21:43:33 +0000 (23:43 +0200)] 
Issue #25220: truncate some long lines in libregrtest/*.py

10 years agoIssue #25220: regrtest setups Python after parsing command line options
Victor Stinner [Tue, 29 Sep 2015 21:37:14 +0000 (23:37 +0200)] 
Issue #25220: regrtest setups Python after parsing command line options

10 years agoIssue #25220: Enhance regrtest --coverage
Victor Stinner [Tue, 29 Sep 2015 21:36:27 +0000 (23:36 +0200)] 
Issue #25220: Enhance regrtest --coverage

Add a new Regrtest.run_test() method to ensure that --coverage pass the same
options to the runtest() function.

10 years agoIssue #25220: Create libregrtest/runtest_mp.py
Victor Stinner [Tue, 29 Sep 2015 21:15:38 +0000 (23:15 +0200)] 
Issue #25220: Create libregrtest/runtest_mp.py

Move the code to run tests in multiple processes using threading and subprocess
to a new submodule.

Move also slave_runner() (renamed to run_tests_slave()) and
run_test_in_subprocess() (renamed to run_tests_in_subprocess()) there.

10 years agoIssue #25220: Split the huge main() function of libregrtest.main into a class
Victor Stinner [Tue, 29 Sep 2015 20:48:52 +0000 (22:48 +0200)] 
Issue #25220: Split the huge main() function of libregrtest.main into a class
with attributes and methods.

The --threshold command line option is now ignored if the gc module is missing.

* Convert main() variables to Regrtest attributes, document some attributes
* Convert accumulate_result() function to a method
* Create setup_python() function and setup_regrtest() method.
* Import gc at top level
* Move resource.setrlimit() and the code to make the module paths absolute into
  the new setup_python() function. So this code is no more executed when the
  module is imported, only when main() is executed. We have a better control on
  when the setup is done.
* Move textwrap import from printlist() to the top level.
* Some other minor cleanup.

10 years agoIssue #22958: Constructor and update method of weakref.WeakValueDictionary
Serhiy Storchaka [Tue, 29 Sep 2015 20:53:25 +0000 (23:53 +0300)] 
Issue #22958: Constructor and update method of weakref.WeakValueDictionary
now accept the self and the dict keyword arguments.

10 years agoIssue #22958: Constructor and update method of weakref.WeakValueDictionary
Serhiy Storchaka [Tue, 29 Sep 2015 20:52:42 +0000 (23:52 +0300)] 
Issue #22958: Constructor and update method of weakref.WeakValueDictionary
now accept the self and the dict keyword arguments.

10 years agoIssue #22958: Constructor and update method of weakref.WeakValueDictionary
Serhiy Storchaka [Tue, 29 Sep 2015 20:52:09 +0000 (23:52 +0300)] 
Issue #22958: Constructor and update method of weakref.WeakValueDictionary
now accept the self and the dict keyword arguments.

10 years agoIssue #22609: Constructor of collections.UserDict now accepts the self keyword
Serhiy Storchaka [Tue, 29 Sep 2015 20:38:34 +0000 (23:38 +0300)] 
Issue #22609: Constructor of collections.UserDict now accepts the self keyword
argument.

10 years agoIssue #22609: Constructor of collections.UserDict now accepts the self keyword
Serhiy Storchaka [Tue, 29 Sep 2015 20:37:09 +0000 (23:37 +0300)] 
Issue #22609: Constructor of collections.UserDict now accepts the self keyword
argument.

10 years agoIssue #22609: Constructor of collections.UserDict now accepts the self keyword
Serhiy Storchaka [Tue, 29 Sep 2015 20:36:06 +0000 (23:36 +0300)] 
Issue #22609: Constructor of collections.UserDict now accepts the self keyword
argument.

10 years agoIssue #25111: Fixed comparison of traceback.FrameSummary.
Serhiy Storchaka [Tue, 29 Sep 2015 19:34:16 +0000 (22:34 +0300)] 
Issue #25111: Fixed comparison of traceback.FrameSummary.

10 years agoIssue #25111: Fixed comparison of traceback.FrameSummary.
Serhiy Storchaka [Tue, 29 Sep 2015 19:33:36 +0000 (22:33 +0300)] 
Issue #25111: Fixed comparison of traceback.FrameSummary.

10 years agoIssue #25262. Added support for BINBYTES8 opcode in Python implementation of
Serhiy Storchaka [Tue, 29 Sep 2015 19:13:01 +0000 (22:13 +0300)] 
Issue #25262. Added support for BINBYTES8 opcode in Python implementation of
unpickler.  Highest 32 bits of 64-bit size for BINUNICODE8 and BINBYTES8
opcodes no longer silently ignored on 32-bit platforms in C implementation.

10 years agoIssue #25262. Added support for BINBYTES8 opcode in Python implementation of
Serhiy Storchaka [Tue, 29 Sep 2015 19:12:29 +0000 (22:12 +0300)] 
Issue #25262. Added support for BINBYTES8 opcode in Python implementation of
unpickler.  Highest 32 bits of 64-bit size for BINUNICODE8 and BINBYTES8
opcodes no longer silently ignored on 32-bit platforms in C implementation.

10 years agoIssue #25262. Added support for BINBYTES8 opcode in Python implementation of
Serhiy Storchaka [Tue, 29 Sep 2015 19:10:07 +0000 (22:10 +0300)] 
Issue #25262. Added support for BINBYTES8 opcode in Python implementation of
unpickler.  Highest 32 bits of 64-bit size for BINUNICODE8 and BINBYTES8
opcodes no longer silently ignored on 32-bit platforms in C implementation.

10 years agoAlso rewrote the guts of asyncio.Semaphore (patch by manipopopo). (Merge 3.5->3.6.)
Guido van Rossum [Tue, 29 Sep 2015 19:01:55 +0000 (12:01 -0700)] 
Also rewrote the guts of asyncio.Semaphore (patch by manipopopo). (Merge 3.5->3.6.)

10 years agoAlso rewrote the guts of asyncio.Semaphore (patch by manipopopo). (Merge 3.4->3.5.)
Guido van Rossum [Tue, 29 Sep 2015 19:00:01 +0000 (12:00 -0700)] 
Also rewrote the guts of asyncio.Semaphore (patch by manipopopo). (Merge 3.4->3.5.)

10 years agoAlso rewrote the guts of asyncio.Semaphore (patch by manipopopo).
Guido van Rossum [Tue, 29 Sep 2015 18:54:45 +0000 (11:54 -0700)] 
Also rewrote the guts of asyncio.Semaphore (patch by manipopopo).

10 years agoMerge 3.5 -> default
Andrew Svetlov [Tue, 29 Sep 2015 15:38:22 +0000 (18:38 +0300)] 
Merge 3.5 -> default

10 years agoMerge 3.4 -> 3.5
Andrew Svetlov [Tue, 29 Sep 2015 15:36:44 +0000 (18:36 +0300)] 
Merge 3.4 -> 3.5

10 years agoFix StreamReader.__repr__
Andrew Svetlov [Tue, 29 Sep 2015 15:36:00 +0000 (18:36 +0300)] 
Fix StreamReader.__repr__

10 years agoIssue #25034: Merge from 3.5.
Eric V. Smith [Tue, 29 Sep 2015 14:30:47 +0000 (10:30 -0400)] 
Issue #25034: Merge from 3.5.

10 years agoIssue #25034: Merge from 3.4.
Eric V. Smith [Tue, 29 Sep 2015 14:30:04 +0000 (10:30 -0400)] 
Issue #25034: Merge from 3.4.

10 years agoFixed issue #25034: Fix string.Formatter problem with auto-numbering
Eric V. Smith [Tue, 29 Sep 2015 14:27:38 +0000 (10:27 -0400)] 
Fixed issue #25034: Fix string.Formatter problem with auto-numbering
and nested format_specs. Patch by Anthon van der Neut.

10 years agoAdded additional unpickling tests.
Serhiy Storchaka [Tue, 29 Sep 2015 12:51:02 +0000 (15:51 +0300)] 
Added additional unpickling tests.

10 years agoAdded additional unpickling tests.
Serhiy Storchaka [Tue, 29 Sep 2015 12:50:45 +0000 (15:50 +0300)] 
Added additional unpickling tests.

10 years agoAdded additional unpickling tests.
Serhiy Storchaka [Tue, 29 Sep 2015 12:49:58 +0000 (15:49 +0300)] 
Added additional unpickling tests.

10 years agoMoved unpickling tests with prepickled data to separate class.
Serhiy Storchaka [Tue, 29 Sep 2015 12:35:19 +0000 (15:35 +0300)] 
Moved unpickling tests with prepickled data to separate class.

10 years agoMoved unpickling tests with prepickled data to separate class.
Serhiy Storchaka [Tue, 29 Sep 2015 12:34:53 +0000 (15:34 +0300)] 
Moved unpickling tests with prepickled data to separate class.

10 years agoMoved unpickling tests with prepickled data to separate class.
Serhiy Storchaka [Tue, 29 Sep 2015 12:33:24 +0000 (15:33 +0300)] 
Moved unpickling tests with prepickled data to separate class.

10 years agoIssue #25220: Add test for --wait in test_regrtest
Victor Stinner [Tue, 29 Sep 2015 12:17:09 +0000 (14:17 +0200)] 
Issue #25220: Add test for --wait in test_regrtest

Replace script_helper.assert_python_ok() with subprocess.run().

10 years agoOops, revert unwanted change, sorry
Victor Stinner [Tue, 29 Sep 2015 12:02:35 +0000 (14:02 +0200)] 
Oops, revert unwanted change, sorry

10 years agoIssue #18174: Explain why is_valid_fd() uses dup() instead of fstat()
Victor Stinner [Tue, 29 Sep 2015 11:59:50 +0000 (13:59 +0200)] 
Issue #18174: Explain why is_valid_fd() uses dup() instead of fstat()

10 years agotest
Victor Stinner [Tue, 29 Sep 2015 11:47:15 +0000 (13:47 +0200)] 
test

10 years agoTry to fix _PyTime_AsTimevalStruct_impl() on OpenBSD
Victor Stinner [Tue, 29 Sep 2015 11:41:46 +0000 (13:41 +0200)] 
Try to fix _PyTime_AsTimevalStruct_impl() on OpenBSD

It looks like the check for integer overflow doesn't work on x86 OpenBSD 5.8.

10 years agoOptimize ascii/latin1+surrogateescape encoders
Victor Stinner [Tue, 29 Sep 2015 10:32:13 +0000 (12:32 +0200)] 
Optimize ascii/latin1+surrogateescape encoders

Issue #25227: Optimize ASCII and latin1 encoders with the ``surrogateescape``
error handler: the encoders are now up to 3 times as fast.

Initial patch written by Serhiy Storchaka.

10 years agoMerge with 3.5, Issue #24028: Add subsection about Idle calltips.
Terry Jan Reedy [Tue, 29 Sep 2015 05:56:54 +0000 (01:56 -0400)] 
Merge with 3.5, Issue #24028: Add subsection about Idle calltips.

10 years agoMerge with 3.4, Issue #24028: Add subsection about Idle calltips.
Terry Jan Reedy [Tue, 29 Sep 2015 05:56:35 +0000 (01:56 -0400)] 
Merge with 3.4, Issue #24028: Add subsection about Idle calltips.

10 years agoIssue #24028: Add subsection about Idle calltips.
Terry Jan Reedy [Tue, 29 Sep 2015 05:55:57 +0000 (01:55 -0400)] 
Issue #24028: Add subsection about Idle calltips.

10 years agomerge 3.5
Terry Jan Reedy [Tue, 29 Sep 2015 05:04:08 +0000 (01:04 -0400)] 
merge 3.5

10 years agoMerge with 3.4
Terry Jan Reedy [Tue, 29 Sep 2015 05:01:00 +0000 (01:01 -0400)] 
Merge with 3.4

10 years agoRemove indent in news item. Error when building 3.x docs.
Terry Jan Reedy [Tue, 29 Sep 2015 05:00:31 +0000 (01:00 -0400)] 
Remove indent in news item. Error when building 3.x docs.

10 years agoIDLE NEWS.
Terry Jan Reedy [Tue, 29 Sep 2015 03:44:37 +0000 (23:44 -0400)] 
IDLE NEWS.

10 years agoIDLE NEWS items.
Terry Jan Reedy [Tue, 29 Sep 2015 03:42:56 +0000 (23:42 -0400)] 
IDLE NEWS items.

10 years agoAdd recent IDLE NEWS items.
Terry Jan Reedy [Tue, 29 Sep 2015 03:38:57 +0000 (23:38 -0400)] 
Add recent IDLE NEWS items.

10 years agoCorrect Misc/NEWS about asyncio.Queue rewrite.
Guido van Rossum [Mon, 28 Sep 2015 23:53:44 +0000 (16:53 -0700)] 
Correct Misc/NEWS about asyncio.Queue rewrite.

10 years agoCorrect Misc/NEWS about asyncio.Queue rewrite.
Guido van Rossum [Mon, 28 Sep 2015 23:51:59 +0000 (16:51 -0700)] 
Correct Misc/NEWS about asyncio.Queue rewrite.

10 years agoCorrect Misc/NEWS about asyncio.Queue rewrite.
Guido van Rossum [Mon, 28 Sep 2015 23:50:38 +0000 (16:50 -0700)] 
Correct Misc/NEWS about asyncio.Queue rewrite.

10 years agoFix test_regrtest.test_tools_buildbot_test()
Victor Stinner [Mon, 28 Sep 2015 23:02:37 +0000 (01:02 +0200)] 
Fix test_regrtest.test_tools_buildbot_test()

Issue #25220: Fix test_regrtest.test_tools_buildbot_test() on release build (on
Windows), pass "+d" option to test.bat.

10 years agoIssue #25220: Add functional tests to test_regrtest
Victor Stinner [Mon, 28 Sep 2015 21:16:17 +0000 (23:16 +0200)] 
Issue #25220: Add functional tests to test_regrtest

* test all available ways to run the Python test suite
* test many regrtest options: --slow, --coverage, -r, -u,  etc.

Note: python -m test --coverage doesn't work on Windows.

10 years agoIssue #25233: Rewrite the guts of Queue to be more understandable and correct. (Merge...
Guido van Rossum [Mon, 28 Sep 2015 20:35:54 +0000 (13:35 -0700)] 
Issue #25233: Rewrite the guts of Queue to be more understandable and correct. (Merge 3.5->default.)

10 years agoIssue #25233: Rewrite the guts of Queue to be more understandable and correct. (Merge...
Guido van Rossum [Mon, 28 Sep 2015 14:44:49 +0000 (07:44 -0700)] 
Issue #25233: Rewrite the guts of Queue to be more understandable and correct. (Merge 3.4->3.5.)

10 years agoIssue #25233: Rewrite the guts of Queue to be more understandable and correct.
Guido van Rossum [Mon, 28 Sep 2015 14:42:34 +0000 (07:42 -0700)] 
Issue #25233: Rewrite the guts of Queue to be more understandable and correct.

10 years agoIssue #25122: Remove verbose mode of test_eintr
Victor Stinner [Mon, 28 Sep 2015 13:04:11 +0000 (15:04 +0200)] 
Issue #25122: Remove verbose mode of test_eintr

"./python -m test -W test_eintr" wrote Lib/test/eintrdata/eintr_tester.py
output to stdout which was not expected.

Since test_eintr doesn't hang anymore, remove the verbose mode instead.

10 years agoIssue #25249: Remove unneeded mkstemp helper in test_subprocess
Berker Peksag [Mon, 28 Sep 2015 10:34:17 +0000 (13:34 +0300)] 
Issue #25249: Remove unneeded mkstemp helper in test_subprocess

The helper was added in 76641824cf05 11 years ago and it can be
removed now since all supported Python versions have tempfile.mkstemp().

Patch by Nir Soffer.

10 years agoIssue #25249: Remove unneeded mkstemp helper in test_subprocess
Berker Peksag [Mon, 28 Sep 2015 10:33:43 +0000 (13:33 +0300)] 
Issue #25249: Remove unneeded mkstemp helper in test_subprocess

The helper was added in 76641824cf05 11 years ago and it can be
removed now since all supported Python versions have tempfile.mkstemp().

Patch by Nir Soffer.

10 years agoIssue #25249: Remove unneeded mkstemp helper in test_subprocess
Berker Peksag [Mon, 28 Sep 2015 10:33:14 +0000 (13:33 +0300)] 
Issue #25249: Remove unneeded mkstemp helper in test_subprocess

The helper was added in 76641824cf05 11 years ago and it can be
removed now since all supported Python versions have tempfile.mkstemp().

Patch by Nir Soffer.

10 years agoMerge with 3.5
Terry Jan Reedy [Mon, 28 Sep 2015 08:53:12 +0000 (04:53 -0400)] 
Merge with 3.5

10 years agoMerge with 3.4
Terry Jan Reedy [Mon, 28 Sep 2015 08:53:01 +0000 (04:53 -0400)] 
Merge with 3.4

10 years agoIssue #24972: New option is only valid in tk 8.5+.
Terry Jan Reedy [Mon, 28 Sep 2015 08:52:49 +0000 (04:52 -0400)] 
Issue #24972: New option is only valid in tk 8.5+.

10 years agoMerge with 3.5
Terry Jan Reedy [Mon, 28 Sep 2015 08:16:56 +0000 (04:16 -0400)] 
Merge with 3.5

10 years agoMerge with 3.4
Terry Jan Reedy [Mon, 28 Sep 2015 08:16:43 +0000 (04:16 -0400)] 
Merge with 3.4

10 years agoIssue #24972: Inactive selection background now matches active selection
Terry Jan Reedy [Mon, 28 Sep 2015 08:16:32 +0000 (04:16 -0400)] 
Issue #24972: Inactive selection background now matches active selection
background, as selected by user, on all systems.  This also fixes a problem
with found items not highlighted on Windows.  Initial patch by Mark Roseman.
Fix replaces workaround with obscure but proper configuration option.

10 years agoMerge from 3.5; no file changes
Martin Panter [Mon, 28 Sep 2015 06:30:43 +0000 (06:30 +0000)] 
Merge from 3.5; no file changes

10 years agoMerge from 3.4 into 3.5; no file changes
Martin Panter [Mon, 28 Sep 2015 06:28:29 +0000 (06:28 +0000)] 
Merge from 3.4 into 3.5; no file changes

10 years agoBacked out changeset: 70c01dd35100
Terry Jan Reedy [Mon, 28 Sep 2015 02:50:54 +0000 (22:50 -0400)] 
Backed out changeset: 70c01dd35100

10 years agoIssue #24972: Inactive selection background now matches active selection
Terry Jan Reedy [Mon, 28 Sep 2015 02:46:17 +0000 (22:46 -0400)] 
Issue #24972: Inactive selection background now matches active selection
background, as selected by user, on all systems.  This also fixes a problem
with found items not highlighted on Windows.  Initial patch by Mark Roseman.
Fix replaces workaround with obscure but proper configuration option.

10 years agomerge
Alexander Belopolsky [Mon, 28 Sep 2015 02:34:59 +0000 (22:34 -0400)] 
merge

10 years agomerge
Alexander Belopolsky [Mon, 28 Sep 2015 02:34:07 +0000 (22:34 -0400)] 
merge

10 years agoCloses issue #23600: Wrong results from tzinfo.fromutc().
Alexander Belopolsky [Mon, 28 Sep 2015 02:32:15 +0000 (22:32 -0400)] 
Closes issue #23600: Wrong results from tzinfo.fromutc().

10 years agoCloses issue #23600: Wrong results from tzinfo.fromutc().
Alexander Belopolsky [Mon, 28 Sep 2015 02:31:45 +0000 (22:31 -0400)] 
Closes issue #23600: Wrong results from tzinfo.fromutc().

10 years agomerge
Alexander Belopolsky [Mon, 28 Sep 2015 02:13:28 +0000 (22:13 -0400)] 
merge

10 years agoCloses issue #23600: Wrong results from tzinfo.fromutc().
Alexander Belopolsky [Mon, 28 Sep 2015 01:56:53 +0000 (21:56 -0400)] 
Closes issue #23600: Wrong results from tzinfo.fromutc().

10 years agoCloses issue #23600: Wrong results from tzinfo.fromutc().
Alexander Belopolsky [Mon, 28 Sep 2015 01:56:09 +0000 (21:56 -0400)] 
Closes issue #23600: Wrong results from tzinfo.fromutc().

10 years agoCloses issue #23600: Wrong results from tzinfo.fromutc().
Alexander Belopolsky [Mon, 28 Sep 2015 01:41:55 +0000 (21:41 -0400)] 
Closes issue #23600: Wrong results from tzinfo.fromutc().

10 years agoIssue #25203: Failed readline.set_completer_delims() no longer left the
Serhiy Storchaka [Sun, 27 Sep 2015 19:38:33 +0000 (22:38 +0300)] 
Issue #25203: Failed readline.set_completer_delims() no longer left the
module in inconsistent state.

10 years agoIssue #25203: Failed readline.set_completer_delims() no longer left the
Serhiy Storchaka [Sun, 27 Sep 2015 19:38:01 +0000 (22:38 +0300)] 
Issue #25203: Failed readline.set_completer_delims() no longer left the
module in inconsistent state.

10 years agoIssue #25203: Failed readline.set_completer_delims() no longer left the
Serhiy Storchaka [Sun, 27 Sep 2015 19:34:59 +0000 (22:34 +0300)] 
Issue #25203: Failed readline.set_completer_delims() no longer left the
 module in inconsistent state.

10 years agoMerge: Fix English phrasing.
R David Murray [Sun, 27 Sep 2015 16:37:20 +0000 (12:37 -0400)] 
Merge: Fix English phrasing.

10 years agoMerge: Fix English phrasing.
R David Murray [Sun, 27 Sep 2015 16:36:50 +0000 (12:36 -0400)] 
Merge: Fix English phrasing.

10 years agoFix English phrasing.
R David Murray [Sun, 27 Sep 2015 16:36:19 +0000 (12:36 -0400)] 
Fix English phrasing.

10 years agoIssue #25011: rlcomplete now omits private and special attribute names unless
Serhiy Storchaka [Sun, 27 Sep 2015 10:43:50 +0000 (13:43 +0300)] 
Issue #25011: rlcomplete now omits private and special attribute names unless
the prefix starts with underscores.

10 years agoIssue #25209: rlcomplete now can add a space or a colon after completed keyword.
Serhiy Storchaka [Sun, 27 Sep 2015 10:26:03 +0000 (13:26 +0300)] 
Issue #25209: rlcomplete now can add a space or a colon after completed keyword.

10 years agoIssue #25220: Fix Lib/test/autotest.py
Victor Stinner [Sun, 27 Sep 2015 09:19:08 +0000 (11:19 +0200)] 
Issue #25220: Fix Lib/test/autotest.py

10 years agomerge 3.5
Benjamin Peterson [Sun, 27 Sep 2015 09:14:29 +0000 (02:14 -0700)] 
merge 3.5

10 years agomerge 3.4
Benjamin Peterson [Sun, 27 Sep 2015 09:14:23 +0000 (02:14 -0700)] 
merge 3.4

10 years agofix spacing
Benjamin Peterson [Sun, 27 Sep 2015 09:13:40 +0000 (02:13 -0700)] 
fix spacing

10 years agomerge 3.5
Benjamin Peterson [Sun, 27 Sep 2015 09:07:50 +0000 (02:07 -0700)] 
merge 3.5

10 years agomerge 3.4
Benjamin Peterson [Sun, 27 Sep 2015 09:07:43 +0000 (02:07 -0700)] 
merge 3.4

10 years agomerge heads
Benjamin Peterson [Sun, 27 Sep 2015 09:07:35 +0000 (02:07 -0700)] 
merge heads

10 years agomerge heads
Benjamin Peterson [Sun, 27 Sep 2015 09:07:27 +0000 (02:07 -0700)] 
merge heads

10 years agomerge heads
Benjamin Peterson [Sun, 27 Sep 2015 09:07:19 +0000 (02:07 -0700)] 
merge heads

10 years agomerge 3.5
Benjamin Peterson [Sun, 27 Sep 2015 09:05:18 +0000 (02:05 -0700)] 
merge 3.5

10 years agomerge 3.4
Benjamin Peterson [Sun, 27 Sep 2015 09:05:12 +0000 (02:05 -0700)] 
merge 3.4