[Jython-checkins] SF.net SVN: jython:[7134] trunk/jython

[<otm...@us...>]

Revision: 7134
          http://jython.svn.sourceforge.net/jython/?rev=7134&view=rev
Author:   otmarhumbel
Date:     2010-10-04 19:52:55 +0000 (Mon, 04 Oct 2010)

Log Message:
-----------
enable help() in standalone mode
fixes issue #1452

thanks to David Handy for the patch! 

Modified Paths:
--------------
    trunk/jython/Lib/pydoc.py
    trunk/jython/NEWS

Modified: trunk/jython/Lib/pydoc.py
===================================================================
--- trunk/jython/Lib/pydoc.py	2010-10-04 17:28:05 UTC (rev 7133)
+++ trunk/jython/Lib/pydoc.py	2010-10-04 19:52:55 UTC (rev 7134)
@@ -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'),

Modified: trunk/jython/NEWS
===================================================================
--- trunk/jython/NEWS	2010-10-04 17:28:05 UTC (rev 7133)
+++ trunk/jython/NEWS	2010-10-04 19:52:55 UTC (rev 7134)
@@ -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
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.