Browse Source

can't use __doc__ for help; it gets stripped out

David Rose 16 years ago
parent
commit
1da688a101

+ 1 - 1
direct/src/p3d/AppRunner.py

@@ -660,7 +660,7 @@ class AppRunner(DirectObject):
     
     
     def loadMultifilePrcFiles(self, mf, root):
     def loadMultifilePrcFiles(self, mf, root):
         """ Loads any prc files in the root of the indicated
         """ Loads any prc files in the root of the indicated
-        Multifile, which is presumbed to have been mounted already
+        Multifile, which is presumed to have been mounted already
         under root. """
         under root. """
         
         
         # We have to load these prc files explicitly, since the
         # We have to load these prc files explicitly, since the

+ 2 - 2
direct/src/p3d/packp3d.py

@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 #! /usr/bin/env python
 
 
-"""
+usageText = """
 
 
 This command will pack a Panda application, consisting of a directory
 This command will pack a Panda application, consisting of a directory
 tree of .py files and models, into a p3d file for convenient
 tree of .py files and models, into a p3d file for convenient
@@ -106,7 +106,7 @@ def makePackedApp(args):
         elif option == '-D':
         elif option == '-D':
             allowPythonDev = True
             allowPythonDev = True
         elif option == '-h':
         elif option == '-h':
-            print __doc__ % (os.path.split(sys.argv[0])[1])
+            print usageText % (os.path.split(sys.argv[0])[1])
             sys.exit(1)
             sys.exit(1)
 
 
     if not args:
     if not args:

+ 2 - 2
direct/src/p3d/ppackage.py

@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 #! /usr/bin/env python
 
 
-"""
+usageText = """
 This script can be used to produce a Panda3D downloadable "package",
 This script can be used to produce a Panda3D downloadable "package",
 which may contain arbitrary files--for instance, Python code, bam
 which may contain arbitrary files--for instance, Python code, bam
 files, and/or compiled DLL's--and which may be downloaded by
 files, and/or compiled DLL's--and which may be downloaded by
@@ -96,7 +96,7 @@ from direct.p3d import Packager
 from pandac.PandaModules import *
 from pandac.PandaModules import *
 
 
 def usage(code, msg = ''):
 def usage(code, msg = ''):
-    print >> sys.stderr, __doc__ % {'prog' : os.path.split(sys.argv[0])[1]}
+    print >> sys.stderr, usageText % {'prog' : os.path.split(sys.argv[0])[1]}
     print >> sys.stderr, msg
     print >> sys.stderr, msg
     sys.exit(code)
     sys.exit(code)
 
 

+ 2 - 2
direct/src/p3d/ppatcher.py

@@ -1,6 +1,6 @@
 #! /usr/bin/env python
 #! /usr/bin/env python
 
 
-"""
+usageText = """
 
 
 This script generates the patches required to support incremental
 This script generates the patches required to support incremental
 download of Panda3D packages.  It can be run as a post-process on a
 download of Panda3D packages.  It can be run as a post-process on a
@@ -63,7 +63,7 @@ from direct.p3d.PatchMaker import PatchMaker
 from pandac.PandaModules import *
 from pandac.PandaModules import *
 
 
 def usage(code, msg = ''):
 def usage(code, msg = ''):
-    print >> sys.stderr, __doc__ % {'prog' : os.path.split(sys.argv[0])[1]}
+    print >> sys.stderr, usageText % {'prog' : os.path.split(sys.argv[0])[1]}
     print >> sys.stderr, msg
     print >> sys.stderr, msg
     sys.exit(code)
     sys.exit(code)