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

Ka-Ping Yee ping@users.sourceforge.net
Fri, 13 Apr 2001 03:53:27 -0700


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

Modified Files:
	pydoc.py 
Log Message:
Another pass through the topic table to fill in cross references.
Restore Helper.__repr__ for now.


Index: pydoc.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/pydoc.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -r1.31 -r1.32
*** pydoc.py	2001/04/13 09:55:49	1.31
--- pydoc.py	2001/04/13 10:53:25	1.32
***************
*** 1144,1148 ****
      keywords = {
          'and': 'BOOLEAN',
!         'assert': 'ASSERT',
          'break': ('ref/break', 'while for'),
          'class': ('ref/class', 'CLASSES SPECIALMETHODS'),
--- 1144,1148 ----
      keywords = {
          'and': 'BOOLEAN',
!         'assert': ('ref/assert', ''),
          'break': ('ref/break', 'while for'),
          'class': ('ref/class', 'CLASSES SPECIALMETHODS'),
***************
*** 1168,1172 ****
          'print': ('ref/print', ''),
          'raise': ('ref/raise', 'EXCEPTIONS'),
!         'return': ('ref/return', ''),
          'try': ('ref/try', 'EXCEPTIONS'),
          'while': ('ref/while', 'break continue if TRUTHVALUE'),
--- 1168,1172 ----
          'print': ('ref/print', ''),
          'raise': ('ref/raise', 'EXCEPTIONS'),
!         'return': ('ref/return', 'FUNCTIONS'),
          'try': ('ref/try', 'EXCEPTIONS'),
          'while': ('ref/while', 'break continue if TRUTHVALUE'),
***************
*** 1175,1192 ****
      topics = {
          'TYPES': ('ref/types', 'STRINGS UNICODE NUMBERS SEQUENCES MAPPINGS FUNCTIONS CLASSES MODULES FILES inspect'),
!         'STRINGS': ('ref/strings', 'UNICODE SEQUENCES STRINGMETHODS FORMATTING TYPES'),
          'STRINGMETHODS': ('lib/string-methods', 'STRINGS FORMATTING'),
          'FORMATTING': ('lib/typesseq-strings', 'OPERATORS'),
!         'UNICODE': ('ref/unicode', 'TYPES STRING'),
          'NUMBERS': ('ref/numbers', 'INTEGER FLOAT COMPLEX TYPES'),
          'INTEGER': ('ref/integers', 'int range'),
          'FLOAT': ('ref/floating', 'float math'),
          'COMPLEX': ('ref/imaginary', 'complex cmath'),
!         'SEQUENCES': ('lib/typesseq', 'LISTS'),
          'MAPPINGS': 'DICTIONARIES',
          'FUNCTIONS': ('lib/typesfunctions', 'def TYPES'),
          'METHODS': ('lib/typesmethods', 'class def CLASSES TYPES'),
          'CODEOBJECTS': ('lib/bltin-code-objects', 'compile FUNCTIONS TYPES'),
!         'TYPEOBJECTS': ('lib/bltin-type-objects', 'TYPES'),
          'FRAMEOBJECTS': 'TYPES',
          'TRACEBACKS': 'TYPES',
--- 1175,1192 ----
      topics = {
          'TYPES': ('ref/types', 'STRINGS UNICODE NUMBERS SEQUENCES MAPPINGS FUNCTIONS CLASSES MODULES FILES inspect'),
!         'STRINGS': ('ref/strings', 'str UNICODE SEQUENCES STRINGMETHODS FORMATTING TYPES'),
          'STRINGMETHODS': ('lib/string-methods', 'STRINGS FORMATTING'),
          'FORMATTING': ('lib/typesseq-strings', 'OPERATORS'),
!         'UNICODE': ('ref/unicode', 'encodings unicode TYPES STRING'),
          'NUMBERS': ('ref/numbers', 'INTEGER FLOAT COMPLEX TYPES'),
          'INTEGER': ('ref/integers', 'int range'),
          'FLOAT': ('ref/floating', 'float math'),
          'COMPLEX': ('ref/imaginary', 'complex cmath'),
!         'SEQUENCES': ('lib/typesseq', 'STRINGMETHODS FORMATTING xrange LISTS'),
          'MAPPINGS': 'DICTIONARIES',
          'FUNCTIONS': ('lib/typesfunctions', 'def TYPES'),
          'METHODS': ('lib/typesmethods', 'class def CLASSES TYPES'),
          'CODEOBJECTS': ('lib/bltin-code-objects', 'compile FUNCTIONS TYPES'),
!         'TYPEOBJECTS': ('lib/bltin-type-objects', 'types TYPES'),
          'FRAMEOBJECTS': 'TYPES',
          'TRACEBACKS': 'TYPES',
***************
*** 1203,1213 ****
          'OBJECTS': ('ref/objects', 'TYPES'),
          'SPECIALMETHODS': ('ref/specialnames', 'BASICMETHODS ATTRIBUTEMETHODS CALLABLEMETHODS SEQUENCEMETHODS1 MAPPINGMETHODS SEQUENCEMETHODS2 NUMBERMETHODS CLASSES'),
!         'BASICMETHODS': ('ref/customization', 'SPECIALMETHODS'),
!         'ATTRIBUTEMETHODS': ('ref/attribute-access', 'SPECIALMETHODS'),
!         'CALLABLEMETHODS': ('ref/callable-types', 'SPECIALMETHODS'),
!         'SEQUENCEMETHODS1': ('ref/sequence-types', 'SEQUENCEMETHODS2'),
!         'SEQUENCEMETHODS2': ('ref/sequence-methods', 'SEQUENCEMETHODS1'),
!         'MAPPINGMETHODS': ('ref/sequence-types', 'SPECIALMETHODS'),
!         'NUMBERMETHODS': ('ref/numeric-types', 'SPECIALMETHODS'),
          'EXECUTION': ('ref/execframes', ''),
          'NAMESPACES': ('ref/execframes', 'global ASSIGNMENT DELETION'),
--- 1203,1213 ----
          'OBJECTS': ('ref/objects', 'TYPES'),
          'SPECIALMETHODS': ('ref/specialnames', 'BASICMETHODS ATTRIBUTEMETHODS CALLABLEMETHODS SEQUENCEMETHODS1 MAPPINGMETHODS SEQUENCEMETHODS2 NUMBERMETHODS CLASSES'),
!         'BASICMETHODS': ('ref/customization', 'cmp hash repr str SPECIALMETHODS'),
!         'ATTRIBUTEMETHODS': ('ref/attribute-access', 'ATTRIBUTES SPECIALMETHODS'),
!         'CALLABLEMETHODS': ('ref/callable-types', 'CALLS SPECIALMETHODS'),
!         'SEQUENCEMETHODS1': ('ref/sequence-types', 'SEQUENCES SEQUENCEMETHODS2 SPECIALMETHODS'),
!         'SEQUENCEMETHODS2': ('ref/sequence-methods', 'SEQUENCES SEQUENCEMETHODS1 SPECIALMETHODS'),
!         'MAPPINGMETHODS': ('ref/sequence-types', 'MAPPINGS SPECIALMETHODS'),
!         'NUMBERMETHODS': ('ref/numeric-types', 'NUMBERS AUGMENTEDASSIGNMENT SPECIALMETHODS'),
          'EXECUTION': ('ref/execframes', ''),
          'NAMESPACES': ('ref/execframes', 'global ASSIGNMENT DELETION'),
***************
*** 1219,1231 ****
          'IDENTIFIERS': ('ref/identifiers', 'keywords SPECIALIDENTIFIERS'),
          'SPECIALIDENTIFIERS': ('ref/id-classes', ''),
!         'PRIVATENAMES': ('ref/identifiers', ''),
          'LITERALS': ('ref/atom-literals', 'STRINGS BACKQUOTES NUMBERS TUPLELITERALS LISTLITERALS DICTIONARYLITERALS'),
          'TUPLES': 'SEQUENCES',
!         'TUPLELITERALS': ('ref/exprlists', 'LITERALS'),
          'LISTS': ('lib/typesseq-mutable', 'LISTLITERALS'),
!         'LISTLITERALS': ('ref/lists', 'LITERALS'),
          'DICTIONARIES': ('lib/typesmapping', 'DICTIONARYLITERALS'),
!         'DICTIONARYLITERALS': ('ref/dict', 'LITERALS'),
!         'BACKQUOTES': ('ref/string-conversions', 'LITERALS'),
          'ATTRIBUTES': ('ref/attribute-references', 'getattr hasattr setattr ATTRIBUTEMETHODS'),
          'SUBSCRIPTS': ('ref/subscriptions', 'SEQUENCEMETHODS1'),
--- 1219,1231 ----
          'IDENTIFIERS': ('ref/identifiers', 'keywords SPECIALIDENTIFIERS'),
          'SPECIALIDENTIFIERS': ('ref/id-classes', ''),
!         'PRIVATENAMES': ('ref/atom-identifiers', ''),
          'LITERALS': ('ref/atom-literals', 'STRINGS BACKQUOTES NUMBERS TUPLELITERALS LISTLITERALS DICTIONARYLITERALS'),
          'TUPLES': 'SEQUENCES',
!         'TUPLELITERALS': ('ref/exprlists', 'TUPLES LITERALS'),
          'LISTS': ('lib/typesseq-mutable', 'LISTLITERALS'),
!         'LISTLITERALS': ('ref/lists', 'LISTS LITERALS'),
          'DICTIONARIES': ('lib/typesmapping', 'DICTIONARYLITERALS'),
!         'DICTIONARYLITERALS': ('ref/dict', 'DICTIONARIES LITERALS'),
!         'BACKQUOTES': ('ref/string-conversions', 'repr str STRINGS LITERALS'),
          'ATTRIBUTES': ('ref/attribute-references', 'getattr hasattr setattr ATTRIBUTEMETHODS'),
          'SUBSCRIPTS': ('ref/subscriptions', 'SEQUENCEMETHODS1'),
***************
*** 1238,1245 ****
          'BITWISE': ('ref/bitwise', 'EXPRESSIONS'),
          'COMPARISON': ('ref/comparisons', 'EXPRESSIONS BASICMETHODS'),
!         'BOOLEAN': ('ref/lambda', 'EXPRESSIONS'),
          'ASSERTION': 'assert',
          'ASSIGNMENT': ('ref/assignment', 'AUGMENTEDASSIGNMENT'),
!         'AUGMENTEDASSIGNMENT': ('ref/augassign', ''),
          'DELETION': 'del',
          'PRINTING': 'print',
--- 1238,1245 ----
          'BITWISE': ('ref/bitwise', 'EXPRESSIONS'),
          'COMPARISON': ('ref/comparisons', 'EXPRESSIONS BASICMETHODS'),
!         'BOOLEAN': ('ref/lambda', 'EXPRESSIONS TRUTHVALUE'),
          'ASSERTION': 'assert',
          'ASSIGNMENT': ('ref/assignment', 'AUGMENTEDASSIGNMENT'),
!         'AUGMENTEDASSIGNMENT': ('ref/augassign', 'NUMBERMETHODS'),
          'DELETION': 'del',
          'PRINTING': 'print',
***************
*** 1249,1252 ****
--- 1249,1253 ----
          'LOOPING': ('ref/compound', 'for while break continue'),
          'TRUTHVALUE': ('lib/truth', 'if while and or not BASICMETHODS'),
+         'DEBUGGING': ('lib/module-pdb', 'pdb'),
      }
  
***************
*** 1266,1269 ****
--- 1267,1276 ----
              if dir and os.path.isdir(os.path.join(dir, 'lib')):
                  self.docdir = dir
+ 
+     def __repr__(self):
+         if len(inspect.stack()) <= 2:
+             self()
+             return ''
+         return '<pydoc.Helper instance at %p>' % id(self)
  
      def __call__(self, request=None):