use six.move for cStringIO

I've tried this before in PR 2385, but now took into account the review comments and committed against a named-bug-tree (or how do properly you call such a thing?) instead of the master. This commits should be considered as a follow up for commit f4adec7.