Reindented, removed tabs.

2 files changed, 320 insertions, 312 deletions

diff --git a/Tools/freeze/makefreeze.py b/Tools/freeze/makefreeze.py
index 97315b3..88265b0 100644
--- a/Tools/freeze/makefreeze.py
+++ b/Tools/freeze/makefreeze.py
@@ -10,52 +10,56 @@ header = """
 static struct _frozen _PyImport_FrozenModules[] = {
 """
 trailer = """\
-	{0, 0, 0} /* sentinel */
+    {0, 0, 0} /* sentinel */
 };
 
 int
 main(argc, argv)
-	int argc;
-	char **argv;
+    int argc;
+    char **argv;
 {
-	PyImport_FrozenModules = _PyImport_FrozenModules;
-	return Py_FrozenMain(argc, argv);
+        PyImport_FrozenModules = _PyImport_FrozenModules;
+        return Py_FrozenMain(argc, argv);
 }
 
 """
 
 def makefreeze(outfp, dict, debug=0):
-	done = []
-	mods = dict.keys()
-	mods.sort()
-	for mod in mods:
-		m = dict[mod]
-		mangled = string.join(string.split(mod, "."), "__")
-		if m.__code__:
-			if debug:
-				print "freezing", mod, "..."
-			str = marshal.dumps(m.__code__)
-			size = len(str)
-			if m.__path__:
-				# Indicate package by negative size
-				size = -size
-			done.append((mod, mangled, size))
-			writecode(outfp, mangled, str)
-	if debug:
-		print "generating table of frozen modules"
-	outfp.write(header)
-	for mod, mangled, size in done:
-		outfp.write('\t{"%s", M_%s, %d},\n' % (mod, mangled, size))
-	outfp.write(trailer)
+    done = []
+    mods = dict.keys()
+    mods.sort()
+    for mod in mods:
+        m = dict[mod]
+        mangled = string.join(string.split(mod, "."), "__")
+        if m.__code__:
+            if debug:
+                print "freezing", mod, "..."
+            str = marshal.dumps(m.__code__)
+            size = len(str)
+            if m.__path__:
+                # Indicate package by negative size
+                size = -size
+            done.append((mod, mangled, size))
+            writecode(outfp, mangled, str)
+    if debug:
+        print "generating table of frozen modules"
+    outfp.write(header)
+    for mod, mangled, size in done:
+        outfp.write('\t{"%s", M_%s, %d},\n' % (mod, mangled, size))
+    outfp.write(trailer)
 
 
 # Write a C initializer for a module containing the frozen python code.
 # The array is called M_<mod>.
 
 def writecode(outfp, mod, str):
-	outfp.write('static unsigned char M_%s[] = {' % mod)
-	for i in range(0, len(str), 16):
-		outfp.write('\n\t')
-		for c in str[i:i+16]:
-			outfp.write('%d,' % ord(c))
-	outfp.write('\n};\n')
+    outfp.write('static unsigned char M_%s[] = {' % mod)
+    for i in range(0, len(str), 16):
+        outfp.write('\n\t')
+        for c in str[i:i+16]:
+            outfp.write('%d,' % ord(c))
+    outfp.write('\n};\n')
+
+# Local Variables:
+# indent-tabs-mode: nil
+# End:
diff --git a/Tools/freeze/modulefinder.py b/Tools/freeze/modulefinder.py
index 79665b7..b6b36e2 100644
--- a/Tools/freeze/modulefinder.py
+++ b/Tools/freeze/modulefinder.py
@@ -16,358 +16,362 @@ IMPORT_FROM = dis.opname.index('IMPORT_FROM')
 class Module:
 
     def __init__(self, name, file=None, path=None):
-	self.__name__ = name
-	self.__file__ = file
-	self.__path__ = path
-	self.__code__ = None
+        self.__name__ = name
+        self.__file__ = file
+        self.__path__ = path
+        self.__code__ = None
 
     def __repr__(self):
