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

[eric.snow]

https://hg.python.org/cpython/rev/6f99cd255237
changeset:   96398:6f99cd255237
parent:      96396:958f1233e28c
parent:      96397:7117e9b0f595
user:        Eric Snow <ericsnowcurrently at gmail.com>
date:        Sat May 30 12:06:26 2015 -0600
summary:
  Merge from 3.5.

files:
  Include/odictobject.h |  1 -
  1 files changed, 0 insertions(+), 1 deletions(-)


diff --git a/Include/odictobject.h b/Include/odictobject.h
--- a/Include/odictobject.h
+++ b/Include/odictobject.h
@@ -34,7 +34,6 @@
 #define PyODict_Size(od) PyDict_Size((PyObject *)od)
 #define PyODict_GetItemString(od, key) \
     PyDict_GetItemString((PyObject *)od, key)
-#define Py_ODict_GetItemId(od, key)  _PyDict_GetItemId((PyObject *)od, key)
 
 #ifdef __cplusplus
 }

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