← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/python2.5/oneiric

« back to all changes in this revision

Viewing changes to Lib/pydoc.py

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2008-12-21 08:57:49 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20081221085749-bijjr25h8na5jdsu
Tags: 2.5.3-0ubuntu1
* New upstream version.
* Regenerate the included documentation.
* Add an option --install-layout=deb, which is ignored for 2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Lib/pydoc.py
27
27
 
28
28
Module docs for core modules are assumed to be in
29
29
 
30
 
    http://www.python.org/doc/current/lib/
 
30
    http://www.python.org/doc/<version>/lib/
31
31
 
32
32
This can be overridden by setting the PYTHONDOCS environment variable
33
33
to a different URL or to a local directory containing the Library
37
37
__author__ = "Ka-Ping Yee <ping@lfw.org>"
38
38
__date__ = "26 February 2001"
39
39
 
40
 
__version__ = "$Revision: 54366 $"
 
40
__version__ = "$Revision: 67693 $"
41
41
__credits__ = """Guido van Rossum, for an excellent programming language.
42
42
Tommy Burnette, the original creator of manpy.
43
43
Paul Prescod, for all his work on onlinehelp.
345
345
        except TypeError:
346
346
            file = '(built-in)'
347
347
 
 
348
        version = '.'.join(str(v) for v in sys.version_info[:3])
348
349
        docloc = os.environ.get("PYTHONDOCS",
349
 
                                "http://www.python.org/doc/current/lib")
 
350
                                "http://www.python.org/doc/%s/lib" % version)
350
351
        basedir = os.path.join(sys.exec_prefix, "lib",
351
352
                               "python"+sys.version[0:3])
352
353
        if (isinstance(object, type(os)) and