### Eclipse Workspace Patch 1.0 #P jython-trunk Index: NEWS =================================================================== --- NEWS (revision 7128) +++ NEWS (working copy) @@ -2,6 +2,7 @@ Jython 2.5.2rc1 Bugs Fixed + - [ 1452 ] pydoc help() function fails because sys.executable is None in stand-alone Jython - [ 1568 ] sys.stdout.encoding returns wrong value in Windows with Jython 2.5.1 (fixed on Java 6 only) - [ 1647 ] zxJDBC does not handle NVARCHAR Index: Lib/pydoc.py =================================================================== --- Lib/pydoc.py (revision 7131) +++ Lib/pydoc.py (working copy) @@ -1623,7 +1623,11 @@ self.input = input self.output = output self.docdir = None - execdir = os.path.dirname(sys.executable) + if sys.executable is None: + execdir = os.getcwd() + else: + execdir = os.path.dirname(sys.executable) + homedir = os.environ.get('PYTHONHOME') for dir in [os.environ.get('PYTHONDOCS'), homedir and os.path.join(homedir, 'doc'),