[Python-checkins] r85457 - python/branches/py3k/Lib/pdb.py

Thu Oct 14 09:14:31 CEST 2010

Author: georg.brandl
Date: Thu Oct 14 09:14:31 2010
New Revision: 85457
Log:
#9964: fix pdb failure to import under -OO. Warn the user that help is simply not available in this case.
Modified:
 python/branches/py3k/Lib/pdb.py
Modified: python/branches/py3k/Lib/pdb.py
==============================================================================

--- python/branches/py3k/Lib/pdb.py	(original)
+++ python/branches/py3k/Lib/pdb.py	Thu Oct 14 09:14:31 2010
@@ -1261,6 +1261,10 @@
 except AttributeError:
 self.error('No help for %r' % arg)
 else:
+ if sys.flags.optimize >= 2:
+ self.error('No help for %r; please do not run Python with -OO '
+ 'if you need command help' % arg)
+ return
 self.message(command.__doc__.rstrip())
 
 do_h = do_help
@@ -1275,7 +1279,7 @@
 (Pdb) global list_options; list_options = ['-l']
 (Pdb)
 """
- self.message(self.help_exec.__doc__.strip())
+ self.message((self.help_exec.__doc__ or '').strip())
 
 def help_pdb(self):
 help()
@@ -1332,23 +1336,24 @@
 (fp.read(), self.mainpyfile)
 self.run(statement)
 
-# Collect all command help into docstring
+# Collect all command help into docstring, if not run with -OO
 
-# unfortunately we can't guess this order from the class definition
-_help_order = [
- 'help', 'where', 'down', 'up', 'break', 'tbreak', 'clear', 'disable',
- 'enable', 'ignore', 'condition', 'commands', 'step', 'next', 'until',
- 'jump', 'return', 'retval', 'run', 'continue', 'list', 'longlist',
- 'args', 'print', 'pp', 'whatis', 'source', 'alias', 'unalias',
- 'debug', 'quit',
-]
-
-docs = set()
-for _command in _help_order:
- __doc__ += getattr(Pdb, 'do_' + _command).__doc__.strip() + '\n\n'
-__doc__ += Pdb.help_exec.__doc__
+if __doc__ is not None:
+ # unfortunately we can't guess this order from the class definition
+ _help_order = [
+ 'help', 'where', 'down', 'up', 'break', 'tbreak', 'clear', 'disable',
+ 'enable', 'ignore', 'condition', 'commands', 'step', 'next', 'until',
+ 'jump', 'return', 'retval', 'run', 'continue', 'list', 'longlist',
+ 'args', 'print', 'pp', 'whatis', 'source', 'alias', 'unalias',
+ 'debug', 'quit',
+ ]
+
+ for _command in _help_order:
+ __doc__ += getattr(Pdb, 'do_' + _command).__doc__.strip() + '\n\n'
+ __doc__ += Pdb.help_exec.__doc__
+
+ del _help_order, _command
 
-del _help_order, _command
 
 # Simplified interface
 
