Whitespace normalization.

Lib/netrc.py

 """An object-oriented interface to .netrc files."""
 
-# Module and documentation by Eric S. Raymond, 21 Dec 1998 
+# Module and documentation by Eric S. Raymond, 21 Dec 1998
 
 import os, shlex
 
@@ -12,7 +12,7 @@ class netrc:
         self.hosts = {}
         self.macros = {}
         lexer = shlex.shlex(fp)
-	# Allows @ in hostnames.  Not a big deal...
+        # Allows @ in hostnames.  Not a big deal...
         lexer.wordchars = lexer.wordchars + '.-@'
         while 1:
             # Look for a machine, default, or macdef top-level keyword
@@ -23,7 +23,7 @@ class netrc:
                 entryname = lexer.get_token()
             elif tt == 'default':
                 entryname = 'default'
-            elif tt == 'macdef':		# Just skip to end of macdefs
+            elif tt == 'macdef':                # Just skip to end of macdefs
                 entryname = lexer.get_token()
                 self.macros[entryname] = []
                 lexer.whitepace = ' \t'
@@ -36,7 +36,7 @@ class netrc:
                     self.macros[entryname].append(line)
             else:
                 raise SyntaxError, "bad toplevel token %s, file %s, line %d" \
-            				% (tt, file, lexer.lineno) 
+                                        % (tt, file, lexer.lineno)
 
             # We're looking at start of an entry for a named machine or default.
             if toplevel == 'machine':
@@ -87,6 +87,5 @@ class netrc:
             rep = rep + "\n"
         return rep
 
-if __name__ == '__main__': 
+if __name__ == '__main__':
     print netrc()
-

Lib/ntpath.py

 # Module 'ntpath' -- common operations on WinNT/Win95 pathnames
-"""Common pathname manipulations, WindowsNT/95 version. 
+"""Common pathname manipulations, WindowsNT/95 version.
 
 Instead of importing this module directly, import os and refer to this
 module as os.path.
@@ -254,7 +254,7 @@ def ismount(path):
 def walk(top, func, arg):
     """Directory tree walk whth callback function.
 
-    walk(top, func, arg) calls func(arg, d, files) for each directory d 
+    walk(top, func, arg) calls func(arg, d, files) for each directory d
     in the tree rooted at top (including top itself); files is a list
     of all the files and subdirs in directory d."""
     try:
@@ -313,7 +313,7 @@ def expanduser(path):
 # XXX With COMMAND.COM you can use any characters in a variable name,
 # XXX except '^|<>='.
 
-def expandvars(path):  
+def expandvars(path):
     """Expand shell variables of form $var and ${var}.
 
     Unknown variables are left unchanged."""

Lib/nturl2path.py

 """Convert a NT pathname to a file URL and vice versa."""
 
 def url2pathname(url):
-	r"""Convert a URL to a DOS path.
+    r"""Convert a URL to a DOS path.
 
-		///C|/foo/bar/spam.foo
+            ///C|/foo/bar/spam.foo
 
-			becomes
+                    becomes
 
-		C:\foo\bar\spam.foo
-	"""
-	import string, urllib
-	if not '|' in url:
-	    # No drive specifier, just convert slashes
-	    if url[:4] == '////':
-	        # path is something like ////host/path/on/remote/host
-	        # convert this to \\host\path\on\remote\host
-	        # (notice halving of slashes at the start of the path)
-	        url = url[2:]
-	    components = string.split(url, '/')
-	    # make sure not to convert quoted slashes :-)
-	    return urllib.unquote(string.join(components, '\\'))
-	comp = string.split(url, '|')
-	if len(comp) != 2 or comp[0][-1] not in string.letters:
-		error = 'Bad URL: ' + url
-		raise IOError, error
-	drive = string.upper(comp[0][-1])
-	components = string.split(comp[1], '/')
-	path = drive + ':'
-	for  comp in components:
-		if comp:
-			path = path + '\\' + urllib.unquote(comp)
-	return path
+            C:\foo\bar\spam.foo
+    """
+    import string, urllib
+    if not '|' in url:
+        # No drive specifier, just convert slashes
+        if url[:4] == '////':
+            # path is something like ////host/path/on/remote/host
+            # convert this to \\host\path\on\remote\host
+            # (notice halving of slashes at the start of the path)
+            url = url[2:]
+        components = string.split(url, '/')
+        # make sure not to convert quoted slashes :-)
+        return urllib.unquote(string.join(components, '\\'))
+    comp = string.split(url, '|')
+    if len(comp) != 2 or comp[0][-1] not in string.letters:
+        error = 'Bad URL: ' + url
+        raise IOError, error
+    drive = string.upper(comp[0][-1])
+    components = string.split(comp[1], '/')
+    path = drive + ':'
+    for  comp in components:
+        if comp:
+            path = path + '\\' + urllib.unquote(comp)
+    return path
 
 def pathname2url(p):