-	s = "Module(%s" % `self.__name__`
-	if self.__file__ is not None:
-	    s = s + ", %s" % `self.__file__`
-	if self.__path__ is not None:
-	    s = s + ", %s" % `self.__path__`
-	s = s + ")"
-	return s
+        s = "Module(%s" % `self.__name__`
+        if self.__file__ is not None:
+            s = s + ", %s" % `self.__file__`
+        if self.__path__ is not None:
+            s = s + ", %s" % `self.__path__`
+        s = s + ")"
+        return s
 
 
 class ModuleFinder:
 
     def __init__(self, path=None, debug=0):
-	if path is None:
-	    path = sys.path
-	self.path = path
-	self.modules = {}
-	self.badmodules = {}
-	self.debug = debug
-	self.indent = 0
+        if path is None:
+            path = sys.path
+        self.path = path
+        self.modules = {}
+        self.badmodules = {}
+        self.debug = debug
+        self.indent = 0
 
     def msg(self, level, str, *args):
-	if level <= self.debug:
-	    for i in range(self.indent):
-		print "   ",
-	    print str,
-	    for arg in args:
-		print repr(arg),
-	    print
+        if level <= self.debug:
+            for i in range(self.indent):
+                print "   ",
+            print str,
+            for arg in args:
+                print repr(arg),
+            print
 
     def msgin(self, *args):
-	level = args[0]
-	if level <= self.debug:
-	    self.indent = self.indent + 1
-	    apply(self.msg, args)
+        level = args[0]
+        if level <= self.debug:
+            self.indent = self.indent + 1
+            apply(self.msg, args)
 
     def msgout(self, *args):
-	level = args[0]
-	if level <= self.debug:
-	    self.indent = self.indent - 1
-	    apply(self.msg, args)
+        level = args[0]
+        if level <= self.debug:
+            self.indent = self.indent - 1
+            apply(self.msg, args)
 
     def run_script(self, pathname):
-	self.msg(2, "run_script", pathname)
-	fp = open(pathname)
-	stuff = ("", "r", imp.PY_SOURCE)
-	self.load_module('__main__', fp, pathname, stuff)
+        self.msg(2, "run_script", pathname)
+        fp = open(pathname)
+        stuff = ("", "r", imp.PY_SOURCE)
+        self.load_module('__main__', fp, pathname, stuff)
 
     def load_file(self, pathname):
-	dir, name = os.path.split(pathname)
-	name, ext = os.path.splitext(name)
-	fp = open(pathname)
-	stuff = (ext, "r", imp.PY_SOURCE)
-	self.load_module(name, fp, pathname, stuff)
+        dir, name = os.path.split(pathname)
+        name, ext = os.path.splitext(name)
+        fp = open(pathname)
+        stuff = (ext, "r", imp.PY_SOURCE)
+        self.load_module(name, fp, pathname, stuff)
 
     def import_hook(self, name, caller=None, fromlist=None):
-	self.msg(3, "import_hook", name, caller, fromlist)
-	parent = self.determine_parent(caller)
-	q, tail = self.find_head_package(parent, name)
-	m = self.load_tail(q, tail)
-	if not fromlist:
-	    return q
-	if m.__path__:
-	    self.ensure_fromlist(m, fromlist)
+        self.msg(3, "import_hook", name, caller, fromlist)
+        parent = self.determine_parent(caller)
+        q, tail = self.find_head_package(parent, name)
+        m = self.load_tail(q, tail)
+        if not fromlist:
+            return q
+        if m.__path__:
+            self.ensure_fromlist(m, fromlist)
 
     def determine_parent(self, caller):
