Commit Graph

92078 Commits

Author SHA1 Message Date
Steve Dower 66b037b087 Merge from 3.5 2015-10-11 18:07:07 -07:00
Steve Dower bec29815d2 Keeps all-users launcher checkbox visible when the option cannot be changed. 2015-10-11 18:06:55 -07:00
Steve Dower 79e60dec1b Merge from 3.5 2015-10-11 18:05:27 -07:00
Steve Dower 8ffe4fdeb0 Only detects features from previous version when a bundle is found.
Otherwise, stray registry entries would cause issues.
Also fixes an accelerator collision and improves UAC icons when upgrading.
2015-10-11 18:05:11 -07:00
Steve Dower 3628d488c7 Issue #25143: Improves installer error messages for unsupported platforms. 2015-10-11 16:40:52 -07:00
Steve Dower b96698112d Issue #25143: Improves installer error messages for unsupported platforms. 2015-10-11 16:40:41 -07:00
Steve Dower 5669387948 Issue #25163: Display correct directory in installer when using non-default settings. 2015-10-11 15:37:36 -07:00
Steve Dower 731f4a2c5f Issue #25163: Display correct directory in installer when using non-default settings. 2015-10-11 15:37:22 -07:00
Steve Dower 80b31402d5 Issue #25361: Disables use of SSE2 instructions in Windows 32-bit build 2015-10-11 15:16:21 -07:00
Steve Dower 5700ae877f Issue #25361: Disables use of SSE2 instructions in Windows 32-bit build 2015-10-11 15:15:52 -07:00
Raymond Hettinger 6b1e113f9f Hoist the deque->maxlen lookup out of the inner-loop. 2015-10-11 09:43:50 -07:00
Serhiy Storchaka 20d15b5100 Issue #24164: Fixed test_descr: __getnewargs_ex__ now is supported in protocols 2 and 3. 2015-10-11 17:52:09 +03:00
Serhiy Storchaka 99deb1989f No longer skip tests for classes with __getnewargs_ex__. The copy module
already supports reduce protocol 4 (issue #20289).
2015-10-11 17:48:51 +03:00
Serhiy Storchaka 9c8213fbc1 No longer skip tests for classes with __getnewargs_ex__. The copy module
already supports reduce protocol 4 (issue #20289).
2015-10-11 17:48:28 +03:00
Serhiy Storchaka 977e5912e2 Cleanup test_descr: remove C8 that is the same as C3. 2015-10-11 17:43:38 +03:00
Serhiy Storchaka 1ddbb8cf47 Cleanup test_descr: remove C8 that is the same as C3. 2015-10-11 17:43:12 +03:00
Serhiy Storchaka 1fdc80b55f Cleanup test_descr: remove C8 that is the same as C3. 2015-10-11 17:42:39 +03:00
Victor Stinner e84c976568 Issue #25357: Add an optional newline paramer to binascii.b2a_base64().
base64.b64encode() uses it to avoid a memory copy.
2015-10-11 11:01:02 +02:00
Victor Stinner 5df7fddc0c Merge 3.5 (test_coroutines) 2015-10-11 10:53:50 +02:00
Victor Stinner 718c984e6e Close #25367: Fix test_coroutines()
Fix usage of support.import_module('asyncio'): store the result in an 'asyncio'
variable.
2015-10-11 10:53:15 +02:00
Victor Stinner 5d28223be7 Null merge 3.5 2015-10-11 10:40:27 +02:00
Victor Stinner 0c886f740b lose #25373: Fix regrtest --slow with interrupted test 2015-10-11 10:39:56 +02:00
Victor Stinner 3909e58994 Close #25373: Fix regrtest --slow with interrupted test
* Fix accumulate_result(): don't use time on interrupted and failed test
* Add unit test for interrupted test
* Add unit test on --slow with interrupted test, with and without
  multiprocessing
2015-10-11 10:37:25 +02:00
Victor Stinner 00a09c05ed Merge 3.5 (test_coroutines, issue #25367) 2015-10-11 10:10:49 +02:00
Victor Stinner b45c0f7e48 Close #25367: Fix test_coroutines with no thread support
Skip test_asyncio_1() when the asyncio module cannot be imported because
CPython is compiled with no thread support.
2015-10-11 10:10:31 +02:00
Victor Stinner 14b4662e18 test_regrtest: catch stderr in test_nowindows()
Check also that the deprecation warning is emited.
2015-10-11 10:04:26 +02:00
Victor Stinner 4967146c8d Close #25369: Fix test_regrtest without thread support 2015-10-11 10:03:28 +02:00
Victor Stinner bc5b80bac1 Close #24784: Fix compilation without thread support
Add "#ifdef WITH_THREAD" around cals to:

* PyGILState_Check()
* _PyImport_AcquireLock()
* _PyImport_ReleaseLock()
2015-10-11 09:54:42 +02:00
Victor Stinner 92f0113701 Close #24784: Fix compilation without thread support
Add "#ifdef WITH_THREAD" around cals to:

* PyGILState_Check()
* _PyImport_AcquireLock()
* _PyImport_ReleaseLock()
2015-10-11 09:54:42 +02:00
Victor Stinner 647dac9d6f Close #25368: Fix test_eintr when Python is compiled without thread support 2015-10-11 09:47:17 +02:00
Benjamin Peterson 6da624098f merge 3.5 (#25375) 2015-10-10 23:24:53 -07:00
Benjamin Peterson b16e12aaaa merge 3.4 2015-10-10 23:24:39 -07:00
Benjamin Peterson 0071b3dfcb don't mention Python 2.2 (closes #25375) 2015-10-10 23:23:55 -07:00
Raymond Hettinger a7f63009d6 Minor tweak. Make the maxlen comparisons a little more clear and consistent. 2015-10-10 23:56:02 -04:00
Benjamin Peterson 10dcff7a04 merge 3.5 (#25362) 2015-10-10 19:36:51 -07:00
Benjamin Peterson 062f4cec5e merge 3.4 (#25362) 2015-10-10 19:36:40 -07:00
Benjamin Peterson 414918a939 use the with statement for locking the internal condition (closes #25362)
Patch by Nir Soffer.
2015-10-10 19:34:46 -07:00
Benjamin Peterson 90ccccf9ed merge 3.5 (#25371) 2015-10-10 19:32:41 -07:00
Benjamin Peterson e5df40727c merge 3.4 (#25371) 2015-10-10 19:32:33 -07:00
Benjamin Peterson b397e3b526 add a missing comma (closes #25371) 2015-10-10 19:32:20 -07:00
Serhiy Storchaka 0d554d7ef1 Issue #24164: Objects that need calling ``__new__`` with keyword arguments,
can now be pickled using pickle protocols older than protocol version 4.
2015-10-10 22:42:18 +03:00
Serhiy Storchaka 4e96df3b59 Null merge 2015-10-10 20:27:52 +03:00
Serhiy Storchaka ea620465a5 Null merge 2015-10-10 20:27:28 +03:00
Serhiy Storchaka 0289155b72 Correct Misc/NEWS. 2015-10-10 20:26:16 +03:00
Serhiy Storchaka ca4265de8d Issue #25365: test_pickle now works in threads disabled builds. 2015-10-10 20:11:13 +03:00
Serhiy Storchaka 456a27013e Issue #25365: test_pickle now works in threads disabled builds. 2015-10-10 20:10:54 +03:00
Serhiy Storchaka 7b2cfc4465 Issue #25365: test_pickle now works in threads disabled builds. 2015-10-10 20:10:07 +03:00
Serhiy Storchaka f98a24eecc Issue #25364: zipfile now works in threads disabled builds. 2015-10-10 19:44:23 +03:00
Serhiy Storchaka 9e777730eb Issue #25364: zipfile now works in threads disabled builds. 2015-10-10 19:43:32 +03:00
Martin Panter 4df3b1a195 Issue #25322: Merge contextlib.suppress test fix from 3.5 2015-10-10 11:06:05 +00:00