mirror of
https://github.com/python/cpython.git
synced 2025-08-14 22:01:08 +00:00
Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,67970-67971,67973,67982,67988,67990,67995,68014,68016,68030,68057,68061,68112,68115-68118,68120-68121,68123-68128 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r67952 | georg.brandl | 2008-12-27 18:42:40 +0100 (Sat, 27 Dec 2008) | 2 lines #4752: actually use custom handler in example. ........ r67953 | georg.brandl | 2008-12-27 19:20:04 +0100 (Sat, 27 Dec 2008) | 3 lines Patch #4739 by David Laban: add symbols to pydoc help topics, so that ``help('@')`` works as expected. ........ r67955 | georg.brandl | 2008-12-27 19:27:53 +0100 (Sat, 27 Dec 2008) | 3 lines Follow-up to r67746 in order to restore backwards-compatibility for those who (monkey-)patch TextWrapper.wordsep_re with a custom RE. ........ r67957 | georg.brandl | 2008-12-27 19:49:19 +0100 (Sat, 27 Dec 2008) | 2 lines #4754: improve winsound documentation. ........ r67958 | georg.brandl | 2008-12-27 20:02:59 +0100 (Sat, 27 Dec 2008) | 2 lines #4682: 'b' is actually unsigned char. ........ r67960 | georg.brandl | 2008-12-27 20:04:44 +0100 (Sat, 27 Dec 2008) | 2 lines #4695: fix backslashery. ........ r67961 | georg.brandl | 2008-12-27 20:06:04 +0100 (Sat, 27 Dec 2008) | 2 lines Use :samp: role. ........ r67963 | georg.brandl | 2008-12-27 20:11:15 +0100 (Sat, 27 Dec 2008) | 2 lines #4671: document that pydoc imports modules. ........ r67965 | antoine.pitrou | 2008-12-27 21:34:52 +0100 (Sat, 27 Dec 2008) | 3 lines Issue #4677: add two list comprehension tests to pybench. ........ r67967 | benjamin.peterson | 2008-12-27 23:18:58 +0100 (Sat, 27 Dec 2008) | 1 line fix markup ........ r67970 | alexandre.vassalotti | 2008-12-28 02:52:58 +0100 (Sun, 28 Dec 2008) | 2 lines Fix name mangling of PyUnicode_ClearFreeList. ........ r67971 | alexandre.vassalotti | 2008-12-28 03:10:35 +0100 (Sun, 28 Dec 2008) | 2 lines Sort UCS-2/UCS-4 name mangling list. ........ r67973 | alexandre.vassalotti | 2008-12-28 03:58:22 +0100 (Sun, 28 Dec 2008) | 2 lines Document Py_VaBuildValue. ........ r67982 | benjamin.peterson | 2008-12-28 16:37:31 +0100 (Sun, 28 Dec 2008) | 1 line fix WORD_BIGEDIAN declaration in Universal builds; fixes #4060 and #4728 ........ r67988 | ronald.oussoren | 2008-12-28 20:40:56 +0100 (Sun, 28 Dec 2008) | 1 line Issue4064: architecture string for universal builds on OSX ........ r67990 | ronald.oussoren | 2008-12-28 20:50:40 +0100 (Sun, 28 Dec 2008) | 3 lines Update the fix for issue4064 to deal correctly with all three variants of universal builds that are presented by the configure script. ........ r67995 | benjamin.peterson | 2008-12-28 22:16:07 +0100 (Sun, 28 Dec 2008) | 1 line #4763 PyErr_ExceptionMatches won't blow up with NULL arguments ........ r68014 | benjamin.peterson | 2008-12-29 18:47:42 +0100 (Mon, 29 Dec 2008) | 1 line #4764 set IOError.filename when trying to open a directory on POSIX platforms ........ r68016 | benjamin.peterson | 2008-12-29 18:56:58 +0100 (Mon, 29 Dec 2008) | 1 line #4764 in io.open, set IOError.filename when trying to open a directory on POSIX platforms ........ r68030 | benjamin.peterson | 2008-12-29 22:38:14 +0100 (Mon, 29 Dec 2008) | 1 line fix French ........ r68057 | vinay.sajip | 2008-12-30 08:01:25 +0100 (Tue, 30 Dec 2008) | 1 line Minor documentation change relating to NullHandler. ........ r68061 | georg.brandl | 2008-12-30 11:15:49 +0100 (Tue, 30 Dec 2008) | 2 lines #4778: attributes can't be called. ........ r68112 | benjamin.peterson | 2009-01-01 00:48:39 +0100 (Thu, 01 Jan 2009) | 1 line #4795 inspect.isgeneratorfunction() should return False instead of None ........ r68115 | benjamin.peterson | 2009-01-01 05:04:41 +0100 (Thu, 01 Jan 2009) | 1 line simplfy code ........ r68116 | georg.brandl | 2009-01-01 12:46:51 +0100 (Thu, 01 Jan 2009) | 2 lines #4100: note that element children are not necessarily present on "start" events. ........ r68117 | georg.brandl | 2009-01-01 12:53:55 +0100 (Thu, 01 Jan 2009) | 2 lines #4156: make clear that "protocol" is to be replaced with the protocol name. ........ r68118 | georg.brandl | 2009-01-01 13:00:19 +0100 (Thu, 01 Jan 2009) | 2 lines #4185: clarify escape behavior of replacement strings. ........ r68120 | georg.brandl | 2009-01-01 13:15:31 +0100 (Thu, 01 Jan 2009) | 4 lines #4228: Pack negative values the same way as 2.4 in struct's L format. ........ r68121 | georg.brandl | 2009-01-01 13:43:33 +0100 (Thu, 01 Jan 2009) | 2 lines Point to types module in new module deprecation notice. ........ r68123 | georg.brandl | 2009-01-01 13:52:29 +0100 (Thu, 01 Jan 2009) | 2 lines #4784: ... on three counts ... ........ r68124 | georg.brandl | 2009-01-01 13:53:19 +0100 (Thu, 01 Jan 2009) | 2 lines #4782: Fix markup error that hid load() and loads(). ........ r68125 | georg.brandl | 2009-01-01 14:02:09 +0100 (Thu, 01 Jan 2009) | 2 lines #4776: add data_files and package_dir arguments. ........ r68126 | georg.brandl | 2009-01-01 14:05:13 +0100 (Thu, 01 Jan 2009) | 2 lines Handlers are in the `logging.handlers` module. ........ r68127 | georg.brandl | 2009-01-01 14:14:49 +0100 (Thu, 01 Jan 2009) | 2 lines #4767: Use correct submodules for all MIME classes. ........ r68128 | antoine.pitrou | 2009-01-01 15:11:22 +0100 (Thu, 01 Jan 2009) | 3 lines Issue #3680: Reference cycles created through a dict, set or deque iterator did not get collected. ........
This commit is contained in:
Georg Brandl
parent
b5fc36c86e
commit
47fe9817f1
35 changed files with 438 additions and 110 deletions
57
Lib/pydoc.py
57
Lib/pydoc.py
|
|
@ -1574,6 +1574,42 @@ class Helper:
|
|||
'with': ('with', 'CONTEXTMANAGERS EXCEPTIONS yield'),
|
||||
'yield': ('yield', ''),
|
||||
}
|
||||
# Either add symbols to this dictionary or to the symbols dictionary
|
||||
# directly: Whichever is easier. They are merged later.
|
||||
_symbols_inverse = {
|
||||
'STRINGS' : ("'", "'''", "r'", "u'", '"""', '"', 'r"', 'u"'),
|
||||
'OPERATORS' : ('+', '-', '*', '**', '/', '//', '%', '<<', '>>', '&',
|
||||
'|', '^', '~', '<', '>', '<=', '>=', '==', '!=', '<>'),
|
||||
'COMPARISON' : ('<', '>', '<=', '>=', '==', '!=', '<>'),
|
||||
'UNARY' : ('-', '~'),
|
||||
'AUGMENTEDASSIGNMENT' : ('+=', '-=', '*=', '/=', '%=', '&=', '|=',
|
||||
'^=', '<<=', '>>=', '**=', '//='),
|
||||
'BITWISE' : ('<<', '>>', '&', '|', '^', '~'),
|
||||
'COMPLEX' : ('j', 'J')
|
||||
}
|
||||
symbols = {
|
||||
'%': 'OPERATORS FORMATTING',
|
||||
'**': 'POWER',
|
||||
',': 'TUPLES LISTS FUNCTIONS',
|
||||
'.': 'ATTRIBUTES FLOAT MODULES OBJECTS',
|
||||
'...': 'ELLIPSIS',
|
||||
':': 'SLICINGS DICTIONARYLITERALS',
|
||||
'@': 'def class',
|
||||
'\\': 'STRINGS',
|
||||
'_': 'PRIVATENAMES',
|
||||
'__': 'PRIVATENAMES SPECIALMETHODS',
|
||||
'`': 'BACKQUOTES',
|
||||
'(': 'TUPLES FUNCTIONS CALLS',
|
||||
')': 'TUPLES FUNCTIONS CALLS',
|
||||
'[': 'LISTS SUBSCRIPTS SLICINGS',
|
||||
']': 'LISTS SUBSCRIPTS SLICINGS'
|
||||
}
|
||||
for topic, symbols_ in _symbols_inverse.iteritems():
|
||||
for symbol in symbols_:
|
||||
topics = symbols.get(symbol, topic)
|
||||
if topic not in topics:
|
||||
topics = topics + ' ' + topic
|
||||
symbols[symbol] = topics
|
||||
|
||||
topics = {
|
||||
'TYPES': ('types', 'STRINGS UNICODE NUMBERS SEQUENCES MAPPINGS '
|
||||
|
|
@ -1717,10 +1753,12 @@ has the same effect as typing a particular string at the help> prompt.
|
|||
if type(request) is type(''):
|
||||
if request == 'help': self.intro()
|
||||
elif request == 'keywords': self.listkeywords()
|
||||
elif request == 'symbols': self.listsymbols()
|
||||
elif request == 'topics': self.listtopics()
|
||||
elif request == 'modules': self.listmodules()
|
||||
elif request[:8] == 'modules ':
|
||||
self.listmodules(split(request)[1])
|
||||
elif request in self.symbols: self.showsymbol(request)
|
||||
elif request in self.keywords: self.showtopic(request)
|
||||
elif request in self.topics: self.showtopic(request)
|
||||
elif request: doc(request, 'Help on %s:')
|
||||
|
|
@ -1766,6 +1804,14 @@ Here is a list of the Python keywords. Enter any keyword to get more help.
|
|||
''')
|
||||
self.list(self.keywords.keys())
|
||||
|
||||
def listsymbols(self):
|
||||
self.output.write('''
|
||||
Here is a list of the punctuation symbols which Python assigns special meaning
|
||||
to. Enter any symbol to get more help.
|
||||
|
||||
''')
|
||||
self.list(self.symbols.keys())
|
||||
|
||||
def listtopics(self):
|
||||
self.output.write('''
|
||||
Here is a list of available topics. Enter any topic name to get more help.
|
||||
|
|
@ -1773,7 +1819,7 @@ Here is a list of available topics. Enter any topic name to get more help.
|
|||
''')
|
||||
self.list(self.topics.keys())
|
||||
|
||||
def showtopic(self, topic):
|
||||
def showtopic(self, topic, more_xrefs=''):
|
||||
try:
|
||||
import pydoc_topics
|
||||
except ImportError:
|
||||
|
|
@ -1787,7 +1833,7 @@ module "pydoc_topics" could not be found.
|
|||
self.output.write('no documentation found for %s\n' % repr(topic))
|
||||
return
|
||||
if type(target) is type(''):
|
||||
return self.showtopic(target)
|
||||
return self.showtopic(target, more_xrefs)
|
||||
|
||||
label, xrefs = target
|
||||
try:
|
||||
|
|
@ -1796,6 +1842,8 @@ module "pydoc_topics" could not be found.
|
|||
self.output.write('no documentation found for %s\n' % repr(topic))
|
||||
return
|
||||
pager(strip(doc) + '\n')
|
||||
if more_xrefs:
|
||||
xrefs = (xrefs or '') + ' ' + more_xrefs
|
||||
if xrefs:
|
||||
import StringIO, formatter
|
||||
buffer = StringIO.StringIO()
|
||||
|
|
@ -1803,6 +1851,11 @@ module "pydoc_topics" could not be found.
|
|||
'Related help topics: ' + join(split(xrefs), ', ') + '\n')
|
||||
self.output.write('\n%s\n' % buffer.getvalue())
|
||||
|
||||
def showsymbol(self, symbol):
|
||||
target = self.symbols[symbol]
|
||||
topic, _, xrefs = target.partition(' ')
|
||||
self.showtopic(topic, xrefs)
|
||||
|
||||
def listmodules(self, key=''):
|
||||
if key:
|
||||
self.output.write('''
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue