Restoring authorship annotation for <shadchin@yandex-team.ru>. Commit 1 of 2.

1 files changed, 42 insertions, 42 deletions

diff --git a/contrib/tools/python3/src/Objects/stringlib/join.h b/contrib/tools/python3/src/Objects/stringlib/join.h
index 53bcbdea7a..5573924a49 100644
--- a/contrib/tools/python3/src/Objects/stringlib/join.h
+++ b/contrib/tools/python3/src/Objects/stringlib/join.h
@@ -7,8 +7,8 @@
 Py_LOCAL_INLINE(PyObject *)
 STRINGLIB(bytes_join)(PyObject *sep, PyObject *iterable)
 {
-    const char *sepstr = STRINGLIB_STR(sep);
-    Py_ssize_t seplen = STRINGLIB_LEN(sep);
+    const char *sepstr = STRINGLIB_STR(sep); 
+    Py_ssize_t seplen = STRINGLIB_LEN(sep); 
     PyObject *res = NULL;
     char *p;
     Py_ssize_t seqlen = 0;
@@ -18,9 +18,9 @@ STRINGLIB(bytes_join)(PyObject *sep, PyObject *iterable)
     Py_buffer *buffers = NULL;
 #define NB_STATIC_BUFFERS 10
     Py_buffer static_buffers[NB_STATIC_BUFFERS];
-#define GIL_THRESHOLD 1048576
-    int drop_gil = 1;
-    PyThreadState *save = NULL;
+#define GIL_THRESHOLD 1048576 
+    int drop_gil = 1; 
+    PyThreadState *save = NULL; 
 
     seq = PySequence_Fast(iterable, "can only join an iterable");
     if (seq == NULL) {
@@ -68,21 +68,21 @@ STRINGLIB(bytes_join)(PyObject *sep, PyObject *iterable)
             buffers[i].buf = PyBytes_AS_STRING(item);
             buffers[i].len = PyBytes_GET_SIZE(item);
         }
-        else {
-            if (PyObject_GetBuffer(item, &buffers[i], PyBUF_SIMPLE) != 0) {
-                PyErr_Format(PyExc_TypeError,
-                             "sequence item %zd: expected a bytes-like object, "
-                             "%.80s found",
-                             i, Py_TYPE(item)->tp_name);
-                goto error;
-            }
-            /* If the backing objects are mutable, then dropping the GIL
-             * opens up race conditions where another thread tries to modify
-             * the object which we hold a buffer on it. Such code has data
-             * races anyway, but this is a conservative approach that avoids
-             * changing the behaviour of that data race.
-             */
-            drop_gil = 0;
+        else { 
+            if (PyObject_GetBuffer(item, &buffers[i], PyBUF_SIMPLE) != 0) { 
+                PyErr_Format(PyExc_TypeError, 
+                             "sequence item %zd: expected a bytes-like object, " 
+                             "%.80s found", 
+                             i, Py_TYPE(item)->tp_name); 
+                goto error; 
+            } 
+            /* If the backing objects are mutable, then dropping the GIL 
+             * opens up race conditions where another thread tries to modify 
+             * the object which we hold a buffer on it. Such code has data 
+             * races anyway, but this is a conservative approach that avoids 
+             * changing the behaviour of that data race. 
+             */ 
+            drop_gil = 0; 
         }
         nbufs = i + 1;  /* for error cleanup */
         itemlen = buffers[i].len;
@@ -114,12 +114,12 @@ STRINGLIB(bytes_join)(PyObject *sep, PyObject *iterable)
 
     /* Catenate everything. */
     p = STRINGLIB_STR(res);
-    if (sz < GIL_THRESHOLD) {
-        drop_gil = 0;   /* Benefits are likely outweighed by the overheads */
-    }
-    if (drop_gil) {
-        save = PyEval_SaveThread();
-    }
+    if (sz < GIL_THRESHOLD) { 
+        drop_gil = 0;   /* Benefits are likely outweighed by the overheads */ 
+    } 
+    if (drop_gil) { 
+        save = PyEval_SaveThread(); 
+    } 
     if (!seplen) {
         /* fast path */
         for (i = 0; i < nbufs; i++) {
@@ -129,23 +129,23 @@ STRINGLIB(bytes_join)(PyObject *sep, PyObject *iterable)
             p += n;
         }
     }
-    else {
-        for (i = 0; i < nbufs; i++) {
-            Py_ssize_t n;
-            char *q;
-            if (i) {
-                memcpy(p, sepstr, seplen);
-                p += seplen;
-            }
-            n = buffers[i].len;
-            q = buffers[i].buf;
-            memcpy(p, q, n);
-            p += n;
+    else { 
+        for (i = 0; i < nbufs; i++) { 
+            Py_ssize_t n; 
+            char *q; 
+            if (i) { 
+                memcpy(p, sepstr, seplen); 
+                p += seplen; 
+            } 
+            n = buffers[i].len; 
+            q = buffers[i].buf; 
+            memcpy(p, q, n); 
+            p += n; 
         }
     }
-    if (drop_gil) {
-        PyEval_RestoreThread(save);
-    }
+    if (drop_gil) { 
+        PyEval_RestoreThread(save); 
+    } 
     goto done;
 
 error:
@@ -160,4 +160,4 @@ done:
 }
 
 #undef NB_STATIC_BUFFERS
-#undef GIL_THRESHOLD
+#undef GIL_THRESHOLD