-	r"""Convert a DOS path name to a file url.
+    r"""Convert a DOS path name to a file url.
 
-		C:\foo\bar\spam.foo
+            C:\foo\bar\spam.foo
 
-			becomes
+                    becomes
 
-		///C|/foo/bar/spam.foo
-	"""
+            ///C|/foo/bar/spam.foo
+    """
 
-	import string, urllib
-	if not ':' in p:
-	    # No drive specifier, just convert slashes and quote the name
-	    if p[:2] == '\\\\':
-	        # path is something like \\host\path\on\remote\host
-	        # convert this to ////host/path/on/remote/host
-	        # (notice doubling of slashes at the start of the path)
-	        p = '\\\\' + p
-	    components = string.split(p, '\\')
-	    return urllib.quote(string.join(components, '/'))
-	comp = string.split(p, ':')
-	if len(comp) != 2 or len(comp[0]) > 1:
-		error = 'Bad path: ' + p
-		raise IOError, error
+    import string, urllib
+    if not ':' in p:
+        # No drive specifier, just convert slashes and quote the name
+        if p[:2] == '\\\\':
+        # path is something like \\host\path\on\remote\host
+        # convert this to ////host/path/on/remote/host
+        # (notice doubling of slashes at the start of the path)
+            p = '\\\\' + p
+        components = string.split(p, '\\')
+        return urllib.quote(string.join(components, '/'))
+    comp = string.split(p, ':')
+    if len(comp) != 2 or len(comp[0]) > 1:
+        error = 'Bad path: ' + p
+        raise IOError, error
 
-	drive = urllib.quote(string.upper(comp[0]))
-	components = string.split(comp[1], '\\')
-	path = '///' + drive + '|'
-	for comp in components:
-		if comp:
-			path = path + '/' + urllib.quote(comp)
-	return path
+    drive = urllib.quote(string.upper(comp[0]))
+    components = string.split(comp[1], '\\')
+    path = '///' + drive + '|'
+    for comp in components:
+        if comp:
+            path = path + '/' + urllib.quote(comp)
+    return path

Lib/os.py

@@ -213,7 +213,7 @@ def execlpe(file, *args):
 
     Execute the executable file (which is searched for along $PATH)
     with argument list args and environment env, replacing the current
-    process. """    
+    process. """
     env = args[-1]
     execvpe(file, args[:-1], env)
 
@@ -231,7 +231,7 @@ def execvpe(file, args, env):
     Execute the executable file (which is searched for along $PATH)
     with argument list args and environment env , replacing the
     current process.
-    args may be a list or tuple of strings. """    
+    args may be a list or tuple of strings. """
     _execvpe(file, args, env)
 
 _notfound = None
@@ -370,7 +370,7 @@ if _exists("fork") and not _exists("spawnv") and _exists("execv"):
 Execute file with arguments from args in a subprocess.
 If mode == P_NOWAIT return the pid of the process.
 If mode == P_WAIT return the process's exit code if it exits normally;
-otherwise return -SIG, where SIG is the signal that killed it. """   
+otherwise return -SIG, where SIG is the signal that killed it. """
         return _spawnvef(mode, file, args, None, execv)
 
     def spawnve(mode, file, args, env):

Lib/pickle.py

@@ -123,7 +123,7 @@ class Pickler:
             return LONG_BINGET + s
 
         return GET + `i` + '\n'
-        
+
     def save(self, object, pers_save = 0):
         memo = self.memo
 
