# HG changeset patch # Parent 02dd99aeba7dbe670b9a7fc00b9cd096d86e28f5 Issue #28139: Fix messed up indentation diff -r 02dd99aeba7d Include/unicodeobject.h --- a/Include/unicodeobject.h Fri Sep 16 00:46:05 2016 +0000 +++ b/Include/unicodeobject.h Fri Sep 16 01:46:38 2016 +0000 @@ -176,7 +176,7 @@ #define Py_UNICODE_FILL(target, value, length) \ do {Py_ssize_t i_; Py_UNICODE *t_ = (target); Py_UNICODE v_ = (value);\ - for (i_ = 0; i_ < (length); i_++) t_[i_] = v_;\ + for (i_ = 0; i_ < (length); i_++) t_[i_] = v_;\ } while (0) /* macros to work with surrogates */ diff -r 02dd99aeba7d Modules/_ctypes/_ctypes.c --- a/Modules/_ctypes/_ctypes.c Fri Sep 16 00:46:05 2016 +0000 +++ b/Modules/_ctypes/_ctypes.c Fri Sep 16 01:46:38 2016 +0000 @@ -5138,18 +5138,18 @@ int status; if (!_PyArg_NoKeywords(Py_TYPE(self)->tp_name, kwds)) - return -1; + return -1; if (!PyArg_ParseTuple(args, "OOO:COMError", &hresult, &text, &details)) return -1; a = PySequence_GetSlice(args, 1, PySequence_Size(args)); if (!a) - return -1; + return -1; status = PyObject_SetAttrString(self, "args", a); Py_DECREF(a); if (status < 0) - return -1; + return -1; if (PyObject_SetAttrString(self, "hresult", hresult) < 0) return -1; diff -r 02dd99aeba7d Modules/fcntlmodule.c --- a/Modules/fcntlmodule.c Fri Sep 16 00:46:05 2016 +0000 +++ b/Modules/fcntlmodule.c Fri Sep 16 01:46:38 2016 +0000 @@ -26,7 +26,7 @@ int fd = PyObject_AsFileDescriptor(object); if (fd < 0) - return 0; + return 0; *target = fd; return 1; } diff -r 02dd99aeba7d Modules/signalmodule.c --- a/Modules/signalmodule.c Fri Sep 16 00:46:05 2016 +0000 +++ b/Modules/signalmodule.c Fri Sep 16 01:46:38 2016 +0000 @@ -154,18 +154,18 @@ 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); @@ -1479,9 +1479,9 @@ #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 -r 02dd99aeba7d Modules/socketmodule.c --- a/Modules/socketmodule.c Fri Sep 16 00:46:05 2016 +0000 +++ b/Modules/socketmodule.c Fri Sep 16 01:46:38 2016 +0000 @@ -1967,12 +1967,13 @@ 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 diff -r 02dd99aeba7d Objects/funcobject.c --- a/Objects/funcobject.c Fri Sep 16 00:46:05 2016 +0000 +++ b/Objects/funcobject.c Fri Sep 16 01:46:38 2016 +0000 @@ -697,8 +697,8 @@ To declare a class method, use this idiom: class C: - def f(cls, arg1, arg2, ...): ... - f = classmethod(f) + def f(cls, arg1, arg2, ...): ... + f = classmethod(f) It can be called either on the class (e.g. C.f()) or on an instance (e.g. C().f()); the instance is ignored except for its class. @@ -880,8 +880,8 @@ To declare a static method, use this idiom: class C: - def f(arg1, arg2, ...): ... - f = staticmethod(f) + def f(arg1, arg2, ...): ... + f = staticmethod(f) It can be called either on the class (e.g. C.f()) or on an instance (e.g. C().f()); the instance is ignored except for its class. @@ -986,8 +986,8 @@ To declare a static method, use this idiom:\n\ \n\ class C:\n\ - def f(arg1, arg2, ...): ...\n\ - f = staticmethod(f)\n\ + def f(arg1, arg2, ...): ...\n\ + f = staticmethod(f)\n\ \n\ It can be called either on the class (e.g. C.f()) or on an instance\n\ (e.g. C().f()). The instance is ignored except for its class.\n\ diff -r 02dd99aeba7d PC/bdist_wininst/install.c --- a/PC/bdist_wininst/install.c Fri Sep 16 00:46:05 2016 +0000 +++ b/PC/bdist_wininst/install.c Fri Sep 16 01:46:38 2016 +0000 @@ -1657,16 +1657,16 @@ PropSheet_SetWizButtons(GetParent(hwnd), PSWIZB_BACK | PSWIZB_NEXT); /* Get the python directory */ - ivi = (InstalledVersionInfo *) + ivi = (InstalledVersionInfo *) SendDlgItemMessage(hwnd, IDC_VERSIONS_LIST, LB_GETITEMDATA, id, 0); - hkey_root = ivi->hkey; - strcpy(python_dir, ivi->prefix); - SetDlgItemText(hwnd, IDC_PATH, python_dir); - /* retrieve the python version and pythondll to use */ + hkey_root = ivi->hkey; + strcpy(python_dir, ivi->prefix); + SetDlgItemText(hwnd, IDC_PATH, python_dir); + /* retrieve the python version and pythondll to use */ result = SendDlgItemMessage(hwnd, IDC_VERSIONS_LIST, LB_GETTEXTLEN, (WPARAM)id, 0); pbuf = (char *)malloc(result + 1);