diff -r 9d0f4da4d531 Modules/makesetup
--- a/Modules/makesetup	Sat Sep 17 01:30:48 2016 +0300
+++ b/Modules/makesetup	Sat Sep 17 03:53:27 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 03:53:27 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 03:53:27 2016 -0300
@@ -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):