forked from pool/python
31 lines
1.5 KiB
Diff
31 lines
1.5 KiB
Diff
--- Lib/pydoc.py
|
|
+++ Lib/pydoc.py
|
|
@@ -1626,11 +1626,7 @@
|
|
for dir in [os.environ.get('PYTHONDOCS'),
|
|
homedir and os.path.join(homedir, 'doc'),
|
|
os.path.join(execdir, 'doc'),
|
|
- '/usr/doc/python-docs-' + split(sys.version)[0],
|
|
- '/usr/doc/python-' + split(sys.version)[0],
|
|
- '/usr/doc/python-docs-' + sys.version[:3],
|
|
- '/usr/doc/python-' + sys.version[:3],
|
|
- os.path.join(sys.prefix, 'Resources/English.lproj/Documentation')]:
|
|
+ '/usr/share/doc/packages/python/html']:
|
|
if dir and os.path.isdir(os.path.join(dir, 'lib')):
|
|
self.docdir = dir
|
|
|
|
@@ -1738,11 +1734,9 @@
|
|
if not self.docdir:
|
|
self.output.write('''
|
|
Sorry, topic and keyword documentation is not available because the Python
|
|
-HTML documentation files could not be found. If you have installed them,
|
|
-please set the environment variable PYTHONDOCS to indicate their location.
|
|
-
|
|
-On the Microsoft Windows operating system, the files can be built by
|
|
-running "hh -decompile . PythonNN.chm" in the C:\PythonNN\Doc> directory.
|
|
+HTML documentation files could not be found. You need to install package
|
|
+python-doc. If you have installed the docunemtation files manually, please
|
|
+set the environment variable PYTHONDOCS to indicate their location.
|
|
''')
|
|
return
|
|
target = self.topics.get(topic, self.keywords.get(topic))
|