-	self.msgin(4, "determine_parent", caller)
-	if not caller:
-	    self.msgout(4, "determine_parent -> None")
-	    return None
-	pname = caller.__name__
-	if caller.__path__:
-	    parent = self.modules[pname]
-	    assert caller is parent
-	    self.msgout(4, "determine_parent ->", parent)
-	    return parent
-	if '.' in pname:
-	    i = string.rfind(pname, '.')
-	    pname = pname[:i]
-	    parent = self.modules[pname]
-	    assert parent.__name__ == pname
-	    self.msgout(4, "determine_parent ->", parent)
-	    return parent
-	self.msgout(4, "determine_parent -> None")
-	return None
+        self.msgin(4, "determine_parent", caller)
+        if not caller:
+            self.msgout(4, "determine_parent -> None")
+            return None
+        pname = caller.__name__
+        if caller.__path__:
+            parent = self.modules[pname]
+            assert caller is parent
+            self.msgout(4, "determine_parent ->", parent)
+            return parent
+        if '.' in pname:
+            i = string.rfind(pname, '.')
+            pname = pname[:i]
+            parent = self.modules[pname]
+            assert parent.__name__ == pname
+            self.msgout(4, "determine_parent ->", parent)
+            return parent
+        self.msgout(4, "determine_parent -> None")
+        return None
 
     def find_head_package(self, parent, name):
-	self.msgin(4, "find_head_package", parent, name)
-	if '.' in name:
-	    i = string.find(name, '.')
-	    head = name[:i]
-	    tail = name[i+1:]
-	else:
-	    head = name
-	    tail = ""
-	if parent:
-	    qname = "%s.%s" % (parent.__name__, head)
-	else:
-	    qname = head
-	q = self.import_module(head, qname, parent)
-	if q:
-	    self.msgout(4, "find_head_package ->", (q, tail))
-	    return q, tail
-	if parent:
-	    qname = head
-	    parent = None
-	    q = self.import_module(head, qname, parent)
-	    if q:
-		self.msgout(4, "find_head_package ->", (q, tail))
-		return q, tail
-	self.msgout(4, "raise ImportError: No module named", qname)
-	raise ImportError, "No module named " + qname
+        self.msgin(4, "find_head_package", parent, name)
+        if '.' in name:
+            i = string.find(name, '.')
+            head = name[:i]
+            tail = name[i+1:]
+        else:
+            head = name
+            tail = ""
+        if parent:
+            qname = "%s.%s" % (parent.__name__, head)
+        else:
+            qname = head
+        q = self.import_module(head, qname, parent)
+        if q:
+            self.msgout(4, "find_head_package ->", (q, tail))
+            return q, tail
+        if parent:
+            qname = head
+            parent = None
+            q = self.import_module(head, qname, parent)
+            if q:
+                self.msgout(4, "find_head_package ->", (q, tail))
+                return q, tail
+        self.msgout(4, "raise ImportError: No module named", qname)
+        raise ImportError, "No module named " + qname
 
     def load_tail(self, q, tail):
-	self.msgin(4, "load_tail", q, tail)
-	m = q
-	while tail:
-	    i = string.find(tail, '.')
-	    if i < 0: i = len(tail)
-	    head, tail = tail[:i], tail[i+1:]
-	    mname = "%s.%s" % (m.__name__, head)
-	    m = self.import_module(head, mname, m)
-	    if not m:
-		self.msgout(4, "raise ImportError: No module named", mname)
-		raise ImportError, "No module named " + mname
-	self.msgout(4, "load_tail ->", m)
-	return m
+        self.msgin(4, "load_tail", q, tail)
+        m = q
+        while tail:
+            i = string.find(tail, '.')
+            if i < 0: i = len(tail)
+            head, tail = tail[:i], tail[i+1:]
+            mname = "%s.%s" % (m.__name__, head)
+            m = self.import_module(head, mname, m)
+            if not m:
+                self.msgout(4, "raise ImportError: No module named", mname)
+                raise ImportError, "No module named " + mname
+        self.msgout(4, "load_tail ->", m)
+        return m
 
     def ensure_fromlist(self, m, fromlist, recursive=0):
