diff -r 9d0f4da4d531 Modules/makesetup
--- a/Modules/makesetup	Sat Sep 17 01:30:48 2016 +0300
+++ b/Modules/makesetup	Sat Sep 17 04:10:38 2016 -0300
@@ -257,7 +257,7 @@
 	for mod in $MODS
 	do
 		EXTDECLS="${EXTDECLS}extern PyObject* PyInit_$mod(void);$NL"
-		INITBITS="${INITBITS}	{\"$mod\", PyInit_$mod},$NL"
+		INITBITS="${INITBITS}    {\"$mod\", PyInit_$mod},$NL"
 	done
 
 
diff -r 9d0f4da4d531 Parser/asdl_c.py
--- a/Parser/asdl_c.py	Sat Sep 17 01:30:48 2016 +0300
+++ b/Parser/asdl_c.py	Sat Sep 17 04:10:38 2016 -0300
@@ -94,8 +94,11 @@
         else:
             lines = [s]
         for line in lines:
-            line = (" " * TABSIZE * depth) + line + "\n"
-            self.file.write(line)
+            if line.strip():
+                line = (" " * TABSIZE * depth) + line + "\n"
+                self.file.write(line)
+            else:
+                self.file.write("\n")
 
 
 class TypeDefVisitor(EmitVisitor):
diff -r 9d0f4da4d531 Tools/unicode/makeunicodedata.py
--- a/Tools/unicode/makeunicodedata.py	Sat Sep 17 01:30:48 2016 +0300
+++ b/Tools/unicode/makeunicodedata.py	Sat Sep 17 04:10:38 2016 -0300
@@ -352,28 +352,28 @@
         index1, index2, shift = splitbins(index, trace)
         print("static const change_record change_records_%s[] = {" % cversion, file=fp)
         for record in records:
-            print("\t{ %s }," % ", ".join(map(str,record)), file=fp)
+            print("    { %s }," % ", ".join(map(str,record)), file=fp)
         print("};", file=fp)
         Array("changes_%s_index" % cversion, index1).dump(fp, trace)
         Array("changes_%s_data" % cversion, index2).dump(fp, trace)
         print("static const change_record* get_change_%s(Py_UCS4 n)" % cversion, file=fp)
         print("{", file=fp)
-        print("\tint index;", file=fp)
-        print("\tif (n >= 0x110000) index = 0;", file=fp)
-        print("\telse {", file=fp)
-        print("\t\tindex = changes_%s_index[n>>%d];" % (cversion, shift), file=fp)
-        print("\t\tindex = changes_%s_data[(index<<%d)+(n & %d)];" % \
+        print("    int index;", file=fp)
+        print("    if (n >= 0x110000) index = 0;", file=fp)
+        print("    else {", file=fp)
+        print("        index = changes_%s_index[n>>%d];" % (cversion, shift), file=fp)
+        print("        index = changes_%s_data[(index<<%d)+(n & %d)];" % \
               (cversion, shift, ((1<<shift)-1)), file=fp)
-        print("\t}", file=fp)
-        print("\treturn change_records_%s+index;" % cversion, file=fp)
+        print("    }", file=fp)
+        print("    return change_records_%s+index;" % cversion, file=fp)
         print("}\n", file=fp)
         print("static Py_UCS4 normalization_%s(Py_UCS4 n)" % cversion, file=fp)
         print("{", file=fp)
-        print("\tswitch(n) {", file=fp)
+        print("    switch(n) {", file=fp)
         for k, v in normalization:
-            print("\tcase %s: return 0x%s;" % (hex(k), v), file=fp)
-        print("\tdefault: return 0;", file=fp)
-        print("\t}\n}\n", file=fp)
+            print("        case %s: return 0x%s;" % (hex(k), v), file=fp)
+        print("        default: return 0;", file=fp)
+        print("    }\n}\n", file=fp)
 
     fp.close()
 
@@ -1262,12 +1262,12 @@
             for item in self.data:
                 i = str(item) + ", "
                 if len(s) + len(i) > 78:
-                    file.write(s + "\n")
+                    file.write(s.strip() + "\n")
                     s = "    " + i
                 else:
                     s = s + i
             if s.strip():
-                file.write(s + "\n")
+                file.write(s.strip() + "\n")
         file.write("};\n\n")
 
 def getsize(data):