@@ -134,7 +134,7 @@ class Pickler:
                 return
 
         d = id(object)
- 
+
         t = type(object)
 
         if ((t is TupleType) and (len(object) == 0)):
@@ -179,14 +179,14 @@ class Pickler:
                                      "tuple" % reduce
 
             l = len(tup)
-   
+
             if ((l != 2) and (l != 3)):
                 raise PicklingError, "tuple returned by %s must contain " \
                                      "only two or three elements" % reduce
 
             callable = tup[0]
             arg_tup  = tup[1]
-          
+
             if (l > 2):
                 state = tup[2]
             else:
@@ -196,7 +196,7 @@ class Pickler:
                 raise PicklingError, "Second element of tuple returned " \
                                      "by %s must be a tuple" % reduce
 
-            self.save_reduce(callable, arg_tup, state) 
+            self.save_reduce(callable, arg_tup, state)
             memo_len = len(memo)
             self.write(self.put(memo_len))
             memo[d] = (memo_len, object)
@@ -224,7 +224,7 @@ class Pickler:
         save(callable)
         save(arg_tup)
         write(REDUCE)
-        
+
         if (state is not None):
             save(state)
             write(BUILD)
@@ -317,7 +317,7 @@ class Pickler:
             if (self.bin):
                 write(POP_MARK + self.get(memo[d][0]))
                 return
-           
+
             write(POP * (len(object) + 1) + self.get(memo[d][0]))
             return
 
@@ -352,7 +352,7 @@ class Pickler:
 
         for element in object:
             save(element)
-  
+
             if (not using_appends):
                 write(APPEND)
 
@@ -542,7 +542,7 @@ class Unpickler:
 
     def load_binpersid(self):
         stack = self.stack
-         
+
         pid = stack[-1]
         del stack[-1]
 
@@ -568,7 +568,7 @@ class Unpickler:
     def load_binint2(self):
         self.append(mloads('i' + self.read(2) + '\000\000'))
     dispatch[BININT2] = load_binint2
- 
+
     def load_long(self):
         self.append(long(self.readline()[:-1], 0))
     dispatch[LONG] = load_long
@@ -710,7 +710,7 @@ class Unpickler:
         k = self.marker()
         klass = stack[k + 1]
         del stack[k + 1]
-        args = tuple(stack[k + 1:]) 
+        args = tuple(stack[k + 1:])
         del stack[k:]
         instantiated = 0
         if (not args and type(klass) is ClassType and
@@ -726,7 +726,7 @@ class Unpickler:
         if not instantiated:
             value = apply(klass, args)
         self.append(value)
-    dispatch[OBJ] = load_obj                
+    dispatch[OBJ] = load_obj
 
     def load_global(self):
         module = self.readline()[:-1]
@@ -761,8 +761,8 @@ class Unpickler:
                     safe = None
 
                 if (not safe):
-                   raise UnpicklingError, "%s is not safe for " \
-                                          "unpickling" % callable
+                    raise UnpicklingError, "%s is not safe for " \
+                                           "unpickling" % callable
 
         if arg_tup is None:
             value = callable.__basicnew__()
@@ -829,7 +829,7 @@ class Unpickler:
 
         del stack[mark:]
     dispatch[APPENDS] = load_appends
-           
+
     def load_setitem(self):
         stack = self.stack
         value = stack[-1]

Lib/posixfile.py

@@ -129,7 +129,7 @@ class _posixfile_:
 
         l_flags = fcntl.fcntl(file.fileno(), FCNTL.F_SETFL, l_flags)
 
-        if 'c' in which:        
+        if 'c' in which:
             arg = ('!' not in which)    # 0 is don't, 1 is do close on exec
             l_flags = fcntl.fcntl(file.fileno(), FCNTL.F_SETFD, arg)
 
@@ -142,7 +142,7 @@ class _posixfile_:
             if FCNTL.O_NDELAY & l_flags: which = which + 'n'
             if FCNTL.O_SYNC & l_flags: which = which + 's'
             return which
-        
+
     def lock(self, how, *args):
         import struct, fcntl, FCNTL
 
@@ -176,7 +176,7 @@ class _posixfile_:
                             'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
                             'bsdos2', 'bsdos3', 'bsdos4'):
             flock = struct.pack('lxxxxlxxxxlhh', \
-                  l_start, l_len, os.getpid(), l_type, l_whence) 
+                  l_start, l_len, os.getpid(), l_type, l_whence)
         elif sys.platform in ['aix3', 'aix4']:
             flock = struct.pack('hhlllii', \
                   l_type, l_whence, l_start, l_len, 0, 0, 0)

