]> granicus.if.org Git - python/log
python
8 years agoMerge with 3.6
Jason R. Coombs [Sun, 6 Nov 2016 16:16:42 +0000 (11:16 -0500)]
Merge with 3.6

8 years agoAdditionally show that a backslash-escaped opening brace is treated as a literal...
Jason R. Coombs [Sun, 6 Nov 2016 16:14:48 +0000 (11:14 -0500)]
Additionally show that a backslash-escaped opening brace is treated as a literal and thus triggers the single closing brace error, clarifying #28590.

8 years agoAdd an additional test with a newline, one that's very similar to test_parens_in_expr...
Jason R. Coombs [Sun, 6 Nov 2016 16:01:08 +0000 (11:01 -0500)]
Add an additional test with a newline, one that's very similar to test_parens_in_expressions, but because the newline is not a literal newline, but a backslash en, this error is triggered.

8 years agoIssue #28123: _PyDict_GetItem_KnownHash() now can raise an exception as
Serhiy Storchaka [Sun, 6 Nov 2016 11:18:24 +0000 (13:18 +0200)]
Issue #28123: _PyDict_GetItem_KnownHash() now can raise an exception as
PyDict_GetItemWithError().  Patch by Xiang Zhang.

8 years agoMerge doc fixup from 3.5 into 3.6
Martin Panter [Sat, 5 Nov 2016 02:46:30 +0000 (02:46 +0000)]
Merge doc fixup from 3.5 into 3.6

8 years agoFix spacing after C++ in documentation
Martin Panter [Sat, 5 Nov 2016 02:40:31 +0000 (02:40 +0000)]
Fix spacing after C++ in documentation

8 years agoIssue #28485: Merge single-threading fix from 3.5 into 3.6
Martin Panter [Sat, 5 Nov 2016 01:35:25 +0000 (01:35 +0000)]
Issue #28485: Merge single-threading fix from 3.5 into 3.6

8 years agoIssue #28485: Check for negative workers even without ProcessPoolExecutor
Martin Panter [Sat, 5 Nov 2016 01:11:36 +0000 (01:11 +0000)]
Issue #28485: Check for negative workers even without ProcessPoolExecutor

This matches the documentation, and passes the test suite when multithreading
is disabled.

8 years agoIssue #28616: merge from 3.5
Ned Deily [Fri, 4 Nov 2016 21:07:06 +0000 (17:07 -0400)]
Issue #28616: merge from 3.5

8 years agoIssue #28616: Correct help for sys.version_info releaselevel component.
Ned Deily [Fri, 4 Nov 2016 21:03:34 +0000 (17:03 -0400)]
Issue #28616: Correct help for sys.version_info releaselevel component.
Patch by Anish Tambe.

