*** just.py Wed Nov 27 13:09:53 2002 --- thomas.py Thu Nov 28 12:03:21 2002 *************** *** 84,89 **** --- 84,90 ---- self.excludes = excludes self.replace_paths = replace_paths self.processed_paths = [] # Used in debugging only + self.ignore = {} def msg(self, level, str, *args): if level <= self.debug: *************** *** 241,247 **** if self.badmodules.has_key(fqname): self.msgout(3, "import_module -> None") if parent: ! self.badmodules[fqname][parent.__name__] = None return None try: fp, pathname, stuff = self.find_module(partname, --- 242,248 ---- if self.badmodules.has_key(fqname): self.msgout(3, "import_module -> None") if parent: ! self._add_badmodule(fqname, parent) return None try: fp, pathname, stuff = self.find_module(partname, *************** *** 285,290 **** --- 286,293 ---- return m def _add_badmodule(self, name, caller): + if name in self.ignore.get(caller.__name__, ()): + return if not self.badmodules.has_key(name): self.badmodules[name] = {} self.badmodules[name][caller.__name__] = None *************** *** 560,565 **** --- 563,577 ---- # Create the module finder and turn its crank mf = ModuleFinder(path, debug, exclude) + + if sys.platform == "win32": + mf.ignore["os"] = "ce dos mac os2 posix riscos riscosenviron riscospath".split() + mf.ignore["posixpath"] = "pwd".split() + mf.ignore["cmd"] = "readline".split() + mf.ignore["pdb"] = "readline".split() + mf.ignore["copy"] = "org.python.core".split() + mf.ignore["asyncore"] = "fcntl poll".split() + for arg in args[1:]: if arg == '-m': domods = 1