From: Brett Cannon <brett@python.org>
Date: Mon, 6 Aug 2012 21:19:22 +0000 (-0400)
Subject: Issue #15163: Pydoc shouldn't show __loader__ as a part of a module's
X-Git-Tag: v3.3.0b2~22^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d340b43d7524338ce3d63d4bd69477fca7dad23c;p=thirdparty%2FPython%2Fcpython.git

Issue #15163: Pydoc shouldn't show __loader__ as a part of a module's
data.

Also alphabetized the attributes in the blacklist to make it easier to
detect changes.

Initial patch by Éric Araujo.
---

diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index a030f685b018..aa296c4c7904 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -163,11 +163,11 @@ def _split_list(s, predicate):
 
 def visiblename(name, all=None, obj=None):
     """Decide whether to show documentation on a variable."""
-    # Certain special names are redundant.
-    if name in {'__builtins__', '__doc__', '__file__', '__path__',
-                     '__module__', '__name__', '__slots__', '__package__',
-                     '__cached__', '__author__', '__credits__', '__date__',
-                     '__version__', '__qualname__', '__initializing__'}:
+    # Certain special names are redundant or internal.
+    if name in {'__author__', '__builtins__', '__cached__', '__credits__',
+                '__date__', '__doc__', '__file__', '__initializing__',
+                '__loader__', '__module__', '__name__', '__package__',
+                '__path__', '__qualname__', '__slots__', '__version__'}:
         return 0
     # Private names are hidden, but special names are displayed.
     if name.startswith('__') and name.endswith('__'): return 1
diff --git a/Misc/NEWS b/Misc/NEWS
index 4f590020f2b2..4ac01632a422 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -77,6 +77,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #15163: Pydoc shouldn't list __loader__ as module data.
+
 - Issue #15471: Do not use mutable objects as defaults for
   importlib.__import__().