diff options
| -rw-r--r-- | Include/unicodeobject.h | 2 | ||||
| -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 | ||||
| -rw-r--r-- | Objects/funcobject.c | 20 | ||||
| -rw-r--r-- | PC/bdist_wininst/install.c | 18 |
7 files changed, 38 insertions, 32 deletions
diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h index bc6ecd4..20331a3 100644 --- a/Include/unicodeobject.h +++ b/Include/unicodeobject.h @@ -160,7 +160,7 @@ typedef uint8_t Py_UCS1; #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 --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 diff --git a/Objects/funcobject.c b/Objects/funcobject.c index 261c16d..69cd973 100644 --- a/Objects/funcobject.c +++ b/Objects/funcobject.c @@ -674,8 +674,9 @@ PyTypeObject PyFunction_Type = { To declare a class method, use this idiom: class C: - def f(cls, arg1, arg2, ...): ... - f = classmethod(f) + @classmethod + def f(cls, arg1, arg2, ...): + ... 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. @@ -785,8 +786,9 @@ just like an instance method receives the instance.\n\ To declare a class method, use this idiom:\n\ \n\ class C:\n\ - def f(cls, arg1, arg2, ...): ...\n\ - f = classmethod(f)\n\ + @classmethod\n\ + def f(cls, arg1, arg2, ...):\n\ + ...\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\ @@ -857,8 +859,9 @@ PyClassMethod_New(PyObject *callable) To declare a static method, use this idiom: class C: - def f(arg1, arg2, ...): ... - f = staticmethod(f) + @staticmethod + def f(arg1, arg2, ...): + ... 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. @@ -963,8 +966,9 @@ A static method does not receive an implicit first argument.\n\ To declare a static method, use this idiom:\n\ \n\ class C:\n\ - def f(arg1, arg2, ...): ...\n\ - f = staticmethod(f)\n\ + @staticmethod\n\ + def f(arg1, arg2, ...):\n\ + ...\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 --git a/PC/bdist_wininst/install.c b/PC/bdist_wininst/install.c index e01dba6..fd977f5 100644 --- a/PC/bdist_wininst/install.c +++ b/PC/bdist_wininst/install.c @@ -1661,16 +1661,16 @@ SelectPythonDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) 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 */ + 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 */ result = SendDlgItemMessage(hwnd, IDC_VERSIONS_LIST, LB_GETTEXTLEN, (WPARAM)id, 0); pbuf = (char *)malloc(result + 1); |