-	self.msg(4, "ensure_fromlist", m, fromlist, recursive)
-	for sub in fromlist:
-	    if sub == "*":
-		if not recursive:
-		    all = self.find_all_submodules(m)
-		    if all:
-			self.ensure_fromlist(m, all, 1)
-	    elif not hasattr(m, sub):
-		subname = "%s.%s" % (m.__name__, sub)
-		submod = self.import_module(sub, subname, m)
-		if not submod:
-		    raise ImportError, "No module named " + subname
+        self.msg(4, "ensure_fromlist", m, fromlist, recursive)
+        for sub in fromlist:
+            if sub == "*":
+                if not recursive:
+                    all = self.find_all_submodules(m)
+                    if all:
+                        self.ensure_fromlist(m, all, 1)
+            elif not hasattr(m, sub):
+                subname = "%s.%s" % (m.__name__, sub)
+                submod = self.import_module(sub, subname, m)
+                if not submod:
+                    raise ImportError, "No module named " + subname
 
     def find_all_submodules(self, m):
-	if not m.__path__:
-	    return
-	modules = {}
-	suffixes = [".py", ".pyc", ".pyo"]
-	for dir in m.__path__:
-	    try:
-		names = os.listdir(dir)
-	    except os.error:
-		self.msg(2, "can't list directory", dir)
-		continue
-	    for name in names:
-		mod = None
-		for suff in suffixes:
-		    n = len(suff)
-		    if name[-n:] == suff:
-			mod = name[:-n]
-			break
-		if mod and mod != "__init__":
-		    modules[mod] = mod
-	return modules.keys()
+        if not m.__path__:
+            return
+        modules = {}
+        suffixes = [".py", ".pyc", ".pyo"]
+        for dir in m.__path__:
+            try:
+                names = os.listdir(dir)
+            except os.error:
+                self.msg(2, "can't list directory", dir)
+                continue
+            for name in names:
+                mod = None
+                for suff in suffixes:
+                    n = len(suff)
+                    if name[-n:] == suff:
+                        mod = name[:-n]
+                        break
+                if mod and mod != "__init__":
+                    modules[mod] = mod
+        return modules.keys()
 
     def import_module(self, partname, fqname, parent):
-	self.msgin(3, "import_module", partname, fqname, parent)
-	try:
-	    m = self.modules[fqname]
-	except KeyError:
-	    pass
-	else:
-	    self.msgout(3, "import_module ->", m)
-	    return m
-	if self.badmodules.has_key(fqname):
-	    self.msgout(3, "import_module -> None")
-	    return None
-	try:
-	    fp, pathname, stuff = self.find_module(partname,
-						   parent and parent.__path__)
-	except ImportError:
-	    self.msgout(3, "import_module ->", None)
-	    return None
-	try:
-	    m = self.load_module(fqname, fp, pathname, stuff)
-	finally:
-	    if fp: fp.close()
-	if parent:
-	    setattr(parent, partname, m)
-	self.msgout(3, "import_module ->", m)
-	return m
+        self.msgin(3, "import_module", partname, fqname, parent)
+        try:
+            m = self.modules[fqname]
+        except KeyError:
+            pass
+        else:
+            self.msgout(3, "import_module ->", m)
+            return m
+        if self.badmodules.has_key(fqname):
+            self.msgout(3, "import_module -> None")
+            return None
+        try:
+            fp, pathname, stuff = self.find_module(partname,
+                                                   parent and parent.__path__)
+        except ImportError:
+            self.msgout(3, "import_module ->", None)
+            return None
+        try:
+            m = self.load_module(fqname, fp, pathname, stuff)
+        finally:
+            if fp: fp.close()
+        if parent:
+            setattr(parent, partname, m)
+        self.msgout(3, "import_module ->", m)
+        return m
 
     def load_module(self, fqname, fp, pathname, (suffix, mode, type)):
