C:\temp\editable>"c:\Program Files\unxutils\usr\local\wbin\diff.exe" -C 5 c:\jython\jython-2.2.1\Lib\pyclbr.py c:\temp\jpythonruby\jython2.2b2\Lib\pyclbr.py *** c:\jython\jython-2.2.1\Lib\pyclbr.py Sat Oct 13 12:06:30 2007 --- c:\temp\jpythonruby\jython2.2b2\Lib\pyclbr.py Wed Nov 14 10:53:04 2007 *************** *** 196,208 **** path = [file] + path f, file, (suff, mode, type) = \ imp.find_module('__init__', [file]) if type != imp.PY_SOURCE: # not Python source, can't do anything with this module f.close() ! _modules[module] = dict ! return dict _modules[module] = dict classstack = [] # stack of (class, indent) pairs src = f.read() f.close() --- 196,219 ---- path = [file] + path f, file, (suff, mode, type) = \ imp.find_module('__init__', [file]) if type != imp.PY_SOURCE: # not Python source, can't do anything with this module + # -- unless maybe we happen to be jython where the modules are compiled f.close() ! if type == imp.PY_COMPILED and not sys.platform.startswith("java"): ! _modules[module] = dict ! return dict ! else: ! # check that the corresponding .py exists ! import os.path ! s_file = os.path.basename(file).replace(os.path.basename(file)[os.path.basename(file).find("$"):], ".py") ! s_path = file.replace(os.path.basename(file), s_file) ! if os.path.exists(s_path): ! # reset the pointers to the source ! f = open(s_path, "r") ! file = s_path _modules[module] = dict classstack = [] # stack of (class, indent) pairs src = f.read() f.close()