(HTML|Text)Repr.repr1: Guard against objects whos types have no __name__
attribute. Patch and bug report from Geoff Talvola. Closes patch #672855.
This commit is contained in:
parent
896e5164bb
commit
0fe8fce7e3
20
Lib/pydoc.py
20
Lib/pydoc.py
|
@ -312,11 +312,11 @@ class HTMLRepr(Repr):
|
|||
return Repr.repr(self, object)
|
||||
|
||||
def repr1(self, x, level):
|
||||
methodname = 'repr_' + join(split(type(x).__name__), '_')
|
||||
if hasattr(self, methodname):
|
||||
return getattr(self, methodname)(x, level)
|
||||
else:
|
||||
return self.escape(cram(stripid(repr(x)), self.maxother))
|
||||
if hasattr(type(x), '__name__'):
|
||||
methodname = 'repr_' + join(split(type(x).__name__), '_')
|
||||
if hasattr(self, methodname):
|
||||
return getattr(self, methodname)(x, level)
|
||||
return self.escape(cram(stripid(repr(x)), self.maxother))
|
||||
|
||||
def repr_string(self, x, level):
|
||||
test = cram(x, self.maxstring)
|
||||
|
@ -874,11 +874,11 @@ class TextRepr(Repr):
|
|||
self.maxstring = self.maxother = 100
|
||||
|
||||
def repr1(self, x, level):
|
||||
methodname = 'repr_' + join(split(type(x).__name__), '_')
|
||||
if hasattr(self, methodname):
|
||||
return getattr(self, methodname)(x, level)
|
||||
else:
|
||||
return cram(stripid(repr(x)), self.maxother)
|
||||
if hasattr(type(x), '__name__'):
|
||||
methodname = 'repr_' + join(split(type(x).__name__), '_')
|
||||
if hasattr(self, methodname):
|
||||
return getattr(self, methodname)(x, level)
|
||||
return cram(stripid(repr(x)), self.maxother)
|
||||
|
||||
def repr_string(self, x, level):
|
||||
test = cram(x, self.maxstring)
|
||||
|
|
Loading…
Reference in New Issue