[Python-checkins] CVS: python/dist/src/Lib pydoc.py,1.24,1.25

[Ka-Ping Yee]

Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv14013

Modified Files:
	pydoc.py 
Log Message:
Typo fixes and small touches.


Index: pydoc.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/pydoc.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** pydoc.py	2001/04/12 10:50:23	1.24
--- pydoc.py	2001/04/12 11:59:50	1.25
***************
*** 1066,1070 ****
  html = HTMLDoc()
  
! def doc(thing, title='Python Library Documentation: '):
      """Display text documentation, given an object or a path to an object."""
      suffix, name = '', None
--- 1066,1070 ----
  html = HTMLDoc()
  
! def doc(thing, title='Python Library Documentation: %s'):
      """Display text documentation, given an object or a path to an object."""
      suffix, name = '', None
***************
*** 1087,1091 ****
      if not suffix and module and module is not thing:
          suffix = ' in module ' + module.__name__
!     pager(title + desc + suffix + '\n\n' + text.document(object, name))
  
  def writedoc(key):
--- 1087,1091 ----
      if not suffix and module and module is not thing:
          suffix = ' in module ' + module.__name__
!     pager(title % (desc + suffix) + '\n\n' + text.document(thing, name))
  
  def writedoc(key):
***************
*** 1179,1184 ****
          return ispackage(dir)
  
!     def run(self, key, callback, completer=None):
!         key = lower(key)
          self.quit = 0
          seen = {}
--- 1179,1184 ----
          return ispackage(dir)
  
!     def run(self, callback, key=None, completer=None):
!         if key: key = lower(key)
          self.quit = 0
          seen = {}
***************
*** 1187,1193 ****
              if modname != '__main__':
                  seen[modname] = 1
!                 desc = split(freshimport(modname).__doc__ or '', '\n')[0]
!                 if find(lower(modname + ' - ' + desc), key) >= 0:
!                     callback(None, modname, desc)
  
          while not self.quit:
--- 1187,1196 ----
              if modname != '__main__':
                  seen[modname] = 1
!                 if key is None:
!                     callback(None, modname, '')
!                 else:
!                     desc = split(freshimport(modname).__doc__ or '', '\n')[0]
!                     if find(lower(modname + ' - ' + desc), key) >= 0:
!                         callback(None, modname, desc)
  
          while not self.quit:
***************
*** 1200,1209 ****
                  if not seen.has_key(modname):
                      seen[modname] = 1 # if we see spam.py, skip spam.pyc
!                     if key:
                          desc = synopsis(path) or ''
                          if find(lower(modname + ' - ' + desc), key) >= 0:
                              callback(path, modname, desc)
-                     else:
-                         callback(path, modname, '')
          if completer: completer()
  
--- 1203,1212 ----
                  if not seen.has_key(modname):
                      seen[modname] = 1 # if we see spam.py, skip spam.pyc
!                     if key is None:
!                         callback(path, modname, '')
!                     else:
                          desc = synopsis(path) or ''
                          if find(lower(modname + ' - ' + desc), key) >= 0:
                              callback(path, modname, desc)
          if completer: completer()
  
***************
*** 1217,1225 ****
      except ImportError: pass
      else: warnings.filterwarnings('ignore') # ignore problems during import
!     ModuleScanner().run(key, callback)
  
  # --------------------------------------------------- web browser interface
  
! def serve(port, callback=None, finalizer=None):
      import BaseHTTPServer, SocketServer, mimetools, select
  
--- 1220,1228 ----
      except ImportError: pass
      else: warnings.filterwarnings('ignore') # ignore problems during import
!     ModuleScanner().run(callback, key)
  
  # --------------------------------------------------- web browser interface
  
! def serve(port, callback=None, completer=None):
      import BaseHTTPServer, SocketServer, mimetools, select
  
***************
*** 1308,1312 ****
              pass
      finally:
!         if finalizer: finalizer()
  
  # ----------------------------------------------------- graphical interface
--- 1311,1315 ----
              pass
      finally:
!         if completer: completer()
  
  # ----------------------------------------------------- graphical interface