__version__: Bump to 1.2

De-string-module-ification.

diff --git a/Tools/pynche/Main.py b/Tools/pynche/Main.py
index 894d804311c0ae4a504633a9d6b612ac92ccae44..8cea31cbc17950307bd7097cda9f363c0c3647b0 100644 (file)
--- a/Tools/pynche/Main.py
+++ b/Tools/pynche/Main.py
@@ -46,16 +46,15 @@ Where:
 
     initialcolor
         initial color, as a color name or #RRGGBB format
-
 """
 
-__version__ = '1.1'
+__version__ = '1.2'
 
 import sys
 import os
-import string
 import getopt
 import ColorDB
+
 from PyncheWidget import PyncheWidget
 from Switchboard import Switchboard
 from StripViewer import StripViewer
@@ -79,15 +78,17 @@ RGB_TXT = [
 
 
 \f
+# Do this because PyncheWidget.py wants to get at the interpolated docstring
+# too, for its Help menu.
 def docstring():
-    return string.rstrip(__doc__ % globals())
+    return __doc__ % globals()
 
 
-def usage(status, msg=''):
+def usage(code, msg=''):
     print docstring()
     if msg:
         print msg
-    sys.exit(status)
+    sys.exit(code)
 
 
 \f
@@ -217,6 +218,7 @@ Version: %s''' % __version__
     run(app, sb)
     sb.save_views()
 
+
 \f
 if __name__ == '__main__':
     main()