diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-09-17 07:59:14 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-09-17 07:59:14 (GMT) |
| commit | d508d00919dccbc9dd5d3c86508f2db7a7c753a7 (patch) | |
| tree | 141cdfbf0908146bab12636e5b270e59ea06b3a5 /Modules | |
| parent | abf275af5804c5f76fbe10c5cb1dd3d2e4b04c5b (diff) | |
| parent | 6d57fe1c23430d0d51de243a177670b76c37dab5 (diff) | |
| download | cpython-d508d00919dccbc9dd5d3c86508f2db7a7c753a7.zip cpython-d508d00919dccbc9dd5d3c86508f2db7a7c753a7.tar.gz cpython-d508d00919dccbc9dd5d3c86508f2db7a7c753a7.tar.bz2 | |
Issue #28139: Merge indentation fixes from 3.5 into 3.6
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_localemodule.c | 3 | ||||
| -rw-r--r-- | Modules/fcntlmodule.c | 2 | ||||
| -rw-r--r-- | Modules/signalmodule.c | 14 | ||||
| -rw-r--r-- | Modules/socketmodule.c | 11 |
4 files changed, 16 insertions, 14 deletions
diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c index 8259180..feb3802 100644 --- a/Modules/_localemodule.c +++ b/Modules/_localemodule.c @@ -54,9 +54,10 @@ copy_grouping(const char* s) int i; PyObject *result, *val = NULL; - if (s[0] == '\0') + if (s[0] == '\0') { /* empty string: no grouping at all */ return PyList_New(0); + } for (i = 0; s[i] != '\0' && s[i] != CHAR_MAX; i++) ; /* nothing */ diff --git a/Modules/fcntlmodule.c b/Modules/fcntlmodule.c index 7bd18ac..8875b26 100644 --- a/Modules/fcntlmodule.c +++ b/Modules/fcntlmodule.c @@ -26,7 +26,7 @@ conv_descriptor(PyObject *object, int *target) int fd = PyObject_AsFileDescriptor(object); if (fd < 0) - return 0; + return 0; *target = fd; return 1; } diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index 8ca5791..e27075b 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -154,18 +154,18 @@ itimer_retval(struct itimerval *iv) r = PyTuple_New(2); if (r == NULL) - return NULL; + return NULL; if(!(v = PyFloat_FromDouble(double_from_timeval(&iv->it_value)))) { - Py_DECREF(r); - return NULL; + Py_DECREF(r); + return NULL; } PyTuple_SET_ITEM(r, 0, v); if(!(v = PyFloat_FromDouble(double_from_timeval(&iv->it_interval)))) { - Py_DECREF(r); - return NULL; + Py_DECREF(r); + return NULL; } PyTuple_SET_ITEM(r, 1, v); @@ -1433,9 +1433,9 @@ PyInit__signal(void) #if defined (HAVE_SETITIMER) || defined (HAVE_GETITIMER) ItimerError = PyErr_NewException("signal.ItimerError", - PyExc_IOError, NULL); + PyExc_IOError, NULL); if (ItimerError != NULL) - PyDict_SetItemString(d, "ItimerError", ItimerError); + PyDict_SetItemString(d, "ItimerError", ItimerError); #endif #ifdef CTRL_C_EVENT diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index e87f790..d25bd7f 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -2061,12 +2061,13 @@ getsockaddrlen(PySocketSockObject *s, socklen_t *len_ret) return 1; } #endif /* AF_UNIX */ + #if defined(AF_NETLINK) - case AF_NETLINK: - { - *len_ret = sizeof (struct sockaddr_nl); - return 1; - } + case AF_NETLINK: + { + *len_ret = sizeof (struct sockaddr_nl); + return 1; + } #endif #ifdef AF_RDS |