diff options
| author | Ka-Ping Yee <ping@zesty.ca> | 2001-03-23 14:05:53 (GMT) |
|---|---|---|
| committer | Ka-Ping Yee <ping@zesty.ca> | 2001-03-23 14:05:53 (GMT) |
| commit | e280c06d5910eca5bcded37611033bb11bc17110 (patch) | |
| tree | 4b27a70d6ea9f4dfc7d4b244b194b1e84b72f667 /Lib | |
| parent | e702481d38dda0c436e4836544d4edd33805d7ae (diff) | |
| download | cpython-e280c06d5910eca5bcded37611033bb11bc17110.zip cpython-e280c06d5910eca5bcded37611033bb11bc17110.tar.gz cpython-e280c06d5910eca5bcded37611033bb11bc17110.tar.bz2 | |
Browser compatibility fixes.
Show methods aliased into a class from other classes.
Diffstat (limited to 'Lib')
| -rwxr-xr-x | Lib/pydoc.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Lib/pydoc.py b/Lib/pydoc.py index e34fccb..1bb50fd 100755 --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -258,8 +258,9 @@ class HTMLDoc(Doc): return ''' <!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"> <html><head><title>Python: %s</title> -<style>TT { font-family: lucida console, lucida typewriter, courier }</style> -</head><body bgcolor="#f0f0f8"> +<style type="text/css"><!-- +TT { font-family: lucida console, lucida typewriter, courier } +--></style></head><body bgcolor="#f0f0f8"> %s </body></html>''' % (title, contents) @@ -440,7 +441,7 @@ class HTMLDoc(Doc): modules = inspect.getmembers(object, inspect.ismodule) - if 0 and hasattr(object, '__all__'): + if 0 and hasattr(object, '__all__'): # disabled for now visible = lambda key, all=object.__all__: key in all else: visible = lambda key: key[:1] != '_' @@ -473,7 +474,7 @@ class HTMLDoc(Doc): doc = self.markup(getdoc(object), self.preformat, fdict, cdict) doc = doc and '<tt>%s</tt>' % doc - result = result + '<p>%s\n' % self.small(doc) + result = result + '<p>%s</p>\n' % self.small(doc) if hasattr(object, '__path__'): modpkgs = [] @@ -575,7 +576,7 @@ class HTMLDoc(Doc): skipdocs = 0 if inspect.ismethod(object): if cl: - if not cl.__dict__.has_key(name): + if object.im_class is not cl: base = object.im_class url = '#%s-%s' % (base.__name__, name) basename = base.__name__ @@ -595,7 +596,7 @@ class HTMLDoc(Doc): else: if (cl and cl.__dict__.has_key(realname) and cl.__dict__[realname] is object): - reallink = '<a href="%s">%s</a>' % ( + reallink = '<a href="#%s">%s</a>' % ( cl.__name__ + '-' + realname, realname) skipdocs = 1 else: @@ -846,7 +847,7 @@ class TextDoc(Doc): skipdocs = 0 if inspect.ismethod(object): if cl: - if not cl.__dict__.has_key(name): + if object.im_class is not cl: base = object.im_class basename = base.__name__ if base.__module__ != cl.__module__: |