Mercurial > public > mercurial-scm > hg-stable

diff tests/test-simplemerge.py @ 28861:86db5cb55d46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pycompat: switch to util.stringio for py3 compat
author timeless <timeless@mozdev.org>
date Sun, 10 Apr 2016 20:55:37 +0000
parents 56b2bcea2529
children 2d433fa7ff44
line wrap: on
line diff
--- 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