diff --git a/tools/patman/func_test.py b/tools/patman/func_test.py index 76319fff37e3df6f0fc3bd515c92209470658ce1..748e225446ae26593123f1790c0d946c48282793 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 9ac96c485db4d967851ab0c680232b8f49aeb76d..21e8fc41a98ffdb1cdde30adf1687b7e32b7108f 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. diff --git a/tools/patman/test_util.py b/tools/patman/test_util.py index 4338dbcd282952cc0b275ebcf56bb2e58a090afc..4d0085e2ed4de21f63b6911b8085778e78d95438 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]