- Fix conversion glitch in test_pyclbr, which caused a test to not fail
   when it should.

 - Remove unneeded classic-class support from pydoc (which would otherwise
   cause test_pyclbr to fail.)
diff --git a/Lib/test/test_pyclbr.py b/Lib/test/test_pyclbr.py
index 7c9d4aa..a03daa9 100644
--- a/Lib/test/test_pyclbr.py
+++ b/Lib/test/test_pyclbr.py
@@ -44,7 +44,7 @@
         if key in ignore: return
         if key not in obj:
             print >>sys.stderr, "***",key
-        self.failUnless(key) in obj
+        self.failUnless(key in obj)
 
     def assertEqualsOrIgnored(self, a, b, ignore):
         ''' succeed iff a == b or a in ignore or b in ignore '''