Benedikt's review 2.0

Author: StanFromIreland

Lib/pydoc.py

@@ -581,9 +581,10 @@ def _get_version(self, object):
         if self._is_stdlib_module(object):
             with warnings.catch_warnings():
                 warnings.simplefilter("ignore", DeprecationWarning)
-                return str(getattr(object, '__version__', None))
+                version = getattr(object, '__version__', None)
         else:
-            return str(getattr(object, '__version__', None))
+            version = getattr(object, '__version__', None)
+        return '' if version is None else str(version)
 
     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

@@ -2306,19 +2306,18 @@ def test_sys_path_adjustment_when_curdir_already_included(self):
                 self.assertIsNone(self._get_revised_path(trailing_argv0dir))
 
     def test__get_version(self):
-        import warnings
         import json
+        import warnings
 
-        class Module:
+        class MyModule:
             __name__ = 'my_module'
 
             @property
             def __version__(self):
-                from warnings import _deprecated
-                _deprecated("__version__", remove=(3, 20))
+                warnings._deprecated("__version__", remove=(3, 20))
                 return "1.2.3"
 
-        module = Module()
+        module = MyModule()
         doc = pydoc.Doc()
         with warnings.catch_warnings(record=True) as w:
             warnings.simplefilter("always")