[Python-checkins] cpython (merge 3.5 -> 3.6): Issue #23903: Fixed errors and remove non-existing names in python3.def.

[serhiy.storchaka]

https://hg.python.org/cpython/rev/b5470d08969c
changeset:   105837:b5470d08969c
branch:      3.6
parent:      105834:0001ae913759
parent:      105836:8423f86486b3
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Tue Dec 27 11:51:15 2016 +0200
summary:
  Issue #23903: Fixed errors and remove non-existing names in python3.def.

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


diff --git a/PC/python3.def b/PC/python3.def
--- a/PC/python3.def
+++ b/PC/python3.def
@@ -189,7 +189,6 @@
   PyExc_KeyboardInterrupt=python36.PyExc_KeyboardInterrupt DATA
   PyExc_LookupError=python36.PyExc_LookupError DATA
   PyExc_MemoryError=python36.PyExc_MemoryError DATA
-  PyExc_MemoryErrorInst=python36.PyExc_MemoryErrorInst DATA
   PyExc_NameError=python36.PyExc_NameError DATA
   PyExc_NotImplementedError=python36.PyExc_NotImplementedError DATA
   PyExc_OSError=python36.PyExc_OSError DATA
@@ -441,7 +440,7 @@
   PyObject_SetItem=python36.PyObject_SetItem
   PyObject_Size=python36.PyObject_Size
   PyObject_Str=python36.PyObject_Str
-  PyObject_Type=python36.PyObject_Type DATA
+  PyObject_Type=python36.PyObject_Type
   PyParser_SimpleParseFileFlags=python36.PyParser_SimpleParseFileFlags
   PyParser_SimpleParseStringFlags=python36.PyParser_SimpleParseStringFlags
   PyProperty_Type=python36.PyProperty_Type DATA
@@ -578,7 +577,7 @@
   PyUnicode_AsUnicodeEscapeString=python36.PyUnicode_AsUnicodeEscapeString
   PyUnicode_AsWideChar=python36.PyUnicode_AsWideChar
   PyUnicode_BuildEncodingMap=python36.PyUnicode_BuildEncodingMap
-  PyUnicode_ClearFreelist=python36.PyUnicode_ClearFreelist
+  PyUnicode_ClearFreeList=python36.PyUnicode_ClearFreeList
   PyUnicode_Compare=python36.PyUnicode_Compare
   PyUnicode_CompareWithASCIIString=python36.PyUnicode_CompareWithASCIIString
   PyUnicode_Concat=python36.PyUnicode_Concat
@@ -626,13 +625,12 @@
   PyUnicode_Replace=python36.PyUnicode_Replace
   PyUnicode_Resize=python36.PyUnicode_Resize
   PyUnicode_RichCompare=python36.PyUnicode_RichCompare
-  PyUnicode_SetDefaultEncoding=python36.PyUnicode_SetDefaultEncoding
   PyUnicode_Split=python36.PyUnicode_Split
   PyUnicode_Splitlines=python36.PyUnicode_Splitlines
   PyUnicode_Tailmatch=python36.PyUnicode_Tailmatch
   PyUnicode_Translate=python36.PyUnicode_Translate
   PyUnicode_Type=python36.PyUnicode_Type DATA
-  PyWeakref_GetObject=python36.PyWeakref_GetObject DATA
+  PyWeakref_GetObject=python36.PyWeakref_GetObject
   PyWeakref_NewProxy=python36.PyWeakref_NewProxy
   PyWeakref_NewRef=python36.PyWeakref_NewRef
   PyWrapperDescr_Type=python36.PyWrapperDescr_Type DATA

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