[Python-checkins] CVS: python/dist/src/Tools/pynche Main.py,2.19,2.20

[Barry Warsaw]

Update of /cvsroot/python/python/dist/src/Tools/pynche
In directory usw-pr-cvs1:/tmp/cvs-serv30150

Modified Files:
	Main.py 
Log Message:
__version__: Bump to 1.2

De-string-module-ification.


Index: Main.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/pynche/Main.py,v
retrieving revision 2.19
retrieving revision 2.20
diff -C2 -r2.19 -r2.20
*** Main.py	2001/04/18 03:49:00	2.19
--- Main.py	2001/07/10 21:42:04	2.20
***************
*** 47,60 ****
      initialcolor
          initial color, as a color name or #RRGGBB format
- 
  """
  
! __version__ = '1.1'
  
  import sys
  import os
- import string
  import getopt
  import ColorDB
  from PyncheWidget import PyncheWidget
  from Switchboard import Switchboard
--- 47,59 ----
      initialcolor
          initial color, as a color name or #RRGGBB format
  """
  
! __version__ = '1.2'
  
  import sys
  import os
  import getopt
  import ColorDB
+ 
  from PyncheWidget import PyncheWidget
  from Switchboard import Switchboard
***************
*** 80,92 ****
  
  
  def docstring():
!     return string.rstrip(__doc__ % globals())
  
  
! def usage(status, msg=''):
      print docstring()
      if msg:
          print msg
!     sys.exit(status)
  
  
--- 79,93 ----
  
  
+ # Do this because PyncheWidget.py wants to get at the interpolated docstring
+ # too, for its Help menu.
  def docstring():
!     return __doc__ % globals()
  
  
! def usage(code, msg=''):
      print docstring()
      if msg:
          print msg
!     sys.exit(code)
  
  
***************
*** 217,220 ****
--- 218,222 ----
      run(app, sb)
      sb.save_views()
+