(HTML|Text)Repr.repr1: Guard against objects whos types have no __name__
attribute. Patch and bug report from Geoff Talvola. Closes patch #672855.
diff --git a/Lib/pydoc.py b/Lib/pydoc.py
index abafc0e..410d921 100755
--- a/Lib/pydoc.py
+++ b/Lib/pydoc.py
@@ -312,11 +312,11 @@
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 @@
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)