Using ./sage -fiximports
from #34945.
Also remove trailing whitespace in the affected files.
Part of Meta-ticket #32414
CC: @alexchandler100 @fchapoton @tscrim
Component: refactoring
Author: Alex Chandler, Matthias Koeppe
Reviewer: Travis Scrimshaw
Issue created by migration from https://trac.sagemath.org/ticket/34946