Whitespace normalization.
diff --git a/Lib/encodings/koi8_r.py b/Lib/encodings/koi8_r.py
index 242d0c4..7494ca6 100644
--- a/Lib/encodings/koi8_r.py
+++ b/Lib/encodings/koi8_r.py
@@ -16,14 +16,14 @@
     def encode(self,input,errors='strict'):
 
         return codecs.charmap_encode(input,errors,encoding_map)
-        
+
     def decode(self,input,errors='strict'):
 
         return codecs.charmap_decode(input,errors,decoding_map)
 
 class StreamWriter(Codec,codecs.StreamWriter):
     pass
-        
+
 class StreamReader(Codec,codecs.StreamReader):
     pass
 
@@ -37,134 +37,134 @@
 
 decoding_map = codecs.make_identity_dict(range(256))
 decoding_map.update({
-	0x0080: 0x2500,	# 	BOX DRAWINGS LIGHT HORIZONTAL
-	0x0081: 0x2502,	# 	BOX DRAWINGS LIGHT VERTICAL
-	0x0082: 0x250c,	# 	BOX DRAWINGS LIGHT DOWN AND RIGHT
-	0x0083: 0x2510,	# 	BOX DRAWINGS LIGHT DOWN AND LEFT
-	0x0084: 0x2514,	# 	BOX DRAWINGS LIGHT UP AND RIGHT
-	0x0085: 0x2518,	# 	BOX DRAWINGS LIGHT UP AND LEFT
-	0x0086: 0x251c,	# 	BOX DRAWINGS LIGHT VERTICAL AND RIGHT
-	0x0087: 0x2524,	# 	BOX DRAWINGS LIGHT VERTICAL AND LEFT
-	0x0088: 0x252c,	# 	BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
-	0x0089: 0x2534,	# 	BOX DRAWINGS LIGHT UP AND HORIZONTAL
-	0x008a: 0x253c,	# 	BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
-	0x008b: 0x2580,	# 	UPPER HALF BLOCK
-	0x008c: 0x2584,	# 	LOWER HALF BLOCK
-	0x008d: 0x2588,	# 	FULL BLOCK
-	0x008e: 0x258c,	# 	LEFT HALF BLOCK
-	0x008f: 0x2590,	# 	RIGHT HALF BLOCK
-	0x0090: 0x2591,	# 	LIGHT SHADE
-	0x0091: 0x2592,	# 	MEDIUM SHADE
-	0x0092: 0x2593,	# 	DARK SHADE
-	0x0093: 0x2320,	# 	TOP HALF INTEGRAL
-	0x0094: 0x25a0,	# 	BLACK SQUARE
-	0x0095: 0x2219,	# 	BULLET OPERATOR
-	0x0096: 0x221a,	# 	SQUARE ROOT
-	0x0097: 0x2248,	# 	ALMOST EQUAL TO
-	0x0098: 0x2264,	# 	LESS-THAN OR EQUAL TO
-	0x0099: 0x2265,	# 	GREATER-THAN OR EQUAL TO
-	0x009a: 0x00a0,	# 	NO-BREAK SPACE
-	0x009b: 0x2321,	# 	BOTTOM HALF INTEGRAL
-	0x009c: 0x00b0,	# 	DEGREE SIGN
-	0x009d: 0x00b2,	# 	SUPERSCRIPT TWO
-	0x009e: 0x00b7,	# 	MIDDLE DOT
-	0x009f: 0x00f7,	# 	DIVISION SIGN
-	0x00a0: 0x2550,	# 	BOX DRAWINGS DOUBLE HORIZONTAL
-	0x00a1: 0x2551,	# 	BOX DRAWINGS DOUBLE VERTICAL
-	0x00a2: 0x2552,	# 	BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE
-	0x00a3: 0x0451,	# 	CYRILLIC SMALL LETTER IO
-	0x00a4: 0x2553,	# 	BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE
-	0x00a5: 0x2554,	# 	BOX DRAWINGS DOUBLE DOWN AND RIGHT
-	0x00a6: 0x2555,	# 	BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE
-	0x00a7: 0x2556,	# 	BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE
-	0x00a8: 0x2557,	# 	BOX DRAWINGS DOUBLE DOWN AND LEFT
-	0x00a9: 0x2558,	# 	BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE
-	0x00aa: 0x2559,	# 	BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE
-	0x00ab: 0x255a,	# 	BOX DRAWINGS DOUBLE UP AND RIGHT
-	0x00ac: 0x255b,	# 	BOX DRAWINGS UP SINGLE AND LEFT DOUBLE
-	0x00ad: 0x255c,	# 	BOX DRAWINGS UP DOUBLE AND LEFT SINGLE
-	0x00ae: 0x255d,	# 	BOX DRAWINGS DOUBLE UP AND LEFT
-	0x00af: 0x255e,	# 	BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE
-	0x00b0: 0x255f,	# 	BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE
-	0x00b1: 0x2560,	# 	BOX DRAWINGS DOUBLE VERTICAL AND RIGHT
-	0x00b2: 0x2561,	# 	BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE
-	0x00b3: 0x0401,	# 	CYRILLIC CAPITAL LETTER IO
-	0x00b4: 0x2562,	# 	BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE
-	0x00b5: 0x2563,	# 	BOX DRAWINGS DOUBLE VERTICAL AND LEFT
-	0x00b6: 0x2564,	# 	BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE
-	0x00b7: 0x2565,	# 	BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE
-	0x00b8: 0x2566,	# 	BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL
-	0x00b9: 0x2567,	# 	BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE
-	0x00ba: 0x2568,	# 	BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE
-	0x00bb: 0x2569,	# 	BOX DRAWINGS DOUBLE UP AND HORIZONTAL
-	0x00bc: 0x256a,	# 	BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE
-	0x00bd: 0x256b,	# 	BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE
-	0x00be: 0x256c,	# 	BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL
-	0x00bf: 0x00a9,	# 	COPYRIGHT SIGN
-	0x00c0: 0x044e,	# 	CYRILLIC SMALL LETTER YU
-	0x00c1: 0x0430,	# 	CYRILLIC SMALL LETTER A
-	0x00c2: 0x0431,	# 	CYRILLIC SMALL LETTER BE
-	0x00c3: 0x0446,	# 	CYRILLIC SMALL LETTER TSE
-	0x00c4: 0x0434,	# 	CYRILLIC SMALL LETTER DE
-	0x00c5: 0x0435,	# 	CYRILLIC SMALL LETTER IE
-	0x00c6: 0x0444,	# 	CYRILLIC SMALL LETTER EF
-	0x00c7: 0x0433,	# 	CYRILLIC SMALL LETTER GHE
-	0x00c8: 0x0445,	# 	CYRILLIC SMALL LETTER HA
-	0x00c9: 0x0438,	# 	CYRILLIC SMALL LETTER I
-	0x00ca: 0x0439,	# 	CYRILLIC SMALL LETTER SHORT I
-	0x00cb: 0x043a,	# 	CYRILLIC SMALL LETTER KA
-	0x00cc: 0x043b,	# 	CYRILLIC SMALL LETTER EL
-	0x00cd: 0x043c,	# 	CYRILLIC SMALL LETTER EM
-	0x00ce: 0x043d,	# 	CYRILLIC SMALL LETTER EN
-	0x00cf: 0x043e,	# 	CYRILLIC SMALL LETTER O
-	0x00d0: 0x043f,	# 	CYRILLIC SMALL LETTER PE
-	0x00d1: 0x044f,	# 	CYRILLIC SMALL LETTER YA
-	0x00d2: 0x0440,	# 	CYRILLIC SMALL LETTER ER
-	0x00d3: 0x0441,	# 	CYRILLIC SMALL LETTER ES
-	0x00d4: 0x0442,	# 	CYRILLIC SMALL LETTER TE
-	0x00d5: 0x0443,	# 	CYRILLIC SMALL LETTER U
-	0x00d6: 0x0436,	# 	CYRILLIC SMALL LETTER ZHE
-	0x00d7: 0x0432,	# 	CYRILLIC SMALL LETTER VE
-	0x00d8: 0x044c,	# 	CYRILLIC SMALL LETTER SOFT SIGN
-	0x00d9: 0x044b,	# 	CYRILLIC SMALL LETTER YERU
-	0x00da: 0x0437,	# 	CYRILLIC SMALL LETTER ZE
-	0x00db: 0x0448,	# 	CYRILLIC SMALL LETTER SHA
-	0x00dc: 0x044d,	# 	CYRILLIC SMALL LETTER E
-	0x00dd: 0x0449,	# 	CYRILLIC SMALL LETTER SHCHA
-	0x00de: 0x0447,	# 	CYRILLIC SMALL LETTER CHE
-	0x00df: 0x044a,	# 	CYRILLIC SMALL LETTER HARD SIGN
-	0x00e0: 0x042e,	# 	CYRILLIC CAPITAL LETTER YU
-	0x00e1: 0x0410,	# 	CYRILLIC CAPITAL LETTER A
-	0x00e2: 0x0411,	# 	CYRILLIC CAPITAL LETTER BE
-	0x00e3: 0x0426,	# 	CYRILLIC CAPITAL LETTER TSE
-	0x00e4: 0x0414,	# 	CYRILLIC CAPITAL LETTER DE
-	0x00e5: 0x0415,	# 	CYRILLIC CAPITAL LETTER IE
-	0x00e6: 0x0424,	# 	CYRILLIC CAPITAL LETTER EF
-	0x00e7: 0x0413,	# 	CYRILLIC CAPITAL LETTER GHE
-	0x00e8: 0x0425,	# 	CYRILLIC CAPITAL LETTER HA
-	0x00e9: 0x0418,	# 	CYRILLIC CAPITAL LETTER I
-	0x00ea: 0x0419,	# 	CYRILLIC CAPITAL LETTER SHORT I
-	0x00eb: 0x041a,	# 	CYRILLIC CAPITAL LETTER KA
-	0x00ec: 0x041b,	# 	CYRILLIC CAPITAL LETTER EL
-	0x00ed: 0x041c,	# 	CYRILLIC CAPITAL LETTER EM
-	0x00ee: 0x041d,	# 	CYRILLIC CAPITAL LETTER EN
-	0x00ef: 0x041e,	# 	CYRILLIC CAPITAL LETTER O
-	0x00f0: 0x041f,	# 	CYRILLIC CAPITAL LETTER PE
-	0x00f1: 0x042f,	# 	CYRILLIC CAPITAL LETTER YA
-	0x00f2: 0x0420,	# 	CYRILLIC CAPITAL LETTER ER
-	0x00f3: 0x0421,	# 	CYRILLIC CAPITAL LETTER ES
-	0x00f4: 0x0422,	# 	CYRILLIC CAPITAL LETTER TE
-	0x00f5: 0x0423,	# 	CYRILLIC CAPITAL LETTER U
-	0x00f6: 0x0416,	# 	CYRILLIC CAPITAL LETTER ZHE
-	0x00f7: 0x0412,	# 	CYRILLIC CAPITAL LETTER VE
-	0x00f8: 0x042c,	# 	CYRILLIC CAPITAL LETTER SOFT SIGN
-	0x00f9: 0x042b,	# 	CYRILLIC CAPITAL LETTER YERU
-	0x00fa: 0x0417,	# 	CYRILLIC CAPITAL LETTER ZE
-	0x00fb: 0x0428,	# 	CYRILLIC CAPITAL LETTER SHA
-	0x00fc: 0x042d,	# 	CYRILLIC CAPITAL LETTER E
-	0x00fd: 0x0429,	# 	CYRILLIC CAPITAL LETTER SHCHA
-	0x00fe: 0x0427,	# 	CYRILLIC CAPITAL LETTER CHE
-	0x00ff: 0x042a,	# 	CYRILLIC CAPITAL LETTER HARD SIGN
+        0x0080: 0x2500, #       BOX DRAWINGS LIGHT HORIZONTAL
+        0x0081: 0x2502, #       BOX DRAWINGS LIGHT VERTICAL
+        0x0082: 0x250c, #       BOX DRAWINGS LIGHT DOWN AND RIGHT
+        0x0083: 0x2510, #       BOX DRAWINGS LIGHT DOWN AND LEFT
+        0x0084: 0x2514, #       BOX DRAWINGS LIGHT UP AND RIGHT
+        0x0085: 0x2518, #       BOX DRAWINGS LIGHT UP AND LEFT
+        0x0086: 0x251c, #       BOX DRAWINGS LIGHT VERTICAL AND RIGHT
+        0x0087: 0x2524, #       BOX DRAWINGS LIGHT VERTICAL AND LEFT
+        0x0088: 0x252c, #       BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
+        0x0089: 0x2534, #       BOX DRAWINGS LIGHT UP AND HORIZONTAL
+        0x008a: 0x253c, #       BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
+        0x008b: 0x2580, #       UPPER HALF BLOCK
+        0x008c: 0x2584, #       LOWER HALF BLOCK
+        0x008d: 0x2588, #       FULL BLOCK
+        0x008e: 0x258c, #       LEFT HALF BLOCK
+        0x008f: 0x2590, #       RIGHT HALF BLOCK
+        0x0090: 0x2591, #       LIGHT SHADE
+        0x0091: 0x2592, #       MEDIUM SHADE
+        0x0092: 0x2593, #       DARK SHADE
+        0x0093: 0x2320, #       TOP HALF INTEGRAL
+        0x0094: 0x25a0, #       BLACK SQUARE
+        0x0095: 0x2219, #       BULLET OPERATOR
+        0x0096: 0x221a, #       SQUARE ROOT
+        0x0097: 0x2248, #       ALMOST EQUAL TO
+        0x0098: 0x2264, #       LESS-THAN OR EQUAL TO
+        0x0099: 0x2265, #       GREATER-THAN OR EQUAL TO
+        0x009a: 0x00a0, #       NO-BREAK SPACE
+        0x009b: 0x2321, #       BOTTOM HALF INTEGRAL
+        0x009c: 0x00b0, #       DEGREE SIGN
+        0x009d: 0x00b2, #       SUPERSCRIPT TWO
+        0x009e: 0x00b7, #       MIDDLE DOT
+        0x009f: 0x00f7, #       DIVISION SIGN
+        0x00a0: 0x2550, #       BOX DRAWINGS DOUBLE HORIZONTAL
+        0x00a1: 0x2551, #       BOX DRAWINGS DOUBLE VERTICAL
+        0x00a2: 0x2552, #       BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE
+        0x00a3: 0x0451, #       CYRILLIC SMALL LETTER IO
+        0x00a4: 0x2553, #       BOX DRAWINGS DOWN DOUBLE AND RIGHT SINGLE
+        0x00a5: 0x2554, #       BOX DRAWINGS DOUBLE DOWN AND RIGHT
+        0x00a6: 0x2555, #       BOX DRAWINGS DOWN SINGLE AND LEFT DOUBLE
+        0x00a7: 0x2556, #       BOX DRAWINGS DOWN DOUBLE AND LEFT SINGLE
+        0x00a8: 0x2557, #       BOX DRAWINGS DOUBLE DOWN AND LEFT
+        0x00a9: 0x2558, #       BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE
+        0x00aa: 0x2559, #       BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE
+        0x00ab: 0x255a, #       BOX DRAWINGS DOUBLE UP AND RIGHT
+        0x00ac: 0x255b, #       BOX DRAWINGS UP SINGLE AND LEFT DOUBLE
+        0x00ad: 0x255c, #       BOX DRAWINGS UP DOUBLE AND LEFT SINGLE
+        0x00ae: 0x255d, #       BOX DRAWINGS DOUBLE UP AND LEFT
+        0x00af: 0x255e, #       BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE
+        0x00b0: 0x255f, #       BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE
+        0x00b1: 0x2560, #       BOX DRAWINGS DOUBLE VERTICAL AND RIGHT
+        0x00b2: 0x2561, #       BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE
+        0x00b3: 0x0401, #       CYRILLIC CAPITAL LETTER IO
+        0x00b4: 0x2562, #       BOX DRAWINGS VERTICAL DOUBLE AND LEFT SINGLE
+        0x00b5: 0x2563, #       BOX DRAWINGS DOUBLE VERTICAL AND LEFT
+        0x00b6: 0x2564, #       BOX DRAWINGS DOWN SINGLE AND HORIZONTAL DOUBLE
+        0x00b7: 0x2565, #       BOX DRAWINGS DOWN DOUBLE AND HORIZONTAL SINGLE
+        0x00b8: 0x2566, #       BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL
+        0x00b9: 0x2567, #       BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE
+        0x00ba: 0x2568, #       BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE
+        0x00bb: 0x2569, #       BOX DRAWINGS DOUBLE UP AND HORIZONTAL
+        0x00bc: 0x256a, #       BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE
+        0x00bd: 0x256b, #       BOX DRAWINGS VERTICAL DOUBLE AND HORIZONTAL SINGLE
+        0x00be: 0x256c, #       BOX DRAWINGS DOUBLE VERTICAL AND HORIZONTAL
+        0x00bf: 0x00a9, #       COPYRIGHT SIGN
+        0x00c0: 0x044e, #       CYRILLIC SMALL LETTER YU
+        0x00c1: 0x0430, #       CYRILLIC SMALL LETTER A
+        0x00c2: 0x0431, #       CYRILLIC SMALL LETTER BE
+        0x00c3: 0x0446, #       CYRILLIC SMALL LETTER TSE
+        0x00c4: 0x0434, #       CYRILLIC SMALL LETTER DE
+        0x00c5: 0x0435, #       CYRILLIC SMALL LETTER IE
+        0x00c6: 0x0444, #       CYRILLIC SMALL LETTER EF
+        0x00c7: 0x0433, #       CYRILLIC SMALL LETTER GHE
+        0x00c8: 0x0445, #       CYRILLIC SMALL LETTER HA
+        0x00c9: 0x0438, #       CYRILLIC SMALL LETTER I
+        0x00ca: 0x0439, #       CYRILLIC SMALL LETTER SHORT I
+        0x00cb: 0x043a, #       CYRILLIC SMALL LETTER KA
+        0x00cc: 0x043b, #       CYRILLIC SMALL LETTER EL
+        0x00cd: 0x043c, #       CYRILLIC SMALL LETTER EM
+        0x00ce: 0x043d, #       CYRILLIC SMALL LETTER EN
+        0x00cf: 0x043e, #       CYRILLIC SMALL LETTER O
+        0x00d0: 0x043f, #       CYRILLIC SMALL LETTER PE
+        0x00d1: 0x044f, #       CYRILLIC SMALL LETTER YA
+        0x00d2: 0x0440, #       CYRILLIC SMALL LETTER ER
+        0x00d3: 0x0441, #       CYRILLIC SMALL LETTER ES
+        0x00d4: 0x0442, #       CYRILLIC SMALL LETTER TE
+        0x00d5: 0x0443, #       CYRILLIC SMALL LETTER U
+        0x00d6: 0x0436, #       CYRILLIC SMALL LETTER ZHE
+        0x00d7: 0x0432, #       CYRILLIC SMALL LETTER VE
+        0x00d8: 0x044c, #       CYRILLIC SMALL LETTER SOFT SIGN
+        0x00d9: 0x044b, #       CYRILLIC SMALL LETTER YERU
+        0x00da: 0x0437, #       CYRILLIC SMALL LETTER ZE
+        0x00db: 0x0448, #       CYRILLIC SMALL LETTER SHA
+        0x00dc: 0x044d, #       CYRILLIC SMALL LETTER E
+        0x00dd: 0x0449, #       CYRILLIC SMALL LETTER SHCHA
+        0x00de: 0x0447, #       CYRILLIC SMALL LETTER CHE
+        0x00df: 0x044a, #       CYRILLIC SMALL LETTER HARD SIGN
+        0x00e0: 0x042e, #       CYRILLIC CAPITAL LETTER YU
+        0x00e1: 0x0410, #       CYRILLIC CAPITAL LETTER A
+        0x00e2: 0x0411, #       CYRILLIC CAPITAL LETTER BE
+        0x00e3: 0x0426, #       CYRILLIC CAPITAL LETTER TSE
+        0x00e4: 0x0414, #       CYRILLIC CAPITAL LETTER DE
+        0x00e5: 0x0415, #       CYRILLIC CAPITAL LETTER IE
+        0x00e6: 0x0424, #       CYRILLIC CAPITAL LETTER EF
+        0x00e7: 0x0413, #       CYRILLIC CAPITAL LETTER GHE
+        0x00e8: 0x0425, #       CYRILLIC CAPITAL LETTER HA
+        0x00e9: 0x0418, #       CYRILLIC CAPITAL LETTER I
+        0x00ea: 0x0419, #       CYRILLIC CAPITAL LETTER SHORT I
+        0x00eb: 0x041a, #       CYRILLIC CAPITAL LETTER KA
+        0x00ec: 0x041b, #       CYRILLIC CAPITAL LETTER EL
+        0x00ed: 0x041c, #       CYRILLIC CAPITAL LETTER EM
+        0x00ee: 0x041d, #       CYRILLIC CAPITAL LETTER EN
+        0x00ef: 0x041e, #       CYRILLIC CAPITAL LETTER O
+        0x00f0: 0x041f, #       CYRILLIC CAPITAL LETTER PE
+        0x00f1: 0x042f, #       CYRILLIC CAPITAL LETTER YA
+        0x00f2: 0x0420, #       CYRILLIC CAPITAL LETTER ER
+        0x00f3: 0x0421, #       CYRILLIC CAPITAL LETTER ES
+        0x00f4: 0x0422, #       CYRILLIC CAPITAL LETTER TE
+        0x00f5: 0x0423, #       CYRILLIC CAPITAL LETTER U
+        0x00f6: 0x0416, #       CYRILLIC CAPITAL LETTER ZHE
+        0x00f7: 0x0412, #       CYRILLIC CAPITAL LETTER VE
+        0x00f8: 0x042c, #       CYRILLIC CAPITAL LETTER SOFT SIGN
+        0x00f9: 0x042b, #       CYRILLIC CAPITAL LETTER YERU
+        0x00fa: 0x0417, #       CYRILLIC CAPITAL LETTER ZE
+        0x00fb: 0x0428, #       CYRILLIC CAPITAL LETTER SHA
+        0x00fc: 0x042d, #       CYRILLIC CAPITAL LETTER E
+        0x00fd: 0x0429, #       CYRILLIC CAPITAL LETTER SHCHA
+        0x00fe: 0x0427, #       CYRILLIC CAPITAL LETTER CHE
+        0x00ff: 0x042a, #       CYRILLIC CAPITAL LETTER HARD SIGN
 })
 
 ### Encoding Map