-	self.msgin(2, "load_module", fqname, fp and "fp", pathname)
-	if type == imp.PKG_DIRECTORY:
-	    m = self.load_package(fqname, pathname)
-	    self.msgout(2, "load_module ->", m)
-	    return m
-	if type == imp.PY_SOURCE:
-	    co = compile(fp.read(), pathname, 'exec')
-	elif type == imp.PY_COMPILED:
-	    if fp.read(4) != imp.get_magic():
-		self.msgout(2, "raise ImportError: Bad magic number", pathname)
-		raise ImportError, "Bad magic number in %s", pathname
-	    fp.read(4)
-	    co = marshal.load(fp)
-	else:
-	    co = None
-	m = self.add_module(fqname)
-	if co:
-	    m.__file__ = pathname
-	    m.__code__ = co
-	    code = co.co_code
-	    n = len(code)
-	    i = 0
-	    lastname = None
-	    while i < n:
-		c = code[i]
-		i = i+1
-		op = ord(c)
-		if op >= dis.HAVE_ARGUMENT:
-		    oparg = ord(code[i]) + ord(code[i+1])*256
-		    i = i+2
-		if op == IMPORT_NAME:
-		    name = lastname = co.co_names[oparg]
-		    if not self.badmodules.has_key(lastname):
-			try:
-			    self.import_hook(name, m)
-			except ImportError, msg:
-			    self.msg(2, "ImportError:", str(msg))
-			    self.badmodules[name] = None
-		elif op == IMPORT_FROM:
-		    name = co.co_names[oparg]
-		    assert lastname is not None
-		    if not self.badmodules.has_key(lastname):
-			try:
-			    self.import_hook(lastname, m, [name])
-			except ImportError, msg:
-			    self.msg(2, "ImportError:", str(msg))
-			    fullname = lastname + "." + name
-			    self.badmodules[fullname] = None
-		else:
-		    lastname = None
-	self.msgout(2, "load_module ->", m)
-	return m
+        self.msgin(2, "load_module", fqname, fp and "fp", pathname)
+        if type == imp.PKG_DIRECTORY:
+            m = self.load_package(fqname, pathname)
+            self.msgout(2, "load_module ->", m)
+            return m
+        if type == imp.PY_SOURCE:
+            co = compile(fp.read(), pathname, 'exec')
+        elif type == imp.PY_COMPILED:
+            if fp.read(4) != imp.get_magic():
+                self.msgout(2, "raise ImportError: Bad magic number", pathname)
+                raise ImportError, "Bad magic number in %s", pathname
+            fp.read(4)
+            co = marshal.load(fp)
+        else:
+            co = None
+        m = self.add_module(fqname)
+        if co:
+            m.__file__ = pathname
+            m.__code__ = co
+            code = co.co_code
+            n = len(code)
+            i = 0
+            lastname = None
+            while i < n:
+                c = code[i]
+                i = i+1
+                op = ord(c)
+                if op >= dis.HAVE_ARGUMENT:
+                    oparg = ord(code[i]) + ord(code[i+1])*256
+                    i = i+2
+                if op == IMPORT_NAME:
+                    name = lastname = co.co_names[oparg]
+                    if not self.badmodules.has_key(lastname):
+                        try:
+                            self.import_hook(name, m)
+                        except ImportError, msg:
+                            self.msg(2, "ImportError:", str(msg))
+                            self.badmodules[name] = None
+                elif op == IMPORT_FROM:
+                    name = co.co_names[oparg]
+                    assert lastname is not None
+                    if not self.badmodules.has_key(lastname):
+                        try:
+                            self.import_hook(lastname, m, [name])
+                        except ImportError, msg:
+                            self.msg(2, "ImportError:", str(msg))
+                            fullname = lastname + "." + name
+                            self.badmodules[fullname] = None
+                else:
+                    lastname = None
+        self.msgout(2, "load_module ->", m)
+        return m
 
     def load_package(self, fqname, pathname):
-	self.msgin(2, "load_package", fqname, pathname)
-	m = self.add_module(fqname)
-	m.__file__ = pathname
-	m.__path__ = [pathname]
-	fp, buf, stuff = self.find_module("__init__", m.__path__)
-	self.load_module(fqname, fp, buf, stuff)
-	self.msgout(2, "load_package ->", m)
-	return m
+        self.msgin(2, "load_package", fqname, pathname)
+        m = self.add_module(fqname)
+        m.__file__ = pathname
+        m.__path__ = [pathname]
+        fp, buf, stuff = self.find_module("__init__", m.__path__)
+        self.load_module(fqname, fp, buf, stuff)
+        self.msgout(2, "load_package ->", m)
+        return m
 
     def add_module(self, fqname):