8 years agoMerge 3.5 (issue #28613)
Yury Selivanov [Fri, 4 Nov 2016 18:30:11 +0000 (14:30 -0400)]
Merge 3.5 (issue #28613)

8 years agoIssue #28613: Fix get_event_loop() to return the current loop
Yury Selivanov [Fri, 4 Nov 2016 18:29:28 +0000 (14:29 -0400)]
Issue #28613: Fix get_event_loop() to return the current loop

when called from coroutines or callbacks.

8 years agoIssue #28088: Document Transport.set_protocol and get_protocol.
INADA Naoki [Fri, 4 Nov 2016 07:34:46 +0000 (16:34 +0900)]
Issue #28088: Document Transport.set_protocol and get_protocol.

Patch by Mariatta Wijaya.

8 years agoIssue #28088: Document Transport.set_protocol and get_protocol
INADA Naoki [Fri, 4 Nov 2016 07:33:47 +0000 (16:33 +0900)]
Issue #28088: Document Transport.set_protocol and get_protocol

8 years agoIssue #28605: Fix the help and What's New entry for --with-optimizations.
Brett Cannon [Thu, 3 Nov 2016 23:20:00 +0000 (16:20 -0700)]
Issue #28605: Fix the help and What's New entry for --with-optimizations.

8 years agoMerge 3.5 (asyncio)
Yury Selivanov [Thu, 3 Nov 2016 22:35:41 +0000 (15:35 -0700)]
Merge 3.5 (asyncio)

8 years agoasyncio: Sync with upstream
Yury Selivanov [Thu, 3 Nov 2016 22:35:23 +0000 (15:35 -0700)]
asyncio: Sync with upstream

8 years agoMerge 3.5 (issue #28600)
Yury Selivanov [Thu, 3 Nov 2016 22:10:11 +0000 (15:10 -0700)]
Merge 3.5 (issue #28600)

8 years agoIssue #28600: Optimize loop.call_soon().
Yury Selivanov [Thu, 3 Nov 2016 22:09:24 +0000 (15:09 -0700)]
Issue #28600: Optimize loop.call_soon().

Run expensive type checks only in debug mode.  In addition, stop
supporting passing handles to loop.run_in_executor.

8 years agoIssue #26980: Improve docs for create_unix_connection(). By Mariatta. (3.5->3.6)
Guido van Rossum [Thu, 3 Nov 2016 21:18:04 +0000 (14:18 -0700)]
Issue #26980: Improve docs for create_unix_connection(). By Mariatta. (3.5->3.6)

8 years agoIssue #26980: Improve docs for create_unix_connection(). By Mariatta.
Guido van Rossum [Thu, 3 Nov 2016 21:17:25 +0000 (14:17 -0700)]
Issue #26980: Improve docs for create_unix_connection(). By Mariatta.

8 years agoIssue #28387: Fixed possible crash in _io.TextIOWrapper deallocator when
Serhiy Storchaka [Thu, 3 Nov 2016 13:38:17 +0000 (15:38 +0200)]
Issue #28387: Fixed possible crash in _io.TextIOWrapper deallocator when
the garbage collector is invoked in other thread.
Based on patch by Sebastian Cufre.

8 years agoIssue #28387: Fixed possible crash in _io.TextIOWrapper deallocator when
Serhiy Storchaka [Thu, 3 Nov 2016 13:37:01 +0000 (15:37 +0200)]
Issue #28387: Fixed possible crash in _io.TextIOWrapper deallocator when
the garbage collector is invoked in other thread.
Based on patch by Sebastian Cufre.

8 years agoAllow ensurepip even when ssl is unavailable
Donald Stufft [Thu, 3 Nov 2016 00:32:37 +0000 (20:32 -0400)]
Allow ensurepip even when ssl is unavailable

8 years agoMerge updated pip/setuptools from 3.5
Donald Stufft [Wed, 2 Nov 2016 19:55:01 +0000 (15:55 -0400)]
Merge updated pip/setuptools from 3.5

8 years agoMerge new pip/setuptools from 3.4
Donald Stufft [Wed, 2 Nov 2016 19:53:58 +0000 (15:53 -0400)]
Merge new pip/setuptools from 3.4

8 years agoUpgrade pip to 9.0 and setuptools to 28.7.1
Donald Stufft [Wed, 2 Nov 2016 19:42:49 +0000 (15:42 -0400)]
Upgrade pip to 9.0 and setuptools to 28.7.1

8 years agoFixed hyperlinks for tarfile CLI options.
Serhiy Storchaka [Wed, 2 Nov 2016 19:05:49 +0000 (21:05 +0200)]
Fixed hyperlinks for tarfile CLI options.

8 years agoFixed hyperlinks for tarfile CLI options.
Serhiy Storchaka [Wed, 2 Nov 2016 19:04:45 +0000 (21:04 +0200)]
Fixed hyperlinks for tarfile CLI options.

8 years agoIssue #28513: Documented command-line interface of zipfile.
Serhiy Storchaka [Wed, 2 Nov 2016 10:11:32 +0000 (12:11 +0200)]
Issue #28513: Documented command-line interface of zipfile.

8 years agoIssue #28513: Documented command-line interface of zipfile.
Serhiy Storchaka [Wed, 2 Nov 2016 10:06:15 +0000 (12:06 +0200)]
Issue #28513: Documented command-line interface of zipfile.

8 years agoIssue #28583: PyDict_SetDefault didn't combine split table when needed.
INADA Naoki [Wed, 2 Nov 2016 09:45:16 +0000 (18:45 +0900)]
Issue #28583: PyDict_SetDefault didn't combine split table when needed.

Patch by Xiang Zhang.

8 years agoMinor code beautification
Raymond Hettinger [Wed, 2 Nov 2016 05:23:11 +0000 (22:23 -0700)]
Minor code beautification

8 years agoAdd cum_weights example (simulation of a cumulative binomial distribution).
Raymond Hettinger [Tue, 1 Nov 2016 05:53:52 +0000 (22:53 -0700)]
Add cum_weights example (simulation of a cumulative binomial distribution).

8 years agoStart 3.6.0b4
Ned Deily [Tue, 1 Nov 2016 04:35:39 +0000 (00:35 -0400)]
Start 3.6.0b4

8 years agoAdded tag v3.6.0b3 for changeset 8345e066c0ed
Ned Deily [Tue, 1 Nov 2016 00:45:16 +0000 (20:45 -0400)]
Added tag v3.6.0b3 for changeset 8345e066c0ed

8 years agoVersion bump for 3.6.0b3 v3.6.0b3
Ned Deily [Tue, 1 Nov 2016 00:43:30 +0000 (20:43 -0400)]
Version bump for 3.6.0b3

8 years agoUpdate pydoc topics for 3.6.0b3
Ned Deily [Tue, 1 Nov 2016 00:39:38 +0000 (20:39 -0400)]
Update pydoc topics for 3.6.0b3

8 years agoIssue #28248: merge from 3.5
Ned Deily [Mon, 31 Oct 2016 23:54:17 +0000 (19:54 -0400)]
Issue #28248: merge from 3.5

8 years agoIssue #28248: Update macOS installer build to use OpenSSL 1.0.2j.
Ned Deily [Mon, 31 Oct 2016 23:51:58 +0000 (19:51 -0400)]
Issue #28248: Update macOS installer build to use OpenSSL 1.0.2j.
Original patch by Mariatta Wijaya.

8 years agoIssue #28028: Update OS X installers to use SQLite 3.14.2.
Ned Deily [Mon, 31 Oct 2016 23:32:48 +0000 (19:32 -0400)]
Issue #28028: Update OS X installers to use SQLite 3.14.2.
Patch by Mariatta Wijaya.

8 years agoIssue 28128: Print out better error/warning messages for invalid string escapes....
Eric V. Smith [Mon, 31 Oct 2016 18:46:26 +0000 (14:46 -0400)]
Issue 28128: Print out better error/warning messages for invalid string escapes. Backport to 3.6.

8 years agoBacked out changeset 6b88dfc7b25d
Serhiy Storchaka [Mon, 31 Oct 2016 18:14:05 +0000 (20:14 +0200)]
Backed out changeset 6b88dfc7b25d

8 years agoIssue #28553: Fix logic error in example code of int.to_bytes doc.
INADA Naoki [Mon, 31 Oct 2016 08:42:10 +0000 (17:42 +0900)]
Issue #28553: Fix logic error in example code of int.to_bytes doc.

8 years agoIssue #28553: Fix logic error in example code of int.to_bytes doc.
INADA Naoki [Mon, 31 Oct 2016 08:41:47 +0000 (17:41 +0900)]
Issue #28553: Fix logic error in example code of int.to_bytes doc.

8 years agoIssue #27517: LZMA compressor and decompressor no longer raise exceptions if
Serhiy Storchaka [Mon, 31 Oct 2016 06:31:13 +0000 (08:31 +0200)]
Issue #27517: LZMA compressor and decompressor no longer raise exceptions if
given empty data twice.  Patch by Benjamin Fogle.

8 years agoIssue #27517: LZMA compressor and decompressor no longer raise exceptions if
Serhiy Storchaka [Mon, 31 Oct 2016 06:30:09 +0000 (08:30 +0200)]
Issue #27517: LZMA compressor and decompressor no longer raise exceptions if
given empty data twice.  Patch by Benjamin Fogle.

8 years agoUpdate the f-string test broken in issue #28385.
Serhiy Storchaka [Mon, 31 Oct 2016 06:13:00 +0000 (08:13 +0200)]
Update the f-string test broken in issue #28385.

8 years agoIssue #28541: Improve test coverage for encoding detection in json library.
Serhiy Storchaka [Sun, 30 Oct 2016 21:00:01 +0000 (23:00 +0200)]
Issue #28541: Improve test coverage for encoding detection in json library.
Original patch by Eric Appelt.

8 years agoIssue #28549: Fixed segfault in curses's addch() with ncurses6.
Serhiy Storchaka [Sun, 30 Oct 2016 20:53:09 +0000 (22:53 +0200)]
Issue #28549: Fixed segfault in curses's addch() with ncurses6.

8 years agoIssue #28549: Fixed segfault in curses's addch() with ncurses6.
Serhiy Storchaka [Sun, 30 Oct 2016 20:52:06 +0000 (22:52 +0200)]
Issue #28549: Fixed segfault in curses's addch() with ncurses6.

8 years agoIssue #28449: tarfile.open() with mode "r" or "r:" now tries to open a tar
Serhiy Storchaka [Sun, 30 Oct 2016 18:56:23 +0000 (20:56 +0200)]
Issue #28449: tarfile.open() with mode "r" or "r:" now tries to open a tar
file with compression before trying to open it without compression.  Otherwise
it had 50% chance failed with ignore_zeros=True.

8 years agoIssue #28449: tarfile.open() with mode "r" or "r:" now tries to open a tar
Serhiy Storchaka [Sun, 30 Oct 2016 18:52:29 +0000 (20:52 +0200)]
Issue #28449: tarfile.open() with mode "r" or "r:" now tries to open a tar
file with compression before trying to open it without compression.  Otherwise
it had 50% chance failed with ignore_zeros=True.

8 years agoIssue #28385: An error message when non-empty format spec is passed to
Serhiy Storchaka [Sun, 30 Oct 2016 17:37:46 +0000 (19:37 +0200)]
Issue #28385: An error message when non-empty format spec is passed to
object.__format__ now contains the name of actual type.

8 years agoIssue #28385: An error message when non-empty format spec is passed to
Serhiy Storchaka [Sun, 30 Oct 2016 17:33:54 +0000 (19:33 +0200)]
Issue #28385: An error message when non-empty format spec is passed to
object.__format__ now contains the name of actual type.

8 years ago- Issue #23262: The webbrowser module now supports Firefox 36+ and derived
Serhiy Storchaka [Sun, 30 Oct 2016 17:21:10 +0000 (19:21 +0200)]
- Issue #23262: The webbrowser module now supports Firefox 36+ and derived
  browsers.  Based on patch by Oleg Broytman.

8 years agoIssue #23262: The webbrowser module now supports Firefox 36+ and derived
Serhiy Storchaka [Sun, 30 Oct 2016 17:16:33 +0000 (19:16 +0200)]
Issue #23262: The webbrowser module now supports Firefox 36+ and derived
browsers.  Based on patch by Oleg Broytman.

8 years agoIssue #27939: Fixed bugs in tkinter.ttk.LabeledScale and tkinter.Scale caused
Serhiy Storchaka [Sun, 30 Oct 2016 16:52:02 +0000 (18:52 +0200)]
Issue #27939: Fixed bugs in tkinter.ttk.LabeledScale and tkinter.Scale caused
by representing the scale as float value internally in Tk.  tkinter.IntVar
now works if float value is set to underlying Tk variable.

8 years agoIssue #27939: Fixed bugs in tkinter.ttk.LabeledScale and tkinter.Scale caused
Serhiy Storchaka [Sun, 30 Oct 2016 16:49:52 +0000 (18:49 +0200)]
Issue #27939: Fixed bugs in tkinter.ttk.LabeledScale and tkinter.Scale caused
by representing the scale as float value internally in Tk.  tkinter.IntVar
now works if float value is set to underlying Tk variable.

8 years agoIssue #28561: Clean up UTF-8 encoder: remove dead code, update comments, etc.
Serhiy Storchaka [Sun, 30 Oct 2016 16:25:27 +0000 (18:25 +0200)]
Issue #28561: Clean up UTF-8 encoder: remove dead code, update comments, etc.
Patch by Xiang Zhang.

8 years agoMerge from 3.5.
Serhiy Storchaka [Sun, 30 Oct 2016 15:25:45 +0000 (17:25 +0200)]
Merge from 3.5.

8 years agoBacked out changeset 9f7505019767 (issue #27275).
Serhiy Storchaka [Sun, 30 Oct 2016 15:17:24 +0000 (17:17 +0200)]
Backed out changeset 9f7505019767 (issue #27275).

8 years agoIssue #26638: Merge option warning fixes from 3.5 into 3.6
Martin Panter [Sun, 30 Oct 2016 04:21:23 +0000 (04:21 +0000)]
Issue #26638: Merge option warning fixes from 3.5 into 3.6

8 years agoIssue #26638: Work around more CLI options that can’t be linked
Martin Panter [Sun, 30 Oct 2016 04:20:23 +0000 (04:20 +0000)]
Issue #26638: Work around more CLI options that can’t be linked

* Cannot seem to link directly to main options from the “unittest” module,
  because that module has its own set of options
* Mask out linking for options that no longer exist in Python 3

8 years agoIssue #26638: Mask undefined CLI options to defeat new Sphinx warnings
Martin Panter [Sun, 30 Oct 2016 04:20:17 +0000 (04:20 +0000)]
Issue #26638: Mask undefined CLI options to defeat new Sphinx warnings

8 years agoIssue #18844: Strengthen tests to include a case with unequal weighting
Raymond Hettinger [Sun, 30 Oct 2016 00:42:36 +0000 (17:42 -0700)]
Issue #18844:  Strengthen tests to include a case with unequal weighting

8 years agoIssue #18844: Make the various ways for specifing weights produce the same results.
Raymond Hettinger [Sat, 29 Oct 2016 23:55:36 +0000 (16:55 -0700)]
Issue #18844: Make the various ways for specifing weights produce the same results.

8 years agoIssue #28556: updates to typing.py (add Coroutine, prohibit Generic[T]()) (3.5->3.6)
Guido van Rossum [Sat, 29 Oct 2016 23:05:27 +0000 (16:05 -0700)]
Issue #28556: updates to typing.py (add Coroutine, prohibit Generic[T]()) (3.5->3.6)

8 years agoIssue #28556: updates to typing.py (add Coroutine, prohibit Generic[T]())
Guido van Rossum [Sat, 29 Oct 2016 23:05:26 +0000 (16:05 -0700)]
Issue #28556: updates to typing.py (add Coroutine, prohibit Generic[T]())

8 years agoIssue #28556: updates to typing.py (fix copy, deepcopy, pickle) (3.5->3.6)
Guido van Rossum [Sat, 29 Oct 2016 19:44:30 +0000 (12:44 -0700)]
Issue #28556: updates to typing.py (fix copy, deepcopy, pickle) (3.5->3.6)

8 years agoIssue #28556: updates to typing.py (fix copy, deepcopy, pickle)
Guido van Rossum [Sat, 29 Oct 2016 19:44:29 +0000 (12:44 -0700)]
Issue #28556: updates to typing.py (fix copy, deepcopy, pickle)

8 years agoAdds missing _asyncio.pyd to installer and generally tidies pyd management.
Steve Dower [Sat, 29 Oct 2016 16:23:39 +0000 (09:23 -0700)]
Adds missing _asyncio.pyd to installer and generally tidies pyd management.

8 years agoIssue #28556: updates to typing.py (3.5->3.6)
Guido van Rossum [Sat, 29 Oct 2016 15:54:57 +0000 (08:54 -0700)]
Issue #28556: updates to typing.py (3.5->3.6)

8 years agoIssue #28556: updates to typing.py
Guido van Rossum [Sat, 29 Oct 2016 15:54:56 +0000 (08:54 -0700)]
Issue #28556: updates to typing.py

8 years agoMakes test_underpth* tests more robust by copying the executable.
Steve Dower [Sat, 29 Oct 2016 15:50:31 +0000 (08:50 -0700)]
Makes test_underpth* tests more robust by copying the executable.

8 years agoIssue #28444: Merge with 3.5.
Xavier de Gaye [Sat, 29 Oct 2016 14:59:32 +0000 (16:59 +0200)]
Issue #28444: Merge with 3.5.

8 years agoIssue #28444: Fix missing extensions modules when cross compiling.
Xavier de Gaye [Sat, 29 Oct 2016 14:57:20 +0000 (16:57 +0200)]
Issue #28444: Fix missing extensions modules when cross compiling.

8 years agoIssue #28199: Microoptimized dict resizing. Based on patch by Naoki Inada.
Serhiy Storchaka [Sat, 29 Oct 2016 07:50:00 +0000 (10:50 +0300)]
Issue #28199: Microoptimized dict resizing.  Based on patch by Naoki Inada.

8 years agoIssue #28586: Converted os.scandir() to Argument Clinic.
Serhiy Storchaka [Sun, 6 Nov 2016 11:45:33 +0000 (13:45 +0200)]
Issue #28586: Converted os.scandir() to Argument Clinic.

8 years agoIssue #28123: _PyDict_GetItem_KnownHash() now can raise an exception as
Serhiy Storchaka [Sun, 6 Nov 2016 11:19:38 +0000 (13:19 +0200)]
Issue #28123: _PyDict_GetItem_KnownHash() now can raise an exception as
PyDict_GetItemWithError().  Patch by Xiang Zhang.

8 years agoRemove disabled test code
Martin Panter [Sat, 5 Nov 2016 02:49:20 +0000 (02:49 +0000)]
Remove disabled test code

Loading Unix libraries via getattr() was disabled before ctypes was added to
Python.

8 years agoMerge doc fixup from 3.6
Martin Panter [Sat, 5 Nov 2016 02:49:11 +0000 (02:49 +0000)]
Merge doc fixup from 3.6

8 years agoIssue #28485: Merge single-threading fix from 3.6
Martin Panter [Sat, 5 Nov 2016 01:56:58 +0000 (01:56 +0000)]
Issue #28485: Merge single-threading fix from 3.6

8 years agoIssue #28616: merge from 3.6
Ned Deily [Fri, 4 Nov 2016 21:07:47 +0000 (17:07 -0400)]
Issue #28616: merge from 3.6

8 years agoMerge 3.6 (issue #28613)
Yury Selivanov [Fri, 4 Nov 2016 18:30:41 +0000 (14:30 -0400)]
Merge 3.6 (issue #28613)

8 years agoIssue #28580: Optimize iterating split table values.
INADA Naoki [Fri, 4 Nov 2016 07:59:10 +0000 (16:59 +0900)]
Issue #28580: Optimize iterating split table values.

Patch by Xiang Zhang.

8 years agoIssue #28088: Document Transport.set_protocol and get_protocol.
INADA Naoki [Fri, 4 Nov 2016 07:35:31 +0000 (16:35 +0900)]
Issue #28088: Document Transport.set_protocol and get_protocol.

Patch by Mariatta Wijaya.

8 years agoMerge for issue #28605
Brett Cannon [Thu, 3 Nov 2016 23:21:11 +0000 (16:21 -0700)]
Merge for issue #28605

8 years agoMerge 3.6 (asyncio)
Yury Selivanov [Thu, 3 Nov 2016 22:36:02 +0000 (15:36 -0700)]
Merge 3.6 (asyncio)

8 years agoMerge 3.6 (issue #28600)
Yury Selivanov [Thu, 3 Nov 2016 22:10:48 +0000 (15:10 -0700)]
Merge 3.6 (issue #28600)

8 years agoIssue #26980: Improve docs for create_unix_connection(). By Mariatta. (3.6->3.7)
Guido van Rossum [Thu, 3 Nov 2016 21:18:32 +0000 (14:18 -0700)]
Issue #26980: Improve docs for create_unix_connection(). By Mariatta. (3.6->3.7)

8 years agoIssue #28387: Fixed possible crash in _io.TextIOWrapper deallocator when
Serhiy Storchaka [Thu, 3 Nov 2016 13:38:58 +0000 (15:38 +0200)]
Issue #28387: Fixed possible crash in _io.TextIOWrapper deallocator when
the garbage collector is invoked in other thread.
Based on patch by Sebastian Cufre.

8 years agoMerge 3.6 - allow ensurepip w/o ssl
Donald Stufft [Thu, 3 Nov 2016 00:33:07 +0000 (20:33 -0400)]
Merge 3.6 - allow ensurepip w/o ssl

8 years agoMerge updated pip/setuptools from 3.6
Donald Stufft [Wed, 2 Nov 2016 19:55:26 +0000 (15:55 -0400)]
Merge updated pip/setuptools from 3.6

8 years agoFixed hyperlinks for tarfile CLI options.
Serhiy Storchaka [Wed, 2 Nov 2016 19:06:13 +0000 (21:06 +0200)]
Fixed hyperlinks for tarfile CLI options.

8 years agoIssue #28513: Documented command-line interface of zipfile.
Serhiy Storchaka [Wed, 2 Nov 2016 10:13:48 +0000 (12:13 +0200)]
Issue #28513: Documented command-line interface of zipfile.

8 years agoIssue #28583: PyDict_SetDefault didn't combine split table when needed.
INADA Naoki [Wed, 2 Nov 2016 09:47:24 +0000 (18:47 +0900)]
Issue #28583: PyDict_SetDefault didn't combine split table when needed.

Patch by Xiang Zhang.

8 years agomerge
Raymond Hettinger [Wed, 2 Nov 2016 05:23:34 +0000 (22:23 -0700)]
merge

8 years agomerge
Raymond Hettinger [Tue, 1 Nov 2016 05:54:12 +0000 (22:54 -0700)]
merge

8 years agoMerge tag from 3.6
Ned Deily [Tue, 1 Nov 2016 04:44:09 +0000 (00:44 -0400)]
Merge tag from 3.6