mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-04 03:44:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Issue #28139: Merge indentation fixes from 3.5 into 3.6

Browse source
This commit is contained in:
Martin Panter 2016-09-17 07:59:14 +00:00
commit d508d00919
7 changed files with 38 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Modules/_localemodule.c
View file

@ -54,9 +54,10 @@ copy_grouping(const char* s)
int i; int i;
PyObject *result, *val = NULL; PyObject *result, *val = NULL;
if (s[0] == '\0') if (s[0] == '\0') {
/* empty string: no grouping at all */ /* empty string: no grouping at all */
return PyList_New(0); return PyList_New(0);
}
for (i = 0; s[i] != '\0' && s[i] != CHAR_MAX; i++) for (i = 0; s[i] != '\0' && s[i] != CHAR_MAX; i++)
; /* nothing */ ; /* nothing */

1
Modules/socketmodule.c
View file

@ -2061,6 +2061,7 @@ getsockaddrlen(PySocketSockObject *s, socklen_t *len_ret)
return 1; return 1;
} }
#endif /* AF_UNIX */ #endif /* AF_UNIX */
#if defined(AF_NETLINK) #if defined(AF_NETLINK)
case AF_NETLINK: case AF_NETLINK:
{ {

20
Objects/funcobject.c
View file

@ -674,8 +674,9 @@ PyTypeObject PyFunction_Type = {
To declare a class method, use this idiom: To declare a class method, use this idiom:
class C: class C:
def f(cls, arg1, arg2, ...): ... @classmethod
f = classmethod(f) def f(cls, arg1, arg2, ...):
...
It can be called either on the class (e.g. C.f()) or on an instance 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. (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\ To declare a class method, use this idiom:\n\
\n\ \n\
class C:\n\ class C:\n\
def f(cls, arg1, arg2, ...): ...\n\ @classmethod\n\
f = classmethod(f)\n\ def f(cls, arg1, arg2, ...):\n\
...\n\
\n\ \n\
It can be called either on the class (e.g. C.f()) or on an instance\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\ (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: To declare a static method, use this idiom:
class C: class C:
def f(arg1, arg2, ...): ... @staticmethod
f = staticmethod(f) def f(arg1, arg2, ...):
...
It can be called either on the class (e.g. C.f()) or on an instance 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. (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\ To declare a static method, use this idiom:\n\
\n\ \n\
class C:\n\ class C:\n\
def f(arg1, arg2, ...): ...\n\ @staticmethod\n\
f = staticmethod(f)\n\ def f(arg1, arg2, ...):\n\
...\n\
\n\ \n\
It can be called either on the class (e.g. C.f()) or on an instance\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\ (e.g. C().f()). The instance is ignored except for its class.\n\