[Python-Dev] Fix import errors to have data

[Guido van Rossum]

> And one more time.
> 
> - regen'ed against current CVS import.c
> - removes some now-needless workarounds in .py files

Looks good.  I say, check it in.  Any thoughts on where this affects docs?

--Guido van Rossum (home page: http://www.python.org/~guido/)