diff -r b167df2912d6 Lib/pydoc.py
--- a/Lib/pydoc.py	Sun Jun 08 00:00:13 2014 +1000
+++ b/Lib/pydoc.py	Sat Jun 07 10:59:15 2014 -0700
@@ -2061,7 +2061,8 @@
                         if onerror:
                             onerror(modname)
                         continue
-                    desc = (module.__doc__ or '').splitlines()[0]
+                    doc = module.__doc__
+                    desc = doc.splitlines()[0] if doc else ''
                     path = getattr(module,'__file__',None)
                 name = modname + ' - ' + desc
                 if name.lower().find(key) >= 0: