diff -r 50d11dd8ac02 -r 86db5cb55d46 tests/test-simplemerge.py
--- a/tests/test-simplemerge.py	Sun Apr 10 21:32:08 2016 +0000
+++ b/tests/test-simplemerge.py	Sun Apr 10 20:55:37 2016 +0000
@@ -36,8 +36,7 @@
 CantReprocessAndShowBase = simplemerge.CantReprocessAndShowBase
 
 def split_lines(t):
-    from cStringIO import StringIO
-    return StringIO(t).readlines()
+    return util.stringio(t).readlines()
 
 ############################################################
 # test case data from the gnu diffutils manual