[meld/Python3: 15/54] vc.git: Use new py3k import

[Kai Willadsen <kaiw src gnome org>]

commit b7954fd174dca65e1aea24e5b207be7a2b903fde
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Nov 14 06:54:06 2015 +1000

    vc.git: Use new py3k import

 meld/vc/git.py |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/meld/vc/git.py b/meld/vc/git.py
index 1dc3b29..c799741 100644
--- a/meld/vc/git.py
+++ b/meld/vc/git.py
@@ -26,13 +26,12 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import errno
+import io
 import os
 import re
 import shutil
 import stat
 import subprocess
-import sys
-import StringIO
 import tempfile
 from collections import defaultdict
 
@@ -193,7 +192,7 @@ class Vc(_vc.Vc):
         common ancestor anywhere there *is* a conflict.
         """
         proc = self.run("merge-file", "-p", "--diff3", local, base, remote)
-        vc_file = StringIO.StringIO(
+        vc_file = io.BytesIO(
             _vc.base_from_diff3(proc.stdout.read()))
 
         prefix = 'meld-tmp-%s-' % _vc.CONFLICT_MERGED