[Jython-checkins] SF.net SVN: jython:[5603] trunk/jython/Lib/pydoc.py

[<pj...@us...>]

Revision: 5603
          http://jython.svn.sourceforge.net/jython/?rev=5603&view=rev
Author:   pjenvey
Date:     2008-11-22 23:30:45 +0000 (Sat, 22 Nov 2008)

Log Message:
-----------
o fix help -- our new isatty support confused it into using a real pager
o support $py.class in ispackage

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

Modified: trunk/jython/Lib/pydoc.py
===================================================================
--- trunk/jython/Lib/pydoc.py	2008-11-22 23:27:27 UTC (rev 5602)
+++ trunk/jython/Lib/pydoc.py	2008-11-22 23:30:45 UTC (rev 5603)
@@ -183,7 +183,7 @@
 def ispackage(path):
     """Guess whether a path refers to a package directory."""
     if os.path.isdir(path):
-        for ext in ('.py', '.pyc', '.pyo'):
+        for ext in ('.py', '.pyc', '.pyo', '$py.class'):
             if os.path.isfile(os.path.join(path, '__init__' + ext)):
                 return True
     return False
@@ -1300,6 +1300,8 @@
 
 def getpager():
     """Decide what method to use for paging through text."""
+    if sys.platform.startswith('java'):
+        return plainpager
     if type(sys.stdout) is not types.FileType:
         return plainpager
     if not sys.stdin.isatty() or not sys.stdout.isatty():


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