commit 945328b0f34226396a8fa3748e14516e1c7f0a64
author Simon Glass <sjg@chromium.org> Fri Apr 17 18:08:55 2020 -0600
committer Simon Glass <sjg@chromium.org> Sun Apr 26 14:25:21 2020 -0600
tree 071f9cae17aa7fb12e899a01675864ba921aa467
parent b38aa0174098ecf82f84149270d6ef203366d64f

patman: Drop Python 2 StringIO code

We can rely on Python 3 now, so drop the workaround for importing
StringIO.

Signed-off-by: Simon Glass <sjg@chromium.org>

tools/patman/func_test.py

diff --git a/tools/patman/func_test.py b/tools/patman/func_test.py
index 76319ff..748e225 100644
--- a/tools/patman/func_test.py
+++ b/tools/patman/func_test.py
@@ -12,10 +12,7 @@
 import tempfile
 import unittest
 
-try:
-    from StringIO import StringIO
-except ImportError:
-    from io import StringIO
+from io import StringIO
 
 import gitutil
 import patchstream

tools/patman/settings.py

diff --git a/tools/patman/settings.py b/tools/patman/settings.py
index 9ac96c4..21e8fc4 100644
--- a/tools/patman/settings.py
+++ b/tools/patman/settings.py
@@ -34,10 +34,7 @@
     - Merge general default settings/aliases with project-specific ones.
 
     # Sample config used for tests below...
-    >>> try:
-    ...     from StringIO import StringIO
-    ... except ImportError:
-    ...     from io import StringIO
+    >>> from io import StringIO
     >>> sample_config = '''
     ... [alias]
     ... me: Peter P. <likesspiders@example.com>

tools/patman/test_util.py

diff --git a/tools/patman/test_util.py b/tools/patman/test_util.py
index 4338dbc..4d0085e 100644
--- a/tools/patman/test_util.py
+++ b/tools/patman/test_util.py
@@ -10,10 +10,7 @@
 
 import command
 
-try:
-  from StringIO import StringIO
-except ImportError:
-  from io import StringIO
+from io import StringIO
 
 PYTHON = 'python%d' % sys.version_info[0]