bpo-32150: Expand tabs to spaces in C files. by serhiy-storchaka · Pull Request #4583 · python/cpython · GitHub

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

Where's the bpo issue?

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

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> .

Commented issues in the current code fixed by this PR.

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

Wrong alignment due to tabs.

Mixed tabs and spaces make worser a view on GitHub.

Too larger indent.

Mixed tabs and spaces (compare with lines above).

Too large indent.

Mixed tabs and spaces.

Too large indent.

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.

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

                   int use_bytearray);
               #endif
               PyAPI_FUNC(PyObject *) PyBytes_DecodeEscape(const char *, Py_ssize_t,
-              						   const char *, Py_ssize_t,

               #define PyMethod_GET_FUNCTION(meth) \
                       (((PyMethodObject *)meth) -> im_func)
               #define PyMethod_GET_SELF(meth) \
-              	(((PyMethodObject *)meth) -> im_self)

                   if (return_bytes) {
                       /* If _PyBytes_FromSize() were public we could avoid malloc+copy. */
                       retbuf = (Py_UCS1*) PyMem_Malloc(arglen*2);
-              	if (!retbuf)

                   {"increment", (PyCFunction)Shoddy_increment, METH_NOARGS,
                    PyDoc_STR("increment state counter")},
-                  {NULL,	NULL},
+                  {NULL,      NULL},

+              #define NBYTES(nbits)   (((nbits) + BITSPERBYTE - 1) / BITSPERBYTE)
-              #define BIT2BYTE(ibit)	((ibit) / BITSPERBYTE)
-              #define BIT2SHIFT(ibit)	((ibit) % BITSPERBYTE)

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

               #endif
               typedef struct {
-              	PyObject_HEAD

               const char *
               Py_GetPlatform(void)
               {
-              	return PLATFORM;

               const char *
               Py_GetVersion(void)
               {
-              	static char version[250];

               double
               PyFPE_dummy(void *dummy)
               {
-              	return 1.0;

               char *
               strdup(const char *str)
               {
-              	if (str != NULL) {

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

bpo-32150: Expand tabs to spaces in C files. by serhiy-storchaka · Pull Request #4583 · python/cpython · GitHub

Repository navigation

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

bpo-32150: Expand tabs to spaces in C files.#4583serhiy-storchaka merged 2 commits intopython:masterpython/cpython:masterfrom serhiy-storchaka:expand-tabsserhiy-storchaka/cpython:expand-tabsCopy head branch name to clipboard

Conversation

serhiy-storchaka commented Nov 27, 2017 • edited by bedevere-bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gvanrossum commented Nov 27, 2017

Uh oh!

serhiy-storchaka commented Nov 27, 2017

Uh oh!

gvanrossum commented Nov 27, 2017 via email

Uh oh!

serhiy-storchaka left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

bpo-32150: Expand tabs to spaces in C files.#4583
serhiy-storchaka merged 2 commits into
python:masterfrom
serhiy-storchaka:expand-tabs

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