From ade1e3864f1508ad0ccbce72a39d815c2d7d7c87 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Tue, 14 May 2019 15:53:49 -0600 Subject: [PATCH] patman: Support use of stringIO in Python 3 With Python 3 this class has moved. Update the code to handle both cases. Signed-off-by: Simon Glass --- tools/patman/func_test.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/patman/func_test.py b/tools/patman/func_test.py index 3148115..2c4392d 100644 --- a/tools/patman/func_test.py +++ b/tools/patman/func_test.py @@ -12,15 +12,20 @@ import sys import tempfile import unittest +try: + from StringIO import StringIO +except ImportError: + from io import StringIO + import gitutil import patchstream import settings +import tools @contextlib.contextmanager def capture(): import sys - from cStringIO import StringIO oldout,olderr = sys.stdout, sys.stderr try: out=[StringIO(), StringIO()] -- 2.7.4