# HG changeset patch # User Matt Mackall # Date 1426267686 18000 # Node ID 98829bf71f10ec15c39595c53617747daf49137a # Parent 8d7bf729a4db5f9386b947344df1deca5c37e58d util: define BytesIO in one place diff -r 8d7bf729a4db -r 98829bf71f10 hglib/client.py --- a/hglib/client.py Fri Mar 13 11:34:52 2015 -0400 +++ b/hglib/client.py Fri Mar 13 12:28:06 2015 -0500 @@ -1,11 +1,7 @@ import subprocess, os, struct, re, datetime -try: - from io import BytesIO -except ImportError: - from cStringIO import StringIO as BytesIO import hglib, error, util, templates, merge, context -from util import b, cmdbuilder +from util import b, cmdbuilder, BytesIO class revision(tuple): def __new__(cls, rev, node, tags, branch, author, desc, date): diff -r 8d7bf729a4db -r 98829bf71f10 tests/test-import.py --- a/tests/test-import.py Fri Mar 13 11:34:52 2015 -0400 +++ b/tests/test-import.py Fri Mar 13 12:28:06 2015 -0500 @@ -1,10 +1,5 @@ import common, os -try: - from io import BytesIO -except ImportError: - from cStringIO import StringIO as BytesIO -import hglib -from hglib.util import b +from hglib.util import b, BytesIO patch = b(""" # HG changeset patch