Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue 3190: pydoc now hides module __package__ attributes

This commit is contained in:
Nick Coghlan 2008-07-02 13:09:19 +00:00
parent 70c3289085
commit c060b0e7eb
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/pydoc.py
View File

@ -160,8 +160,9 @@ def _split_list(s, predicate):
def visiblename(name, all=None): def visiblename(name, all=None):
"""Decide whether to show documentation on a variable.""" """Decide whether to show documentation on a variable."""
# Certain special names are redundant. # Certain special names are redundant.
if name in ('__builtins__', '__doc__', '__file__', '__path__', _hidden_names = ('__builtins__', '__doc__', '__file__', '__path__',
'__module__', '__name__', '__slots__'): return 0 '__module__', '__name__', '__slots__', '__package__')
if name in _hidden_names: return 0
# Private names are hidden, but special names are displayed. # Private names are hidden, but special names are displayed.
if name.startswith('__') and name.endswith('__'): return 1 if name.startswith('__') and name.endswith('__'): return 1
if all is not None: if all is not None:

2
Lib/test/test_pydoc.py
View File

@ -57,7 +57,6 @@ FUNCTIONS
DATA DATA
__author__ = 'Benjamin Peterson' __author__ = 'Benjamin Peterson'
__credits__ = 'Nobody' __credits__ = 'Nobody'
__package__ = None
__version__ = '1.2.3.4' __version__ = '1.2.3.4'
VERSION VERSION
@ -146,7 +145,6 @@ war</tt></dd></dl>
<tr><td bgcolor="#55aa55"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td> <tr><td bgcolor="#55aa55"><tt>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</tt></td><td>&nbsp;</td>
<td width="100%%"><strong>__author__</strong> = 'Benjamin Peterson'<br> <td width="100%%"><strong>__author__</strong> = 'Benjamin Peterson'<br>
<strong>__credits__</strong> = 'Nobody'<br> <strong>__credits__</strong> = 'Nobody'<br>
<strong>__package__</strong> = None<br>
<strong>__version__</strong> = '1.2.3.4'</td></tr></table><p> <strong>__version__</strong> = '1.2.3.4'</td></tr></table><p>
<table width="100%%" cellspacing=0 cellpadding=2 border=0 summary="section"> <table width="100%%" cellspacing=0 cellpadding=2 border=0 summary="section">
<tr bgcolor="#7799ee"> <tr bgcolor="#7799ee">

3
Misc/NEWS
View File

@ -33,6 +33,9 @@ Core and Builtins
Library Library
------- -------
- Issue #3190: Pydoc now hides the automatic module attribute __package__ (the
handling is now the same as that of other special attributes like __name__).
- Issue #2885 (partial): The urllib.urlopen() function has been deprecated for - Issue #2885 (partial): The urllib.urlopen() function has been deprecated for
removal in Python 3.0 in favor of urllib2.urlopen(). removal in Python 3.0 in favor of urllib2.urlopen().