Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 79c009d

Browse files
zestypingzestyping
committed
Another pass through the topic table to fill in cross references.
Restore Helper.__repr__ for now.
1 parent dec96e9 commit 79c009d

1 file changed

Lines changed: 27 additions & 20 deletions

File tree

‎Lib/pydoc.py‎

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1143,7 +1143,7 @@ def writedocs(dir, pkgpath='', done=None):
11431143
class Helper:
11441144
keywords = {
11451145
'and': 'BOOLEAN',
1146-
'assert': 'ASSERT',
1146+
'assert': ('ref/assert', ''),
11471147
'break': ('ref/break', 'while for'),
11481148
'class': ('ref/class', 'CLASSES SPECIALMETHODS'),
11491149
'continue': ('ref/continue', 'while for'),
@@ -1167,27 +1167,27 @@ class Helper:
11671167
'pass': 'PASS',
11681168
'print': ('ref/print', ''),
11691169
'raise': ('ref/raise', 'EXCEPTIONS'),
1170-
'return': ('ref/return', ''),
1170+
'return': ('ref/return', 'FUNCTIONS'),
11711171
'try': ('ref/try', 'EXCEPTIONS'),
11721172
'while': ('ref/while', 'break continue if TRUTHVALUE'),
11731173
}
11741174

11751175
topics = {
11761176
'TYPES': ('ref/types', 'STRINGS UNICODE NUMBERS SEQUENCES MAPPINGS FUNCTIONS CLASSES MODULES FILES inspect'),
1177-
'STRINGS': ('ref/strings', 'UNICODE SEQUENCES STRINGMETHODS FORMATTING TYPES'),
1177+
'STRINGS': ('ref/strings', 'str UNICODE SEQUENCES STRINGMETHODS FORMATTING TYPES'),
11781178
'STRINGMETHODS': ('lib/string-methods', 'STRINGS FORMATTING'),
11791179
'FORMATTING': ('lib/typesseq-strings', 'OPERATORS'),
1180-
'UNICODE': ('ref/unicode', 'TYPES STRING'),
1180+
'UNICODE': ('ref/unicode', 'encodings unicode TYPES STRING'),
11811181
'NUMBERS': ('ref/numbers', 'INTEGER FLOAT COMPLEX TYPES'),
11821182
'INTEGER': ('ref/integers', 'int range'),
11831183
'FLOAT': ('ref/floating', 'float math'),
11841184
'COMPLEX': ('ref/imaginary', 'complex cmath'),
1185-
'SEQUENCES': ('lib/typesseq', 'LISTS'),
1185+
'SEQUENCES': ('lib/typesseq', 'STRINGMETHODS FORMATTING xrange LISTS'),
11861186
'MAPPINGS': 'DICTIONARIES',
11871187
'FUNCTIONS': ('lib/typesfunctions', 'def TYPES'),
11881188
'METHODS': ('lib/typesmethods', 'class def CLASSES TYPES'),
11891189
'CODEOBJECTS': ('lib/bltin-code-objects', 'compile FUNCTIONS TYPES'),
1190-
'TYPEOBJECTS': ('lib/bltin-type-objects', 'TYPES'),
1190+
'TYPEOBJECTS': ('lib/bltin-type-objects', 'types TYPES'),
11911191
'FRAMEOBJECTS': 'TYPES',
11921192
'TRACEBACKS': 'TYPES',
11931193
'NONE': ('lib/bltin-null-object', ''),
@@ -1202,13 +1202,13 @@ class Helper:
12021202
'PRECEDENCE': 'EXPRESSIONS',
12031203
'OBJECTS': ('ref/objects', 'TYPES'),
12041204
'SPECIALMETHODS': ('ref/specialnames', 'BASICMETHODS ATTRIBUTEMETHODS CALLABLEMETHODS SEQUENCEMETHODS1 MAPPINGMETHODS SEQUENCEMETHODS2 NUMBERMETHODS CLASSES'),
1205-
'BASICMETHODS': ('ref/customization', 'SPECIALMETHODS'),
1206-
'ATTRIBUTEMETHODS': ('ref/attribute-access', 'SPECIALMETHODS'),
1207-
'CALLABLEMETHODS': ('ref/callable-types', 'SPECIALMETHODS'),
1208-
'SEQUENCEMETHODS1': ('ref/sequence-types', 'SEQUENCEMETHODS2'),
1209-
'SEQUENCEMETHODS2': ('ref/sequence-methods', 'SEQUENCEMETHODS1'),
1210-
'MAPPINGMETHODS': ('ref/sequence-types', 'SPECIALMETHODS'),
1211-
'NUMBERMETHODS': ('ref/numeric-types', 'SPECIALMETHODS'),
1205+
'BASICMETHODS': ('ref/customization', 'cmp hash repr str SPECIALMETHODS'),
1206+
'ATTRIBUTEMETHODS': ('ref/attribute-access', 'ATTRIBUTES SPECIALMETHODS'),
1207+
'CALLABLEMETHODS': ('ref/callable-types', 'CALLS SPECIALMETHODS'),
1208+
'SEQUENCEMETHODS1': ('ref/sequence-types', 'SEQUENCES SEQUENCEMETHODS2 SPECIALMETHODS'),
1209+
'SEQUENCEMETHODS2': ('ref/sequence-methods', 'SEQUENCES SEQUENCEMETHODS1 SPECIALMETHODS'),
1210+
'MAPPINGMETHODS': ('ref/sequence-types', 'MAPPINGS SPECIALMETHODS'),
1211+
'NUMBERMETHODS': ('ref/numeric-types', 'NUMBERS AUGMENTEDASSIGNMENT SPECIALMETHODS'),
12121212
'EXECUTION': ('ref/execframes', ''),
12131213
'NAMESPACES': ('ref/execframes', 'global ASSIGNMENT DELETION'),
12141214
'SCOPING': 'NAMESPACES',
@@ -1218,15 +1218,15 @@ class Helper:
12181218
'CONVERSIONS': ('ref/conversions', ''),
12191219
'IDENTIFIERS': ('ref/identifiers', 'keywords SPECIALIDENTIFIERS'),
12201220
'SPECIALIDENTIFIERS': ('ref/id-classes', ''),
1221-
'PRIVATENAMES': ('ref/identifiers', ''),
1221+
'PRIVATENAMES': ('ref/atom-identifiers', ''),
12221222
'LITERALS': ('ref/atom-literals', 'STRINGS BACKQUOTES NUMBERS TUPLELITERALS LISTLITERALS DICTIONARYLITERALS'),
12231223
'TUPLES': 'SEQUENCES',
1224-
'TUPLELITERALS': ('ref/exprlists', 'LITERALS'),
1224+
'TUPLELITERALS': ('ref/exprlists', 'TUPLES LITERALS'),
12251225
'LISTS': ('lib/typesseq-mutable', 'LISTLITERALS'),
1226-
'LISTLITERALS': ('ref/lists', 'LITERALS'),
1226+
'LISTLITERALS': ('ref/lists', 'LISTS LITERALS'),
12271227
'DICTIONARIES': ('lib/typesmapping', 'DICTIONARYLITERALS'),
1228-
'DICTIONARYLITERALS': ('ref/dict', 'LITERALS'),
1229-
'BACKQUOTES': ('ref/string-conversions', 'LITERALS'),
1228+
'DICTIONARYLITERALS': ('ref/dict', 'DICTIONARIES LITERALS'),
1229+
'BACKQUOTES': ('ref/string-conversions', 'repr str STRINGS LITERALS'),
12301230
'ATTRIBUTES': ('ref/attribute-references', 'getattr hasattr setattr ATTRIBUTEMETHODS'),
12311231
'SUBSCRIPTS': ('ref/subscriptions', 'SEQUENCEMETHODS1'),
12321232
'SLICINGS': ('ref/slicings', 'SEQUENCEMETHODS2'),
@@ -1237,17 +1237,18 @@ class Helper:
12371237
'SHIFTING': ('ref/shifting', 'EXPRESSIONS'),
12381238
'BITWISE': ('ref/bitwise', 'EXPRESSIONS'),
12391239
'COMPARISON': ('ref/comparisons', 'EXPRESSIONS BASICMETHODS'),
1240-
'BOOLEAN': ('ref/lambda', 'EXPRESSIONS'),
1240+
'BOOLEAN': ('ref/lambda', 'EXPRESSIONS TRUTHVALUE'),
12411241
'ASSERTION': 'assert',
12421242
'ASSIGNMENT': ('ref/assignment', 'AUGMENTEDASSIGNMENT'),
1243-
'AUGMENTEDASSIGNMENT': ('ref/augassign', ''),
1243+
'AUGMENTEDASSIGNMENT': ('ref/augassign', 'NUMBERMETHODS'),
12441244
'DELETION': 'del',
12451245
'PRINTING': 'print',
12461246
'RETURNING': 'return',
12471247
'IMPORTING': 'import',
12481248
'CONDITIONAL': 'if',
12491249
'LOOPING': ('ref/compound', 'for while break continue'),
12501250
'TRUTHVALUE': ('lib/truth', 'if while and or not BASICMETHODS'),
1251+
'DEBUGGING': ('lib/module-pdb', 'pdb'),
12511252
}
12521253

12531254
def __init__(self, input, output):
@@ -1266,6 +1267,12 @@ def __init__(self, input, output):
12661267
if dir and os.path.isdir(os.path.join(dir, 'lib')):
12671268
self.docdir = dir
12681269

1270+
def __repr__(self):
1271+
if len(inspect.stack()) <= 2:
1272+
self()
1273+
return ''
1274+
return '<pydoc.Helper instance at %p>' % id(self)
1275+
12691276
def __call__(self, request=None):
12701277
if request is not None:
12711278
self.help(request)

0 commit comments

Comments
 (0)