[pypy-commit] pypy release-pypy3.6-v7.x: fix bad merge

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: release-pypy3.6-v7.x
Changeset: r98256:23a8a6861343
Date: 2019-12-08 09:15 +0200
http://bitbucket.org/pypy/pypy/changeset/23a8a6861343/

Log:	fix bad merge

diff --git a/pypy/module/cpyext/dictobject.py b/pypy/module/cpyext/dictobject.py
--- a/pypy/module/cpyext/dictobject.py
+++ b/pypy/module/cpyext/dictobject.py
@@ -93,16 +93,6 @@
         PyErr_BadInternalCall(space)
     return w_dict.getitem(w_key)
 
- at cpython_api([PyObject, PyObject], PyObject, result_borrowed=True)
-def PyDict_GetItemWithError(space, w_dict, w_key):
-    """Variant of PyDict_GetItem() that does not suppress
-    exceptions. Return NULL with an exception set if an exception
-    occurred.  Return NULL without an exception set if the key
-    wasn't present."""
-    if not isinstance(w_dict, W_DictMultiObject):
-        PyErr_BadInternalCall(space)
-    return w_dict.getitem(w_key)
-
 @cpython_api([PyObject, PyObject, PyObject], rffi.INT_real, error=-1)
 def PyDict_SetItem(space, w_dict, w_key, w_obj):
     if not isinstance(w_dict, W_DictMultiObject):