mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-24 02:35:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #18200: Back out usage of ModuleNotFoundError (8d28d44f3a9a)

Browse source
This commit is contained in:
Brett Cannon 2013-07-04 17:43:24 -04:00
parent fff59155d4
commit cd171c8e92
83 changed files with 158 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/pydoc.py
View file

@ -1892,7 +1892,7 @@ Here is a list of available topics. Enter any topic name to get more help.
def showtopic(self, topic, more_xrefs=''):
try:
import pydoc_data.topics
except ModuleNotFoundError:
except ImportError:
self.output.write('''
Sorry, topic and keyword documentation is not available because the
module "pydoc_data.topics" could not be found.
@ -1932,7 +1932,7 @@ module "pydoc_data.topics" could not be found.
"""
try:
import pydoc_data.topics
except ModuleNotFoundError:
except ImportError:
return('''
Sorry, topic and keyword documentation is not available because the
module "pydoc_data.topics" could not be found.