[Python-checkins] cpython (merge 3.5 -> default): Merge from 3.5.

[eric.snow]

https://hg.python.org/cpython/rev/cf8f8d07a4fd
changeset:   96403:cf8f8d07a4fd
parent:      96401:fbe74badb0c6
parent:      96402:1d851112922f
user:        Eric Snow <ericsnowcurrently at gmail.com>
date:        Sat May 30 14:26:40 2015 -0600
summary:
  Merge from 3.5.

files:
  PC/python3.def |  8 ++++++++
  1 files changed, 8 insertions(+), 0 deletions(-)


diff --git a/PC/python3.def b/PC/python3.def
--- a/PC/python3.def
+++ b/PC/python3.def
@@ -434,6 +434,14 @@
   PyObject_Size=python36.PyObject_Size
   PyObject_Str=python36.PyObject_Str
   PyObject_Type=python36.PyObject_Type DATA
+  PyODict_DelItem=python35.PyODict_DelItem
+  PyODict_New=python35.PyODict_New
+  PyODict_SetItem=python35.PyODict_SetItem
+  PyODict_Type=python35.PyODict_Type DATA
+  PyODictItems_Type=python35.PyODictItems_Type DATA
+  PyODictIter_Type=python35.PyODictIter_Type DATA
+  PyODictKeys_Type=python35.PyODictKeys_Type DATA
+  PyODictValues_Type=python35.PyODictValues_Type DATA
   PyParser_SimpleParseFileFlags=python36.PyParser_SimpleParseFileFlags
   PyParser_SimpleParseStringFlags=python36.PyParser_SimpleParseStringFlags
   PyProperty_Type=python36.PyProperty_Type DATA

-- 
Repository URL: https://hg.python.org/cpython