Bring display of builtin types and functions in line with Py 2
Merge pull request #4405 from takluyver/builtin-types-pprint-py3

Bring display of builtin types and functions in line with Py 2