diff -r e96eb2bd0d5e Modules/_localemodule.c
--- a/Modules/_localemodule.c	Fri Sep 09 18:38:10 2016 -0700
+++ b/Modules/_localemodule.c	Tue Sep 13 20:48:28 2016 -0300
@@ -172,23 +172,23 @@
 #endif
 
     if (locale) {
-    /* set locale */
-    result = setlocale(category, locale);
-    if (!result) {
-        /* operation failed, no setting was changed */
-        PyErr_SetString(Error, "unsupported locale setting");
-        return NULL;
-    }
-    result_object = PyString_FromString(result);
-    if (!result_object)
-        return NULL;
-    /* record changes to LC_CTYPE */
-    if (category == LC_CTYPE || category == LC_ALL)
-        fixup_ulcase();
+        /* set locale */
+        result = setlocale(category, locale);
+        if (!result) {
+            /* operation failed, no setting was changed */
+            PyErr_SetString(Error, "unsupported locale setting");
+            return NULL;
+        }
+        result_object = PyString_FromString(result);
+        if (!result_object)
+            return NULL;
+        /* record changes to LC_CTYPE */
+        if (category == LC_CTYPE || category == LC_ALL)
+            fixup_ulcase();
         /* things that got wrong up to here are ignored */
         PyErr_Clear();
     } else {
-    /* get locale */
+        /* get locale */
         result = setlocale(category, NULL);
         if (!result) {
             PyErr_SetString(Error, "locale query failed");
@@ -297,9 +297,9 @@
     }
     /* Convert the non-unicode argument to unicode. */
     if (!PyUnicode_Check(os1)) {
-    os1 = PyUnicode_FromObject(os1);
-    if (!os1)
-        return NULL;
+        os1 = PyUnicode_FromObject(os1);
+        if (!os1)
+            return NULL;
         rel1 = 1;
     }
     if (!PyUnicode_Check(os2)) {
diff -r e96eb2bd0d5e Modules/cjkcodecs/multibytecodec.c
--- a/Modules/cjkcodecs/multibytecodec.c	Fri Sep 09 18:38:10 2016 -0700
+++ b/Modules/cjkcodecs/multibytecodec.c	Tue Sep 13 20:48:28 2016 -0300
@@ -531,7 +531,7 @@
         if (_PyString_Resize(&buf.outobj, finalsize) == -1)
             goto errorexit;
 
-	*data = buf.inbuf;
+    *data = buf.inbuf;
     Py_XDECREF(buf.excobj);
     return buf.outobj;
 
diff -r e96eb2bd0d5e Python/ast.c
--- a/Python/ast.c	Fri Sep 09 18:38:10 2016 -0700
+++ b/Python/ast.c	Tue Sep 13 20:48:28 2016 -0300
@@ -2284,7 +2284,7 @@
         dest = ast_for_expr(c, CHILD(n, 2));
         if (!dest)
             return NULL;
-            start = 4;
+        start = 4;
     }
     values_count = (NCH(n) + 1 - start) / 2;
     if (values_count) {