From: Simon Glass <sjg@chromium.org>
Date: Sat, 18 Apr 2020 00:08:55 +0000 (-0600)
Subject: patman: Drop Python 2 StringIO code
X-Git-Url: http://git.dujemihanovic.xyz/img/sics.gif?a=commitdiff_plain;h=c3a13cc3331846a900f0bf6d003357d5c6b7dbe3;p=u-boot.git

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>
---

diff --git a/tools/patman/func_test.py b/tools/patman/func_test.py
index 76319fff37..748e225446 100644
--- a/tools/patman/func_test.py
+++ b/tools/patman/func_test.py
@@ -12,10 +12,7 @@ import sys
 import tempfile
 import unittest
 
-try:
-    from StringIO import StringIO
-except ImportError:
-    from io import StringIO
+from io import StringIO
 
 import gitutil
 import patchstream
diff --git a/tools/patman/settings.py b/tools/patman/settings.py
index 9ac96c485d..21e8fc41a9 100644
--- a/tools/patman/settings.py
+++ b/tools/patman/settings.py
@@ -34,10 +34,7 @@ class _ProjectConfigParser(ConfigParser.SafeConfigParser):
     - 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>
diff --git a/tools/patman/test_util.py b/tools/patman/test_util.py
index 4338dbcd28..4d0085e2ed 100644
--- a/tools/patman/test_util.py
+++ b/tools/patman/test_util.py
@@ -10,10 +10,7 @@ import sys
 
 import command
 
-try:
-  from StringIO import StringIO
-except ImportError:
-  from io import StringIO
+from io import StringIO
 
 PYTHON = 'python%d' % sys.version_info[0]