Lib/posixpath.py

@@ -55,7 +55,7 @@ def join(a, *p):
 # Trailing '/'es are stripped from head unless it is the root.
 
 def split(p):
-    """Split a pathname.  Returns tuple "(head, tail)" where "tail" is 
+    """Split a pathname.  Returns tuple "(head, tail)" where "tail" is
     everything after the final slash.  Either part may be empty."""
     i = p.rfind('/') + 1
     head, tail = p[:i], p[i:]
@@ -93,7 +93,7 @@ def splitext(p):
 # path.  Useful on DOS/Windows/NT; on Unix, the drive is always empty.
 
 def splitdrive(p):
-    """Split a pathname into drive and path. On Posix, drive is always 
+    """Split a pathname into drive and path. On Posix, drive is always
     empty."""
     return '', p
 
@@ -220,7 +220,7 @@ def sameopenfile(fp1, fp2):
 def samestat(s1, s2):
     """Test whether two stat buffers reference the same file"""
     return s1[stat.ST_INO] == s2[stat.ST_INO] and \
-	   s1[stat.ST_DEV] == s2[stat.ST_DEV]
+           s1[stat.ST_DEV] == s2[stat.ST_DEV]
 
 
 # Is a path a mount point?
@@ -253,7 +253,7 @@ def ismount(path):
 # or to impose a different order of visiting.
 
 def walk(top, func, arg):
-    """walk(top,func,arg) calls func(arg, d, files) for each directory "d" 
+    """walk(top,func,arg) calls func(arg, d, files) for each directory "d"
     in the tree  rooted at "top" (including "top" itself).  "files" is a list
     of all the files and subdirs in directory "d".
     """
@@ -263,10 +263,10 @@ def walk(top, func, arg):
         return
     func(arg, top, names)
     for name in names:
-            name = join(top, name)
-            st = os.lstat(name)
-            if stat.S_ISDIR(st[stat.ST_MODE]):
-                walk(name, func, arg)
+        name = join(top, name)
+        st = os.lstat(name)
+        if stat.S_ISDIR(st[stat.ST_MODE]):
+            walk(name, func, arg)
 
 
 # Expand paths beginning with '~' or '~user'.
@@ -279,7 +279,7 @@ def walk(top, func, arg):
 # variable expansion.)
 
 def expanduser(path):
-    """Expand ~ and ~user constructions.  If user or $HOME is unknown, 
+    """Expand ~ and ~user constructions.  If user or $HOME is unknown,
     do nothing."""
     if path[:1] != '~':
         return path
@@ -349,7 +349,7 @@ def normpath(path):
     for comp in comps:
         if comp in ('', '.'):
             continue
