bpo-32150: Expand tabs to spaces in C files. #4583

serhiy-storchaka · 2017-11-27T09:22:52Z

Tabs in C files add a noise in the diff if the committer uses an editor which don't preserve tabs (see for example #4390). This can hide semantic changes in tab expansion changes. It is better to expand all tabs to spaces in the single commit that doesn't do anything other.

https://bugs.python.org/issue32150

gvanrossum · 2017-11-27T15:41:56Z

Where's the bpo issue?

serhiy-storchaka · 2017-11-27T16:01:26Z

I haven't created a bpo issue. Do you think that this is necessary?

gvanrossum · 2017-11-27T16:15:05Z

That's where discussion should go, and I expect we'll need some (sorry, I am not in immediate agreement).

…

On Nov 27, 2017 8:03 AM, "Serhiy Storchaka" ***@***.***> wrote: I haven't created a bpo issue. Do you think that this is necessary? — You are receiving this because your review was requested. Reply to this email directly, view it on GitHub <#4583 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ACwrMs_UsBQT09LvIuNziMdpJOO6HI0Eks5s6tzlgaJpZM4QrVUE> .

serhiy-storchaka

Commented issues in the current code fixed by this PR.

serhiy-storchaka · 2017-11-27T17:38:51Z

Include/bitset.h


-#define BIT2BYTE(ibit)	((ibit) / BITSPERBYTE)
-#define BIT2SHIFT(ibit)	((ibit) % BITSPERBYTE)


Here tabs make the view on GitHub uglier. See at left side.

serhiy-storchaka · 2017-11-27T17:39:14Z

Include/bytesobject.h

