Kaydet (Commit) 99e96f2b authored tarafından Benjamin Peterson's avatar Benjamin Peterson

remove unnecessary braces and indentation

üst 277b9752
...@@ -2404,81 +2404,80 @@ mutablemapping_update(PyObject *self, PyObject *args, PyObject *kwargs) ...@@ -2404,81 +2404,80 @@ mutablemapping_update(PyObject *self, PyObject *args, PyObject *kwargs)
/* first handle args, if any */ /* first handle args, if any */
if (len < 0) /* PyObject_Size raised an exception. */ if (len < 0) /* PyObject_Size raised an exception. */
return NULL; return NULL;
else if (len > 1) {
if (len > 1) {
char *msg = "update() takes at most 1 positional argument (%d given)"; char *msg = "update() takes at most 1 positional argument (%d given)";
PyErr_Format(PyExc_TypeError, msg, len); PyErr_Format(PyExc_TypeError, msg, len);
return NULL; return NULL;
} }
else if (len == 1) {
PyObject *other = PyTuple_GET_ITEM(args, 0); /* borrowed reference */
if (other == NULL) PyObject *other = PyTuple_GET_ITEM(args, 0); /* borrowed reference */
if (other == NULL)
return NULL;
Py_INCREF(other);
if (PyObject_HasAttrString(other, "items")) { /* never fails */
PyObject *items = PyMapping_Items(other);
Py_DECREF(other);
if (items == NULL)
return NULL; return NULL;
Py_INCREF(other); res = mutablemapping_add_pairs(self, items);
if (PyObject_HasAttrString(other, "items")) { /* never fails */ Py_DECREF(items);
PyObject *items = PyMapping_Items(other); if (res == -1)
return NULL;
}
else if (PyObject_HasAttrString(other, "keys")) { /* never fails */
PyObject *keys, *iterator, *key;
keys = PyObject_CallMethod(other, "keys", NULL);
if (keys == NULL) {
Py_DECREF(other); Py_DECREF(other);
if (items == NULL) return NULL;
return NULL;
res = mutablemapping_add_pairs(self, items);
Py_DECREF(items);
if (res == -1)
return NULL;
} }
else if (PyObject_HasAttrString(other, "keys")) { /* never fails */ iterator = PyObject_GetIter(keys);
PyObject *keys, *iterator, *key; Py_DECREF(keys);
keys = PyObject_CallMethod(other, "keys", NULL); if (iterator == NULL) {
if (keys == NULL) {
Py_DECREF(other);
return NULL;
}
iterator = PyObject_GetIter(keys);
Py_DECREF(keys);
if (iterator == NULL) {
Py_DECREF(other);
return NULL;
}
while (res == 0 && (key = PyIter_Next(iterator))) {
PyObject *value = PyObject_GetItem(other, key);
if (value != NULL) {
res = PyObject_SetItem(self, key, value);
Py_DECREF(value);
}
else {
res = -1;
}
Py_DECREF(key);
}
Py_DECREF(other); Py_DECREF(other);
Py_DECREF(iterator); return NULL;
if (res != 0 || PyErr_Occurred())
return NULL;
} }
else { while (res == 0 && (key = PyIter_Next(iterator))) {
res = mutablemapping_add_pairs(self, other); PyObject *value = PyObject_GetItem(other, key);
Py_DECREF(other); if (value != NULL) {
if (res != 0) res = PyObject_SetItem(self, key, value);
return NULL; Py_DECREF(value);
}
else {
res = -1;
}
Py_DECREF(key);
} }
Py_DECREF(other);
Py_DECREF(iterator);
if (res != 0 || PyErr_Occurred())
return NULL;
}
else {
res = mutablemapping_add_pairs(self, other);
Py_DECREF(other);
if (res != 0)
return NULL;
} }
/* now handle kwargs */ /* now handle kwargs */
len = (kwargs != NULL) ? PyObject_Size(kwargs) : 0; len = (kwargs != NULL) ? PyObject_Size(kwargs) : 0;
if (len < 0) /* PyObject_Size raised an exception. */ if (len < 0) /* PyObject_Size raised an exception. */
return NULL; return NULL;
else if (len > 0) { PyObject *items;
PyObject *items; if (!PyMapping_Check(kwargs)) {
if (!PyMapping_Check(kwargs)) { PyErr_SetString(PyExc_TypeError, "expected mapping for kwargs");
PyErr_SetString(PyExc_TypeError, "expected mapping for kwargs"); return NULL;
return NULL;
}
items = PyMapping_Items(kwargs);
if (items == NULL)
return NULL;
res = mutablemapping_add_pairs(self, items);
Py_DECREF(items);
if (res == -1)
return NULL;
} }
items = PyMapping_Items(kwargs);
if (items == NULL)
return NULL;
res = mutablemapping_add_pairs(self, items);
Py_DECREF(items);
if (res == -1)
return NULL;
Py_RETURN_NONE; Py_RETURN_NONE;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment