Benedikt's review

Author: StanFromIreland

Lib/pydoc.py

@@ -581,12 +581,9 @@ def _get_version(self, object):
         if self._is_stdlib_module(object):
             with warnings.catch_warnings():
                 warnings.simplefilter("ignore", DeprecationWarning)
-                if hasattr(object, '__version__'):
-                    return str(object.__version__)
+                return str(getattr(object, '__version__', None))
         else:
-            if hasattr(object, '__version__'):
-                return str(object.__version__)
-        return None
+            return str(getattr(object, '__version__', None))
 
     def _is_stdlib_module(self, object, basedir=None):
         basedir = self.STDLIB_DIR if basedir is None else basedir

Lib/test/test_pydoc/test_pydoc.py

@@ -2310,13 +2310,13 @@ def test__get_version(self):
         import json
 
         class Module:
-            __name__ = 'fauxmod'
+            __name__ = 'my_module'
 
-            def __getattr__(self, name):
-                if name == "__version__":
-                    from warnings import _deprecated
-                    _deprecated("__version__", remove=(3, 20))
-                    return "1"
+            @property
+            def __version__(self):
+                from warnings import _deprecated
+                _deprecated("__version__", remove=(3, 20))
+                return "1.2.3"
 
         module = Module()
         doc = pydoc.Doc()
@@ -2329,8 +2329,8 @@ def __getattr__(self, name):
         with warnings.catch_warnings(record=True) as w:
             warnings.simplefilter("always")
             version = doc._get_version(module)
-            self.assertEqual(version, "1")
-            self.assertEqual(len(w), 2)
+            self.assertEqual(version, "1.2.3")
+            self.assertEqual(len(w), 1)
 
 
 def setUpModule():