@@ -72,8 +72,8 @@ PyAPI_FUNC(PyObject*) _PyBytes_FromHex(
    int use_bytearray);
 #endif
 PyAPI_FUNC(PyObject *) PyBytes_DecodeEscape(const char *, Py_ssize_t,
-						   const char *, Py_ssize_t,


Wrong alignment due to tabs.

serhiy-storchaka · 2017-11-27T17:40:17Z

Include/bytesobject.h

@@ -132,10 +132,10 @@ PyAPI_FUNC(Py_ssize_t) _PyBytes_InsertThousandsGrouping(char *buffer,

 /* Flags used by string formatting */
 #define F_LJUST (1<<0)
-#define F_SIGN	(1<<1)


Mixed tabs and spaces make worser a view on GitHub.

serhiy-storchaka · 2017-11-27T17:40:39Z

Include/cellobject.h

@@ -7,8 +7,8 @@ extern "C" {
 #endif

 typedef struct {
-	PyObject_HEAD


Too larger indent.

serhiy-storchaka · 2017-11-27T17:41:20Z

Include/classobject.h

@@ -30,13 +30,13 @@ PyAPI_FUNC(PyObject *) PyMethod_Self(PyObject *);
 #define PyMethod_GET_FUNCTION(meth) \
        (((PyMethodObject *)meth) -> im_func)
 #define PyMethod_GET_SELF(meth) \
-	(((PyMethodObject *)meth) -> im_self)


Mixed tabs and spaces (compare with lines above).

serhiy-storchaka · 2017-11-27T17:50:41Z

Python/getplatform.c

@@ -8,5 +8,5 @@
 const char *
 Py_GetPlatform(void)
 {
-	return PLATFORM;


Too large indent.

serhiy-storchaka · 2017-11-27T17:50:49Z

Python/getversion.c

@@ -8,8 +8,8 @@
 const char *
 Py_GetVersion(void)
 {
-	static char version[250];


Too large indent.

serhiy-storchaka · 2017-11-27T17:50:55Z

Python/pyfpe.c

@@ -19,5 +19,5 @@ int PyFPE_counter = 0;
 double
 PyFPE_dummy(void *dummy)
 {
-	return 1.0;


Too large indent.

serhiy-storchaka · 2017-11-27T17:51:12Z

Python/pystrhex.c

@@ -16,14 +16,14 @@ static PyObject *_Py_strhex_impl(const char* argbuf, const Py_ssize_t arglen,
    if (return_bytes) {
        /* If _PyBytes_FromSize() were public we could avoid malloc+copy. */
        retbuf = (Py_UCS1*) PyMem_Malloc(arglen*2);
-	if (!retbuf)


Mixed tabs and spaces.

serhiy-storchaka · 2017-11-27T17:51:19Z

Python/strdup.c

@@ -5,10 +5,10 @@
 char *
 strdup(const char *str)
 {
-	if (str != NULL) {


Too large indent.

vadmium · 2017-11-27T21:30:00Z

Doc/includes/shoddy.c

@@ -17,7 +17,7 @@ Shoddy_increment(Shoddy *self, PyObject *unused)
 static PyMethodDef Shoddy_methods[] = {
    {"increment", (PyCFunction)Shoddy_increment, METH_NOARGS,
     PyDoc_STR("increment state counter")},
-    {NULL,	NULL},
+    {NULL,      NULL},


This is part of the documentation. Maybe use a single space? The tab doesn’t seem to align with anything.

Or even drop the second NULL. Other PyMethodDef arrays on the page have a single NULL. The other three fields get zeroed implicitly, and it looks like the first field (ml_name) is the one that is checked for NULL.

I prefer to drop the second NULL.

ned-deily · 2017-11-28T19:40:34Z

Include/patchlevel.h

+#define PY_MINOR_VERSION        7
+#define PY_MICRO_VERSION        0
+#define PY_RELEASE_LEVEL        PY_RELEASE_LEVEL_ALPHA
+#define PY_RELEASE_SERIAL       2



Note that the version constants are automatically generated by the release management tool, https://github.com/python/release-tools/blob/master/release.py, so that will probably need to be modified to handle spaces instead of tabs and any changes there need to be able to continue to handle patchlevel.h in older release cycles.

Oh, my bad.

I have created a PR for the release management tool: python/release-tools#2 .

Expanded tabs to spaces in C files.

99e234e

serhiy-storchaka added skip issue skip news labels Nov 27, 2017

serhiy-storchaka requested review from ambv and gvanrossum November 27, 2017 09:22

the-knights-who-say-ni added the CLA signed label Nov 27, 2017

bedevere-bot added the awaiting merge label Nov 27, 2017

serhiy-storchaka changed the title ~~Expand tabs to spaces in C files.~~ bpo-32150: Expand tabs to spaces in C files. Nov 27, 2017

serhiy-storchaka removed the skip issue label Nov 27, 2017

serhiy-storchaka commented Nov 27, 2017

View reviewed changes

vadmium reviewed Nov 27, 2017

View reviewed changes

Update shoddy.c

90cc396

serhiy-storchaka merged commit 598ceae into python:master Nov 28, 2017

bedevere-bot removed the awaiting merge label Nov 28, 2017

serhiy-storchaka deleted the expand-tabs branch November 28, 2017 15:56

ned-deily reviewed Nov 28, 2017

View reviewed changes

serhiy-storchaka mentioned this pull request Dec 2, 2017

String annotations [PEP 563] #4390

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

bpo-32150: Expand tabs to spaces in C files. #4583

bpo-32150: Expand tabs to spaces in C files. #4583

serhiy-storchaka commented Nov 27, 2017 •

edited by bedevere-bot

Loading

gvanrossum commented Nov 27, 2017

serhiy-storchaka commented Nov 27, 2017

gvanrossum commented Nov 27, 2017 via email

serhiy-storchaka left a comment

serhiy-storchaka Nov 27, 2017

serhiy-storchaka Nov 27, 2017

serhiy-storchaka Nov 27, 2017

serhiy-storchaka Nov 27, 2017

serhiy-storchaka Nov 27, 2017

serhiy-storchaka Nov 27, 2017

serhiy-storchaka Nov 27, 2017

serhiy-storchaka Nov 27, 2017

serhiy-storchaka Nov 27, 2017

serhiy-storchaka Nov 27, 2017

vadmium Nov 27, 2017

serhiy-storchaka Nov 27, 2017

ned-deily Nov 28, 2017

serhiy-storchaka Nov 28, 2017


		#define BIT2BYTE(ibit) ((ibit) / BITSPERBYTE)
		#define BIT2SHIFT(ibit) ((ibit) % BITSPERBYTE)

bpo-32150: Expand tabs to spaces in C files. #4583

bpo-32150: Expand tabs to spaces in C files. #4583

Conversation

serhiy-storchaka commented Nov 27, 2017 • edited by bedevere-bot Loading

gvanrossum commented Nov 27, 2017

serhiy-storchaka commented Nov 27, 2017

gvanrossum commented Nov 27, 2017 via email

serhiy-storchaka left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

serhiy-storchaka commented Nov 27, 2017 •

edited by bedevere-bot

Loading