Oops! Restored the pickle test to test_pyclbr, but changed types.py so

that pyclbr doesn't need to special-case modules that do "from types
import *".