Issue 2918: Merge StringIO and cStringIO.
8 files changed