-        if (comp != '..' or (not initial_slash and not new_comps) or 
+        if (comp != '..' or (not initial_slash and not new_comps) or
              (new_comps and new_comps[-1] == '..')):
             new_comps.append(comp)
         elif new_comps:

Lib/pty.py

 """Pseudo terminal utilities."""
 
 # Bugs: No signal handling.  Doesn't set slave termios and window size.
-#	Only tested on Linux.
-# See:  W. Richard Stevens. 1992.  Advanced Programming in the 
-#	UNIX Environment.  Chapter 19.
+#       Only tested on Linux.
+# See:  W. Richard Stevens. 1992.  Advanced Programming in the
+#       UNIX Environment.  Chapter 19.
 # Author: Steen Lumholt -- with additions by Guido.
 
 from select import select
@@ -17,133 +17,133 @@ STDERR_FILENO = 2
 CHILD = 0
 
 def openpty():
-	"""openpty() -> (master_fd, slave_fd)
-	Open a pty master/slave pair, using os.openpty() if possible."""
+    """openpty() -> (master_fd, slave_fd)
+    Open a pty master/slave pair, using os.openpty() if possible."""
 
-	try:
-		return os.openpty()
-	except (AttributeError, OSError):
-		pass
-	master_fd, slave_name = _open_terminal()
-	slave_fd = slave_open(slave_name)
-	return master_fd, slave_fd
+    try:
+        return os.openpty()
+    except (AttributeError, OSError):
+        pass
+    master_fd, slave_name = _open_terminal()
+    slave_fd = slave_open(slave_name)
+    return master_fd, slave_fd
 
 def master_open():
-	"""master_open() -> (master_fd, slave_name)
-	Open a pty master and return the fd, and the filename of the slave end.
-	Deprecated, use openpty() instead."""
+    """master_open() -> (master_fd, slave_name)
+    Open a pty master and return the fd, and the filename of the slave end.
+    Deprecated, use openpty() instead."""
 
-	try:
-		master_fd, slave_fd = os.openpty()
-	except (AttributeError, OSError):
-		pass
-	else:
-		slave_name = os.ttyname(slave_fd)
-		os.close(slave_fd)
-		return master_fd, slave_name
+    try:
+        master_fd, slave_fd = os.openpty()
+    except (AttributeError, OSError):
+        pass
+    else:
+        slave_name = os.ttyname(slave_fd)
+        os.close(slave_fd)
+        return master_fd, slave_name
 
-	return _open_terminal()
+    return _open_terminal()
 
 def _open_terminal():
-	"""Open pty master and return (master_fd, tty_name).
-	SGI and generic BSD version, for when openpty() fails."""
-	try:
-		import sgi
-	except ImportError:
-		pass
-	else:
-		try:
-		    tty_name, master_fd = sgi._getpty(FCNTL.O_RDWR, 0666, 0)
-		except IOError, msg:
-			raise os.error, msg
-		return master_fd, tty_name
-	for x in 'pqrstuvwxyzPQRST':
-		for y in '0123456789abcdef':
-			pty_name = '/dev/pty' + x + y
-			try:
-				fd = os.open(pty_name, FCNTL.O_RDWR)
-			except os.error:
-				continue
-			return (fd, '/dev/tty' + x + y)
-	raise os.error, 'out of pty devices'
+    """Open pty master and return (master_fd, tty_name).
+    SGI and generic BSD version, for when openpty() fails."""
+    try:
+        import sgi
+    except ImportError:
+        pass
+    else:
+        try:
+            tty_name, master_fd = sgi._getpty(FCNTL.O_RDWR, 0666, 0)
+        except IOError, msg:
+            raise os.error, msg
+        return master_fd, tty_name
+    for x in 'pqrstuvwxyzPQRST':
+        for y in '0123456789abcdef':
+            pty_name = '/dev/pty' + x + y
+            try:
+                fd = os.open(pty_name, FCNTL.O_RDWR)
+            except os.error:
+                continue
+            return (fd, '/dev/tty' + x + y)
+    raise os.error, 'out of pty devices'
 
 def slave_open(tty_name):
-	"""slave_open(tty_name) -> slave_fd
-	Open the pty slave and acquire the controlling terminal, returning
-	opened filedescriptor.
-	Deprecated, use openpty() instead."""
+    """slave_open(tty_name) -> slave_fd
+    Open the pty slave and acquire the controlling terminal, returning
+    opened filedescriptor.
+    Deprecated, use openpty() instead."""
 
-	return os.open(tty_name, FCNTL.O_RDWR)
+    return os.open(tty_name, FCNTL.O_RDWR)
 
 def fork():
-	"""fork() -> (pid, master_fd)
-	Fork and make the child a session leader with a controlling terminal."""
-
-	try:
-		pid, fd = os.forkpty()
-	except (AttributeError, OSError):
-		pass
-	else:
-		if pid == CHILD:
-			try:
-				os.setsid()
-			except OSError:
-				# os.forkpty() already set us session leader
-				pass
-		return pid, fd
-
-	master_fd, slave_fd = openpty() 
-	pid = os.fork()
-	if pid == CHILD:
-		# Establish a new session.
-		os.setsid()
-		os.close(master_fd)
-
-		# Slave becomes stdin/stdout/stderr of child.
-		os.dup2(slave_fd, STDIN_FILENO)
-		os.dup2(slave_fd, STDOUT_FILENO)
-		os.dup2(slave_fd, STDERR_FILENO)
-		if (slave_fd > STDERR_FILENO):
-			os.close (slave_fd)
-
-	# Parent and child process.
-	return pid, master_fd
+    """fork() -> (pid, master_fd)
+    Fork and make the child a session leader with a controlling terminal."""
+
+    try:
+        pid, fd = os.forkpty()
+    except (AttributeError, OSError):
+        pass
+    else:
+        if pid == CHILD:
+            try:
+                os.setsid()
+            except OSError:
+                # os.forkpty() already set us session leader
+                pass
+        return pid, fd
+
+    master_fd, slave_fd = openpty()
+    pid = os.fork()
+    if pid == CHILD:
+        # Establish a new session.
+        os.setsid()
+        os.close(master_fd)
+
+        # Slave becomes stdin/stdout/stderr of child.
+        os.dup2(slave_fd, STDIN_FILENO)
+        os.dup2(slave_fd, STDOUT_FILENO)
+        os.dup2(slave_fd, STDERR_FILENO)
+        if (slave_fd > STDERR_FILENO):
+            os.close (slave_fd)
+
+    # Parent and child process.
+    return pid, master_fd
 
 def _writen(fd, data):
-	"""Write all the data to a descriptor."""
-	while data != '':
-		n = os.write(fd, data)
-		data = data[n:]
+    """Write all the data to a descriptor."""
+    while data != '':
+        n = os.write(fd, data)
+        data = data[n:]
 
 def _read(fd):
-	"""Default read function."""
-	return os.read(fd, 1024)
+    """Default read function."""
+    return os.read(fd, 1024)
 
 def _copy(master_fd, master_read=_read, stdin_read=_read):
-	"""Parent copy loop.
-	Copies  
-	  	pty master -> standard output	(master_read)
-	  	standard input -> pty master	(stdin_read)"""
-	while 1:
-		rfds, wfds, xfds = select(
-			[master_fd, STDIN_FILENO], [], [])
-		if master_fd in rfds:
-			data = master_read(master_fd)
-			os.write(STDOUT_FILENO, data)
-		if STDIN_FILENO in rfds:
-			data = stdin_read(STDIN_FILENO)
-			_writen(master_fd, data)
+    """Parent copy loop.
+    Copies
+            pty master -> standard output   (master_read)
+            standard input -> pty master    (stdin_read)"""
+    while 1:
+        rfds, wfds, xfds = select(
+                [master_fd, STDIN_FILENO], [], [])
+        if master_fd in rfds:
+            data = master_read(master_fd)
+            os.write(STDOUT_FILENO, data)
+        if STDIN_FILENO in rfds:
+            data = stdin_read(STDIN_FILENO)
+            _writen(master_fd, data)
 
 def spawn(argv, master_read=_read, stdin_read=_read):
-	"""Create a spawned process."""
-	if type(argv) == type(''):
-		argv = (argv,)
-	pid, master_fd = fork()
-	if pid == CHILD:
-		apply(os.execlp, (argv[0],) + argv)
-	mode = tty.tcgetattr(STDIN_FILENO)
-	tty.setraw(STDIN_FILENO)
-	try:
-		_copy(master_fd, master_read, stdin_read)
-	except:
-		tty.tcsetattr(STDIN_FILENO, tty.TCSAFLUSH, mode)
+    """Create a spawned process."""
+    if type(argv) == type(''):
+        argv = (argv,)
+    pid, master_fd = fork()
+    if pid == CHILD:
+        apply(os.execlp, (argv[0],) + argv)
+    mode = tty.tcgetattr(STDIN_FILENO)
+    tty.setraw(STDIN_FILENO)
+    try:
+        _copy(master_fd, master_read, stdin_read)
+    except:
+        tty.tcsetattr(STDIN_FILENO, tty.TCSAFLUSH, mode)

Lib/quopri.py

@@ -26,7 +26,7 @@ def encode(input, output, quotetabs):
 
     'input' and 'output' are files with readline() and write() methods.
     The 'quotetabs' flag indicates whether tabs should be quoted.
-	"""
+        """
     while 1:
         line = input.readline()
         if not line: