Whitespace normalization.

Lib/SimpleXMLRPCServer.py

@@ -253,10 +253,10 @@ class SimpleXMLRPCDispatcher:
                 response = self._dispatch(method, params)
             # wrap response in a singleton tuple
             response = (response,)
-            response = xmlrpclib.dumps(response, methodresponse=1, 
+            response = xmlrpclib.dumps(response, methodresponse=1,
                                        allow_none=self.allow_none, encoding=self.encoding)
         except Fault, fault:
-            response = xmlrpclib.dumps(fault, allow_none=self.allow_none, 
+            response = xmlrpclib.dumps(fault, allow_none=self.allow_none,
                                        encoding=self.encoding)
         except:
             # report exception back to server
@@ -427,8 +427,8 @@ class SimpleXMLRPCRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
         """
 
         try:
-            # Get arguments by reading body of request. 
-            # We read this in chunks to avoid straining 
+            # Get arguments by reading body of request.
+            # We read this in chunks to avoid straining
             # socket.read(); around the 10 or 15Mb mark, some platforms
             # begin to have problems (bug #792570).
             max_chunk_size = 10*1024*1024
@@ -490,8 +490,8 @@ class SimpleXMLRPCServer(SocketServer.TCPServer,
         SimpleXMLRPCDispatcher.__init__(self, allow_none, encoding)
         SocketServer.TCPServer.__init__(self, addr, requestHandler)
 
-        # [Bug #1222790] If possible, set close-on-exec flag; if a 
-        # method spawns a subprocess, the subprocess shouldn't have 
+        # [Bug #1222790] If possible, set close-on-exec flag; if a
+        # method spawns a subprocess, the subprocess shouldn't have
         # the listening socket open.
         if hasattr(fcntl, 'FD_CLOEXEC'):
             flags = fcntl.fcntl(self.fileno(), fcntl.F_GETFD)

Lib/codecs.py

@@ -269,7 +269,7 @@ class StreamReader(Codec):
         if self.linebuffer:
             self.charbuffer = "".join(self.linebuffer)
             self.linebuffer = None
-            
+
         # read until we get the required number of characters (if available)
         while True:
             # can the request can be satisfied from the character buffer?
@@ -335,7 +335,7 @@ class StreamReader(Codec):
             if not keepends:
                 line = line.splitlines(False)[0]
             return line
-            
+
         readsize = size or 72
         line = ""
         # If size is given, we call read() only once

Lib/cookielib.py

@@ -1528,7 +1528,7 @@ class CookieJar:
         for cookie in cookies:
             if cookie.version == 1:
                 cookie.rfc2109 = True
-                if rfc2109_as_ns: 
+                if rfc2109_as_ns:
                     # treat 2109 cookies as Netscape cookies rather than
                     # as RFC2965 cookies
                     cookie.version = 0

Lib/test/bad_coding2.py

 #coding: utf8
-print '我'
\ No newline at end of file
+print '我'

Lib/test/test_code.py

@@ -33,7 +33,7 @@ consts: ('None',)
 ...     b = x - y
 ...     c = a * b
 ...     return c
-... 
+...
 >>> dump(h.func_code)
 name: h
 argcount: 2

Lib/test/test_exception_variations.py

-
-from test.test_support import run_unittest
-import unittest
-
-class ExceptionTestCase(unittest.TestCase):
-    def test_try_except_else_finally(self):
-        hit_except = False
-        hit_else = False
-        hit_finally = False
-
-        try:
-            raise Exception, 'nyaa!'
-        except:
-            hit_except = True
-        else:
-            hit_else = True
-        finally:
-            hit_finally = True
-
-        self.assertTrue(hit_except)
-        self.assertTrue(hit_finally)
-        self.assertFalse(hit_else)
-
-    def test_try_except_else_finally_no_exception(self):
-        hit_except = False
-        hit_else = False
-        hit_finally = False
-
-        try:
-            pass
-        except:
-            hit_except = True
-        else:
-            hit_else = True
-        finally:
-            hit_finally = True
-
-        self.assertFalse(hit_except)
-        self.assertTrue(hit_finally)
-        self.assertTrue(hit_else)
-
-    def test_try_except_finally(self):
-        hit_except = False
-        hit_finally = False
-
-        try:
-            raise Exception, 'yarr!'
-        except:
-            hit_except = True
-        finally:
-            hit_finally = True
-            
-        self.assertTrue(hit_except)
-        self.assertTrue(hit_finally)
-
-    def test_try_except_finally_no_exception(self):
-        hit_except = False
-        hit_finally = False
-
-        try:
-            pass
-        except:
-            hit_except = True
-        finally:
-            hit_finally = True
-
-        self.assertFalse(hit_except)
-        self.assertTrue(hit_finally)
-        
-    def test_try_except(self):
-        hit_except = False
-
-        try:
-            raise Exception, 'ahoy!'
-        except:
-            hit_except = True
-
-        self.assertTrue(hit_except)
-
-    def test_try_except_no_exception(self):
-        hit_except = False
-
-        try:
-            pass
-        except:
-            hit_except = True
-
-        self.assertFalse(hit_except)
-
-    def test_try_except_else(self):
-        hit_except = False
-        hit_else = False
-
-        try:
-            raise Exception, 'foo!'
-        except:
-            hit_except = True
-        else:
-            hit_else = True
-
-        self.assertFalse(hit_else)
-        self.assertTrue(hit_except)
-
-    def test_try_except_else_no_exception(self):
-        hit_except = False
-        hit_else = False
-
-        try:
-            pass
-        except:
-            hit_except = True
-        else:
-            hit_else = True
-
-        self.assertFalse(hit_except)
-        self.assertTrue(hit_else)
-
-    def test_try_finally_no_exception(self):
-        hit_finally = False
-
-        try:
-            pass
-        finally:
-            hit_finally = True
-
-        self.assertTrue(hit_finally)
-
-    def test_nested(self):
-        hit_finally = False
-        hit_inner_except = False
-        hit_inner_finally = False
-
-        try:
-            try:
-                raise Exception, 'inner exception'
-            except:
-                hit_inner_except = True
-            finally:
-                hit_inner_finally = True
-        finally:
-            hit_finally = True
-            
-        self.assertTrue(hit_inner_except)
-        self.assertTrue(hit_inner_finally)
-        self.assertTrue(hit_finally)
-
-    def test_nested_else(self):
-        hit_else = False
-        hit_finally = False
-        hit_except = False
-        hit_inner_except = False
-        hit_inner_else = False
-
-        try:
-            try:
-                pass
-            except:
-                hit_inner_except = True
-            else:
-                hit_inner_else = True
-
-            raise Exception, 'outer exception'
-        except:
-            hit_except = True
-        else:
-            hit_else = True
-        finally:
-            hit_finally = True
-
-        self.assertFalse(hit_inner_except)
-        self.assertTrue(hit_inner_else)
-        self.assertFalse(hit_else)
-        self.assertTrue(hit_finally)
-        self.assertTrue(hit_except)
-
-def test_main():
-    run_unittest(ExceptionTestCase)
-
-if __name__ == '__main__':
-    test_main()
+
+from test.test_support import run_unittest
+import unittest
+
+class ExceptionTestCase(unittest.TestCase):
+    def test_try_except_else_finally(self):
+        hit_except = False
+        hit_else = False
+        hit_finally = False
+
+        try:
+            raise Exception, 'nyaa!'
+        except:
+            hit_except = True
+        else:
+            hit_else = True
+        finally:
+            hit_finally = True
+
+        self.assertTrue(hit_except)
+        self.assertTrue(hit_finally)
+        self.assertFalse(hit_else)
+
+    def test_try_except_else_finally_no_exception(self):
+        hit_except = False
+        hit_else = False
+        hit_finally = False
+
+        try:
+            pass
+        except:
+            hit_except = True
+        else:
+            hit_else = True
+        finally:
+            hit_finally = True
+
+        self.assertFalse(hit_except)
+        self.assertTrue(hit_finally)
+        self.assertTrue(hit_else)
+
+    def test_try_except_finally(self):
+        hit_except = False
+        hit_finally = False
+
+        try:
+            raise Exception, 'yarr!'
+        except:
+            hit_except = True
+        finally:
+            hit_finally = True
+
+        self.assertTrue(hit_except)
+        self.assertTrue(hit_finally)
+
+    def test_try_except_finally_no_exception(self):
+        hit_except = False
+        hit_finally = False
+
+        try:
+            pass
+        except:
+            hit_except = True
+        finally:
+            hit_finally = True
+
+        self.assertFalse(hit_except)
+        self.assertTrue(hit_finally)
+
+    def test_try_except(self):
+        hit_except = False
+
+        try:
+            raise Exception, 'ahoy!'
+        except:
+            hit_except = True
+
+        self.assertTrue(hit_except)
+
+    def test_try_except_no_exception(self):
+        hit_except = False
+
+        try:
+            pass
+        except:
+            hit_except = True
+
+        self.assertFalse(hit_except)
+
+    def test_try_except_else(self):
+        hit_except = False
+        hit_else = False
+
+        try:
+            raise Exception, 'foo!'
+        except:
+            hit_except = True
+        else:
+            hit_else = True
+
+        self.assertFalse(hit_else)
+        self.assertTrue(hit_except)
+
+    def test_try_except_else_no_exception(self):
+        hit_except = False
+        hit_else = False
+
+        try:
+            pass
+        except:
+            hit_except = True
+        else:
+            hit_else = True
+
+        self.assertFalse(hit_except)
+        self.assertTrue(hit_else)
+
+    def test_try_finally_no_exception(self):
+        hit_finally = False
+
+        try:
+            pass
+        finally:
+            hit_finally = True
+
+        self.assertTrue(hit_finally)
+
+    def test_nested(self):
+        hit_finally = False
+        hit_inner_except = False
+        hit_inner_finally = False
+
+        try:
+            try:
+                raise Exception, 'inner exception'
+            except:
+                hit_inner_except = True
+            finally:
+                hit_inner_finally = True
+        finally:
+            hit_finally = True
+
+        self.assertTrue(hit_inner_except)
+        self.assertTrue(hit_inner_finally)
+        self.assertTrue(hit_finally)
+
+    def test_nested_else(self):
+        hit_else = False
+        hit_finally = False
+        hit_except = False
+        hit_inner_except = False
+        hit_inner_else = False
+
+        try:
+            try:
+                pass
+            except:
+                hit_inner_except = True
+            else:
+                hit_inner_else = True
+
+            raise Exception, 'outer exception'
+        except:
+            hit_except = True
+        else:
+            hit_else = True
+        finally:
+            hit_finally = True
+
+        self.assertFalse(hit_inner_except)
+        self.assertTrue(hit_inner_else)
+        self.assertFalse(hit_else)
+        self.assertTrue(hit_finally)
+        self.assertTrue(hit_except)
+
+def test_main():
+    run_unittest(ExceptionTestCase)
+
+if __name__ == '__main__':
+    test_main()

Lib/test/test_generators.py

@@ -774,7 +774,7 @@ These are fine:
 ...         try:
 ...             1//0
 ...         except ZeroDivisionError:
-...             yield 666 
+...             yield 666
 ...         except:
 ...             pass
 ...     finally:

Lib/test/test_minidom.py

@@ -1137,9 +1137,9 @@ def testPatch1094164 ():
     # Check that replacing a child with itself leaves the tree unchanged
     elem.replaceChild(e, e)
     confirm(e.parentNode is elem, "After replaceChild()")
-    
-    
-    
+
+
+
 def testReplaceWholeText():
     def setup():
         doc = parseString("<doc>a<e/>d</doc>")

Lib/test/test_poll.py

@@ -185,7 +185,7 @@ def test_poll3():
     if x != 5:
         print 'Overflow must have occurred'
     print 'Poll test 3 complete'
-    
+
 
 test_poll1()
 test_poll2()

Lib/test/test_quopri.py

@@ -175,18 +175,18 @@ zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz''')
             self.assert_(quopri.decodestring(e, header=True) == p)
 
     def test_scriptencode(self):
-       (p, e) = self.STRINGS[-1]
-       (cin, cout) = os.popen2("%s -mquopri" % sys.executable)
-       cin.write(p)
-       cin.close()
-       self.assert_(cout.read() == e)
+        (p, e) = self.STRINGS[-1]
+        (cin, cout) = os.popen2("%s -mquopri" % sys.executable)
+        cin.write(p)
+        cin.close()
+        self.assert_(cout.read() == e)
 
     def test_scriptdecode(self):
-       (p, e) = self.STRINGS[-1]
-       (cin, cout) = os.popen2("%s -mquopri -d" % sys.executable)
-       cin.write(e)
-       cin.close()
-       self.assert_(cout.read() == p)
+        (p, e) = self.STRINGS[-1]
+        (cin, cout) = os.popen2("%s -mquopri -d" % sys.executable)
+        cin.write(e)
+        cin.close()
+        self.assert_(cout.read() == p)
 
 def test_main():
     test_support.run_unittest(QuopriTestCase)

Lib/test/test_xmlrpc.py

@@ -78,7 +78,7 @@ class XMLRPCTestCase(unittest.TestCase):
 
     def test_bug_1164912 (self):
         d = xmlrpclib.DateTime()
-        ((new_d,), dummy) = xmlrpclib.loads(xmlrpclib.dumps((d,), 
+        ((new_d,), dummy) = xmlrpclib.loads(xmlrpclib.dumps((d,),
                                             methodresponse=True))
         self.assert_(isinstance(new_d.value, str))
 

Lib/webbrowser.py

@@ -96,7 +96,7 @@ def _synthesize(browser, update_tryorder=1):
 if sys.platform[:3] == "win":
     def _isexecutable(cmd):
         cmd = cmd.lower()
-        if os.path.isfile(cmd) and (cmd.endswith(".exe") or 
+        if os.path.isfile(cmd) and (cmd.endswith(".exe") or
                                     cmd.endswith(".bat")):
             return True
         for ext in ".exe", ".bat":
@@ -134,7 +134,7 @@ class BaseBrowser(object):
     def __init__(self, name=""):
         self.name = name
         self.basename = name
-    
+
     def open(self, url, new=0, autoraise=1):
         raise NotImplementedError
 

Lib/xmlcore/etree/ElementInclude.py

@@ -141,4 +141,3 @@ def include(elem, loader=None):
         else:
             include(e, loader)
         i = i + 1
-

Lib/xmlcore/etree/ElementPath.py

@@ -196,4 +196,3 @@ def findtext(element, path, default=None):
 
 def findall(element, path):
     return _compile(path).findall(element)
-

Parser/asdl.py

@@ -142,7 +142,7 @@ class ASDLParser(spark.GenericParser, object):
     def p_product(self, (_0, fields, _1)):
         " product ::= ( fields ) "
         # XXX can't I just construct things in the right order?
-        fields.reverse() 
+        fields.reverse()
         return Product(fields)
 
     def p_sum_0(self, (constructor,)):
@@ -164,7 +164,7 @@ class ASDLParser(spark.GenericParser, object):
     def p_constructor_1(self, (id, _0, fields, _1)):
         " constructor ::= Id ( fields ) "
         # XXX can't I just construct things in the right order?
-        fields.reverse() 
+        fields.reverse()
         return Constructor(id, fields)
 
     def p_fields_0(self, (field,)):
@@ -355,7 +355,7 @@ def check(mod):
             v.errors += 1
             uses = ", ".join(v.types[t])
             print "Undefined type %s, used in %s" % (t, uses)
-    
+
     return not v.errors
 
 def parse(file):
@@ -380,7 +380,7 @@ if __name__ == "__main__":
     else:
         testdir = "tests"
         files = glob.glob(testdir + "/*.asdl")
-    
+
     for file in files:
         print file
         mod = parse(file)

Parser/asdl_c.py

@@ -439,7 +439,7 @@ class FreeVisitor(PickleVisitor):
         self.emit("", 0)
         self.emit("free(o);", 1)
         self.func_end()
-        
+
     def visitConstructor(self, cons, enum, name):
         self.emit("case %s_kind:" % cons.name, 1)
         for f in cons.fields:
@@ -487,76 +487,76 @@ class FreeVisitor(PickleVisitor):
         else:
             ctype = get_c_type(field.type)
             self.emit("free_%s((%s)%s);" % (field.type, ctype, value), depth)
-        
+
 
 class MarshalUtilVisitor(StaticVisitor):
 
     CODE = '''
 #define CHECKSIZE(BUF, OFF, MIN) { \\
-	int need = *(OFF) + MIN; \\
-	if (need >= PyString_GET_SIZE(*(BUF))) { \\
-		int newsize = PyString_GET_SIZE(*(BUF)) * 2; \\
-		if (newsize < need) \\
-			newsize = need; \\
-		if (_PyString_Resize((BUF), newsize) < 0) \\
-			return 0; \\
-	} \\
-} 
-
-static int 
+        int need = *(OFF) + MIN; \\
+        if (need >= PyString_GET_SIZE(*(BUF))) { \\
+                int newsize = PyString_GET_SIZE(*(BUF)) * 2; \\
+                if (newsize < need) \\
+                        newsize = need; \\
+                if (_PyString_Resize((BUF), newsize) < 0) \\
+                        return 0; \\
+        } \\
+}
+
+static int
 marshal_write_int(PyObject **buf, int *offset, int x)
 {
-	char *s;
-
-	CHECKSIZE(buf, offset, 4)
-	s = PyString_AS_STRING(*buf) + (*offset);
-	s[0] = (x & 0xff);
-	s[1] = (x >> 8) & 0xff;
-	s[2] = (x >> 16) & 0xff;
-	s[3] = (x >> 24) & 0xff;
-	*offset += 4;
-	return 1;
+        char *s;
+
+        CHECKSIZE(buf, offset, 4)
+        s = PyString_AS_STRING(*buf) + (*offset);
+        s[0] = (x & 0xff);
+        s[1] = (x >> 8) & 0xff;
+        s[2] = (x >> 16) & 0xff;
+        s[3] = (x >> 24) & 0xff;
+        *offset += 4;
+        return 1;
 }
 
-static int 
+static int
 marshal_write_bool(PyObject **buf, int *offset, bool b)
 {
-	if (b)
-		marshal_write_int(buf, offset, 1);
-	else
-		marshal_write_int(buf, offset, 0);
-	return 1;
+        if (b)
+                marshal_write_int(buf, offset, 1);
+        else
+                marshal_write_int(buf, offset, 0);
+        return 1;
 }
 
-static int 
+static int
 marshal_write_identifier(PyObject **buf, int *offset, identifier id)
 {
-	int l = PyString_GET_SIZE(id);
-	marshal_write_int(buf, offset, l);
-	CHECKSIZE(buf, offset, l);
-	memcpy(PyString_AS_STRING(*buf) + *offset,
-	       PyString_AS_STRING(id), l);
-	*offset += l;
-	return 1;
+        int l = PyString_GET_SIZE(id);
+        marshal_write_int(buf, offset, l);
+        CHECKSIZE(buf, offset, l);
+        memcpy(PyString_AS_STRING(*buf) + *offset,
+               PyString_AS_STRING(id), l);
+        *offset += l;
+        return 1;
 }
 
-static int 
+static int
 marshal_write_string(PyObject **buf, int *offset, string s)
 {
-	int len = PyString_GET_SIZE(s);
-	marshal_write_int(buf, offset, len);
-	CHECKSIZE(buf, offset, len);
-	memcpy(PyString_AS_STRING(*buf) + *offset,
-	       PyString_AS_STRING(s), len);
-	*offset += len;
-	return 1;
+        int len = PyString_GET_SIZE(s);
+        marshal_write_int(buf, offset, len);
+        CHECKSIZE(buf, offset, len);
+        memcpy(PyString_AS_STRING(*buf) + *offset,
+               PyString_AS_STRING(s), len);
+        *offset += len;
+        return 1;
 }
 
-static int 
+static int
 marshal_write_object(PyObject **buf, int *offset, object s)
 {
-	/* XXX */
-	return 0;
+        /* XXX */
+        return 0;
 }
 '''
 
@@ -575,7 +575,7 @@ class MarshalFunctionVisitor(PickleVisitor):
         self.emit("return 1;", 1)
         self.emit("}", 0)
         self.emit("", 0)
-    
+
     def visitSum(self, sum, name):
         self.func_begin(name, has_sequence(sum.types, False))
         simple = is_simple(sum)
@@ -594,7 +594,7 @@ class MarshalFunctionVisitor(PickleVisitor):
         for field in prod.fields:
             self.visitField(field, name, 1, 1)
         self.func_end()
-            
+
     def visitConstructor(self, cons, enum, name, simple):
         if simple:
             self.emit("case %s:" % cons.name, 1)

Tools/bgen/bgen/bgenGenerator.py

@@ -218,10 +218,10 @@ class FunctionGenerator(BaseFunctionGenerator):
 
     def beginallowthreads(self):
         pass
-        
+
     def endallowthreads(self):
         pass
-        
+
     def callit(self):
         args = ""
         s = "%s%s(" % (self.getrvforcallit(), self.callname)

Tools/bgen/bgen/bgenHeapBuffer.py

@@ -111,10 +111,10 @@ class VarVarHeapOutputBufferType(VarHeapOutputBufferType):
 
     def passOutput(self, name):
         return "%s__out__, %s__len__, &%s__len__" % (name, name, name)
-        
+
 class MallocHeapOutputBufferType(HeapOutputBufferType):
     """Output buffer allocated by the called function -- passed as (&buffer, &size).
-    
+
     Instantiate without parameters.
     Call from Python without parameters.
     """
@@ -124,7 +124,7 @@ class MallocHeapOutputBufferType(HeapOutputBufferType):
 
     def getAuxDeclarations(self, name):
         return []
-        
+
     def passOutput(self, name):
         return "&%s__out__, &%s__len__" % (name, name)
 
@@ -133,10 +133,9 @@ class MallocHeapOutputBufferType(HeapOutputBufferType):
 
     def getargsArgs(self, name):
         return None
-        
+
     def mkvalueFormat(self):
         return "z#"
-        
+
     def cleanup(self, name):
         Output("if( %s__out__ ) free(%s__out__);", name, name)
-

Tools/compiler/dumppyc.py

@@ -43,5 +43,5 @@ if __name__ == "__main__":
         buf = open(filename).read()
         co = compile(buf, filename, "exec")
         walk(co)
-    else:   
+    else:
         load(filename, codename)

Tools/unicode/gencodec.py

@@ -295,8 +295,8 @@ class Codec(codecs.Codec):
     else:
         l.append('''\
         return codecs.charmap_decode(input,errors,decoding_map)''')
-         
-    l.append('''    
+
+    l.append('''
 class StreamWriter(Codec,codecs.StreamWriter):
     pass
 
@@ -330,7 +330,7 @@ def getregentry():
 
     # Final new-line
     l.append('\n')
-    
+
     return '\n'.join(l)
 
 def pymap(name,map,pyfile,comments=1):