-	if self.modules.has_key(fqname):
-	    return self.modules[fqname]
-	self.modules[fqname] = m = Module(fqname)
-	return m
+        if self.modules.has_key(fqname):
+            return self.modules[fqname]
+        self.modules[fqname] = m = Module(fqname)
+        return m
 
     def find_module(self, name, path):
-	if path is None:
-	    if name in sys.builtin_module_names:
-		return (None, None, ("", "", imp.C_BUILTIN))
-	    path = self.path
-	return imp.find_module(name, path)
+        if path is None:
+            if name in sys.builtin_module_names:
+                return (None, None, ("", "", imp.C_BUILTIN))
+            path = self.path
+        return imp.find_module(name, path)
 
     def report(self):
-	print
-	print "  %-25s %s" % ("Name", "File")
-	print "  %-25s %s" % ("----", "----")
-	# Print modules found
-	keys = self.modules.keys()
-	keys.sort()
-	for key in keys:
-	    m = self.modules[key]
-	    if m.__path__:
-		print "P",
-	    else:
-		print "m",
-	    print "%-25s" % key, m.__file__ or ""
-
-	# Print missing modules
-	keys = self.badmodules.keys()
-	keys.sort()
-	for key in keys:
-	    print "?", key
+        print
+        print "  %-25s %s" % ("Name", "File")
+        print "  %-25s %s" % ("----", "----")
+        # Print modules found
+        keys = self.modules.keys()
+        keys.sort()
+        for key in keys:
+            m = self.modules[key]
+            if m.__path__:
+                print "P",
+            else:
+                print "m",
+            print "%-25s" % key, m.__file__ or ""
+
+        # Print missing modules
+        keys = self.badmodules.keys()
+        keys.sort()
+        for key in keys:
+            print "?", key
 
 
 def test():
     # Parse command line
     import getopt
     try:
-	opts, args = getopt.getopt(sys.argv[1:], "dmp:q")
+        opts, args = getopt.getopt(sys.argv[1:], "dmp:q")
     except getopt.error, msg:
-	print msg
-	return
+        print msg
+        return
 
     # Process options
     debug = 1
     domods = 0
     addpath = []
     for o, a in opts:
-	if o == '-d':
-	    debug = debug + 1
-	if o == '-m':
-	    domods = 1
-	if o == '-p':
-	    addpath = addpath + string.split(a, os.pathsep)
-	if o == '-q':
-	    debug = 0
+        if o == '-d':
+            debug = debug + 1
+        if o == '-m':
+            domods = 1
+        if o == '-p':
+            addpath = addpath + string.split(a, os.pathsep)
+        if o == '-q':
+            debug = 0
 
     # Provide default arguments
     if not args:
-	script = "hello.py"
+        script = "hello.py"
     else:
-	script = args[0]
+        script = args[0]
 
     # Set the path based on sys.path and the script directory
     path = sys.path[:]
     path[0] = os.path.dirname(script)
     path = addpath + path
     if debug > 1:
-	print "path:"
-	for item in path:
-	    print "   ", `item`
+        print "path:"
+        for item in path:
+            print "   ", `item`
 
     # Create the module finder and turn its crank
     mf = ModuleFinder(path, debug)
     for arg in args[1:]:
-	if arg == '-m':
-	    domods = 1
-	    continue
-	if domods:
-	    if arg[-2:] == '.*':
-		mf.import_hook(arg[:-2], None, ["*"])
-	    else:
-		mf.import_hook(arg)
+        if arg == '-m':
+            domods = 1
+            continue
+        if domods:
+            if arg[-2:] == '.*':
+                mf.import_hook(arg[:-2], None, ["*"])
+            else:
+                mf.import_hook(arg)
         else:
-	    mf.load_file(arg)
+            mf.load_file(arg)
     mf.run_script(script)
     mf.report()
 
 
 if __name__ == '__main__':
     try:
-	test()
+        test()
     except KeyboardInterrupt:
-	print "\n[interrupt]"
+        print "\n[interrupt]"
+
+# Local Variables:
+# indent-tabs-mode: nil
+# End: